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 dddd29d  Fix camel-main to skip unwanted configuration file.
dddd29d is described below

commit dddd29d5f25d6854821a7fd51dab92e59405069c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jun 15 14:57:32 2020 +0200

    Fix camel-main to skip unwanted configuration file.
---
 .../resources/META-INF/camel-main-configuration-metadata.json     | 8 --------
 core/camel-main/src/main/docs/main.adoc                           | 8 --------
 .../org/apache/camel/maven/packaging/PrepareCamelMainMojo.java    | 4 +++-
 3 files changed, 3 insertions(+), 17 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 03f494d..7dd47c3 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
@@ -10,7 +10,6 @@
     { "name": "camel.threadpool", "description": "camel-threadpool 
configurations.", "sourceType": 
"org.apache.camel.main.ThreadPoolConfigurationProperties" }
   ],
   "properties": [
-    { "name": "camel.main.allowCoreThreadTimeOut", "description": "Sets 
whether to allow core threads to timeout", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"boolean", "javaType": "java.lang.Boolean" },
     { "name": "camel.main.allowUseOriginalMessage", "description": "Sets 
whether to allow access to the original message from Camel's error handler, or 
from org.apache.camel.spi.UnitOfWork.getOriginalInMessage(). Turning this off 
can optimize performance, as defensive copy of the original message is not 
needed. Default is false.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
     { "name": "camel.main.autoConfigurationEnabled", "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.na [...]
     { "name": "camel.main.autoConfigurationEnvironmentVariablesEnabled", 
"description": "Whether auto configuration should include OS environment 
variables as well. When enabled this allows to overrule any configuration using 
an OS environment variable. For example to set a shutdown timeout of 5 seconds: 
CAMEL_MAIN_SHUTDOWNTIMEOUT=5. This option is default enabled.", "sourceType": 
"org.apache.camel.main.MainConfigurationProperties", "type": "boolean", 
"javaType": "boolean", "defaultValue [...]
@@ -37,28 +36,22 @@
     { "name": "camel.main.endpointLazyStartProducer", "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 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 mes [...]
     { "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.id", "description": "Sets the id of this thread 
pool", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"string", "javaType": "java.lang.String" },
     { "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: 
&#42;&#42;\/Bar&#42; To exclude all routes form a specific package use: 
com\/mycompany\/bar\/&#42;  [...]
     { "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: 
&#42;&#42;\/Foo To include all routes form a specific package use: 
com\/mycompany\/foo\/&#42; To in [...]
     { "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": 
"ManagementStatisticsLevel.Default", "enum": [ "Extended", "Default", 
"RoutesOnly", "Off" ] },
-    { "name": "camel.main.keepAliveTime", "description": "Sets the keep alive 
time for inactive threads", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"integer", "javaType": "java.lang.Long" },
     { "name": "camel.main.lightweight", "description": "Experimental: 
Configure the context to be lightweight. This will trigger some optimizations 
and memory reduction options. Lightweight context have some limitations. At 
this moment, dynamic endpoint destinations are not supported.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
     { "name": "camel.main.loadTypeConverters", "description": "Whether to load 
custom type converters by scanning classpath. This is used for backwards 
compatibility with Camel 2.x. Its recommended to migrate to use fast type 
converter loading by setting Converter(loader = true) on your custom type 
converter classes.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
     { "name": "camel.main.logDebugMaxChars", "description": "Is used to limit 
the maximum length of the logging Camel message bodies. If the message body is 
longer than the limit, the log message is clipped. Use -1 to have unlimited 
length. Use for example 1000 to log at most 1000 characters.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", 
"javaType": "int" },
     { "name": "camel.main.logExhaustedMessageBody", "description": "Sets 
whether to log exhausted message body with message history. Default is false.", 
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": 
"boolean", "javaType": "boolean" },
     { "name": "camel.main.logMask", "description": "Sets whether log mask is 
enabled or not. Default is false.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
-    { "name": "camel.main.maxPoolSize", "description": "Sets the maximum pool 
size", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"integer", "javaType": "java.lang.Integer" },
-    { "name": "camel.main.maxQueueSize", "description": "Sets the maximum 
number of tasks in the work queue. Use -1 or an unbounded queue", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"integer", "javaType": "java.lang.Integer" },
     { "name": "camel.main.mdcLoggingKeysPattern", "description": "Sets the 
pattern used for determine which custom MDC keys to propagate during message 
routing when the routing engine continues routing asynchronously for the given 
message. Setting this pattern to will propagate all custom keys. Or setting the 
pattern to foo,bar will propagate any keys starting with either foo or bar. 
Notice that a set of standard Camel MDC keys are always propagated which starts 
with camel. as key name.  [...]
     { "name": "camel.main.messageHistory", "description": "Sets whether 
message history is enabled or not. Default is false.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
     { "name": "camel.main.name", "description": "Sets the name of the 
CamelContext.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string", 
"javaType": "java.lang.String" },
     { "name": "camel.main.packageScanRouteBuilders", "description": "Sets 
package names for scanning for org.apache.camel.builder.RouteBuilder classes as 
candidates to be included. If you are using Spring Boot then its instead 
recommended to use Spring Boots component scanning and annotate your route 
builder classes with Component. In other words only use this for Camel Main in 
standalone mode.", "sourceType": 
"org.apache.camel.main.MainConfigurationProperties", "type": "string", "javaTy 
[...]
-    { "name": "camel.main.poolSize", "description": "Sets the core pool size 
(threads to keep minimum in pool)", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"integer", "javaType": "java.lang.Integer" },
     { "name": "camel.main.producerTemplateCacheSize", "description": "Producer 
template endpoints cache size.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", 
"javaType": "int", "defaultValue": 1000 },
-    { "name": "camel.main.rejectedPolicy", "description": "Sets the handler 
for tasks which cannot be executed by the thread pool.", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"object", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy" },
     { "name": "camel.main.routeControllerBackOffDelay", "description": 
"Backoff delay in millis when restarting a route that failed to startup.", 
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": 
"integer", "javaType": "long" },
     { "name": "camel.main.routeControllerBackOffMaxAttempts", "description": 
"Backoff maximum number of attempts to restart a route that failed to startup. 
When this threshold has been exceeded then the controller will give up 
attempting to restart the route, and the route will remain as stopped.", 
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": 
"integer", "javaType": "long" },
     { "name": "camel.main.routeControllerBackOffMaxDelay", "description": 
"Backoff maximum delay in millis when restarting a route that failed to 
startup.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", 
"javaType": "long" },
@@ -92,7 +85,6 @@
     { "name": "camel.main.streamCachingSpoolUsedHeapMemoryThreshold", 
"description": "Sets a percentage (1-99) of used heap memory threshold to 
activate stream caching spooling to disk.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer", 
"javaType": "int" },
     { "name": "camel.main.streamCachingStatisticsEnabled", "description": 
"Sets whether stream caching statistics is enabled.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
     { "name": "camel.main.threadNamePattern", "description": "Sets the thread 
name pattern used for creating the full thread name. The default pattern is: 
Camel (#camelId#) thread ##counter# - #name# Where #camelId# is the name of the 
CamelContext. and #counter# is a unique incrementing counter. and #name# is the 
regular thread name. You can also use #longName# which is the long thread name 
which can includes endpoint parameters etc.", "sourceType": 
"org.apache.camel.main.DefaultConfigur [...]
-    { "name": "camel.main.timeUnit", "description": "Sets the time unit used 
for keep alive time", "sourceType": 
"org.apache.camel.main.ThreadPoolProfileConfigurationProperties", "type": 
"object", "javaType": "java.util.concurrent.TimeUnit" },
     { "name": "camel.main.tracing", "description": "Sets whether tracing is 
enabled or not. Default is false.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
     { "name": "camel.main.tracingPattern", "description": "Tracing pattern to 
match which node EIPs to trace. For example to match all To EIP nodes, use to. 
The pattern matches by node and route id's Multiple patterns can be separated 
by comma.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string", 
"javaType": "java.lang.String" },
     { "name": "camel.main.useBreadcrumb", "description": "Set whether 
breadcrumb is enabled. The default value is false.", "sourceType": 
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", 
"javaType": "boolean" },
diff --git a/core/camel-main/src/main/docs/main.adoc 
b/core/camel-main/src/main/docs/main.adoc
index b37ffc7..d8a5965 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -22,7 +22,6 @@ The following table lists all the options:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.main.allowCoreThreadTime Out* | Sets whether to allow core threads to 
timeout |  | Boolean
 | *camel.main.allowUseOriginal Message* | Sets whether to allow access to the 
original message from Camel's error handler, or from 
org.apache.camel.spi.UnitOfWork.getOriginalInMessage(). Turning this off can 
optimize performance, as defensive copy of the original message is not needed. 
Default is false. |  | boolean
 | *camel.main.autoConfiguration Enabled* | 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.dataf [...]
 | *camel.main.autoConfiguration EnvironmentVariablesEnabled* | Whether auto 
configuration should include OS environment variables as well. When enabled 
this allows to overrule any configuration using an OS environment variable. For 
example to set a shutdown timeout of 5 seconds: CAMEL_MAIN_SHUTDOWNTIMEOUT=5. 
This option is default enabled. | true | boolean
@@ -49,28 +48,22 @@ The following table lists all the options:
 | *camel.main.endpointLazyStart 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 cre [...]
 | *camel.main.endpointRuntime 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.id* | Sets the id of this thread pool |  | String
 | *camel.main.inflightRepository 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 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: 
&#42;&#42;/Bar&#42; To exclude all routes form a specific package use: 
com/mycompany/bar/&#42; To exclude all routes form a s [...]
 | *camel.main.javaRoutesInclude 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: &#42;&#42;/Foo 
To include all routes form a specific package use: com/mycompany/foo/&#42; To 
include all routes form a specif [...]
 | *camel.main.jmxEnabled* | Enable JMX in your Camel application. | true | 
boolean
 | *camel.main.jmxManagementName Pattern* | The naming pattern for creating the 
CamelContext JMX management name. The default pattern is #name# | #name# | 
String
 | *camel.main.jmxManagement StatisticsLevel* | Sets the JMX statistics level 
The level can be set to Extended to gather additional information The default 
value is Default. | ManagementStatisticsLevel.Default | 
ManagementStatisticsLevel
-| *camel.main.keepAliveTime* | Sets the keep alive time for inactive threads | 
 | Long
 | *camel.main.lightweight* | Experimental: Configure the context to be 
lightweight. This will trigger some optimizations and memory reduction options. 
Lightweight context have some limitations. At this moment, dynamic endpoint 
destinations are not supported. |  | boolean
 | *camel.main.loadTypeConverters* | Whether to load custom type converters by 
scanning classpath. This is used for backwards compatibility with Camel 2.x. 
Its recommended to migrate to use fast type converter loading by setting 
Converter(loader = true) on your custom type converter classes. |  | boolean
 | *camel.main.logDebugMaxChars* | Is used to limit the maximum length of the 
logging Camel message bodies. If the message body is longer than the limit, the 
log message is clipped. Use -1 to have unlimited length. Use for example 1000 
to log at most 1000 characters. |  | int
 | *camel.main.logExhaustedMessage Body* | Sets whether to log exhausted 
message body with message history. Default is false. |  | boolean
 | *camel.main.logMask* | Sets whether log mask is enabled or not. Default is 
false. |  | boolean
-| *camel.main.maxPoolSize* | Sets the maximum pool size |  | Integer
-| *camel.main.maxQueueSize* | Sets the maximum number of tasks in the work 
queue. Use -1 or an unbounded queue |  | Integer
 | *camel.main.mdcLoggingKeys Pattern* | Sets the pattern used for determine 
which custom MDC keys to propagate during message routing when the routing 
engine continues routing asynchronously for the given message. Setting this 
pattern to will propagate all custom keys. Or setting the pattern to foo,bar 
will propagate any keys starting with either foo or bar. Notice that a set of 
standard Camel MDC keys are always propagated which starts with camel. as key 
name. The match rules are applie [...]
 | *camel.main.messageHistory* | Sets whether message history is enabled or 
not. Default is false. |  | boolean
 | *camel.main.name* | Sets the name of the CamelContext. |  | String
 | *camel.main.packageScanRoute Builders* | Sets package names for scanning for 
org.apache.camel.builder.RouteBuilder classes as candidates to be included. If 
you are using Spring Boot then its instead recommended to use Spring Boots 
component scanning and annotate your route builder classes with Component. In 
other words only use this for Camel Main in standalone mode. |  | String
-| *camel.main.poolSize* | Sets the core pool size (threads to keep minimum in 
pool) |  | Integer
 | *camel.main.producerTemplate CacheSize* | Producer template endpoints cache 
size. | 1000 | int
-| *camel.main.rejectedPolicy* | Sets the handler for tasks which cannot be 
executed by the thread pool. |  | ThreadPoolRejectedPolicy
 | *camel.main.routeControllerBack OffDelay* | Backoff delay in millis when 
restarting a route that failed to startup. |  | long
 | *camel.main.routeControllerBack OffMaxAttempts* | Backoff maximum number of 
attempts to restart a route that failed to startup. When this threshold has 
been exceeded then the controller will give up attempting to restart the route, 
and the route will remain as stopped. |  | long
 | *camel.main.routeControllerBack OffMaxDelay* | Backoff maximum delay in 
millis when restarting a route that failed to startup. |  | long
@@ -104,7 +97,6 @@ The following table lists all the options:
 | *camel.main.streamCachingSpool UsedHeapMemoryThreshold* | Sets a percentage 
(1-99) of used heap memory threshold to activate stream caching spooling to 
disk. |  | int
 | *camel.main.streamCaching StatisticsEnabled* | Sets whether stream caching 
statistics is enabled. |  | boolean
 | *camel.main.threadNamePattern* | Sets the thread name pattern used for 
creating the full thread name. The default pattern is: Camel (#camelId#) thread 
##counter# - #name# Where #camelId# is the name of the CamelContext. and 
#counter# is a unique incrementing counter. and #name# is the regular thread 
name. You can also use #longName# which is the long thread name which can 
includes endpoint parameters etc. |  | String
-| *camel.main.timeUnit* | Sets the time unit used for keep alive time |  | 
TimeUnit
 | *camel.main.tracing* | Sets whether tracing is enabled or not. Default is 
false. |  | boolean
 | *camel.main.tracingPattern* | Tracing pattern to match which node EIPs to 
trace. For example to match all To EIP nodes, use to. The pattern matches by 
node and route id's Multiple patterns can be separated by comma. |  | String
 | *camel.main.useBreadcrumb* | Set whether breadcrumb is enabled. The default 
value is false. |  | boolean
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
index 9091913..523fa8b 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
@@ -179,8 +179,10 @@ public class PrepareCamelMainMojo extends 
AbstractGeneratorMojo {
                     prefix = "camel.health.";
                 } else if (file.getName().contains("Lra")) {
                     prefix = "camel.lra.";
+                } else if 
(file.getName().contains("ThreadPoolProfileConfigurationProperties")) {
+                    // skip this file
+                    continue;
                 } else if 
(file.getName().contains("ThreadPoolConfigurationProperties")) {
-                    // we only want this properties class for thread pool
                     prefix = "camel.threadpool.";
                 } else {
                     prefix = "camel.main.";

Reply via email to