date:20190624

[camel] branch master updated: Fixed camel-fhir 2 options was not in the docs

2019-06-24 Thread davsclaus

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 a6af030  Fixed camel-fhir 2 options was not in the docs
a6af030 is described below

commit a6af030d27d98c1ec1ad3d251d2e78e6ae57b942
Author: Claus Ibsen 
AuthorDate: Tue Jun 25 07:42:05 2019 +0200

Fixed camel-fhir 2 options was not in the docs
---
 .../src/main/docs/fhir-component.adoc  |   4 +-
 .../camel/component/fhir/FhirConfiguration.java|  14 +--
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   | 124 +
 3 files changed, 134 insertions(+), 8 deletions(-)

diff --git 
a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc 
b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
index 901ff81..47c177c 100644
--- 
a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
+++ 
b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
@@ -81,7 +81,7 @@ with the following path and query parameters:
 |===
 
 
- Query Parameters (28 parameters):
+ Query Parameters (30 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +98,8 @@ with the following path and query parameters:
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
 | *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 [...]
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic 
property binding (Camel 2.x) or the newer property binding with additional 
capabilities | false | boolean
+| *client* (advanced) | To use the custom client |  | IGenericClient
+| *clientFactory* (advanced) | To use the custom client factory |  | 
IRestfulClientFactory
 | *compress* (advanced) | Compresses outgoing (POST/PUT) contents to the GZIP 
format | false | boolean
 | *connectionTimeout* (advanced) | How long to try and establish the initial 
TCP connection (in ms) | 1 | Integer
 | *deferModelScanning* (advanced) | When this option is set, model classes 
will not be scanned for children until the child list for the given type is 
actually accessed. | false | boolean
diff --git 
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
 
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
index 3043a97..33910e0 100644
--- 
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
+++ 
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
@@ -36,8 +36,8 @@ import org.apache.camel.util.ObjectHelper;
 @UriParams
 public class FhirConfiguration {
 
-@UriPath
-@Metadata(enums = "capabilities, create, delete, history, load-page, meta, 
patch, read, search, transaction, update, validate", required = true)
+@UriPath(enums = 
"capabilities,create,delete,history,load-page,meta,patch,read,search,transaction,update,validate")
+@Metadata(required = true)
 private FhirApiName apiName;
 @UriPath
 @Metadata(required = true)
@@ -46,7 +46,7 @@ public class FhirConfiguration {
 @UriParam(description = "The FHIR server base URL")
 private String serverUrl;
 
-@UriParam(description = "The FHIR Version to use", enums = "DSTU2, 
DSTU2_HL7ORG, DSTU2_1, DSTU3, R4", defaultValue = "DSTU3", javaType = 
"java.lang.String")
+@UriParam(description = "The FHIR Version to use", defaultValue = "DSTU3", 
javaType = "java.lang.String")
 private FhirVersionEnum fhirVersion = FhirVersionEnum.DSTU3;
 
 @UriParam(description = "Pretty print all request")
@@ -70,7 +70,7 @@ public class FhirConfiguration {
 @UriParam(description = "Compresses outgoing (POST/PUT) contents to the 
GZIP format", label = "advanced")
 private boolean compress;
 
-@UriParam(description = "Request that the server modify the response using 
the _summary param", enums = "TRUE, FALSE, TEXT, DATA, COUNT",
+@UriParam(description = "Request that the server modify the response using 
the _summary param",
 label = "advanced", javaType = "java.lang.String")
 private SummaryEnum summary;
 
@@ -84,7 +84,7 @@ public class FhirConfiguration {
 @UriParam(description = "Force conformance

[camel] branch master updated: Lets also use logback in this example

2019-06-24 Thread davsclaus

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 f76cfbf  Lets also use logback in this example
f76cfbf is described below

commit f76cfbf7cd6946cb1c1774a70f7c65b1c40e97da
Author: Claus Ibsen 
AuthorDate: Tue Jun 25 06:49:24 2019 +0200

Lets also use logback in this example
---
 examples/camel-example-main/pom.xml| 17 +-
 .../src/main/resources/log4j2.properties   | 26 --
 .../src/main/resources/logback.xml | 11 +
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/examples/camel-example-main/pom.xml 
b/examples/camel-example-main/pom.xml
index 240d629..e2eee64 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/pom.xml
@@ -59,19 +59,14 @@
 runtime
 
 
-org.apache.logging.log4j
-log4j-core
-runtime
-
-
-org.apache.logging.log4j
-log4j-slf4j-impl
-runtime
+ch.qos.logback
+logback-core
+1.2.3
 
 
-org.apache.logging.log4j
-log4j-jul
-runtime
+ch.qos.logback
+logback-classic
+1.2.3
 
 
 
diff --git a/examples/camel-example-main/src/main/resources/log4j2.properties 
b/examples/camel-example-main/src/main/resources/log4j2.properties
deleted file mode 100644
index c63f861..000
--- a/examples/camel-example-main/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-## ---
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##  http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
-
-logger.camel-main.name = org.apache.camel.main
-logger.camel-main.level = INFO
diff --git a/examples/camel-example-main/src/main/resources/logback.xml 
b/examples/camel-example-main/src/main/resources/logback.xml
new file mode 100644
index 000..6156c21
--- /dev/null
+++ b/examples/camel-example-main/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+
+
+
+%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - 
%msg%n
+
+
+
+
+
+
+
\ No newline at end of file

[camel] branch master updated: Polished

2019-06-24 Thread davsclaus

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 3b75c01  Polished
3b75c01 is described below

commit 3b75c01110efb3bf2ffbe43bbe701c13c2a58f63
Author: Claus Ibsen 
AuthorDate: Tue Jun 25 06:43:00 2019 +0200

Polished
---
 examples/camel-example-main-tiny/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/camel-example-main-tiny/pom.xml 
b/examples/camel-example-main-tiny/pom.xml
index 83d..744f005 100644
--- a/examples/camel-example-main-tiny/pom.xml
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -44,7 +44,7 @@
 org.apache.camel
 camel-core-engine
 
-
+
 
 org.apache.camel
 camel-jaxp

[camel] 01/03: Regen

2019-06-24 Thread davsclaus

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

commit b12c7f27e191d11879ede31eeae22eee43da580a
Author: Claus Ibsen 
AuthorDate: Tue Jun 25 06:25:09 2019 +0200

Regen
---
 components/camel-aws-s3/src/main/docs/aws-s3-component.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc 
b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 5290d61..412ddcc 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
+| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the link:registry.htmlRegistry. |  | 
AmazonS3
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket | true 
| boolean
 | *pathStyleAccess* (common) | Whether or not the S3 client should use path 
style access | false | boolean
 | *policy* (common) | The policy for this queue to set in the 
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. |  | String
@@ -170,7 +170,7 @@ The component supports 38 options, which are listed below.
 | *camel.component.aws-s3.basic-property-binding* | Whether the component 
should use basic property binding (Camel 2.x) or the newer property binding 
with additional capabilities | false | Boolean
 | *camel.component.aws-s3.configuration.accelerate-mode-enabled* | Define if 
Accelerate Mode enabled is true or false | false | Boolean
 | *camel.component.aws-s3.configuration.access-key* | Amazon AWS Access Key |  
| String
-| *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a 
`com.amazonaws.services.s3.AmazonS3` in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
+| *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a 
`com.amazonaws.services.s3.AmazonS3` in the link:registry.html[Registry]. |  | 
AmazonS3
 | *camel.component.aws-s3.configuration.auto-create-bucket* | Setting the 
autocreation of the bucket | true | Boolean
 | *camel.component.aws-s3.configuration.autoclose-body* | If this option is 
true and includeBody is true, then the S3Object.close() method will be called 
on exchange completion. This option is strongly related to includeBody option. 
In case of setting includeBody to true and autocloseBody to false, it will be 
up to the caller to close the S3Object stream. Setting autocloseBody to true, 
will close the S3Object stream automatically. | true | Boolean
 | *camel.component.aws-s3.configuration.aws-k-m-s-key-id* | Define the id of 
KMS key to use in case KMS is enabled |  | String

[camel] branch master updated (86f48b5 -> 7ab48f4)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 86f48b5  aws-s3-comonent.adoc auto generated correcly from 
camel/components to camel/docs
 new b12c7f2  Regen
 new 442679f  Polish
 new 7ab48f4  Regen

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/docs/aws-s3-component.adoc|  4 +-
 .../modules/ROOT/pages/aws-s3-component.adoc   |  4 +-
 .../modules/ROOT/pages/aggregate-eip.adoc  | 26 +-
 docs/user-manual/modules/ROOT/pages/bean-eip.adoc  | 14 +++---
 .../user-manual/modules/ROOT/pages/choice-eip.adoc |  6 +--
 .../modules/ROOT/pages/claimCheck-eip.adoc |  2 +-
 .../ROOT/pages/content-based-router-eip.adoc   |  8 +--
 .../modules/ROOT/pages/content-filter-eip.adoc |  4 +-
 docs/user-manual/modules/ROOT/pages/delay-eip.adoc |  2 +-
 .../modules/ROOT/pages/dynamicRouter-eip.adoc  |  2 +-
 .../user-manual/modules/ROOT/pages/filter-eip.adoc | 20 
 docs/user-manual/modules/ROOT/pages/from-eip.adoc  |  2 +-
 .../modules/ROOT/pages/hystrix-eip.adoc|  6 +--
 .../modules/ROOT/pages/idempotentConsumer-eip.adoc | 10 ++--
 docs/user-manual/modules/ROOT/pages/log-eip.adoc   |  6 +--
 .../modules/ROOT/pages/marshal-eip.adoc|  4 +-
 .../modules/ROOT/pages/multicast-eip.adoc  |  2 +-
 .../modules/ROOT/pages/otherwise-eip.adoc  |  4 +-
 .../modules/ROOT/pages/pipeline-eip.adoc   |  6 +--
 .../modules/ROOT/pages/process-eip.adoc| 18 +++
 .../modules/ROOT/pages/recipientList-eip.adoc  |  2 +-
 .../modules/ROOT/pages/resequence-eip.adoc |  2 +-
 .../modules/ROOT/pages/rollback-eip.adoc   | 40 +++
 .../modules/ROOT/pages/routingSlip-eip.adoc|  2 +-
 .../user-manual/modules/ROOT/pages/script-eip.adoc |  2 +-
 .../modules/ROOT/pages/simple-language.adoc|  2 +
 docs/user-manual/modules/ROOT/pages/split-eip.adoc |  2 +-
 docs/user-manual/modules/ROOT/pages/step-eip.adoc  |  2 +-
 docs/user-manual/modules/ROOT/pages/to-eip.adoc| 12 ++---
 docs/user-manual/modules/ROOT/pages/toD-eip.adoc   |  2 +-
 .../modules/ROOT/pages/transform-eip.adoc  |  2 +-
 .../modules/ROOT/pages/unmarshal-eip.adoc  |  6 +--
 docs/user-manual/modules/ROOT/pages/when-eip.adoc  |  4 +-
 .../modules/ROOT/pages/wireTap-eip.adoc| 58 +++---
 examples/camel-example-main-tiny/pom.xml   |  3 +-
 35 files changed, 147 insertions(+), 144 deletions(-)

[camel] 03/03: Regen

2019-06-24 Thread davsclaus

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

commit 7ab48f4f876416bc02c95c720a831288f810f7c5
Author: Claus Ibsen 
AuthorDate: Tue Jun 25 06:36:45 2019 +0200

Regen
---
 .../modules/ROOT/pages/aws-s3-component.adoc   |  4 +-
 .../modules/ROOT/pages/aggregate-eip.adoc  | 26 +-
 docs/user-manual/modules/ROOT/pages/bean-eip.adoc  | 14 +++---
 .../user-manual/modules/ROOT/pages/choice-eip.adoc |  6 +--
 .../modules/ROOT/pages/claimCheck-eip.adoc |  2 +-
 .../ROOT/pages/content-based-router-eip.adoc   |  8 +--
 .../modules/ROOT/pages/content-filter-eip.adoc |  4 +-
 docs/user-manual/modules/ROOT/pages/delay-eip.adoc |  2 +-
 .../modules/ROOT/pages/dynamicRouter-eip.adoc  |  2 +-
 .../user-manual/modules/ROOT/pages/filter-eip.adoc | 20 
 docs/user-manual/modules/ROOT/pages/from-eip.adoc  |  2 +-
 .../modules/ROOT/pages/hystrix-eip.adoc|  6 +--
 .../modules/ROOT/pages/idempotentConsumer-eip.adoc | 10 ++--
 docs/user-manual/modules/ROOT/pages/log-eip.adoc   |  6 +--
 .../modules/ROOT/pages/marshal-eip.adoc|  4 +-
 .../modules/ROOT/pages/multicast-eip.adoc  |  2 +-
 .../modules/ROOT/pages/otherwise-eip.adoc  |  4 +-
 .../modules/ROOT/pages/pipeline-eip.adoc   |  6 +--
 .../modules/ROOT/pages/process-eip.adoc| 18 +++
 .../modules/ROOT/pages/recipientList-eip.adoc  |  2 +-
 .../modules/ROOT/pages/resequence-eip.adoc |  2 +-
 .../modules/ROOT/pages/rollback-eip.adoc   | 40 +++
 .../modules/ROOT/pages/routingSlip-eip.adoc|  2 +-
 .../user-manual/modules/ROOT/pages/script-eip.adoc |  2 +-
 .../modules/ROOT/pages/simple-language.adoc|  2 +
 docs/user-manual/modules/ROOT/pages/split-eip.adoc |  2 +-
 docs/user-manual/modules/ROOT/pages/step-eip.adoc  |  2 +-
 docs/user-manual/modules/ROOT/pages/to-eip.adoc| 12 ++---
 docs/user-manual/modules/ROOT/pages/toD-eip.adoc   |  2 +-
 .../modules/ROOT/pages/transform-eip.adoc  |  2 +-
 .../modules/ROOT/pages/unmarshal-eip.adoc  |  6 +--
 docs/user-manual/modules/ROOT/pages/when-eip.adoc  |  4 +-
 .../modules/ROOT/pages/wireTap-eip.adoc| 58 +++---
 33 files changed, 143 insertions(+), 141 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc 
b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 5290d61..412ddcc 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
+| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the link:registry.htmlRegistry. |  | 
AmazonS3
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket | true 
| boolean
 | *pathStyleAccess* (common) | Whether or not the S3 client should use path 
style access | false | boolean
 | *policy* (common) | The policy for this queue to set in the 
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. |  | String
@@ -170,7 +170,7 @@ The component supports 38 options, which are listed below.
 | *camel.component.aws-s3.basic-property-binding* | Whether the component 
should use basic property binding (Camel 2.x) or the newer property binding 
with additional capabilities | false | Boolean
 | *camel.component.aws-s3.configuration.accelerate-mode-enabled* | Define if 
Accelerate Mode enabled is true or false | false | Boolean
 | *camel.component.aws-s3.configuration.access-key* | Amazon AWS Access Key |  
| String
-| *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a 
`com.amazonaws.services.s3.AmazonS3` in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
+| *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a 
`com.amazonaws.services.s3.AmazonS3` in the link:registry.html[Registry]. |  | 
AmazonS3
 | *camel.component.aws-s3.configuration.auto-create-bucket* | Setting the 
autocreation of the bucket | true | Boolean
 | *camel.component.aws-s3.configuration.autoclose-body* | If this option is 
true and includeBody is true, then the S3Object.close() method will be called 
on exchange completion. This option is strongly related to includeBody option. 
In case of setting includeBody to true and autocloseBody to false, it will be 
up to the caller to close the S3Object stream. Setting autocloseBody to true, 
will close the S3Object stream automatically. | true | Boolean
 | *camel.component.aws-s3.configuration.aws-k-m-s-key-id* | Define the id of 
KMS key to use in case KMS is

[camel] 02/03: Polish

2019-06-24 Thread davsclaus

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

commit 442679ff4c914d79b84c525ff0c9c18e7ac5bc1a
Author: Claus Ibsen 
AuthorDate: Tue Jun 25 06:36:16 2019 +0200

Polish
---
 examples/camel-example-main-tiny/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/camel-example-main-tiny/pom.xml 
b/examples/camel-example-main-tiny/pom.xml
index 2787ac8..83d 100644
--- a/examples/camel-example-main-tiny/pom.xml
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -63,7 +63,7 @@
 org.apache.camel
 camel-main
 
-
+
 
 org.apache.camel
 camel-bean
@@ -74,6 +74,7 @@
 
 
 
+
 
 com.sun.xml.bind
 jaxb-core

[camel] 03/04: little fix on dataset-component.adoc in camel/component and autogenerate it on camel/docs

2019-06-24 Thread davsclaus

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

commit 7dabfee1f6034bb8322d59572b3bb2f78c5f4cec
Author: nayananga@acerubuntu18.04 
AuthorDate: Mon Jun 24 13:58:19 2019 +0530

little fix on dataset-component.adoc in camel/component and autogenerate it 
on camel/docs
---
 components/camel-dataset/src/main/docs/dataset-component.adoc | 2 +-
 docs/components/modules/ROOT/pages/dataset-component.adoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc 
b/components/camel-dataset/src/main/docs/dataset-component.adoc
index b28114c..22c265b 100644
--- a/components/camel-dataset/src/main/docs/dataset-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The <>, 
<>
 and <> endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.html[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.
 
diff --git a/docs/components/modules/ROOT/pages/dataset-component.adoc 
b/docs/components/modules/ROOT/pages/dataset-component.adoc
index b28114c..22c265b 100644
--- a/docs/components/modules/ROOT/pages/dataset-component.adoc
+++ b/docs/components/modules/ROOT/pages/dataset-component.adoc
@@ -8,7 +8,7 @@ notoriously difficult. The <>, 
<>
 and <> endpoints work great with the
 Camel Testing Framework to simplify your unit and
 integration testing using
-xref:enterprise-integration-patterns.html[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's large range of Components
 together with the powerful Bean Integration.

[camel] branch master updated (9d92f1a -> 86f48b5)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 9d92f1a  Regen
 new f3a6ee7  bug fixes
 new ffa2218  fixed link issues inside camel/components .adoc file and ran 
mvn clean install in each folder then ran mvn clean package inside camel/docs
 new 7dabfee  little fix on dataset-component.adoc in camel/component and 
autogenerate it on camel/docs
 new 86f48b5  aws-s3-comonent.adoc auto generated correcly from 
camel/components to camel/docs

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/docs/ahc-ws-component.adoc|  2 +-
 .../camel-ahc/src/main/docs/ahc-component.adoc |  2 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |  2 +-
 .../src/main/docs/aws-s3-component.adoc|  4 +-
 .../src/main/docs/beanstalk-component.adoc |  4 +-
 components/camel-cdi/src/main/docs/cdi.adoc| 30 ++---
 .../src/main/docs/cometd-component.adoc|  2 +-
 .../src/main/docs/crypto-component.adoc|  2 +-
 .../src/main/docs/cxf-transport.adoc   |  2 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc | 52 +++---
 .../camel-cxf/src/main/docs/cxfrs-component.adoc   |  2 +-
 .../src/main/docs/dataformat-component.adoc|  6 +--
 .../src/main/docs/dataset-component.adoc   |  2 +-
 .../src/main/docs/dataset-test-component.adoc  |  2 +-
 .../src/main/docs/disruptor-component.adoc |  2 +-
 .../main/docs/elasticsearch-rest-component.adoc|  2 +-
 .../src/main/docs/facebook-component.adoc  |  2 +-
 .../camel-grape/src/main/docs/grape-component.adoc |  2 +-
 .../src/main/docs/groovy-language.adoc |  4 +-
 .../camel-http4/src/main/docs/http4-component.adoc |  2 +-
 .../camel-irc/src/main/docs/irc-component.adoc |  2 +-
 .../camel-jetty/src/main/docs/jetty-component.adoc |  4 +-
 .../camel-jms/src/main/docs/jms-component.adoc |  6 +--
 .../camel-jpa/src/main/docs/jpa-component.adoc | 14 +++---
 .../docs/openshift-build-configs-component.adoc|  2 +-
 .../src/main/docs/language-component.adoc  |  2 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |  2 +-
 .../src/main/docs/metrics-component.adoc   | 10 ++---
 .../src/main/docs/micrometer-component.adoc| 10 ++---
 .../camel-mock/src/main/docs/mock-component.adoc   |  2 +-
 .../camel-mvel/src/main/docs/mvel-language.adoc|  2 +-
 .../src/main/docs/nagios-component.adoc|  2 +-
 .../src/main/docs/netty4-component.adoc|  2 +-
 .../camel-ognl/src/main/docs/ognl-language.adoc|  2 +-
 .../camel-paho/src/main/docs/paho-component.adoc   |  2 +-
 .../camel-pdf/src/main/docs/pdf-component.adoc |  8 ++--
 .../src/main/docs/properties-component.adoc|  2 +-
 .../src/main/docs/quartz2-component.adoc   |  2 +-
 components/camel-ribbon/src/main/docs/ribbon.adoc  |  2 +-
 .../src/main/docs/xquery-component.adoc|  4 +-
 .../camel-saxon/src/main/docs/xquery-language.adoc |  4 +-
 .../src/main/docs/servlet-component.adoc   |  2 +-
 .../src/main/docs/soroush-component.adoc   |  4 +-
 .../src/main/docs/spring-boot.adoc |  2 +-
 .../src/main/docs/spring-security.adoc |  2 +-
 .../camel-spring/src/main/docs/spel-language.adoc  |  4 +-
 .../src/main/docs/spring-event-component.adoc  |  4 +-
 components/camel-spring/src/main/docs/spring.adoc  | 20 -
 .../src/main/docs/sql-stored-component.adoc|  4 +-
 .../src/main/docs/telegram-component.adoc  |  4 +-
 .../camel-timer/src/main/docs/timer-component.adoc |  2 +-
 .../camel-twitter/src/main/docs/twitter.adoc   |  2 +-
 .../src/main/docs/undertow-component.adoc  |  2 +-
 .../src/main/docs/univocity-csv-dataformat.adoc|  2 +-
 .../src/main/docs/univocity-fixed-dataformat.adoc  |  2 +-
 .../src/main/docs/univocity-tsv-dataformat.adoc|  2 +-
 .../src/main/docs/websocket-component.adoc |  2 +-
 .../src/main/docs/xmlsecurity-component.adoc   |  2 +-
 .../camel-xpath/src/main/docs/xpath-language.adoc  |  4 +-
 .../camel-xslt/src/main/docs/xslt-component.adoc   |  2 +-
 components/camel-zipkin/src/main/docs/zipkin.adoc  |  4 +-
 .../modules/ROOT/pages/aws-s3-component.adoc   |  6 +--
 .../modules/ROOT/pages/cm-sms-component.adoc   |  6 +--
 .../modules/ROOT/pages/dataset-component.adoc  |  2 +-
 .../modules/ROOT/pages/flink-component.adoc|  8 ++--
 .../components/modules/ROOT/pages/opentracing.adoc |  2 +-
 66 files changed, 155 insertions(+), 155 deletions(-)

[camel] 01/04: bug fixes

2019-06-24 Thread davsclaus

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

commit f3a6ee7c3729703e67d6516f4485060b8ee36973
Author: nayananga@acerubuntu18.04 
AuthorDate: Sat Jun 22 17:05:21 2019 +0530

bug fixes
---
 docs/components/modules/ROOT/pages/aws-s3-component.adoc | 4 ++--
 docs/components/modules/ROOT/pages/flink-component.adoc  | 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc 
b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index db42150..0275975 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the xref:registry.adocRegistry. |  | 
AmazonS3
+| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the xref:registry.adoc [Registry]. |  | 
AmazonS3
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket | true 
| boolean
 | *pathStyleAccess* (common) | Whether or not the S3 client should use path 
style access | false | boolean
 | *policy* (common) | The policy for this queue to set in the 
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. |  | String
@@ -463,7 +463,7 @@ This operation will list the buckets for this account
 
 This operation will delete the bucket mycamelbucket
 
-- Downloadxref: this operation create a download link for the file specified 
in the key header
+- DownloadLink: this operation create a download link for the file specified 
in the key header
 
 [source,java]
 

diff --git a/docs/components/modules/ROOT/pages/flink-component.adoc 
b/docs/components/modules/ROOT/pages/flink-component.adoc
index 8d70465..99d9003 100644
--- a/docs/components/modules/ROOT/pages/flink-component.adoc
+++ b/docs/components/modules/ROOT/pages/flink-component.adoc
@@ -30,8 +30,8 @@ Currently, the Flink Component supports only Producers. One 
can create DataSet,
 
 [source,java]
 -
-fxref:dataset?dataset=#myDataSet=#dataSetCallback
-fxref:datastream?datastream=#myDataStream=#dataStreamCallback
+flink:dataset?dataset=#myDataSet=#dataSetCallback
+flink:datastream?datastream=#myDataStream=#dataStreamCallback
 -
 
 [[Flink-FlinkEndpointOptions]]
@@ -43,7 +43,7 @@ FlinkEndpoint Options
 The Apache Flink endpoint is configured using URI syntax:
 
 
-fxref:endpointType
+flink:endpointType
 
 
 with the following path and query parameters:
@@ -183,7 +183,7 @@ String pattern = "foo";
 try {
 ProducerTemplate template = camelContext.createProducerTemplate();
 camelContext.start();
-Long count = 
template.requestBody("fxref:dataSet?dataSet=#myDataSet=#countLinesContaining",
 pattern, Long.class);
+Long count = 
template.requestBody("flink:dataSet?dataSet=#myDataSet=#countLinesContaining",
 pattern, Long.class);
 } finally {
 camelContext.stop();
 }

[camel] 02/04: fixed link issues inside camel/components .adoc file and ran mvn clean install in each folder then ran mvn clean package inside camel/docs

2019-06-24 Thread davsclaus

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

commit ffa2218022aad1eb751bdbcb638ebf73a86f8ba3
Author: nayananga@acerubuntu18.04 
AuthorDate: Mon Jun 24 13:26:08 2019 +0530

fixed link issues inside camel/components .adoc file and ran mvn clean 
install in each folder then ran mvn clean package inside camel/docs
---
 .../src/main/docs/ahc-ws-component.adoc|  2 +-
 .../camel-ahc/src/main/docs/ahc-component.adoc |  2 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |  2 +-
 .../src/main/docs/aws-s3-component.adoc|  2 +-
 .../src/main/docs/beanstalk-component.adoc |  4 +-
 components/camel-cdi/src/main/docs/cdi.adoc| 30 ++---
 .../src/main/docs/cometd-component.adoc|  2 +-
 .../src/main/docs/crypto-component.adoc|  2 +-
 .../src/main/docs/cxf-transport.adoc   |  2 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc | 52 +++---
 .../camel-cxf/src/main/docs/cxfrs-component.adoc   |  2 +-
 .../src/main/docs/dataformat-component.adoc|  6 +--
 .../src/main/docs/dataset-component.adoc   |  2 +-
 .../src/main/docs/dataset-test-component.adoc  |  2 +-
 .../src/main/docs/disruptor-component.adoc |  2 +-
 .../main/docs/elasticsearch-rest-component.adoc|  2 +-
 .../src/main/docs/facebook-component.adoc  |  2 +-
 .../camel-grape/src/main/docs/grape-component.adoc |  2 +-
 .../src/main/docs/groovy-language.adoc |  4 +-
 .../camel-http4/src/main/docs/http4-component.adoc |  2 +-
 .../camel-irc/src/main/docs/irc-component.adoc |  2 +-
 .../camel-jetty/src/main/docs/jetty-component.adoc |  4 +-
 .../camel-jms/src/main/docs/jms-component.adoc |  6 +--
 .../camel-jpa/src/main/docs/jpa-component.adoc | 14 +++---
 .../docs/openshift-build-configs-component.adoc|  2 +-
 .../src/main/docs/language-component.adoc  |  2 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |  2 +-
 .../src/main/docs/metrics-component.adoc   | 10 ++---
 .../src/main/docs/micrometer-component.adoc| 10 ++---
 .../camel-mock/src/main/docs/mock-component.adoc   |  2 +-
 .../camel-mvel/src/main/docs/mvel-language.adoc|  2 +-
 .../src/main/docs/nagios-component.adoc|  2 +-
 .../src/main/docs/netty4-component.adoc|  2 +-
 .../camel-ognl/src/main/docs/ognl-language.adoc|  2 +-
 .../camel-paho/src/main/docs/paho-component.adoc   |  2 +-
 .../camel-pdf/src/main/docs/pdf-component.adoc |  8 ++--
 .../src/main/docs/properties-component.adoc|  2 +-
 .../src/main/docs/quartz2-component.adoc   |  2 +-
 components/camel-ribbon/src/main/docs/ribbon.adoc  |  2 +-
 .../src/main/docs/xquery-component.adoc|  4 +-
 .../camel-saxon/src/main/docs/xquery-language.adoc |  4 +-
 .../src/main/docs/servlet-component.adoc   |  2 +-
 .../src/main/docs/soroush-component.adoc   |  4 +-
 .../src/main/docs/spring-boot.adoc |  2 +-
 .../src/main/docs/spring-security.adoc |  2 +-
 .../camel-spring/src/main/docs/spel-language.adoc  |  4 +-
 .../src/main/docs/spring-event-component.adoc  |  4 +-
 components/camel-spring/src/main/docs/spring.adoc  | 20 -
 .../src/main/docs/sql-stored-component.adoc|  4 +-
 .../src/main/docs/telegram-component.adoc  |  4 +-
 .../camel-timer/src/main/docs/timer-component.adoc |  2 +-
 .../camel-twitter/src/main/docs/twitter.adoc   |  2 +-
 .../src/main/docs/undertow-component.adoc  |  2 +-
 .../src/main/docs/univocity-csv-dataformat.adoc|  2 +-
 .../src/main/docs/univocity-fixed-dataformat.adoc  |  2 +-
 .../src/main/docs/univocity-tsv-dataformat.adoc|  2 +-
 .../src/main/docs/websocket-component.adoc |  2 +-
 .../src/main/docs/xmlsecurity-component.adoc   |  2 +-
 .../camel-xpath/src/main/docs/xpath-language.adoc  |  4 +-
 .../camel-xslt/src/main/docs/xslt-component.adoc   |  2 +-
 components/camel-zipkin/src/main/docs/zipkin.adoc  |  4 +-
 .../components/modules/ROOT/pages/opentracing.adoc |  2 +-
 62 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc 
b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index 86e5366..531eef4 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -206,5 +206,5 @@ And the equivalent Spring sample:
 * Endpoint
 * Getting Started
 
-* link:../../../../camel-ahc/src/main/docs/readme.html[AHC]
+* xref:../../../../camel-ahc/src/main/docs/readme.adoc[AHC]
 * <>
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc 
b/components/camel-ahc/src/main/docs/ahc-component.adoc
index e7cd912..bd44369 100644
---

[camel] 04/04: aws-s3-comonent.adoc auto generated correcly from camel/components to camel/docs

2019-06-24 Thread davsclaus

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

commit 86f48b5453c25b8f5491c4e59787c13a09341381
Author: nayananga@acerubuntu18.04 
AuthorDate: Mon Jun 24 18:22:22 2019 +0530

aws-s3-comonent.adoc auto generated correcly from camel/components to 
camel/docs
---
 components/camel-aws-s3/src/main/docs/aws-s3-component.adoc | 2 +-
 docs/components/modules/ROOT/pages/aws-s3-component.adoc| 4 ++--
 docs/components/modules/ROOT/pages/cm-sms-component.adoc| 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc 
b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 4a48c28..5290d61 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the link:registry.htmlRegistry. |  | 
AmazonS3
+| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket | true 
| boolean
 | *pathStyleAccess* (common) | Whether or not the S3 client should use path 
style access | false | boolean
 | *policy* (common) | The policy for this queue to set in the 
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. |  | String
diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc 
b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 0275975..5290d61 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the xref:registry.adoc [Registry]. |  | 
AmazonS3
+| *amazonS3Client* (common) | Reference to a 
com.amazonaws.services.s3.AmazonS3 in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket | true 
| boolean
 | *pathStyleAccess* (common) | Whether or not the S3 client should use path 
style access | false | boolean
 | *policy* (common) | The policy for this queue to set in the 
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. |  | String
@@ -170,7 +170,7 @@ The component supports 38 options, which are listed below.
 | *camel.component.aws-s3.basic-property-binding* | Whether the component 
should use basic property binding (Camel 2.x) or the newer property binding 
with additional capabilities | false | Boolean
 | *camel.component.aws-s3.configuration.accelerate-mode-enabled* | Define if 
Accelerate Mode enabled is true or false | false | Boolean
 | *camel.component.aws-s3.configuration.access-key* | Amazon AWS Access Key |  
| String
-| *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a 
`com.amazonaws.services.s3.AmazonS3` in the xref:registry.adoc[Registry]. |  | 
AmazonS3
+| *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a 
`com.amazonaws.services.s3.AmazonS3` in the 
xref:components::registry.adoc[Registry]. |  | AmazonS3
 | *camel.component.aws-s3.configuration.auto-create-bucket* | Setting the 
autocreation of the bucket | true | Boolean
 | *camel.component.aws-s3.configuration.autoclose-body* | If this option is 
true and includeBody is true, then the S3Object.close() method will be called 
on exchange completion. This option is strongly related to includeBody option. 
In case of setting includeBody to true and autocloseBody to false, it will be 
up to the caller to close the S3Object stream. Setting autocloseBody to true, 
will close the S3Object stream automatically. | true | Boolean
 | *camel.component.aws-s3.configuration.aws-k-m-s-key-id* | Define the id of 
KMS key to use in case KMS is enabled |  | String
diff --git a/docs/components/modules/ROOT/pages/cm-sms-component.adoc 
b/docs/components/modules/ROOT/pages/cm-sms-component.adoc
index 4470bc5..d40ba67 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

[camel] 10/12: Optimise camel-bean to not lookup method annotations on JDK classes

2019-06-24 Thread davsclaus

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

commit 97a5606b11b19b45c042ce03f3db41965cb66b78
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 15:47:11 2019 +0200

Optimise camel-bean to not lookup method annotations on JDK classes
---
 .../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
 
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 4bbcf3e..0e54632 100644
--- 
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ 
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -489,13 +489,17 @@ public class BeanInfo {
 }
 
 protected void collectParameterAnnotations(Class c, Method m, 
List[] a) {
+// because we are only looking for camel annotations then skip all 
stuff from JDKs
+if (c.getName().startsWith("java")) {
+return;
+}
 try {
 Annotation[][] pa = c.getDeclaredMethod(m.getName(), 
m.getParameterTypes()).getParameterAnnotations();
 for (int i = 0; i < pa.length; i++) {
 a[i].addAll(Arrays.asList(pa[i]));
 }
 } catch (NoSuchMethodException e) {
-// no method with signature of m declared on c
+// ignore no method with signature of m declared on c
 }
 for (Class i : c.getInterfaces()) {
 collectParameterAnnotations(i, m, a);

[camel] branch master updated (5f40a20 -> 9d92f1a)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 5f40a20  Some grammatical fixes for the Drill docs
 new 0459989  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new 080940d  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new 4dc672e  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new d087898  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new 20718be  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new b854652  Optimise a bit for class loading
 new 1bd38dc  Lets use logback as logger as its more tiny and faster than 
log4j
 new eaf1ae0  Fixed NPE
 new 4ae8033  Optimise camel-bean to not lookup method annotations on 
java.lang.Object superclass
 new 97a5606  Optimise camel-bean to not lookup method annotations on JDK 
classes
 new de59af8  Regen
 new 9d92f1a  Regen

The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 apache-camel/pom.xml   |   4 +
 apache-camel/src/main/descriptors/common-bin.xml   |   1 +
 bom/camel-bom/pom.xml  |   5 +
 .../org/apache/camel/component/bean/BeanInfo.java  |   8 +-
 core/camel-api/pom.xml |   5 -
 .../org/apache/camel/spi/ThreadPoolProfile.java|   2 -
 .../camel/impl/engine/DefaultClassResolver.java|   5 -
 core/camel-core-engine/pom.xml | 176 +
 .../java/org/apache/camel/reifier/BeanReifier.java |   8 +-
 core/camel-main/pom.xml|  32 +-
 .../java/org/apache/camel/main/MainSupport.java|  18 +-
 core/camel-management-api/pom.xml  |   4 -
 core/pom.xml   |   1 +
 examples/README.adoc   |   4 +-
 .../META-INF/spring-configuration-metadata.json|   7 -
 .../pom.xml|  71 ++--
 .../readme.adoc|  13 +-
 .../src/main/data/foo.properties   |   0
 .../org/apache/camel/example/MyApplication.java|   0
 .../main/java/org/apache/camel/example/MyBean.java |   0
 .../org/apache/camel/example/MyConfiguration.java  |   0
 .../org/apache/camel/example/MyRouteBuilder.java   |   0
 .../META-INF/spring-configuration-metadata.json| 428 +
 .../src/main/resources/application.properties  |   0
 .../src/main/resources/logback.xml |  11 +
 examples/camel-example-main/pom.xml|   1 +
 .../META-INF/spring-configuration-metadata.json|   7 -
 examples/pom.xml   |   1 +
 parent/pom.xml |   5 +
 .../camel-spring-boot-dependencies/pom.xml |   5 +
 30 files changed, 737 insertions(+), 85 deletions(-)
 create mode 100644 core/camel-core-engine/pom.xml
 copy examples/{camel-example-main-artemis => camel-example-main-tiny}/pom.xml 
(68%)
 copy examples/{camel-example-main => camel-example-main-tiny}/readme.adoc (64%)
 copy examples/{camel-example-main => 
camel-example-main-tiny}/src/main/data/foo.properties (100%)
 copy examples/{camel-example-main => 
camel-example-main-tiny}/src/main/java/org/apache/camel/example/MyApplication.java
 (100%)
 copy examples/{camel-example-main => 
camel-example-main-tiny}/src/main/java/org/apache/camel/example/MyBean.java 
(100%)
 copy examples/{camel-example-main => 
camel-example-main-tiny}/src/main/java/org/apache/camel/example/MyConfiguration.java
 (100%)
 copy examples/{camel-example-main => 
camel-example-main-tiny}/src/main/java/org/apache/camel/example/MyRouteBuilder.java
 (100%)
 copy 
core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
 => 
examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
 (65%)
 copy examples/{camel-example-main => 
camel-example-main-tiny}/src/main/resources/application.properties (100%)
 create mode 100644 
examples/camel-example-main-tiny/src/main/resources/logback.xml

[camel] 04/12: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

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

commit d0878981f2ed4dbace655201acc1cac6daf05d61
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:57:29 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 examples/camel-example-main/pom.xml | 34 --
 1 file changed, 34 deletions(-)

diff --git a/examples/camel-example-main/pom.xml 
b/examples/camel-example-main/pom.xml
index 37a3a8e..240d629 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/pom.xml
@@ -43,48 +43,14 @@
 org.apache.camel
 camel-core
 
-
 
 org.apache.camel
 camel-main
 
 
 org.apache.camel
-camel-bean
-
-
-org.apache.camel
 camel-quartz2
 
-
-
-
-
-
-
-
-
-
-

[camel] 02/12: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

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

commit 080940de861d0702098f010161690f0bbb5906a5
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:46:11 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 examples/camel-example-main-tiny/pom.xml   |  148 +++
 examples/camel-example-main-tiny/readme.adoc   |   22 +
 .../src/main/data/foo.properties   |   18 +
 .../org/apache/camel/example/MyApplication.java|   41 +
 .../main/java/org/apache/camel/example/MyBean.java |   36 +
 .../org/apache/camel/example/MyConfiguration.java  |   37 +
 .../org/apache/camel/example/MyRouteBuilder.java   |   31 +
 .../META-INF/spring-configuration-metadata.json| 1112 
 .../src/main/resources/application.properties  |   52 +
 .../src/main/resources/log4j2.properties   |   26 +
 examples/pom.xml   |1 +
 11 files changed, 1524 insertions(+)

diff --git a/examples/camel-example-main-tiny/pom.xml 
b/examples/camel-example-main-tiny/pom.xml
new file mode 100644
index 000..cdc2ae0
--- /dev/null
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -0,0 +1,148 @@
+
+
+http://www.w3.org/2001/XMLSchema-instance; 
xmlns="http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+org.apache.camel.example
+examples
+3.0.0-SNAPSHOT
+
+
+camel-example-main-tiny
+jar
+Camel :: Example :: Main :: Tiny
+An example for showing standalone Camel with as few JARs on 
classpath as possible
+
+
+Beginner
+
+
+
+
+
+
+org.apache.camel
+camel-core-engine
+
+
+
+org.apache.camel
+camel-jaxp
+
+
+org.apache.camel
+camel-caffeine-lrucache
+
+
+org.apache.camel
+camel-util-json
+
+
+
+
+org.apache.camel
+camel-main
+
+
+
+org.apache.camel
+camel-bean
+
+
+org.apache.camel
+camel-quartz2
+
+
+
+
+com.sun.xml.bind
+jaxb-core
+test
+
+
+com.sun.xml.bind
+jaxb-impl
+test
+
+
+
+
+org.apache.logging.log4j
+log4j-api
+runtime
+
+
+org.apache.logging.log4j
+log4j-core
+runtime
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+runtime
+
+
+org.apache.logging.log4j
+log4j-jul
+runtime
+
+
+
+
+
+
+
+
+org.apache.camel
+camel-maven-plugin
+${project.version}
+
+true
+
org.apache.camel.example.MyApplication
+
+
+
+
+
+org.apache.camel
+camel-main-maven-plugin
+${project.version}
+
+false
+
+
+
+generate
+
+generate
+
+process-classes
+
+
+
+
+
+
+
+
diff --git a/examples/camel-example-main-tiny/readme.adoc 
b/examples/camel-example-main-tiny/readme.adoc
new file mode 100644
index 000..c405e4b
--- /dev/null
+++ b/examples/camel-example-main-tiny/readme.adoc
@@ -0,0 +1,22 @@
+== Camel Example Main Tiny
+
+The example uses the `camel-core-engine` as dependency to use as few JARs
+on the classpath as possible. For more details see the `pom.xml` file.
+
+This example shows how to run Camel standalone via the built-in Main class.
+
+The example also demonstrates how you can configure the Camel application
+via Camel built-in dependency-injection that supports binding via the
+`@BindToRegistry`, `@BeanInject` and `@PropertyInject` annotations.
+
+Also notice how you can configure Camel in the `application.properties` file.
+
+=== How to run
+
+You can run this example using
+
+mvn camel:run   
+
+=== More information
+
+You can find more information about Apache Camel at the website: 
http://camel.apache.org/
diff --git

[camel] 09/12: Optimise camel-bean to not lookup method annotations on java.lang.Object superclass

2019-06-24 Thread davsclaus

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

commit 4ae80338c1fdcdd105dd2bcf39616c8d6e3981ae
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 15:27:21 2019 +0200

Optimise camel-bean to not lookup method annotations on java.lang.Object 
superclass
---
 .../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
 
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 00d0c6e..4bbcf3e 100644
--- 
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ 
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -500,7 +500,7 @@ public class BeanInfo {
 for (Class i : c.getInterfaces()) {
 collectParameterAnnotations(i, m, a);
 }
-if (!c.isInterface() && c.getSuperclass() != null) {
+if (!c.isInterface() && c.getSuperclass() != null && c.getSuperclass() 
!= Object.class) {
 collectParameterAnnotations(c.getSuperclass(), m, a);
 }
 }

[camel] branch core-engine deleted (was 1acc903)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git.


 was 1acc903  Optimise camel-bean to not lookup method annotations on JDK 
classes

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[camel] 03/12: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

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

commit 4dc672e4333bfde93c88f2538c60ed8d58ab1ffe
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:48:41 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 apache-camel/pom.xml | 4 
 apache-camel/src/main/descriptors/common-bin.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 2986a98..10f0839 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -78,6 +78,10 @@
 
 
 org.apache.camel
+camel-core-engine
+
+
+org.apache.camel
 camel-core-osgi
 
 
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 6056ee7..ab2de78 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -34,6 +34,7 @@
 org.apache.camel:camel-base
 org.apache.camel:camel-support
 org.apache.camel:camel-core
+org.apache.camel:camel-core-engine
 org.apache.camel:camel-core-osgi
 org.apache.camel:camel-core-xml
 org.apache.camel:camel-cloud

[camel] 12/12: Regen

2019-06-24 Thread davsclaus

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

commit 9d92f1afeb5564c7e25ecefb486cc47b1c98d265
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 16:21:37 2019 +0200

Regen
---
 examples/README.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/README.adoc b/examples/README.adoc
index e519691..15a2bfe 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
 ### Examples
 
 // examples: START
-Number of Examples: 112 (0 deprecated)
+Number of Examples: 113 (0 deprecated)
 
 [width="100%",cols="4,2,4",options="header"]
 |===
@@ -43,6 +43,8 @@ Number of Examples: 112 (0 deprecated)
 
 | link:camel-example-main/readme.adoc[Main] (camel-example-main) | Beginner | 
An example for showing standalone Camel
 
+| link:camel-example-main-tiny/readme.adoc[Main Tiny] 
(camel-example-main-tiny) | Beginner | An example for showing standalone Camel 
with as few JARs on classpath as possible
+
 | link:camel-example-pojo-messaging/README.md[POJO Routing] 
(camel-example-pojo-messaging) | Beginner | An example showing how to produce 
and consume messages from Camel endpoints using annotated POJOs

[camel] 08/12: Fixed NPE

2019-06-24 Thread davsclaus

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

commit eaf1ae028543e0d535a045994dd86dcbf9d5072e
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 14:57:36 2019 +0200

Fixed NPE
---
 .../main/java/org/apache/camel/main/MainSupport.java   | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index 9aec640..ac8a5a2 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -905,17 +905,19 @@ public abstract class MainSupport extends ServiceSupport {
 Properties prop = new OrderedProperties();
 try {
 InputStream is = 
camelContext.getClassResolver().loadResourceAsStream("/META-INF/services/org/apache/camel/autowire.properties");
-prop.load(is);
-if (!prop.isEmpty()) {
-LOG.info("Loaded {} properties from classpath: 
META-INF/services/org/apache/camel/autowire.properties", prop.size());
-if (LOG.isDebugEnabled()) {
-LOG.debug("Properties from classpath: 
META-INF/services/org/apache/camel/autowire.properties:");
-for (String key : prop.stringPropertyNames()) {
-LOG.debug("{}={}", key, prop.getProperty(key));
+if (is != null) {
+prop.load(is);
+if (!prop.isEmpty()) {
+LOG.info("Loaded {} properties from classpath: 
META-INF/services/org/apache/camel/autowire.properties", prop.size());
+if (LOG.isDebugEnabled()) {
+LOG.debug("Properties from classpath: 
META-INF/services/org/apache/camel/autowire.properties:");
+for (String key : prop.stringPropertyNames()) {
+LOG.debug("{}={}", key, prop.getProperty(key));
+}
 }
 }
+IOHelper.close(is);
 }
-IOHelper.close(is);
 } catch (Throwable e) {
 // ignore as this file is optional
 }

[camel] 06/12: Optimise a bit for class loading

2019-06-24 Thread davsclaus

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

commit b85465275d6e26ba6193fe87a4b3a06f4098399e
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 13:45:14 2019 +0200

Optimise a bit for class loading
---
 .../main/java/org/apache/camel/impl/engine/DefaultClassResolver.java | 5 -
 1 file changed, 5 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
index 8921607..2f5d5cd 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
@@ -25,7 +25,6 @@ import org.apache.camel.CamelContextAware;
 import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
 
 /**
  * Default class resolver that uses regular class loader to load classes.
@@ -108,12 +107,10 @@ public class DefaultClassResolver implements 
ClassResolver, CamelContextAware {
 }
 
 public InputStream loadResourceAsStream(String uri) {
-StringHelper.notEmpty(uri, "uri");
 return ObjectHelper.loadResourceAsStream(uri, 
getApplicationContextClassLoader());
 }
 
 public URL loadResourceAsURL(String uri) {
-StringHelper.notEmpty(uri, "uri");
 return ObjectHelper.loadResourceAsURL(uri, 
getApplicationContextClassLoader());
 }
 
@@ -122,12 +119,10 @@ public class DefaultClassResolver implements 
ClassResolver, CamelContextAware {
 }
 
 public Enumeration loadAllResourcesAsURL(String uri) {
-StringHelper.notEmpty(uri, "uri");
 return ObjectHelper.loadResourcesAsURL(uri);
 }
 
 protected Class loadClass(String name, ClassLoader loader) {
-StringHelper.notEmpty(name, "name");
 return ObjectHelper.loadClass(name, loader);
 }

[camel] 11/12: Regen

2019-06-24 Thread davsclaus

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

commit de59af8a5c4abdd674d43b39d4c01604edf08c5e
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 16:19:50 2019 +0200

Regen
---
 bom/camel-bom/pom.xml  |   5 +
 .../META-INF/spring-configuration-metadata.json|   7 -
 .../META-INF/spring-configuration-metadata.json| 945 +
 .../camel-spring-boot-dependencies/pom.xml |   5 +
 4 files changed, 955 insertions(+), 7 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index cf63b07..333da82 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -664,6 +664,11 @@
   
   
 org.apache.camel
+camel-core-engine
+${project.version}
+  
+  
+org.apache.camel
 camel-core-osgi
 ${project.version}
   
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 bb502b1..7a3f173 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
@@ -1065,13 +1065,6 @@
"defaultValue":"1000"
},
{
-   "name":"camel.main.duration",
-   "type":"long",
-   
"sourceType":"org.apache.camel.main.MainConfigurationProperties",
-   "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":"int",

"sourceType":"org.apache.camel.main.MainConfigurationProperties",
diff --git 
a/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
 
b/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
index 9d44c79..7e338cb 100644
--- 
a/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
+++ 
b/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -31,6 +31,16 @@

"sourceType":"org.apache.camel.component.bean.BeanComponent"
},
{
+   "name":"camel.component.browse",
+   "description":"The browse component is used for viewing 
the messages received on endpoints that supports BrowsableEndpoint.",
+   
"sourceType":"org.apache.camel.component.browse.BrowseComponent"
+   },
+   {
+   "name":"camel.component.browse",
+   "description":"The browse component is used for viewing 
the messages received on endpoints that supports BrowsableEndpoint.",
+   
"sourceType":"org.apache.camel.component.browse.BrowseComponent"
+   },
+   {
"name":"camel.component.class",
"description":"The class component is for invoking Java 
classes (Java beans) from Camel.",

"sourceType":"org.apache.camel.component.beanclass.ClassComponent"
@@ -46,6 +56,141 @@

"sourceType":"org.apache.camel.component.beanclass.ClassComponent"
},
{
+   "name":"camel.component.controlbus",
+   "description":"The controlbus component provides easy 
management of Camel applications based on the Control Bus EIP pattern.",
+   
"sourceType":"org.apache.camel.component.controlbus.ControlBusComponent"
+   },
+   {
+   "name":"camel.component.controlbus",
+   "description":"The controlbus component provides easy 
management of Camel applications based on the Control Bus EIP pattern.",
+   
"sourceType":"org.apache.camel.component.controlbus.ControlBusComponent"
+   },
+   {
+   "name":"camel.component.dataformat",
+   "description":"The dataformat component is used for 
working with Data Formats as if it was a regular Component supporting Endpoints 
and URIs.",
+   
"sourceType":"org.apache.camel.component.dataformat.DataFormatComponent"
+   },
+   {
+   "name":"camel.component.dataformat",
+   "description":"The

[camel] 07/12: Lets use logback as logger as its more tiny and faster than log4j

2019-06-24 Thread davsclaus

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

commit 1bd38dce42c164afbf0282f68a969b6e5d5619cf
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 14:51:52 2019 +0200

Lets use logback as logger as its more tiny and faster than log4j
---
 examples/camel-example-main-tiny/pom.xml   | 17 +-
 .../src/main/resources/log4j2.properties   | 26 --
 .../src/main/resources/logback.xml | 11 +
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/examples/camel-example-main-tiny/pom.xml 
b/examples/camel-example-main-tiny/pom.xml
index cdc2ae0..2787ac8 100644
--- a/examples/camel-example-main-tiny/pom.xml
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -92,19 +92,14 @@
 runtime
 
 
-org.apache.logging.log4j
-log4j-core
-runtime
-
-
-org.apache.logging.log4j
-log4j-slf4j-impl
-runtime
+ch.qos.logback
+logback-core
+1.2.3
 
 
-org.apache.logging.log4j
-log4j-jul
-runtime
+ch.qos.logback
+logback-classic
+1.2.3
 
 
 
diff --git 
a/examples/camel-example-main-tiny/src/main/resources/log4j2.properties 
b/examples/camel-example-main-tiny/src/main/resources/log4j2.properties
deleted file mode 100644
index c63f861..000
--- a/examples/camel-example-main-tiny/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-## ---
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##  http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
-
-logger.camel-main.name = org.apache.camel.main
-logger.camel-main.level = INFO
diff --git a/examples/camel-example-main-tiny/src/main/resources/logback.xml 
b/examples/camel-example-main-tiny/src/main/resources/logback.xml
new file mode 100644
index 000..6156c21
--- /dev/null
+++ b/examples/camel-example-main-tiny/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+
+
+
+%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - 
%msg%n
+
+
+
+
+
+
+
\ No newline at end of file

[camel] 01/12: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

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

commit 0459989ba447f890e26201baeac3a5989351d6f4
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:18:16 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 core/camel-api/pom.xml |   5 -
 .../org/apache/camel/spi/ThreadPoolProfile.java|   2 -
 core/camel-core-engine/pom.xml | 176 
 .../java/org/apache/camel/reifier/BeanReifier.java |   8 +-
 core/camel-main/pom.xml|  32 +-
 core/camel-management-api/pom.xml  |   4 -
 core/pom.xml   |   1 +
 examples/camel-example-main/pom.xml|  35 +
 .../META-INF/spring-configuration-metadata.json| 952 -
 .../src/main/resources/application.properties  |   4 +-
 parent/pom.xml |   5 +
 11 files changed, 257 insertions(+), 967 deletions(-)

diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index 39f939c..04a797b 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -54,11 +54,6 @@
 
 
 
-org.apache.camel
-camel-util-json
-
-
-
 org.slf4j
 slf4j-api
 
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
index 193b29c..e4ba6ca 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
@@ -29,8 +29,6 @@ import 
org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
  */
 public class ThreadPoolProfile implements Serializable, Cloneable {
 
-// TODO: Camel 3.0 consider moving to org.apache.camel
-
 private static final long serialVersionUID = 1L;
 
 private String id;
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
new file mode 100644
index 000..ecfe0ff
--- /dev/null
+++ b/core/camel-core-engine/pom.xml
@@ -0,0 +1,176 @@
+
+
+http://www.w3.org/2001/XMLSchema-instance; 
xmlns="http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+
+org.apache.camel
+core
+3.0.0-SNAPSHOT
+..
+
+
+camel-core-engine
+jar
+
+Camel :: Core Engine
+Just the Camel Core engine without any core 
components
+
+
+3.0.0
+core
+
+
+
+
+
+
+org.apache.camel
+spi-annotations
+true
+
+
+org.apache.camel
+meta-annotations
+true
+
+
+
+org.apache.camel
+camel-api
+
+
+org.apache.camel
+camel-management-api
+
+
+org.apache.camel
+camel-support
+
+
+
+org.apache.camel
+camel-core
+
+
+org.apache.camel
+camel-bean
+
+
+org.apache.camel
+camel-browse
+
+
+
+
+org.apache.camel
+camel-controlbus
+
+
+org.apache.camel
+camel-dataformat
+
+
+org.apache.camel
+camel-dataset
+
+
+org.apache.camel
+camel-direct
+
+
+org.apache.camel
+camel-directvm
+
+
+org.apache.camel
+camel-file
+
+
+org.apache.camel
+camel-language
+
+
+org.apache.camel
+camel-log
+
+
+org.apache.camel
+camel-mock
+
+
+
+
+org.apache.camel
+camel-ref
+
+
+org.apache.camel
+camel-rest
+
+
+org.apache.camel
+camel-saga
+
+
+org.apache.camel
+camel-scheduler
+
+

[camel] 05/12: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

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

commit 20718be60c2e1fddb0da30db2d8c628f067ee704
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:58:38 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 .../camel-example-main-tiny/src/main/resources/application.properties | 4 +---
 examples/camel-example-main/src/main/resources/application.properties | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/examples/camel-example-main-tiny/src/main/resources/application.properties 
b/examples/camel-example-main-tiny/src/main/resources/application.properties
index f33b578..71ab7ab 100644
--- a/examples/camel-example-main-tiny/src/main/resources/application.properties
+++ b/examples/camel-example-main-tiny/src/main/resources/application.properties
@@ -20,8 +20,6 @@
 camel.main.name = MyCoolCamel
 camel.main.jmx-enabled = false
 
-camel.main.duration-max-seconds=5
-
 # you can also configure camel context directly
 # camel.context.shutdown-strategy.shutdown-now-on-timeout = false
 
@@ -30,7 +28,7 @@ camel.main.file-configurations=src/main/data/*.properties
 
 # to configure the camel quartz component
 # here we can configure the options on the component level (and we can use 
dash-naming-style)
-camel.component.quartz2.start-delayed-seconds = 10
+camel.component.quartz2.start-delayed-seconds = 3
 
 # to configure Hystrix EIP (global and you need to add camel-hystrix to the 
classpath)
 ### camel.hystrix.group-key=myGroup
diff --git 
a/examples/camel-example-main/src/main/resources/application.properties 
b/examples/camel-example-main/src/main/resources/application.properties
index f33b578..71ab7ab 100644
--- a/examples/camel-example-main/src/main/resources/application.properties
+++ b/examples/camel-example-main/src/main/resources/application.properties
@@ -20,8 +20,6 @@
 camel.main.name = MyCoolCamel
 camel.main.jmx-enabled = false
 
-camel.main.duration-max-seconds=5
-
 # you can also configure camel context directly
 # camel.context.shutdown-strategy.shutdown-now-on-timeout = false
 
@@ -30,7 +28,7 @@ camel.main.file-configurations=src/main/data/*.properties
 
 # to configure the camel quartz component
 # here we can configure the options on the component level (and we can use 
dash-naming-style)
-camel.component.quartz2.start-delayed-seconds = 10
+camel.component.quartz2.start-delayed-seconds = 3
 
 # to configure Hystrix EIP (global and you need to add camel-hystrix to the 
classpath)
 ### camel.hystrix.group-key=myGroup

buildbot success in on camel-site-production

2019-06-24 Thread buildbot

The Buildbot has detected a restored build on builder camel-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/34852

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

2019-06-24 Thread buildbot

The Buildbot has detected a new failure on builder camel-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/34851

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[camel] branch master updated: Some grammatical fixes for the Drill docs

2019-06-24 Thread coheigea

This is an automated email from the ASF dual-hosted git repository.

coheigea 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 5f40a20  Some grammatical fixes for the Drill docs
5f40a20 is described below

commit 5f40a2055efb8080b1fba478a0aaea6b91bfdd86
Author: Colm O hEigeartaigh 
AuthorDate: Mon Jun 24 19:02:58 2019 +0100

Some grammatical fixes for the Drill docs
---
 components/camel-drill/src/main/docs/drill-component.adoc | 4 ++--
 docs/components/modules/ROOT/pages/drill-component.adoc   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/camel-drill/src/main/docs/drill-component.adoc 
b/components/camel-drill/src/main/docs/drill-component.adoc
index ce62a24..7f010e4 100644
--- a/components/camel-drill/src/main/docs/drill-component.adoc
+++ b/components/camel-drill/src/main/docs/drill-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The *drill:* component gives you the ability to querying to 
https://drill.apache.org/[Apache Drill Cluster]
+The *drill:* component gives you the ability to query an 
https://drill.apache.org/[Apache Drill Cluster]
 
 Drill is an Apache open-source SQL query engine for Big Data exploration. 
Drill is designed from the ground up to support high-performance analysis on 
the semi-structured and rapidly evolving data coming from modern Big Data 
applications, while still providing the familiarity and ecosystem of ANSI SQL, 
the industry-standard query language
 
@@ -32,7 +32,7 @@ You can append query options to the URI in the following 
format,
 
 ### Drill Producer 
 
-The producer execute query using *CamelDrillQuery* header and put results into 
body.
+The producer executes a query using the *CamelDrillQuery* header and puts the 
results into the body.
 
 ### Options
 
diff --git a/docs/components/modules/ROOT/pages/drill-component.adoc 
b/docs/components/modules/ROOT/pages/drill-component.adoc
index ce62a24..7f010e4 100644
--- a/docs/components/modules/ROOT/pages/drill-component.adoc
+++ b/docs/components/modules/ROOT/pages/drill-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The *drill:* component gives you the ability to querying to 
https://drill.apache.org/[Apache Drill Cluster]
+The *drill:* component gives you the ability to query an 
https://drill.apache.org/[Apache Drill Cluster]
 
 Drill is an Apache open-source SQL query engine for Big Data exploration. 
Drill is designed from the ground up to support high-performance analysis on 
the semi-structured and rapidly evolving data coming from modern Big Data 
applications, while still providing the familiarity and ecosystem of ANSI SQL, 
the industry-standard query language
 
@@ -32,7 +32,7 @@ You can append query options to the URI in the following 
format,
 
 ### Drill Producer 
 
-The producer execute query using *CamelDrillQuery* header and put results into 
body.
+The producer executes a query using the *CamelDrillQuery* header and puts the 
results into the body.
 
 ### Options

[camel] branch master updated: [CAMEL-13664]add previous BundleTypeConverterLoader as fallback

2019-06-24 Thread ffang

This is an automated email from the ASF dual-hosted git repository.

ffang 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 24b7cf6  [CAMEL-13664]add previous BundleTypeConverterLoader as 
fallback
24b7cf6 is described below

commit 24b7cf6090aa6c4476bc2265385aa21bd5ca02d4
Author: Freeman Fang 
AuthorDate: Mon Jun 24 12:09:08 2019 -0400

[CAMEL-13664]add previous BundleTypeConverterLoader as fallback
---
 .../src/main/java/org/apache/camel/core/osgi/impl/Activator.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
 
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index 115baa1..25f809e 100644
--- 
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
+++ 
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -252,7 +252,10 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer

[camel] branch camel-2.24.x updated: Fixing failing scala tests

2019-06-24 Thread coheigea

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch camel-2.24.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.24.x by this push:
 new 7537d7c  Fixing failing scala tests
7537d7c is described below

commit 7537d7cc976831b6caed4c0ad6956b4d92c98cd4
Author: Colm O hEigeartaigh 
AuthorDate: Tue Jun 18 14:19:35 2019 +0100

Fixing failing scala tests
---
 .../src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
 
b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
index 9bae48b..c0461b7 100644
--- 
a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
+++ 
b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
@@ -57,7 +57,7 @@ class SetHeaderTest extends ScalaTestSupport {
   def doTestExpression(from: String, mock: String) {
 mock expect {_.headerReceived("genus", "felis")}
 test {
-  from ! (new Cat("Duchess"), new Cat("Toulouse"))
+  from ! (new Cat("Duchess"))
 }
   }

[camel] branch core-engine updated (abe2813 -> 1acc903)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git.


from abe2813  Lets use logback as logger as its more tiny and faster than 
log4j
 add e0b8cb8  Fixed NPE
 add f7ef0a9  Optimise camel-bean to not lookup method annotations on 
java.lang.Object superclass
 add 1acc903  Optimise camel-bean to not lookup method annotations on JDK 
classes

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/camel/component/bean/BeanInfo.java |  8 ++--
 .../main/java/org/apache/camel/main/MainSupport.java   | 18 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

[camel] branch core-engine updated (1e90e5d -> abe2813)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 1e90e5d  Optimise a bit for class loading
 add 7cff7a7  CAMEL-13675: camel-main - Optimise main configurer
 add abe2813  Lets use logback as logger as its more tiny and faster than 
log4j

No new revisions were added by this update.

Summary of changes:
 .../camel/main/DefaultConfigurationConfigurer.java | 152 -
 examples/camel-example-main-tiny/pom.xml   |  17 +--
 .../src/main/resources/log4j2.properties   |  26 
 .../src/main/resources/logback.xml |  11 ++
 4 files changed, 135 insertions(+), 71 deletions(-)
 delete mode 100644 
examples/camel-example-main-tiny/src/main/resources/log4j2.properties
 create mode 100644 
examples/camel-example-main-tiny/src/main/resources/logback.xml

[camel] 01/01: CAMEL-12570: fixed Camel-FTP component does not set CamelFtpRep… (#2997)

2019-06-24 Thread valdar

This is an automated email from the ASF dual-hosted git repository.

valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9de64a3baf28bb898b11b99bdbed917eecb32d46
Merge: a23d109 302e43e
Author: Andrea Tarocchi 
AuthorDate: Mon Jun 24 14:44:43 2019 +0200

CAMEL-12570: fixed Camel-FTP component does not set CamelFtpRep… (#2997)

CAMEL-12570: fixed Camel-FTP component does not set CamelFtpReplyCode…

 .../camel/component/file/GenericFileProducer.java  |  4 +-
 .../camel/component/file/remote/FtpOperations.java | 18 ++--
 .../component/file/remote/FtpsOperations.java  | 17 +++-
 .../component/file/remote/RemoteFileConsumer.java  |  2 +-
 .../file/remote/RemoteFileOperations.java  |  4 +-
 .../component/file/remote/RemoteFileProducer.java  |  8 ++--
 .../component/file/remote/SftpOperations.java  | 10 ++---
 .../remote/FtpProducerConnectErrorsHeaderTest.java | 51 ++
 .../apache/camel/component/scp/ScpOperations.java  |  2 +-
 9 files changed, 97 insertions(+), 19 deletions(-)

[camel] branch master updated (a23d109 -> 9de64a3)

2019-06-24 Thread valdar

This is an automated email from the ASF dual-hosted git repository.

valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from a23d109  CAMEL-13675: camel-main - Optimise main configurer
 add 302e43e  CAMEL-12570: fixed Camel-FTP component does not set 
CamelFtpReplyCode in some case(ex 530)
 new 9de64a3  CAMEL-12570: fixed Camel-FTP component does not set 
CamelFtpRep… (#2997)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/component/file/GenericFileProducer.java|  4 ++--
 .../camel/component/file/remote/FtpOperations.java   | 18 +++---
 .../camel/component/file/remote/FtpsOperations.java  | 17 +++--
 .../component/file/remote/RemoteFileConsumer.java|  2 +-
 .../component/file/remote/RemoteFileOperations.java  |  4 +++-
 .../component/file/remote/RemoteFileProducer.java|  8 
 .../camel/component/file/remote/SftpOperations.java  | 10 +-
 java => FtpProducerConnectErrorsHeaderTest.java} | 20 
 .../apache/camel/component/scp/ScpOperations.java|  2 +-
 9 files changed, 58 insertions(+), 27 deletions(-)
 copy 
components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/{FtpReconnectAttemptUnknownHostTest.java
 => FtpProducerConnectErrorsHeaderTest.java} (67%)

[camel] branch master updated: CAMEL-13675: camel-main - Optimise main configurer

2019-06-24 Thread davsclaus

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 a23d109  CAMEL-13675: camel-main - Optimise main configurer
a23d109 is described below

commit a23d109628d51bdbdb4a5d2d0eb5321e34f07316
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 14:34:20 2019 +0200

CAMEL-13675: camel-main - Optimise main configurer
---
 .../camel/main/DefaultConfigurationConfigurer.java | 152 -
 1 file changed, 118 insertions(+), 34 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
 
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 9568594..e88497a 100644
--- 
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++ 
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -169,46 +169,126 @@ public final class DefaultConfigurationConfigurer {
  * Similar code in camel-core-xml module in class 
org.apache.camel.core.xml.AbstractCamelContextFactoryBean
  * or in camel-spring-boot module in class 
org.apache.camel.spring.boot.CamelAutoConfiguration.
  */
-public static void afterPropertiesSet(CamelContext camelContext) throws 
Exception {
+public static void afterPropertiesSet(final CamelContext camelContext) 
throws Exception {
 final Registry registry = camelContext.getRegistry();
 final ManagementStrategy managementStrategy = 
camelContext.getManagementStrategy();
+final ExtendedCamelContext ecc = 
camelContext.adapt(ExtendedCamelContext.class);
 
-registerPropertyForBeanType(registry, BacklogTracer.class, bt -> 
camelContext.setExtension(BacklogTracer.class, bt));
-registerPropertyForBeanType(registry, HandleFault.class, 
camelContext.adapt(ExtendedCamelContext.class)::addInterceptStrategy);
-registerPropertyForBeanType(registry, InflightRepository.class, 
camelContext::setInflightRepository);
-registerPropertyForBeanType(registry, 
AsyncProcessorAwaitManager.class, 
camelContext.adapt(ExtendedCamelContext.class)::setAsyncProcessorAwaitManager);
-registerPropertyForBeanType(registry, ManagementStrategy.class, 
camelContext::setManagementStrategy);
-registerPropertyForBeanType(registry, 
ManagementObjectNameStrategy.class, 
managementStrategy::setManagementObjectNameStrategy);
-registerPropertyForBeanType(registry, EventFactory.class, 
managementStrategy::setEventFactory);
-registerPropertyForBeanType(registry, UnitOfWorkFactory.class, 
camelContext.adapt(ExtendedCamelContext.class)::setUnitOfWorkFactory);
-registerPropertyForBeanType(registry, RuntimeEndpointRegistry.class, 
camelContext::setRuntimeEndpointRegistry);
-registerPropertyForBeanType(registry, ModelJAXBContextFactory.class, 
camelContext.adapt(ExtendedCamelContext.class)::setModelJAXBContextFactory);
-registerPropertyForBeanType(registry, ClassResolver.class, 
camelContext::setClassResolver);
-registerPropertyForBeanType(registry, FactoryFinderResolver.class, 
camelContext.adapt(ExtendedCamelContext.class)::setFactoryFinderResolver);
-registerPropertyForBeanType(registry, RouteController.class, 
camelContext::setRouteController);
-registerPropertyForBeanType(registry, UuidGenerator.class, 
camelContext::setUuidGenerator);
-registerPropertyForBeanType(registry, ExecutorServiceManager.class, 
camelContext::setExecutorServiceManager);
-registerPropertyForBeanType(registry, ThreadPoolFactory.class, 
camelContext.getExecutorServiceManager()::setThreadPoolFactory);
-registerPropertyForBeanType(registry, ProcessorFactory.class, 
camelContext.adapt(ExtendedCamelContext.class)::setProcessorFactory);
-registerPropertyForBeanType(registry, Debugger.class, 
camelContext::setDebugger);
-registerPropertyForBeanType(registry, NodeIdFactory.class, 
camelContext.adapt(ExtendedCamelContext.class)::setNodeIdFactory);
-registerPropertyForBeanType(registry, MessageHistoryFactory.class, 
camelContext::setMessageHistoryFactory);
-registerPropertyForBeanType(registry, ReactiveExecutor.class, 
camelContext::setReactiveExecutor);
-registerPropertyForBeanType(registry, ShutdownStrategy.class, 
camelContext::setShutdownStrategy);
-
-registerPropertiesForBeanTypes(registry, TypeConverters.class, 
camelContext.getTypeConverterRegistry()::addTypeConverters);
-registerPropertiesForBeanTypes(registry, EndpointStrategy.class, 
camelContext.adapt(ExtendedCamelContext.class)::registerEndpointCallback);
-registerPropertiesForBeanTypes(registry, CamelClusterService.class, 
addServiceToContext(camelContext));
-registerPropertiesForBeanTypes(registry,

[camel] branch core-engine updated (80d1972 -> 1e90e5d)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 80d1972  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 add 1e90e5d  Optimise a bit for class loading

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/camel/impl/engine/DefaultClassResolver.java | 5 -
 1 file changed, 5 deletions(-)

buildbot success in on camel-site-production

2019-06-24 Thread buildbot

The Buildbot has detected a restored build on builder camel-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/34837

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

2019-06-24 Thread buildbot

The Buildbot has detected a new failure on builder camel-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/34836

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[camel] branch core-engine updated: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/core-engine by this push:
 new 80d1972  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
80d1972 is described below

commit 80d1972592391eb5ed4e62c793e51f1814889b5a
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:58:38 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 .../camel-example-main-tiny/src/main/resources/application.properties | 4 +---
 examples/camel-example-main/src/main/resources/application.properties | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/examples/camel-example-main-tiny/src/main/resources/application.properties 
b/examples/camel-example-main-tiny/src/main/resources/application.properties
index f33b578..71ab7ab 100644
--- a/examples/camel-example-main-tiny/src/main/resources/application.properties
+++ b/examples/camel-example-main-tiny/src/main/resources/application.properties
@@ -20,8 +20,6 @@
 camel.main.name = MyCoolCamel
 camel.main.jmx-enabled = false
 
-camel.main.duration-max-seconds=5
-
 # you can also configure camel context directly
 # camel.context.shutdown-strategy.shutdown-now-on-timeout = false
 
@@ -30,7 +28,7 @@ camel.main.file-configurations=src/main/data/*.properties
 
 # to configure the camel quartz component
 # here we can configure the options on the component level (and we can use 
dash-naming-style)
-camel.component.quartz2.start-delayed-seconds = 10
+camel.component.quartz2.start-delayed-seconds = 3
 
 # to configure Hystrix EIP (global and you need to add camel-hystrix to the 
classpath)
 ### camel.hystrix.group-key=myGroup
diff --git 
a/examples/camel-example-main/src/main/resources/application.properties 
b/examples/camel-example-main/src/main/resources/application.properties
index f33b578..71ab7ab 100644
--- a/examples/camel-example-main/src/main/resources/application.properties
+++ b/examples/camel-example-main/src/main/resources/application.properties
@@ -20,8 +20,6 @@
 camel.main.name = MyCoolCamel
 camel.main.jmx-enabled = false
 
-camel.main.duration-max-seconds=5
-
 # you can also configure camel context directly
 # camel.context.shutdown-strategy.shutdown-now-on-timeout = false
 
@@ -30,7 +28,7 @@ camel.main.file-configurations=src/main/data/*.properties
 
 # to configure the camel quartz component
 # here we can configure the options on the component level (and we can use 
dash-naming-style)
-camel.component.quartz2.start-delayed-seconds = 10
+camel.component.quartz2.start-delayed-seconds = 3
 
 # to configure Hystrix EIP (global and you need to add camel-hystrix to the 
classpath)
 ### camel.hystrix.group-key=myGroup

[camel] branch core-engine updated: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/core-engine by this push:
 new 44a3b00  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
44a3b00 is described below

commit 44a3b0071499e3c13871ef9ba5eb42ed3ac7850f
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:57:29 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 examples/camel-example-main/pom.xml | 34 --
 1 file changed, 34 deletions(-)

diff --git a/examples/camel-example-main/pom.xml 
b/examples/camel-example-main/pom.xml
index 37a3a8e..240d629 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/pom.xml
@@ -43,48 +43,14 @@
 org.apache.camel
 camel-core
 
-
 
 org.apache.camel
 camel-main
 
 
 org.apache.camel
-camel-bean
-
-
-org.apache.camel
 camel-quartz2
 
-
-
-
-
-
-
-
-
-
-

[camel] 03/03: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 99c1c59cdcd50b74b632fe80cce960fe51a70f5f
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:48:41 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 apache-camel/pom.xml | 4 
 apache-camel/src/main/descriptors/common-bin.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 2986a98..10f0839 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -78,6 +78,10 @@
 
 
 org.apache.camel
+camel-core-engine
+
+
+org.apache.camel
 camel-core-osgi
 
 
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 6056ee7..ab2de78 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -34,6 +34,7 @@
 org.apache.camel:camel-base
 org.apache.camel:camel-support
 org.apache.camel:camel-core
+org.apache.camel:camel-core-engine
 org.apache.camel:camel-core-osgi
 org.apache.camel:camel-core-xml
 org.apache.camel:camel-cloud

[camel] 01/03: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3dcf7f1a65193538f94e5135eee412c03fb02ac4
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:18:16 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 core/camel-api/pom.xml |   5 -
 .../org/apache/camel/spi/ThreadPoolProfile.java|   2 -
 core/camel-core-engine/pom.xml | 176 
 .../java/org/apache/camel/reifier/BeanReifier.java |   8 +-
 core/camel-main/pom.xml|  32 +-
 core/camel-management-api/pom.xml  |   4 -
 core/pom.xml   |   1 +
 examples/camel-example-main/pom.xml|  35 +
 .../META-INF/spring-configuration-metadata.json| 952 -
 .../src/main/resources/application.properties  |   4 +-
 parent/pom.xml |   5 +
 11 files changed, 257 insertions(+), 967 deletions(-)

diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index 39f939c..04a797b 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -54,11 +54,6 @@
 
 
 
-org.apache.camel
-camel-util-json
-
-
-
 org.slf4j
 slf4j-api
 
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
index 193b29c..e4ba6ca 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
@@ -29,8 +29,6 @@ import 
org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
  */
 public class ThreadPoolProfile implements Serializable, Cloneable {
 
-// TODO: Camel 3.0 consider moving to org.apache.camel
-
 private static final long serialVersionUID = 1L;
 
 private String id;
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
new file mode 100644
index 000..ecfe0ff
--- /dev/null
+++ b/core/camel-core-engine/pom.xml
@@ -0,0 +1,176 @@
+
+
+http://www.w3.org/2001/XMLSchema-instance; 
xmlns="http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+
+org.apache.camel
+core
+3.0.0-SNAPSHOT
+..
+
+
+camel-core-engine
+jar
+
+Camel :: Core Engine
+Just the Camel Core engine without any core 
components
+
+
+3.0.0
+core
+
+
+
+
+
+
+org.apache.camel
+spi-annotations
+true
+
+
+org.apache.camel
+meta-annotations
+true
+
+
+
+org.apache.camel
+camel-api
+
+
+org.apache.camel
+camel-management-api
+
+
+org.apache.camel
+camel-support
+
+
+
+org.apache.camel
+camel-core
+
+
+org.apache.camel
+camel-bean
+
+
+org.apache.camel
+camel-browse
+
+
+
+
+org.apache.camel
+camel-controlbus
+
+
+org.apache.camel
+camel-dataformat
+
+
+org.apache.camel
+camel-dataset
+
+
+org.apache.camel
+camel-direct
+
+
+org.apache.camel
+camel-directvm
+
+
+org.apache.camel
+camel-file
+
+
+org.apache.camel
+camel-language
+
+
+org.apache.camel
+camel-log
+
+
+org.apache.camel
+camel-mock
+
+
+
+
+org.apache.camel
+camel-ref
+
+
+org.apache.camel
+camel-rest
+
+
+org.apache.camel
+camel-saga
+
+
+org.apache.camel
+camel-scheduler
+

[camel] 02/03: CAMEL-13201: camel-core-engine to have minimal camel-core with no components (only properties)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d1b9764f314b954801aaa999bc077cc002c52d9b
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 12:46:11 2019 +0200

CAMEL-13201: camel-core-engine to have minimal camel-core with no 
components (only properties)
---
 examples/camel-example-main-tiny/pom.xml   |  148 +++
 examples/camel-example-main-tiny/readme.adoc   |   22 +
 .../src/main/data/foo.properties   |   18 +
 .../org/apache/camel/example/MyApplication.java|   41 +
 .../main/java/org/apache/camel/example/MyBean.java |   36 +
 .../org/apache/camel/example/MyConfiguration.java  |   37 +
 .../org/apache/camel/example/MyRouteBuilder.java   |   31 +
 .../META-INF/spring-configuration-metadata.json| 1112 
 .../src/main/resources/application.properties  |   52 +
 .../src/main/resources/log4j2.properties   |   26 +
 examples/pom.xml   |1 +
 11 files changed, 1524 insertions(+)

diff --git a/examples/camel-example-main-tiny/pom.xml 
b/examples/camel-example-main-tiny/pom.xml
new file mode 100644
index 000..cdc2ae0
--- /dev/null
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -0,0 +1,148 @@
+
+
+http://www.w3.org/2001/XMLSchema-instance; 
xmlns="http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+org.apache.camel.example
+examples
+3.0.0-SNAPSHOT
+
+
+camel-example-main-tiny
+jar
+Camel :: Example :: Main :: Tiny
+An example for showing standalone Camel with as few JARs on 
classpath as possible
+
+
+Beginner
+
+
+
+
+
+
+org.apache.camel
+camel-core-engine
+
+
+
+org.apache.camel
+camel-jaxp
+
+
+org.apache.camel
+camel-caffeine-lrucache
+
+
+org.apache.camel
+camel-util-json
+
+
+
+
+org.apache.camel
+camel-main
+
+
+
+org.apache.camel
+camel-bean
+
+
+org.apache.camel
+camel-quartz2
+
+
+
+
+com.sun.xml.bind
+jaxb-core
+test
+
+
+com.sun.xml.bind
+jaxb-impl
+test
+
+
+
+
+org.apache.logging.log4j
+log4j-api
+runtime
+
+
+org.apache.logging.log4j
+log4j-core
+runtime
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+runtime
+
+
+org.apache.logging.log4j
+log4j-jul
+runtime
+
+
+
+
+
+
+
+
+org.apache.camel
+camel-maven-plugin
+${project.version}
+
+true
+
org.apache.camel.example.MyApplication
+
+
+
+
+
+org.apache.camel
+camel-main-maven-plugin
+${project.version}
+
+false
+
+
+
+generate
+
+generate
+
+process-classes
+
+
+
+
+
+
+
+
diff --git a/examples/camel-example-main-tiny/readme.adoc 
b/examples/camel-example-main-tiny/readme.adoc
new file mode 100644
index 000..c405e4b
--- /dev/null
+++ b/examples/camel-example-main-tiny/readme.adoc
@@ -0,0 +1,22 @@
+== Camel Example Main Tiny
+
+The example uses the `camel-core-engine` as dependency to use as few JARs
+on the classpath as possible. For more details see the `pom.xml` file.
+
+This example shows how to run Camel standalone via the built-in Main class.
+
+The example also demonstrates how you can configure the Camel application
+via Camel built-in dependency-injection that supports binding via the
+`@BindToRegistry`, `@BeanInject` and `@PropertyInject` annotations.
+
+Also notice how you can configure Camel in the `application.properties` file.
+
+=== How to run
+
+You can run this example using
+
+mvn camel:run   
+
+=== More information
+
+You can find more information about Apache Camel at the website: 
http://camel.apache.org/
diff --git

[camel] branch core-engine created (now 99c1c59)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch core-engine
in repository https://gitbox.apache.org/repos/asf/camel.git.


  at 99c1c59  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)

This branch includes the following new commits:

 new 3dcf7f1  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new d1b9764  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)
 new 99c1c59  CAMEL-13201: camel-core-engine to have minimal camel-core 
with no components (only properties)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[camel] branch master updated (d8a1b3a -> e8f2c2e)

2019-06-24 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from d8a1b3a  CAMEL-13672: camel-main-maven-plugin - Add groups to tooling 
metadata
 new 8f383b0  Polished
 new 950d71f  Type converter source code generator should include javadoc 
about its source code generated by Camel. Optimise a bit to use static method.
 new e8f2c2e  Fixed camel-main setting duration max seconds.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../reifier/errorhandler/ErrorHandlerReifier.java  | 56 +++---
 .../camel/main/MainConfigurationProperties.java| 22 -
 .../java/org/apache/camel/main/MainSupport.java| 17 +++
 .../camel-main-configuration-metadata.json |  7 ---
 .../src/main/resources/log4j2.properties   |  2 +-
 .../tools/apt/AbstractTypeConverterGenerator.java  |  9 ++--
 6 files changed, 44 insertions(+), 69 deletions(-)

[camel] 01/03: Polished

2019-06-24 Thread davsclaus

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

commit 8f383b029a232f5ba473a205d3a3ed90b54694aa
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 10:24:21 2019 +0200

Polished
---
 .../reifier/errorhandler/ErrorHandlerReifier.java  | 56 +++---
 .../src/main/resources/log4j2.properties   |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git 
a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
 
b/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index 59a53e3..8f1216c 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -17,9 +17,7 @@
 package org.apache.camel.reifier.errorhandler;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 
 import org.apache.camel.CamelContext;
@@ -110,34 +108,34 @@ public abstract class ErrorHandlerReifier
 return null;
 }
 Map policy = new HashMap<>();
-setoption(policy, RedeliveryOption.maximumRedeliveries, 
definition.getMaximumRedeliveries());
-setoption(policy, RedeliveryOption.redeliveryDelay, 
definition.getRedeliveryDelay());
-setoption(policy, RedeliveryOption.asyncDelayedRedelivery, 
definition.getAsyncDelayedRedelivery());
-setoption(policy, RedeliveryOption.backOffMultiplier, 
definition.getBackOffMultiplier());
-setoption(policy, RedeliveryOption.useExponentialBackOff, 
definition.getUseExponentialBackOff());
-setoption(policy, RedeliveryOption.collisionAvoidanceFactor, 
definition.getCollisionAvoidanceFactor());
-setoption(policy, RedeliveryOption.useCollisionAvoidance, 
definition.getUseCollisionAvoidance());
-setoption(policy, RedeliveryOption.maximumRedeliveryDelay, 
definition.getMaximumRedeliveryDelay());
-setoption(policy, RedeliveryOption.retriesExhaustedLogLevel, 
definition.getRetriesExhaustedLogLevel());
-setoption(policy, RedeliveryOption.retryAttemptedLogLevel, 
definition.getRetryAttemptedLogLevel());
-setoption(policy, RedeliveryOption.retryAttemptedLogInterval, 
definition.getRetryAttemptedLogInterval());
-setoption(policy, RedeliveryOption.logRetryAttempted, 
definition.getLogRetryAttempted());
-setoption(policy, RedeliveryOption.logStackTrace, 
definition.getLogStackTrace());
-setoption(policy, RedeliveryOption.logRetryStackTrace, 
definition.getLogRetryStackTrace());
-setoption(policy, RedeliveryOption.logHandled, 
definition.getLogHandled());
-setoption(policy, RedeliveryOption.logNewException, 
definition.getLogNewException());
-setoption(policy, RedeliveryOption.logContinued, 
definition.getLogContinued());
-setoption(policy, RedeliveryOption.logExhausted, 
definition.getLogExhausted());
-setoption(policy, RedeliveryOption.logExhaustedMessageHistory, 
definition.getLogExhaustedMessageHistory());
-setoption(policy, RedeliveryOption.logExhaustedMessageBody, 
definition.getLogExhaustedMessageBody());
-setoption(policy, RedeliveryOption.disableRedelivery, 
definition.getDisableRedelivery());
-setoption(policy, RedeliveryOption.delayPattern, 
definition.getDelayPattern());
-setoption(policy, RedeliveryOption.allowRedeliveryWhileStopping, 
definition.getAllowRedeliveryWhileStopping());
-setoption(policy, RedeliveryOption.exchangeFormatterRef, 
definition.getExchangeFormatterRef());
+setOption(policy, RedeliveryOption.maximumRedeliveries, 
definition.getMaximumRedeliveries());
+setOption(policy, RedeliveryOption.redeliveryDelay, 
definition.getRedeliveryDelay());
+setOption(policy, RedeliveryOption.asyncDelayedRedelivery, 
definition.getAsyncDelayedRedelivery());
+setOption(policy, RedeliveryOption.backOffMultiplier, 
definition.getBackOffMultiplier());
+setOption(policy, RedeliveryOption.useExponentialBackOff, 
definition.getUseExponentialBackOff());
+setOption(policy, RedeliveryOption.collisionAvoidanceFactor, 
definition.getCollisionAvoidanceFactor());
+setOption(policy, RedeliveryOption.useCollisionAvoidance, 
definition.getUseCollisionAvoidance());
+setOption(policy, RedeliveryOption.maximumRedeliveryDelay, 
definition.getMaximumRedeliveryDelay());
+setOption(policy, RedeliveryOption.retriesExhaustedLogLevel, 
definition.getRetriesExhaustedLogLevel());
+setOption(policy, RedeliveryOption.retryAttemptedLogLevel, 
definition.getRetryAttemptedLogLevel());
+setOption(policy, RedeliveryOption.retryAttemptedLogInterval, 
definition.getRetryAttemptedLogInterval());
+

[camel] 03/03: Fixed camel-main setting duration max seconds.

2019-06-24 Thread davsclaus

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

commit e8f2c2e9b1f6fb9d5149d7dbda6a48d8a7659297
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 11:01:12 2019 +0200

Fixed camel-main setting duration max seconds.
---
 .../camel/main/MainConfigurationProperties.java| 22 --
 .../java/org/apache/camel/main/MainSupport.java| 17 +
 .../camel-main-configuration-metadata.json |  7 ---
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
 
b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
index 7af382b..89518b9 100644
--- 
a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
+++ 
b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
@@ -25,7 +25,6 @@ public class MainConfigurationProperties extends 
DefaultConfigurationProperties<
 private boolean autowireComponentProperties = true;
 private boolean autowireComponentPropertiesDeep;
 private boolean autowireComponentPropertiesAllowPrivateSetter = true;
-private long duration = -1;
 private int durationHitExitCode;
 private boolean hangupInterceptorEnabled = true;
 
@@ -123,18 +122,6 @@ public class MainConfigurationProperties extends 
DefaultConfigurationProperties<
 this.autowireComponentPropertiesAllowPrivateSetter = 
autowireComponentPropertiesAllowPrivateSetter;
 }
 
-public long getDuration() {
-return duration;
-}
-
-/**
- * Sets the duration (in seconds) to run the application until it
- * should be terminated. Defaults to -1. Any value <= 0 will run forever.
- */
-public void setDuration(long duration) {
-this.duration = duration;
-}
-
 public boolean isHangupInterceptorEnabled() {
 return hangupInterceptorEnabled;
 }
@@ -221,15 +208,6 @@ public class MainConfigurationProperties extends 
DefaultConfigurationProperties<
 }
 
 /**
- * Sets the duration (in seconds) to run the application until it
- * should be terminated. Defaults to -1. Any value <= 0 will run forever.
- */
-public MainConfigurationProperties withDuration(long duration) {
-this.duration = duration;
-return this;
-}
-
-/**
  * Whether to use graceful hangup when Camel is stopping or when the JVM 
terminates.
  */
 public MainConfigurationProperties withHangupInterceptorEnabled(boolean 
hangupInterceptorEnabled) {
diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index 4e841f3..9aec640 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -138,7 +138,7 @@ public abstract class MainSupport extends ServiceSupport {
 if (parameter.endsWith("s") || parameter.endsWith("S")) {
 parameter = parameter.substring(0, parameter.length() - 1);
 }
-configure().setDuration(Integer.parseInt(parameter));
+configure().setDurationMaxSeconds(Integer.parseInt(parameter));
 }
 });
 addOption(new ParameterOption("dm", "durationMaxMessages",
@@ -363,8 +363,8 @@ public abstract class MainSupport extends ServiceSupport {
 }
 
 @Deprecated
-public long getDuration() {
-return mainConfigurationProperties.getDuration();
+public int getDuration() {
+return mainConfigurationProperties.getDurationMaxSeconds();
 }
 
 /**
@@ -373,8 +373,8 @@ public abstract class MainSupport extends ServiceSupport {
  * @deprecated use {@link #configure()}
  */
 @Deprecated
-public void setDuration(long duration) {
-mainConfigurationProperties.setDuration(duration);
+public void setDuration(int duration) {
+mainConfigurationProperties.setDurationMaxSeconds(duration);
 }
 
 @Deprecated
@@ -551,9 +551,10 @@ public abstract class MainSupport extends ServiceSupport {
 try {
 int idle = 
mainConfigurationProperties.getDurationMaxIdleSeconds();
 int max = mainConfigurationProperties.getDurationMaxMessages();
-if (mainConfigurationProperties.getDuration() > 0) {
-LOG.info("Waiting for: {} seconds", 
mainConfigurationProperties.getDuration());
-latch.await(mainConfigurationProperties.getDuration(), 
TimeUnit.SECONDS);
+long sec = mainConfigurationProperties.getDurationMaxSeconds();
+if (sec > 0) {
+LOG.info("Waiting for: {} seconds", sec);
+

[camel] 02/03: Type converter source code generator should include javadoc about its source code generated by Camel. Optimise a bit to use static method.

2019-06-24 Thread davsclaus

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

commit 950d71f491886ddd8a370464bd986583642f957b
Author: Claus Ibsen 
AuthorDate: Mon Jun 24 10:49:09 2019 +0200

Type converter source code generator should include javadoc about its 
source code generated by Camel. Optimise a bit to use static method.
---
 .../apache/camel/tools/apt/AbstractTypeConverterGenerator.java   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
index d4941ab..a9f16ac 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
@@ -219,8 +219,11 @@ public abstract class AbstractTypeConverterGenerator 
extends AbstractCamelAnnota
 writer.append("import 
org.apache.camel.support.TypeConverterSupport;\n");
 writer.append("import org.apache.camel.util.DoubleMap;\n");
 writer.append("\n");
+writer.append("/**\n");
+writer.append(" * Source code generated by 
org.apache.camel:apt\n");
+writer.append(" */\n");
 writer.append("@SuppressWarnings(\"unchecked\")\n");
-writer.append("public class ").append(c).append(" implements 
TypeConverterLoader {\n");
+writer.append("public final class ").append(c).append(" implements 
TypeConverterLoader {\n");
 writer.append("\n");
 writer.append("").append("public ").append(c).append("() {\n");
 writer.append("}\n");
@@ -258,7 +261,7 @@ public abstract class AbstractTypeConverterGenerator 
extends AbstractCamelAnnota
 writer.append("\n");
 
 writer.append(
-  "private void 
addTypeConverter(TypeConverterRegistry registry, Class toType, Class 
fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method)"
+  "private static void 
addTypeConverter(TypeConverterRegistry registry, Class toType, Class 
fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method)"
   + " { \n");
 writer.append("registry.addTypeConverter(toType, 
fromType, new SimpleTypeConverter(allowNull, method));\n");
 writer.append("}\n");
@@ -280,7 +283,7 @@ public abstract class AbstractTypeConverterGenerator 
extends AbstractCamelAnnota
 writer.append("}\n");
 writer.append("\n");
 
-writer.append("private void 
addFallbackTypeConverter(TypeConverterRegistry registry, boolean allowNull, 
boolean canPromote, SimpleTypeConverter.ConversionMethod method) { \n");
+writer.append("private static void 
addFallbackTypeConverter(TypeConverterRegistry registry, boolean allowNull, 
boolean canPromote, SimpleTypeConverter.ConversionMethod method) { \n");
 writer.append("registry.addFallbackTypeConverter(new 
SimpleTypeConverter(allowNull, method), canPromote);\n");
 writer.append("}\n");
 writer.append("\n");

49 matches

Mail list logo