camel git commit: CAMEL-11748 - Camel-Undertow: transferException option doesn't work - improved docs

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 4552d4491 -> 0e44b5879


CAMEL-11748 - Camel-Undertow: transferException option doesn't work - improved 
docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e44b587
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e44b587
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e44b587

Branch: refs/heads/master
Commit: 0e44b58795886084d8ab0f3a6c687164caa5d573
Parents: 4552d44
Author: Andrea Cosentino 
Authored: Tue Sep 5 19:50:28 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 19:53:01 2017 +0200

--
 .../camel-undertow/src/main/docs/undertow-component.adoc | 2 +-
 .../apache/camel/component/undertow/UndertowEndpoint.java| 8 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0e44b587/components/camel-undertow/src/main/docs/undertow-component.adoc
--
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc 
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 652322d..11c07b8 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -91,7 +91,7 @@ with the following path and query parameters:
 | **reuseAddresses** (producer) | Setting to facilitate socket multiplexing | 
true | Boolean
 | **tcpNoDelay** (producer) | Setting to improve TCP protocol performance | 
true | Boolean
 | **throwExceptionOnFailure** (producer) | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status 
code. | true | Boolean
-| **transferException** (producer) | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status 
code. | false | Boolean
+| **transferException** (producer) | If enabled and an Exchange failed 
processing on the consumer side and if the caused Exception was send back 
serialized in the response as a application/x-java-serialized-object content 
type. On the producer side the exception will be deserialized and thrown as is 
instead of the HttpOperationFailedException. The caused exception is required 
to be serialized. This is by default turned off. If you enable this then be 
aware that Java will deserialize the incoming data from the request to Java and 
that can be a potential security risk. | false | Boolean
 | **headerFilterStrategy** (advanced) | To use a custom HeaderFilterStrategy 
to filter header to and from Camel message. |  | HeaderFilterStrategy
 | **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 | **undertowHttpBinding** (advanced) | To use a custom UndertowHttpBinding to 
control the mapping between Camel message and undertow. |  | UndertowHttpBinding

http://git-wip-us.apache.org/repos/asf/camel/blob/0e44b587/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index 16037c5..ec9986a 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -223,8 +223,12 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements AsyncEndpoint,
 }
 
 /**
- * Option to disable throwing the HttpOperationFailedException in case of 
failed responses from the remote server.
- * This allows you to get all responses regardless of the HTTP status code.
+ * If enabled and an Exchange failed processing on the consumer side and 
if the caused Exception 
+ * was send back serialized in the response as a 
application/x-java-serialized-object content type. 
+ * On the producer side the exception will be deserialized and thrown as 
is instead of the HttpOperationFailedException. The caused exception is 
required to be serialized. 
+ * This is by default turned off. If you enable this 
+ * then be aware that Java will deserialize the incoming data from the 
request to Java and that can be a potential security risk.
+ * 
  */
 public

camel git commit: CAMEL-11748 - Camel-Undertow: transferException option doesn't work - improved docs

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 491552942 -> ab1a540e4


CAMEL-11748 - Camel-Undertow: transferException option doesn't work - improved 
docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab1a540e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab1a540e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab1a540e

Branch: refs/heads/camel-2.19.x
Commit: ab1a540e4beacc7562d7abfb2c318c3db6284f8b
Parents: 4915529
Author: Andrea Cosentino 
Authored: Tue Sep 5 19:50:28 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 19:50:52 2017 +0200

--
 .../camel-undertow/src/main/docs/undertow-component.adoc | 2 +-
 .../apache/camel/component/undertow/UndertowEndpoint.java| 8 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ab1a540e/components/camel-undertow/src/main/docs/undertow-component.adoc
--
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc 
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index cf5883f..e41c7e2 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -91,7 +91,7 @@ with the following path and query parameters:
 | **reuseAddresses** (producer) | Setting to facilitate socket multiplexing | 
true | Boolean
 | **tcpNoDelay** (producer) | Setting to improve TCP protocol performance | 
true | Boolean
 | **throwExceptionOnFailure** (producer) | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status 
code. | true | Boolean
-| **transferException** (producer) | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status 
code. | false | Boolean
+| **transferException** (producer) | If enabled and an Exchange failed 
processing on the consumer side and if the caused Exception was send back 
serialized in the response as a application/x-java-serialized-object content 
type. On the producer side the exception will be deserialized and thrown as is 
instead of the HttpOperationFailedException. The caused exception is required 
to be serialized. This is by default turned off. If you enable this then be 
aware that Java will deserialize the incoming data from the request to Java and 
that can be a potential security risk. | false | Boolean
 | **headerFilterStrategy** (advanced) | To use a custom HeaderFilterStrategy 
to filter header to and from Camel message. |  | HeaderFilterStrategy
 | **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 | **undertowHttpBinding** (advanced) | To use a custom UndertowHttpBinding to 
control the mapping between Camel message and undertow. |  | UndertowHttpBinding

http://git-wip-us.apache.org/repos/asf/camel/blob/ab1a540e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index 53a6bc0..1f019fc 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -222,8 +222,12 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements AsyncEndpoint,
 }
 
 /**
- * Option to disable throwing the HttpOperationFailedException in case of 
failed responses from the remote server.
- * This allows you to get all responses regardless of the HTTP status code.
+ * If enabled and an Exchange failed processing on the consumer side and 
if the caused Exception 
+ * was send back serialized in the response as a 
application/x-java-serialized-object content type. 
+ * On the producer side the exception will be deserialized and thrown as 
is instead of the HttpOperationFailedException. The caused exception is 
required to be serialized. 
+ * This is by default turned off. If you enable this 
+ * then be aware that Java will deserialize the incoming data from the 
request to Java and that can be a potential security risk.
+ * 
  */

camel git commit: CAMEL-11680: Camel-dropbox should support Put not only from localPath

2017-09-05 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 3c385c32d -> 4552d4491


CAMEL-11680: Camel-dropbox should support Put not only from localPath


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4552d449
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4552d449
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4552d449

Branch: refs/heads/master
Commit: 4552d44917ba0cd472c7e28fc539354e215d6793
Parents: 3c385c3
Author: Claus Ibsen 
Authored: Tue Sep 5 19:10:28 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Sep 5 19:10:28 2017 +0200

--
 .../src/main/docs/dropbox-component.adoc| 20 -
 .../component/dropbox/DropboxConfiguration.java |  3 +-
 .../dropbox/core/DropboxAPIFacade.java  | 81 +++-
 .../dropbox/util/DropboxConstants.java  |  1 +
 4 files changed, 100 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4552d449/components/camel-dropbox/src/main/docs/dropbox-component.adoc
--
diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc 
b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
index 3281c55..015620f 100644
--- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
+++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
@@ -91,7 +91,7 @@ with the following path and query parameters:
 | **accessToken** (common) | *Required* The access token to make API requests 
for a specific Dropbox user |  | String
 | **client** (common) | To use an existing DbxClient instance as DropBox 
client. |  | DbxClient
 | **clientIdentifier** (common) | *Required* Name of the app registered to 
make API requests |  | String
-| **localPath** (common) | Folder or file to upload on Dropbox from the local 
filesystem. |  | String
+| **localPath** (common) | Optional folder or file to upload on Dropbox from 
the local filesystem. If this option has not been configured then the message 
body is used as the content to upload. |  | String
 | **newRemotePath** (common) | Destination file or folder |  | String
 | **query** (common) | A space-separated list of sub-strings to search for. A 
file matches only if it contains all the sub-strings. If this option is not set 
all files will be matched. |  | String
 | **remotePath** (common) | Original file or folder to move |  | String
@@ -266,7 +266,9 @@ dropbox: in case of "add" the new file will be renamed if a 
file with the same
 name already exists on dropbox. In case of "force" if a file with the same 
name already exists on
 dropbox, this will be overwritten.
 
-|`localPath` |`true` |Folder or file to upload on Dropbox from the local 
filesystem .
+|`localPath` |`false` |Folder or file to upload on Dropbox from the local 
filesystem.
+If this option has been configured then it takes precedence over uploading as 
a single
+file with content from the Camel message body (message body is converted into 
a byte array).
 
 |`remotePath` |`false` |Folder destination on Dropbox. If the property is not 
set, the component
 will upload the file on a remote path equal to the local path.
@@ -281,6 +283,20 @@ 
from("direct:start").to("dropbox://put?accessToken=XXX=XXX
 
from("direct:start").to("dropbox://put?accessToken=XXX=XXX=add=/root/folder1=/root/folder2").to("mock:result");
 ---
 
+And to upload a single file with content from the message body
+
+[source,java]
+---
+from("direct:start")
+   .setHeader(DropboxConstants.HEADER_PUT_FILE_NAME, constant("myfile.txt"))
+   
.to("dropbox://put?accessToken=XXX=XXX=add=/root/folder2")
+   .to("mock:result");
+---
+
+The name of the file can be provided in the header 
`DropboxConstants.HEADER_PUT_FILE_NAME`
+or `Exchange.FILE_NAME` in that order of precedence. If no header has been 
provided then the message id (uuid) is
+used as the file name.
+
  Result Message Headers
 
 The following headers are set on message result:

http://git-wip-us.apache.org/repos/asf/camel/blob/4552d449/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
--
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
index 753e4d8..e02c82d 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
+++

camel git commit: CAMEL-11730: camel-connector-maven-plugin : it should be possible to configure connector only properties

2017-09-05 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master bc09a41da -> 3c385c32d


CAMEL-11730: camel-connector-maven-plugin : it should be possible to configure 
connector only properties


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c385c32
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c385c32
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c385c32

Branch: refs/heads/master
Commit: 3c385c32de4b53b5df20286e6d80fb44aba628cd
Parents: bc09a41
Author: lburgazzoli 
Authored: Tue Sep 5 18:40:09 2017 +0200
Committer: lburgazzoli 
Committed: Tue Sep 5 18:40:09 2017 +0200

--
 .../myfoo-connector/src/main/resources/camel-connector-schema.json | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c385c32/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
--
diff --git 
a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json 
b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
index 7a6f51a..c4f618a 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
@@ -22,5 +22,7 @@
 "timerName": { "kind": "path", "displayName": "Timer Name", "group": 
"consumer", "required": true, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "secret": false, "description": "The name of the timer" },
 "period": { "kind": "parameter", "displayName": "Period", "group": 
"consumer", "required": false, "type": "integer", "javaType": "long", 
"deprecated": false, "secret": false, "defaultValue": 5000, "description": "If 
greater than 0 generate periodic events every period milliseconds. The default 
value is 1000. You can also specify time values using units such as 60s (60 
seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour)." },
 "repeatCount": { "kind": "parameter", "displayName": "Repeat Count", 
"group": "consumer", "required": false, "type": "integer", "javaType": "long", 
"deprecated": false, "secret": false, "defaultValue": 0, "description": 
"Specifies a maximum limit of number of fires. So if you set it to 1 the timer 
will only fire once. If you set it to 5 it will only fire five times. A value 
of zero or negative means fire forever." }
+  },
+  "connectorProperties": {
   }
 }

[2/2] camel git commit: CAMEL-11730: camel-connector-maven-plugin : it should be possible to configure connector only properties

2017-09-05 Thread lburgazzoli 
CAMEL-11730: camel-connector-maven-plugin : it should be possible to configure 
connector only properties


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc09a41d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc09a41d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc09a41d

Branch: refs/heads/master
Commit: bc09a41da297d0012af31f08ddedbf1f4452d279
Parents: 3a3c05b
Author: lburgazzoli 
Authored: Fri Sep 1 18:55:42 2017 +0200
Committer: lburgazzoli 
Committed: Tue Sep 5 17:00:08 2017 +0200

--
 .../camel/maven/connector/ConnectorMojo.java| 39 
 .../SpringBootAutoConfigurationMojo.java| 34 +--
 .../maven/connector/model/ComponentModel.java   |  9 ++
 .../connector/model/ConnectorOptionModel.java   | 20 
 .../component/connector/ConnectorModel.java | 30 ++
 .../connector/DefaultConnectorComponent.java| 24 ++---
 .../main/resources/camel-connector-schema.json  |  2 +
 .../main/resources/camel-connector-schema.json  |  2 +
 .../PetStoreConnectorAutoConfiguration.java | 98 ++-
 .../PetStoreConnectorConfigurationCommon.java   | 14 ++-
 .../main/resources/camel-connector-schema.json  |  2 +
 .../src/main/resources/camel-connector.json |  2 +-
 ...UpsertContactConnectorAutoConfiguration.java | 99 +++-
 ...sertContactConnectorConfigurationCommon.java |  3 +-
 .../main/resources/camel-connector-schema.json  |  4 +-
 .../src/main/resources/camel-connector.json |  2 +-
 ...witterMentionConnectorAutoConfiguration.java | 18 ++--
 ...tterMentionConnectorConfigurationCommon.java |  3 +-
 .../main/resources/camel-connector-schema.json  |  2 +
 .../src/main/resources/camel-connector.json |  2 +-
 ...TwitterSearchConnectorAutoConfiguration.java | 18 ++--
 ...itterSearchConnectorConfigurationCommon.java | 17 +++-
 .../main/resources/camel-connector-schema.json  |  3 +
 .../src/main/resources/camel-connector.json | 16 +++-
 .../java/org/foo/TwitterSearchCustomizer.java   |  7 ++
 .../src/main/resources/application.properties   |  3 +-
 .../main/resources/camel-connector-schema.json  |  2 +
 27 files changed, 371 insertions(+), 104 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bc09a41d/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
--
diff --git 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
index 2f6d95e..b0471c0 100644
--- 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
+++ 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
@@ -29,6 +29,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -124,12 +125,16 @@ public class ConnectorMojo extends AbstractJarMojo {
 String endpointOptions = buildEndpointOptionsSchema(rows, 
dto);
 getLog().debug(endpointOptions);
 
+String connectorOptions = buildConnectorOptionsSchema(dto);
+getLog().debug(connectorOptions);
+
 // generate the json file
 StringBuilder jsonSchema = new StringBuilder();
 jsonSchema.append("{\n");
 jsonSchema.append(header);
 jsonSchema.append(componentOptions);
 jsonSchema.append(endpointOptions);
+jsonSchema.append(connectorOptions);
 jsonSchema.append("}\n");
 
 String newJson = jsonSchema.toString();
@@ -233,6 +238,7 @@ public class ConnectorMojo extends AbstractJarMojo {
 sb.append("  \"componentProperties\": {\n");
 
 boolean first = true;
+
 for (int i = 0; i < rows.size(); i++) {
 Map row = rows.get(i);
 String key = row.get("name");
@@ -346,6 +352,39 @@ public class ConnectorMojo extends AbstractJarMojo {
 sb.append("\n");
 }
 
+sb.append("  },\n");
+return sb.toString();
+}
+
+private String buildConnectorOptionsSchema(Map dto) throws 
JsonProcessingException {
+// find the endpoint options
+Map properties = (Map) dto.get("connectorProperties");
+
+StringBuilder sb =

[1/2] camel git commit: CAMEL-11729: camel-connector-maven-plugin : generated spring boot starters should support customizers

2017-09-05 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 30baf10b7 -> bc09a41da


CAMEL-11729: camel-connector-maven-plugin : generated spring boot starters 
should support customizers


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a3c05bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a3c05bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a3c05bd

Branch: refs/heads/master
Commit: 3a3c05bd8d8cc6b0bb9634b2e3c9adc5a6e14fa4
Parents: 30baf10
Author: lburgazzoli 
Authored: Fri Sep 1 12:54:45 2017 +0200
Committer: lburgazzoli 
Committed: Tue Sep 5 16:48:52 2017 +0200

--
 .../SpringBootAutoConfigurationMojo.java| 91 +---
 .../component/connector/ConnectorComponent.java | 13 ++-
 .../connector/ConnectorCustomizer.java  | 27 ++
 .../connector/DefaultConnectorComponent.java| 37 +---
 ...witterMentionConnectorAutoConfiguration.java | 90 +++
 ...tterMentionConnectorConfigurationCommon.java |  4 +-
 .../main/resources/camel-connector-schema.json  |  2 +-
 .../src/main/resources/camel-connector.json |  2 +-
 ...TwitterSearchConnectorAutoConfiguration.java | 90 +++
 ...itterSearchConnectorConfigurationCommon.java |  4 +-
 .../main/resources/camel-connector-schema.json  |  2 +-
 .../src/main/resources/camel-connector.json |  2 +-
 .../java/org/foo/TwitterSearchCustomizer.java   | 38 
 .../foo/TwitterSearchCustomizerProperties.java  | 37 
 .../src/main/resources/application.properties   |  3 +-
 15 files changed, 366 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3a3c05bd/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
--
diff --git 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
index 23a2396..179d788 100644
--- 
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
+++ 
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java
@@ -58,6 +58,7 @@ import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import 
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -270,6 +271,11 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 final String configNameCommon = javaType.substring(pos + 
1).replace("Component", "ConnectorConfigurationCommon");
 final String configName = javaType.substring(pos + 
1).replace("Component", "ConnectorConfiguration");
 
+// add method for auto configure
+final String shortJavaType = getShortJavaType(javaType);
+// must be named -component because camel-spring-boot uses that to 
lookup components
+final String beanName = connectorScheme + "-component";
+
 javaClass.setPackage(packageName).setName(name);
 
 String doc = "Generated by camel-connector-maven-plugin - do not edit 
this file!";
@@ -285,16 +291,36 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 AnnotationSource ann = 
javaClass.addAnnotation(EnableConfigurationProperties.class);
 ann.setLiteralValue("value", configurationName + ".class");
 
-javaClass.addImport("java.util.HashMap");
-javaClass.addImport("java.util.Map");
+javaClass.addImport(HashMap.class);
+javaClass.addImport(Map.class);
 javaClass.addImport("org.apache.camel.util.IntrospectionSupport");
 }
 
 javaClass.addImport(javaType);
+javaClass.addImport(ApplicationContext.class);
 javaClass.addImport(BeanCreationException.class);
+javaClass.addImport(List.class);
+javaClass.addImport("org.slf4j.Logger");
+javaClass.addImport("org.slf4j.LoggerFactory");
 javaClass.addImport("org.apache.camel.CamelContext");
+
javaClass.addImport("org.apache.camel.component.connector.ConnectorCustomizer");
+

camel git commit: Fix CS

2017-09-05 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 08d60c0c1 -> 30baf10b7


Fix CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/30baf10b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/30baf10b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/30baf10b

Branch: refs/heads/master
Commit: 30baf10b71599b4f9c1a0aaca9ef5be0fdc06ea6
Parents: 08d60c0
Author: lburgazzoli 
Authored: Tue Sep 5 16:38:42 2017 +0200
Committer: lburgazzoli 
Committed: Tue Sep 5 16:38:42 2017 +0200

--
 .../org/apache/camel/component/ahc/AhcProducerSessionTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/30baf10b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java
index 95b519a..3c6e762 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java
@@ -104,7 +104,7 @@ public class AhcProducerSessionTest extends BaseAhcTest {
 session.setAttribute("foo", "bar");
 message.setBody("New " + body);
 }
-message.getResponse().addCookie(new 
Cookie("othercookie","value"));
+message.getResponse().addCookie(new 
Cookie("othercookie", "value"));
 }
 });
 }

camel git commit: CAMEL-11748 - Camel-Undertow: transferException option doesn't work

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 5e0c8dea8 -> 08d60c0c1


CAMEL-11748 - Camel-Undertow: transferException option doesn't work


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08d60c0c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08d60c0c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08d60c0c

Branch: refs/heads/master
Commit: 08d60c0c142766a198e95cf12b46d926e36a6d12
Parents: 5e0c8de
Author: Andrea Cosentino 
Authored: Tue Sep 5 15:46:47 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 15:53:38 2017 +0200

--
 .../undertow/DefaultUndertowHttpBinding.java|  3 +-
 .../undertow/UndertowTransferExceptionTest.java | 55 
 2 files changed, 56 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/08d60c0c/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index 7fb22ce..7d64433 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -311,7 +311,7 @@ public class DefaultUndertowHttpBinding implements 
UndertowHttpBinding {
 // we failed due an exception, and transfer it as java 
serialized object
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 ObjectOutputStream oos = new ObjectOutputStream(bos);
-oos.writeObject(exception.getCause());
+oos.writeObject(exception);
 oos.flush();
 IOHelper.close(oos, bos);
 
@@ -342,7 +342,6 @@ public class DefaultUndertowHttpBinding implements 
UndertowHttpBinding {
 httpExchange.getResponseHeaders().put(Headers.CONTENT_TYPE, 
contentType);
 LOG.trace("Content-Type: {}", contentType);
 }
-
 return body;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/08d60c0c/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
new file mode 100644
index 000..6e693c6
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
@@ -0,0 +1,55 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.undertow;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UndertowTransferExceptionTest extends BaseUndertowTest {
+
+@Test
+public void getSerializedExceptionTest() throws IOException, 
ClassNotFoundException {
+HttpClient client = new HttpClient();
+GetMethod get = new GetMethod("http://localhost:; + getPort() + 
"/test/transfer");
+get.setRequestHeader("Accept", "application/x-java-serialized-object");
+client.executeMethod(get);
+ObjectInputStream in = new 
ObjectInputStream(get.getResponseBodyAsStream());
+IllegalArgumentException e = (IllegalArgumentException)in.readObject();
+Assert.assertNotNull(e);
+

camel git commit: CAMEL-11748 - Camel-Undertow: transferException option doesn't work

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 34a0e90b8 -> 491552942


CAMEL-11748 - Camel-Undertow: transferException option doesn't work


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49155294
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49155294
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49155294

Branch: refs/heads/camel-2.19.x
Commit: 4915529424eb5d8713aad075b445d8835316fefe
Parents: 34a0e90
Author: Andrea Cosentino 
Authored: Tue Sep 5 15:46:47 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 15:47:42 2017 +0200

--
 .../undertow/DefaultUndertowHttpBinding.java|  3 +-
 .../undertow/UndertowTransferExceptionTest.java | 55 
 2 files changed, 56 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/49155294/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index 3d2578a..577160e 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -313,7 +313,7 @@ public class DefaultUndertowHttpBinding implements 
UndertowHttpBinding {
 // we failed due an exception, and transfer it as java 
serialized object
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 ObjectOutputStream oos = new ObjectOutputStream(bos);
-oos.writeObject(exception.getCause());
+oos.writeObject(exception);
 oos.flush();
 IOHelper.close(oos, bos);
 
@@ -344,7 +344,6 @@ public class DefaultUndertowHttpBinding implements 
UndertowHttpBinding {
 httpExchange.getResponseHeaders().put(Headers.CONTENT_TYPE, 
contentType);
 LOG.trace("Content-Type: {}", contentType);
 }
-
 return body;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/49155294/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
new file mode 100644
index 000..6e693c6
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
@@ -0,0 +1,55 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.undertow;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UndertowTransferExceptionTest extends BaseUndertowTest {
+
+@Test
+public void getSerializedExceptionTest() throws IOException, 
ClassNotFoundException {
+HttpClient client = new HttpClient();
+GetMethod get = new GetMethod("http://localhost:; + getPort() + 
"/test/transfer");
+get.setRequestHeader("Accept", "application/x-java-serialized-object");
+client.executeMethod(get);
+ObjectInputStream in = new 
ObjectInputStream(get.getResponseBodyAsStream());
+IllegalArgumentException e = (IllegalArgumentException)in.readObject();
+Assert.assertNotNull(e);
+

camel git commit: CAMEL-11715: Camel Spring : unable to mix xml a...

2017-09-05 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master b8128c93c -> 5e0c8dea8


CAMEL-11715: Camel Spring : unable to mix xml a...

...nd java routes

Changes the order of `RoutesCollector` so it performs before
`CamelContextFactoryBean`. This helps as `CamelContextFactoryBean` will
startup `SpringCamelContext` before `RoutesCollector` gets a chance to
add routes to the context.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e0c8dea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e0c8dea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e0c8dea

Branch: refs/heads/master
Commit: 5e0c8dea8f8d663028e8e7c3daba08a5f20adb20
Parents: b8128c9
Author: Zoran Regvart 
Authored: Tue Sep 5 09:53:28 2017 +0200
Committer: Zoran Regvart 
Committed: Tue Sep 5 15:51:55 2017 +0200

--
 .../camel/spring/boot/RoutesCollector.java  | 14 ++--
 .../spring/boot/MixedJavaDslAndXmlTest.java | 78 
 .../src/test/resources/camel/camelContext.xml   |  2 +-
 .../src/test/resources/test-camel-context.xml   |  2 +-
 4 files changed, 89 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5e0c8dea/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
index b1edd8c..6e4d588 100644
--- 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
@@ -225,13 +225,17 @@ public class RoutesCollector implements 
ApplicationListenerhttp://git-wip-us.apache.org/repos/asf/camel/blob/5e0c8dea/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/MixedJavaDslAndXmlTest.java
--
diff --git 
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/MixedJavaDslAndXmlTest.java
 
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/MixedJavaDslAndXmlTest.java
new file mode 100644
index 000..1dbe394
--- /dev/null
+++ 
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/MixedJavaDslAndXmlTest.java
@@ -0,0 +1,78 @@
+/**
+ * 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.
+ */
+package org.apache.camel.spring.boot;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Route;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultRoute;
+import org.assertj.core.api.Condition;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class MixedJavaDslAndXmlTest {
+
+@Configuration
+@EnableAutoConfiguration
+@ImportResource("classpath:test-camel-context.xml")
+public static class JavaDslConfiguration {
+
+@Bean
+public RouteBuilder javaDsl() {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+
from("timer:project?period=1s").id("java").setBody().constant("Hello World from 
Java Route")
+.log(">>> ${body}");
+

camel git commit: CAMEL-11748 - Camel-Undertow: transferException option doesn't work

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 1dd8be7e7 -> becd9613d


CAMEL-11748 - Camel-Undertow: transferException option doesn't work


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/becd9613
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/becd9613
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/becd9613

Branch: refs/heads/camel-2.18.x
Commit: becd9613dd7d50c599e34c3633e1575f524755a9
Parents: 1dd8be7
Author: Andrea Cosentino 
Authored: Tue Sep 5 15:46:47 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 15:50:28 2017 +0200

--
 .../undertow/DefaultUndertowHttpBinding.java|  3 +-
 .../undertow/UndertowTransferExceptionTest.java | 55 
 2 files changed, 56 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/becd9613/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index 10aaf52..77e612c 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -283,7 +283,7 @@ public class DefaultUndertowHttpBinding implements 
UndertowHttpBinding {
 // we failed due an exception, and transfer it as java 
serialized object
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 ObjectOutputStream oos = new ObjectOutputStream(bos);
-oos.writeObject(exception.getCause());
+oos.writeObject(exception);
 oos.flush();
 IOHelper.close(oos, bos);
 
@@ -314,7 +314,6 @@ public class DefaultUndertowHttpBinding implements 
UndertowHttpBinding {
 httpExchange.getResponseHeaders().put(Headers.CONTENT_TYPE, 
contentType);
 LOG.trace("Content-Type: {}", contentType);
 }
-
 return body;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/becd9613/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
new file mode 100644
index 000..6e693c6
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
@@ -0,0 +1,55 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.undertow;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UndertowTransferExceptionTest extends BaseUndertowTest {
+
+@Test
+public void getSerializedExceptionTest() throws IOException, 
ClassNotFoundException {
+HttpClient client = new HttpClient();
+GetMethod get = new GetMethod("http://localhost:; + getPort() + 
"/test/transfer");
+get.setRequestHeader("Accept", "application/x-java-serialized-object");
+client.executeMethod(get);
+ObjectInputStream in = new 
ObjectInputStream(get.getResponseBodyAsStream());
+IllegalArgumentException e = (IllegalArgumentException)in.readObject();
+Assert.assertNotNull(e);
+

buildbot success in on camel-site-production

2017-09-05 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/19166

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

2017-09-05 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/19165

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 git commit: This closes #1914

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master bec99f278 -> b8128c93c


This closes #1914


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b8128c93
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b8128c93
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b8128c93

Branch: refs/heads/master
Commit: b8128c93ce8b387aad70791bd2929dd8015c1d9b
Parents: bec99f2
Author: Andrea Cosentino 
Authored: Tue Sep 5 11:20:43 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 11:20:43 2017 +0200

--

--

camel git commit: Fixed Camel-gRPC Kubernetes example with the latest f-m-p

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 3055b1357 -> bec99f278


Fixed Camel-gRPC Kubernetes example with the latest f-m-p


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bec99f27
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bec99f27
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bec99f27

Branch: refs/heads/master
Commit: bec99f2787bc30055a23e6638f404aa014e01a65
Parents: 3055b13
Author: Andrea Cosentino 
Authored: Tue Sep 5 11:03:21 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 11:03:21 2017 +0200

--
 .../example/springboot/grpc/CamelGrpcRoute.java |  2 +-
 .../hello-camel-grpc-server-kubernetes/pom.xml  | 20 
 2 files changed, 17 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bec99f27/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
--
diff --git 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
index 864a880..19a55ec 100644
--- 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
+++ 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
@@ -39,7 +39,7 @@ public class CamelGrpcRoute extends RouteBuilder {
 exchange.getIn().setBody(request, CamelHelloRequest.class);
 
 }
-
}).to("grpc://grpc-server:80/org.apache.camel.examples.CamelHello?method=sayHelloToCamel=true").log("Received
 ${body}");
+
}).to("grpc://grpc-server:8080/org.apache.camel.examples.CamelHello?method=sayHelloToCamel=true").log("Received
 ${body}");
 }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/bec99f27/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
--
diff --git 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index 57b8c9d..6208614 100644
--- 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -87,17 +87,29 @@



-   
-   org.apache.maven.plugins
-   maven-jar-plugin
-   2.4
+   
+   maven-assembly-plugin
+   3.1.0

+   
+   
jar-with-dependencies
+   



org.apache.camel.examples.grpc.HelloCamelServer



+   
+   
+   make-assembly 
+   package 
+   
+   single
+   
+   
+

camel git commit: Use a specific version of fabric8-maven-plugin from parent POM

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 25ddb5fd8 -> 3055b1357


Use a specific version of fabric8-maven-plugin from parent POM


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3055b135
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3055b135
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3055b135

Branch: refs/heads/master
Commit: 3055b135776625c90f9c8b43d269d9eb28783338
Parents: 25ddb5f
Author: Andrea Cosentino 
Authored: Tue Sep 5 10:34:41 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 10:34:41 2017 +0200

--
 examples/camel-example-cassandra-kubernetes/pom.xml   | 3 +--
 .../hello-camel-grpc-client-kubernetes/pom.xml| 2 +-
 .../hello-camel-grpc-server-kubernetes/pom.xml| 2 +-
 examples/camel-example-hazelcast-kubernetes/pom.xml   | 3 +--
 parent/pom.xml| 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3055b135/examples/camel-example-cassandra-kubernetes/pom.xml
--
diff --git a/examples/camel-example-cassandra-kubernetes/pom.xml 
b/examples/camel-example-cassandra-kubernetes/pom.xml
index b2e496a..6c116a1 100644
--- a/examples/camel-example-cassandra-kubernetes/pom.xml
+++ b/examples/camel-example-cassandra-kubernetes/pom.xml
@@ -41,7 +41,6 @@
 3.3.0
 
 
-3.5.22
 1.5.0
 3.6.0
 2.19.1
@@ -114,7 +113,7 @@
   
 io.fabric8
 fabric8-maven-plugin
-${fabric8.maven.plugin.version}
+${fabric8-maven-plugin-version}
 
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/3055b135/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
--
diff --git 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
index c1717d2..f4fd006 100644
--- 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
+++ 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
@@ -127,7 +127,7 @@

io.fabric8

fabric8-maven-plugin
-   3.2.31
+   
${fabric8-maven-plugin-version}




http://git-wip-us.apache.org/repos/asf/camel/blob/3055b135/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
--
diff --git 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index 16b456b..57b8c9d 100644
--- 
a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ 
b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -114,7 +114,7 @@

io.fabric8

fabric8-maven-plugin
-   3.2.31
+   
${fabric8-maven-plugin-version}




http://git-wip-us.apache.org/repos/asf/camel/blob/3055b135/examples/camel-example-hazelcast-kubernetes/pom.xml
--
diff --git a/examples/camel-example-hazelcast-kubernetes/pom.xml 
b/examples/camel-example-hazelcast-kubernetes/pom.xml
index 5050c2f..4aa5aaf 100644
--- a/examples/camel-example-hazelcast-kubernetes/pom.xml
+++ b/examples/camel-example-hazelcast-kubernetes/pom.xml
@@ -37,7 +37,6 @@
 UTF-8
 
 
-3.2.31
 1.5.0
 3.6.0
 2.19.1
@@ -104,7 +103,7 @@
   
 io.fabric8
 fabric8-maven-plugin
-${fabric8.maven.plugin.version}
+${fabric8-maven-plugin-version}
 
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/3055b135/parent/pom.xml

camel git commit: Regen

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master cc6883dcb -> 25ddb5fd8


Regen


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/25ddb5fd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25ddb5fd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25ddb5fd

Branch: refs/heads/master
Commit: 25ddb5fd83790818dc834966cd420d0799ac3a1e
Parents: cc6883d
Author: Andrea Cosentino 
Authored: Tue Sep 5 09:39:38 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 09:39:38 2017 +0200

--
 .../xmpp/springboot/XmppComponentAutoConfiguration.java   | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/25ddb5fd/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
index 8fdfe96..f8d2f3d 100644
--- 
a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
@@ -26,6 +26,7 @@ import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spi.HasId;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
@@ -94,16 +95,15 @@ public class XmppComponentAutoConfiguration {
 IntrospectionSupport.getProperties(value, nestedParameters,
 null, false);
 Object nestedProperty = nestedClass.newInstance();
-IntrospectionSupport.setProperties(camelContext,
-camelContext.getTypeConverter(), nestedProperty,
-nestedParameters);
+CamelPropertiesHelper.setCamelProperties(camelContext,
+nestedProperty, nestedParameters, false);
 entry.setValue(nestedProperty);
 } catch (NoSuchFieldException e) {
 }
 }
 }
-IntrospectionSupport.setProperties(camelContext,
-camelContext.getTypeConverter(), component, parameters);
+CamelPropertiesHelper.setCamelProperties(camelContext, component,
+parameters, false);
 if (ObjectHelper.isNotEmpty(customizers)) {
 for (ComponentCustomizer customizer : customizers) {
 boolean useCustomizer = (customizer instanceof HasId)

camel git commit: Upgrade Smack to version 4.2.1

2017-09-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 70c18da39 -> cc6883dcb


Upgrade Smack to version 4.2.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc6883dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc6883dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc6883dc

Branch: refs/heads/master
Commit: cc6883dcb96aff85ecc03846000694a380783355
Parents: 70c18da
Author: Andrea Cosentino 
Authored: Tue Sep 5 09:07:40 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 5 09:07:40 2017 +0200

--
 parent/pom.xml|  2 +-
 .../xmpp/springboot/XmppComponentAutoConfiguration.java   | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cc6883dc/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8757f23..5d65f25 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -606,7 +606,7 @@
 1.1
 1.7.22
 1.7.22
-4.2.0
+4.2.1
 1.18
 1.1.2.6
 2.3.4_1

http://git-wip-us.apache.org/repos/asf/camel/blob/cc6883dc/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
index f8d2f3d..8fdfe96 100644
--- 
a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java
@@ -26,7 +26,6 @@ import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spi.HasId;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
@@ -95,15 +94,16 @@ public class XmppComponentAutoConfiguration {
 IntrospectionSupport.getProperties(value, nestedParameters,
 null, false);
 Object nestedProperty = nestedClass.newInstance();
-CamelPropertiesHelper.setCamelProperties(camelContext,
-nestedProperty, nestedParameters, false);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), nestedProperty,
+nestedParameters);
 entry.setValue(nestedProperty);
 } catch (NoSuchFieldException e) {
 }
 }
 }
-CamelPropertiesHelper.setCamelProperties(camelContext, component,
-parameters, false);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), component, parameters);
 if (ObjectHelper.isNotEmpty(customizers)) {
 for (ComponentCustomizer customizer : customizers) {
 boolean useCustomizer = (customizer instanceof HasId)