[1/3] camel git commit: Mina2BodyPatch

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 9f0df574e -> f44d8652e
  refs/heads/camel-2.17.x c70838bb0 -> a4c031b0f
  refs/heads/master c4a7e2d70 -> 050aa7d1b


Mina2BodyPatch


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

Branch: refs/heads/master
Commit: 050aa7d1bf18b3aee32c1024a0d8381053a2bc0b
Parents: c4a7e2d
Author: Arno Noordover 
Authored: Fri Jun 10 13:59:56 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 20:28:13 2016 +0200

--
 .../main/java/org/apache/camel/component/mina2/Mina2Helper.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/050aa7d1/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
--
diff --git 
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
 
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
index 4505a59..4e843b6 100644
--- 
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
+++ 
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
@@ -51,7 +51,7 @@ public final class Mina2Helper {
 // thread hanging forever
 LOG.trace("Waiting for write to complete for body: {} using session: 
{}", body, session);
 if (!future.awaitUninterruptibly(1L)) {
-String message = "Cannot write body: " + body + " using session: " 
+ session;
+String message = "Cannot write body: " + 
body.getClass().getCanonicalName() + " using session: " + session;
 if (future.getException() != null) {
 throw new CamelExchangeException(message, exchange, 
future.getException());
 } else {

[2/3] camel git commit: Mina2BodyPatch

[davsclaus]

Mina2BodyPatch


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

Branch: refs/heads/camel-2.17.x
Commit: a4c031b0fdb38898f61c10dd66cadaf68292d200
Parents: c70838b
Author: Arno Noordover 
Authored: Fri Jun 10 13:59:56 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 20:28:40 2016 +0200

--
 .../main/java/org/apache/camel/component/mina2/Mina2Helper.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4c031b0/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
--
diff --git 
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
 
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
index 4505a59..4e843b6 100644
--- 
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
+++ 
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
@@ -51,7 +51,7 @@ public final class Mina2Helper {
 // thread hanging forever
 LOG.trace("Waiting for write to complete for body: {} using session: 
{}", body, session);
 if (!future.awaitUninterruptibly(1L)) {
-String message = "Cannot write body: " + body + " using session: " 
+ session;
+String message = "Cannot write body: " + 
body.getClass().getCanonicalName() + " using session: " + session;
 if (future.getException() != null) {
 throw new CamelExchangeException(message, exchange, 
future.getException());
 } else {

[3/3] camel git commit: Mina2BodyPatch

[davsclaus]

Mina2BodyPatch


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

Branch: refs/heads/camel-2.16.x
Commit: f44d8652eea9867f3956e900ce005e4b1fdf4728
Parents: 9f0df57
Author: Arno Noordover 
Authored: Fri Jun 10 13:59:56 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 20:29:06 2016 +0200

--
 .../main/java/org/apache/camel/component/mina2/Mina2Helper.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f44d8652/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
--
diff --git 
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
 
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
index 4505a59..4e843b6 100644
--- 
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
+++ 
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
@@ -51,7 +51,7 @@ public final class Mina2Helper {
 // thread hanging forever
 LOG.trace("Waiting for write to complete for body: {} using session: 
{}", body, session);
 if (!future.awaitUninterruptibly(1L)) {
-String message = "Cannot write body: " + body + " using session: " 
+ session;
+String message = "Cannot write body: " + 
body.getClass().getCanonicalName() + " using session: " + session;
 if (future.getException() != null) {
 throw new CamelExchangeException(message, exchange, 
future.getException());
 } else {

camel git commit: include scheme in ironmq doc

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 2c7e84c9f -> c4a7e2d70


include scheme in ironmq doc

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

Branch: refs/heads/master
Commit: c4a7e2d7028e09ad39a179dd068e597dcd753afa
Parents: 2c7e84c
Author: Preben Asmussen 
Authored: Fri Jun 10 20:02:02 2016 +0200
Committer: Preben Asmussen 
Committed: Fri Jun 10 20:02:02 2016 +0200

--
 components/camel-ironmq/src/main/docs/ironmq.adoc| 8 
 .../apache/camel/component/ironmq/IronMQConfiguration.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c4a7e2d7/components/camel-ironmq/src/main/docs/ironmq.adoc
--
diff --git a/components/camel-ironmq/src/main/docs/ironmq.adoc 
b/components/camel-ironmq/src/main/docs/ironmq.adoc
index 18df266..969bb30 100644
--- a/components/camel-ironmq/src/main/docs/ironmq.adoc
+++ b/components/camel-ironmq/src/main/docs/ironmq.adoc
@@ -54,7 +54,7 @@ The ironmq component supports 31 endpoint options which are 
listed below:
 | Name | Group | Default | Java Type | Description
 | queueName | common |  | String | *Required* The name of the IronMQ queue
 | client | common |  | Client | Reference to a io.iron.ironmq.Client in the 
Registry.
-| ironMQCloud | common | https://mq-aws-us-east-1-1.iron.io | String | IronMq 
Cloud url. Urls for public clusters: mq-aws-us-east-1-1.iron.io (US) 
mq-aws-eu-west-1-1.iron.io (EU)
+| ironMQCloud | common | https://mq-aws-us-east-1-1.iron.io | String | IronMq 
Cloud url. Urls for public clusters: https://mq-aws-us-east-1-1.iron.io (US) 
and https://mq-aws-eu-west-1-1.iron.io (EU)
 | preserveHeaders | common | false | boolean | Should message headers be 
preserved when publishing messages. This will add the Camel headers to the Iron 
MQ message as a json payload with a header list and a message body. Useful when 
Camel is both consumer and producer.
 | projectId | common |  | String | IronMQ projectId
 | token | common |  | String | IronMQ token
@@ -142,8 +142,8 @@ Consume 50 messages pr. poll from the queue 'testqueue' on 
aws eu, and save the
 
 [source,java]
 --
-from("ironmq:testqueue?ironMQCloud=mq-aws-eu-west-1-1.iron.io=myIronMQProjectid=myIronMQToken=50")
-  .to("file:somefolder);
+from("ironmq:testqueue?ironMQCloud=https://mq-aws-eu-west-1-1.iron.io=myIronMQProjectid=myIronMQToken=50;)
+  .to("file:somefolder");
 --
 
 Producer example
@@ -152,6 +152,6 @@ Dequeue from activemq jms and enqueue the messages on 
IronMQ.
 
 [source,java]
 --
-from("activemq:foo)
+from("activemq:foo")
   .to("ironmq:testqueue?projectId=myIronMQProjectid=myIronMQToken");
 --

http://git-wip-us.apache.org/repos/asf/camel/blob/c4a7e2d7/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
--
diff --git 
a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
 
b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
index db5e23e..2eec44f 100644
--- 
a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
+++ 
b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
@@ -121,7 +121,7 @@ public class IronMQConfiguration {
 }
 
 /**
- * IronMq Cloud url. Urls for public clusters: mq-aws-us-east-1-1.iron.io 
(US), mq-aws-eu-west-1-1.iron.io (EU)
+ * IronMq Cloud url. Urls for public clusters: 
https://mq-aws-us-east-1-1.iron.io (US) and https://mq-aws-eu-west-1-1.iron.io 
(EU)
  */
 public void setIronMQCloud(String ironMQCloud) {
 this.ironMQCloud = ironMQCloud;

svn commit: r990322 - in /websites/production/camel/content: cache/main.pageCache ironmq.html

[buildbot]

Author: buildbot
Date: Fri Jun 10 16:18:56 2016
New Revision: 990322

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/ironmq.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/ironmq.html
==
--- websites/production/camel/content/ironmq.html (original)
+++ websites/production/camel/content/ironmq.html Fri Jun 10 16:18:56 2016
@@ -97,7 +97,7 @@
 
 Where queueName identifies the IronMQ queue 
you want to publish or consume messages from.OptionsNameGroupDefaultTypeDescriptionclientcommonnullio.iron.ironmq.ClientReference to a io.iron.ironmq.Client in the 
Registry.iron
 MQCloudcommonhttps://mq-aws-us-east-1-1.iron.io; 
rel="nofollow">https://mq-aws-us-east-1-1.iron.ioStringIronMq Cloud url. 
Urls for public clusters: https://mq-aws-http://us-east-1-1.iron.io; 
rel="nofollow">us-east-1-1.iron.io (US), https://mq-aws-eu-http://west-1-1.iron.io; 
rel="nofollow">west-1-1.iron.io (EU)preserveHeaderscommonfalsebooleanShould message headers be preserved when 
publishing messages.This will add the Camel headers to the Iron 
MQ message as a json payload with a header list, and a message 
body.Useful when Camel is both consumer and 
producer.projectIdcommonnullStringThe IronMQ project IdtokencommonnullStringThe IronMQ tokenbatchDeleteconsumerfalsebooleanShould messages be deleted in one batch. This will 
limit the number of api requests since messages are deleted in one request, 
instead of one pr. exchange. If enabled care should be taken that the consumer 
is idempotent when processing exchanges.concurrentConsumersconsumer1intThe number of concurrent 
consumers.maxMessagesPerPollconsumer1intNumber of messages to poll pr. call. Maximum is 100.timeoutconsumer60intAfter timeout (in seconds), item will be placed back 
onto the queue.waitconsumer0intTime in seconds to wait for a message to become 
available. This enables long polling. Default is 0 (does not wait), maximum is 
30.visibilityDelayproducer0intThe item will not be available on the queue until 
this many seconds have passed. Default is 0 
seconds.Producer headersHeaderTypeDescriptionCamelIronMQOperationStringIf value set to CamelIronMQClearQueue 
the queue is cleared of unconsumed messages.CamelIronMQMessageIdString or 
io.iron.ironmq.IdsThe id of the IronMQ message as a String when 
sending a single message, or a Ids object when sending a array of strings. See 
message bodyConsumer head
 ersHeaderTypeDescriptionCamelIronMQMessageIdStringThe id of the message.CamelIronMQReservationIdStringThe reservation id of the 
message.CamelIronMQReservedCountStringThe number of times
  this message has been reserved.Message body when producingShould 
be either a String or a array of Strings.In the latter case the batch of 
strings will be send to IronMQ as one request, creating one message pr. element 
in the array.Consumer 
exampleConsume 50 messages pr. poll from the queue 'testqueue' on aws 
eu, and save the messages to files.
-https://mq-aws-eu-west-1-1.iron.io&projectId=myIronMQProjectid&token=myIronMQToken&maxMessagesPerPoll=50";)
   .to("file:somefolder");]]>
 Producer exampleDequeue 
from activemq jms and enqueue the messages on IronMQ.
 

camel git commit: Update Components Spring-boot Auto Configuration

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master e42ef725c -> 2c7e84c9f


Update Components Spring-boot Auto Configuration


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

Branch: refs/heads/master
Commit: 2c7e84c9f4be7e5de69d59840ed647cad73c7c37
Parents: e42ef72
Author: Andrea Cosentino 
Authored: Fri Jun 10 16:36:03 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 16:36:03 2016 +0200

--
 .../cometd/springboot/CometdComponentAutoConfiguration.java| 3 ++-
 .../springboot/WebsocketComponentAutoConfiguration.java| 3 ++-
 .../websocket/springboot/WebsocketComponentConfiguration.java  | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2c7e84c9/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
--
diff --git 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index f6eaf4f..ed11ce3 100644
--- 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -42,7 +42,8 @@ public class CometdComponentAutoConfiguration {
 CometdComponent component = new CometdComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), component, parameters);
 return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/2c7e84c9/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 2b5dda8..92a74be 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -43,7 +43,8 @@ public class WebsocketComponentAutoConfiguration {
 WebsocketComponent component = new WebsocketComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), component, parameters);
 return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/2c7e84c9/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
index 76a2821..a40d156 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
@@ -64,7 +64,7 @@ public class WebsocketComponentConfiguration {
  * If this option is true Jetty JMX support will be enabled for this
  * endpoint. See Jetty JMX support for more details.
  */
-private boolean enableJmx;
+private Boolean enableJmx = false;
 /**
  * To set a 

camel git commit: Explicitly add javax.servlet-api depedency in camel-cometd and camel-websocket

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 6bce8a15a -> e42ef725c


Explicitly add javax.servlet-api depedency in camel-cometd and camel-websocket


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

Branch: refs/heads/master
Commit: e42ef725cd2d6dd09ebfaf24b0ead6b2fa393174
Parents: 6bce8a1
Author: Andrea Cosentino 
Authored: Fri Jun 10 16:02:55 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 16:06:15 2016 +0200

--
 components/camel-cometd/pom.xml| 4 
 .../cometd/springboot/CometdComponentAutoConfiguration.java| 3 +--
 components/camel-websocket/pom.xml | 5 +
 .../springboot/WebsocketComponentAutoConfiguration.java| 3 +--
 .../websocket/springboot/WebsocketComponentConfiguration.java  | 6 +++---
 5 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-cometd/pom.xml
--
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 4c365c8..10fe5d6 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -78,6 +78,10 @@
 cometd-java-server
 ${cometd-java-server}
 
+
+javax.servlet
+javax.servlet-api
+
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
--
diff --git 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index ed11ce3..f6eaf4f 100644
--- 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -42,8 +42,7 @@ public class CometdComponentAutoConfiguration {
 CometdComponent component = new CometdComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null,
-false);
+IntrospectionSupport.getProperties(configuration, parameters, null);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), component, parameters);
 return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-websocket/pom.xml
--
diff --git a/components/camel-websocket/pom.xml 
b/components/camel-websocket/pom.xml
index 9b262f5..3ebd172 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -80,6 +80,11 @@
 jetty-jmx
 ${jetty-version}
 
+
+
+javax.servlet
+javax.servlet-api
+
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e42ef725/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 92a74be..2b5dda8 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -43,8 +43,7 @@ public class WebsocketComponentAutoConfiguration {
 WebsocketComponent component = new WebsocketComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null,
-false);
+IntrospectionSupport.getProperties(configuration, parameters, null);
 

[2/3] camel git commit: CAMEL-10042: camel-spring-boot - Add default values to auto configuration

[davsclaus]

CAMEL-10042: camel-spring-boot - Add default values to auto configuration


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

Branch: refs/heads/master
Commit: 6bce8a15a65eddf83f4b8b9aaefdb5325ecf00f3
Parents: 1fa124d
Author: Claus Ibsen 
Authored: Fri Jun 10 15:11:07 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 15:37:43 2016 +0200

--
 .../DirectComponentConfiguration.java   |   8 +-
 .../DirectVmComponentConfiguration.java |  14 +-
 .../PropertiesComponentConfiguration.java   |  18 +-
 .../springboot/XsltComponentConfiguration.java  |  12 +-
 .../springboot/ZipDataFormatConfiguration.java  |   2 +-
 .../ws/springboot/WsComponentConfiguration.java |   6 +-
 .../springboot/AhcComponentConfiguration.java   |   6 +-
 .../springboot/AMQPComponentConfiguration.java  | 174 +--
 .../WebsocketComponentConfiguration.java|  12 +-
 .../Base64DataFormatConfiguration.java  |   4 +-
 .../BeanIODataFormatConfiguration.java  |   6 +-
 .../springboot/BoonDataFormatConfiguration.java |   2 +-
 .../CastorDataFormatConfiguration.java  |   2 +-
 .../CryptoDataFormatConfiguration.java  |   4 +-
 .../springboot/PGPDataFormatConfiguration.java  |   4 +-
 .../springboot/CsvDataFormatConfiguration.java  |  22 +--
 .../DisruptorComponentConfiguration.java|  12 +-
 .../DisruptorVmComponentConfiguration.java  |  12 +-
 .../FlatpackDataFormatConfiguration.java|   8 +-
 .../springboot/GsonDataFormatConfiguration.java |   8 +-
 .../springboot/HL7DataFormatConfiguration.java  |   2 +-
 .../springboot/HttpComponentConfiguration.java  |   6 +-
 .../springboot/HttpComponentConfiguration.java  |   6 +-
 .../IBatisComponentConfiguration.java   |   6 +-
 .../springboot/ICalDataFormatConfiguration.java |   2 +-
 .../JacksonDataFormatConfiguration.java |   8 +-
 .../JacksonXMLDataFormatConfiguration.java  |   8 +-
 .../springboot/JaxbDataFormatConfiguration.java |  12 +-
 .../JettyHttpComponentConfiguration9.java   |  24 +--
 .../JGroupsComponentConfiguration.java  |   6 +-
 .../springboot/JmsComponentConfiguration.java   | 174 +--
 .../springboot/JpaComponentConfiguration.java   |  12 +-
 .../springboot/ScpComponentConfiguration.java   |   6 +-
 .../springboot/LZFDataFormatConfiguration.java  |   2 +-
 .../MimeMultipartDataFormatConfiguration.java   |   6 +-
 .../QuartzComponentConfiguration.java   |  12 +-
 .../QuartzComponentConfiguration.java   |  24 +--
 .../QuickfixjComponentConfiguration.java|   6 +-
 .../RestletComponentConfiguration.java  |   6 +-
 .../SalesforceComponentConfiguration.java   |  18 +-
 .../ServletComponentConfiguration.java  |  12 +-
 .../SnakeYAMLDataFormatConfiguration.java   |   4 +-
 .../springboot/SqlComponentConfiguration.java   |   6 +-
 .../TarFileDataFormatConfiguration.java |   2 +-
 .../UniVocityCsvDataFormatConfiguration.java|  16 +-
 ...VocityFixedWidthDataFormatConfiguration.java |  18 +-
 .../UniVocityTsvDataFormatConfiguration.java|  14 +-
 .../WebsocketComponentConfiguration.java|   6 +-
 .../XmlJsonDataFormatConfiguration.java |  12 +-
 .../XmlRpcDataFormatConfiguration.java  |   2 +-
 .../XMLSecurityDataFormatConfiguration.java |   4 +-
 .../springboot/JsonDataFormatConfiguration.java |   8 +-
 .../ZipFileDataFormatConfiguration.java |   2 +-
 53 files changed, 394 insertions(+), 394 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6bce8a15/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentConfiguration.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentConfiguration.java
 
b/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentConfiguration.java
index 848e762..ec80b49 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentConfiguration.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentConfiguration.java
@@ -32,17 +32,17 @@ public class DirectComponentConfiguration {
  * then we can tell the producer to block and wait for the consumer to
  * become active.
  */
-private boolean block;
+private Boolean block = false;
 /**
  * The timeout value to use if block is enabled.
  */
-private long timeout;
+private long timeout = 3;
 
-

[1/3] camel git commit: CAMEL-10042: camel-spring-boot - Add default values to auto configuration

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 8d81593ad -> 6bce8a15a


http://git-wip-us.apache.org/repos/asf/camel/blob/6bce8a15/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index b027c28..8862b42 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -58,7 +58,7 @@ public class JmsComponentConfiguration {
  * queue on the JMS broker. To avoid this its recommended to enable this
  * option.
  */
-private boolean acceptMessagesWhileStopping;
+private Boolean acceptMessagesWhileStopping = false;
 /**
  * Whether the DefaultMessageListenerContainer used in the reply managers
  * for request-reply messaging allow the
@@ -68,7 +68,7 @@ public class JmsComponentConfiguration {
  * ability is enabled by default in the regular JMS consumers but to enable
  * for reply managers you must enable this flag.
  */
-private boolean allowReplyManagerQuickStop;
+private Boolean allowReplyManagerQuickStop = false;
 /**
  * The JMS acknowledgement mode defined as an Integer. Allows you to set
  * vendor-specific extensions to the acknowledgment mode. For the regular
@@ -81,7 +81,7 @@ public class JmsComponentConfiguration {
  * but sometimes can catch early any issues with the underlying JMS 
provider
  * and the use of JMS properties
  */
-private boolean eagerLoadingOfProperties;
+private Boolean eagerLoadingOfProperties = false;
 /**
  * The JMS acknowledgement name which is one of: SESSION_TRANSACTED
  * CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
@@ -90,7 +90,7 @@ public class JmsComponentConfiguration {
 /**
  * Specifies whether the consumer container should auto-startup.
  */
-private boolean autoStartup;
+private Boolean autoStartup = false;
 /**
  * Sets the cache level by ID for the underlying JMS resources. See
  * cacheLevelName option for more details.
@@ -142,7 +142,7 @@ public class JmsComponentConfiguration {
 /**
  * Specifies whether persistent delivery is used by default.
  */
-private boolean deliveryPersistent;
+private Boolean deliveryPersistent = false;
 /**
  * Specifies the delivery mode to be used. Possible values are Possibles
  * values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1
@@ -178,7 +178,7 @@ public class JmsComponentConfiguration {
  * Allows to control whether stacktraces should be logged or not by the
  * default errorHandler.
  */
-private boolean errorHandlerLogStackTrace;
+private Boolean errorHandlerLogStackTrace = false;
 /**
  * Set if the deliveryMode priority or timeToLive qualities of service
  * should be used when sending messages. This option is based on Spring's
@@ -187,12 +187,12 @@ public class JmsComponentConfiguration {
  * option which operates at message granularity reading QoS properties
  * exclusively from the Camel In message headers.
  */
-private boolean explicitQosEnabled;
+private Boolean explicitQosEnabled = false;
 /**
  * Specifies whether the listener session should be exposed when consuming
  * messages.
  */
-private boolean exposeListenerSession;
+private Boolean exposeListenerSession = false;
 /**
  * Specifies the limit for idle executions of a receive task not having
  * received any message within its execution. If this limit is reached the
@@ -244,16 +244,16 @@ public class JmsComponentConfiguration {
  * suited payload type such as javax.jms.TextMessage to a String etc. See
  * section about how mapping works below for more details.
  */
-private boolean mapJmsMessage;
+private Boolean mapJmsMessage = false;
 /**
  * When sending specifies whether message IDs should be added.
  */
-private boolean messageIdEnabled;
+private Boolean messageIdEnabled = false;
 /**
  * Specifies whether timestamps should be enabled by default on sending
  * messages.
  */
-private boolean messageTimestampEnabled;
+private Boolean messageTimestampEnabled = false;
 /**
  * If true Camel will always make a JMS message copy of the message when it
  * is passed to the producer for sending. Copying the message is needed in
@@ -261,12 +261,12 @@ public class JmsComponentConfiguration {
  * (incidentally Camel will set the alwaysCopyMessage option to true if a
  * 

[3/3] camel git commit: CAMEL-10042: camel-spring-boot - Add default values to auto configuration

[davsclaus]

CAMEL-10042: camel-spring-boot - Add default values to auto configuration


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

Branch: refs/heads/master
Commit: 1fa124db20fdda2dbfebef74a736cab481cddb43
Parents: 8d81593
Author: Claus Ibsen 
Authored: Fri Jun 10 13:24:58 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 15:37:43 2016 +0200

--
 .../SpringBootAutoConfigurationMojo.java| 26 
 .../packaging/model/ComponentOptionModel.java   |  9 +++
 .../packaging/model/DataFormatOptionModel.java  |  9 +++
 3 files changed, 44 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1fa124db/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index db6f0e5..e997e18 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -203,6 +203,11 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 // remove  as generic type as Roaster (Eclipse JDT) cannot use 
that
 String type = option.getJavaType();
 type = type.replaceAll("\\<\\?\\>", "");
+// favor using Boolean types over boolean with Spring Boot
+if ("boolean".equals(type)) {
+type = "java.lang.Boolean";
+}
+
 PropertySource prop = javaClass.addProperty(type, 
option.getName());
 if ("true".equals(option.getDeprecated())) {
 prop.getField().addAnnotation(Deprecated.class);
@@ -210,6 +215,13 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 if (!Strings.isBlank(option.getDescription())) {
 
prop.getField().getJavaDoc().setFullText(option.getDescription());
 }
+if (!Strings.isBlank(option.getDefaultValue())) {
+if ("java.lang.String".equals(option.getJavaType())) {
+
prop.getField().setStringInitializer(option.getDefaultValue());
+} else if ("integer".equals(option.getType()) || 
"boolean".equals(option.getType())) {
+
prop.getField().setLiteralInitializer(option.getDefaultValue());
+}
+}
 }
 
 sortImports(javaClass);
@@ -266,6 +278,11 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 // remove  as generic type as Roaster (Eclipse JDT) cannot use 
that
 String type = option.getJavaType();
 type = type.replaceAll("\\<\\?\\>", "");
+// favor using Boolean types over boolean with Spring Boot
+if ("boolean".equals(type)) {
+type = "java.lang.Boolean";
+}
+
 PropertySource prop = javaClass.addProperty(type, 
option.getName());
 if ("true".equals(option.getDeprecated())) {
 prop.getField().addAnnotation(Deprecated.class);
@@ -273,6 +290,13 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 if (!Strings.isBlank(option.getDescription())) {
 
prop.getField().getJavaDoc().setFullText(option.getDescription());
 }
+if (!Strings.isBlank(option.getDefaultValue())) {
+if ("java.lang.String".equals(option.getType())) {
+
prop.getField().setStringInitializer(option.getDefaultValue());
+} else if ("integer".equals(option.getType()) || 
"boolean".equals(option.getType())) {
+
prop.getField().setLiteralInitializer(option.getDefaultValue());
+}
+}
 }
 
 sortImports(javaClass);
@@ -734,6 +758,7 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 option.setJavaType(getSafeValue("javaType", row));
 option.setDeprecated(getSafeValue("deprecated", row));
 option.setDescription(getSafeValue("description", row));
+option.setDefaultValue(getSafeValue("defaultValue", row));
 

camel git commit: CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to performance degradation. Default ObjectFactory values set to false on DataFormat too.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x b230af99f -> c70838bb0


CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to 
performance degradation. Default ObjectFactory values set to false on 
DataFormat too.


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

Branch: refs/heads/camel-2.17.x
Commit: c70838bb0538dc240478b0841fff19b6e6e31265
Parents: b230af9
Author: Andrea Cosentino 
Authored: Fri Jun 10 15:17:03 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 15:18:41 2016 +0200

--
 .../main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c70838bb/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 9fbd1bc..d66c7c5 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -85,7 +85,7 @@ public class JaxbDataFormat extends ServiceSupport implements 
DataFormat, DataFo
 private String noNamespaceSchemaLocation;
 
 private boolean prettyPrint = true;
-private boolean objectFactory = true;
+private boolean objectFactory;
 private boolean ignoreJAXBElement = true;
 private boolean mustBeJAXBElement = true;
 private boolean filterNonXmlChars;

camel git commit: CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to performance degradation. Default ObjectFactory values set to false on DataFormat too.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 81f5a3395 -> 8d81593ad


CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to 
performance degradation. Default ObjectFactory values set to false on 
DataFormat too.


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

Branch: refs/heads/master
Commit: 8d81593ad4b6f5760b36f7f08c8b97cee276e37a
Parents: 81f5a33
Author: Andrea Cosentino 
Authored: Fri Jun 10 15:17:03 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 15:17:03 2016 +0200

--
 .../main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8d81593a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 9fbd1bc..d66c7c5 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -85,7 +85,7 @@ public class JaxbDataFormat extends ServiceSupport implements 
DataFormat, DataFo
 private String noNamespaceSchemaLocation;
 
 private boolean prettyPrint = true;
-private boolean objectFactory = true;
+private boolean objectFactory;
 private boolean ignoreJAXBElement = true;
 private boolean mustBeJAXBElement = true;
 private boolean filterNonXmlChars;

camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 6c63eb100 -> b230af99f


Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: b230af99f39c509278a9dd810e309ad6d7f3c3c8
Parents: 6c63eb1
Author: Andrea Cosentino 
Authored: Fri Jun 10 15:04:28 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 15:05:24 2016 +0200

--
 .../org/apache/camel/converter/jaxb/FallbackTypeConverter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b230af99/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 0ca881a..8283af6 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -70,7 +70,7 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 private final StaxConverter staxConverter = new StaxConverter();
 private TypeConverter parentTypeConverter;
 private boolean prettyPrint = true;
-private boolean objectFactory = false;
+private boolean objectFactory;
 private CamelContext camelContext;
 
 public boolean isPrettyPrint() {
@@ -216,7 +216,7 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 if (isObjectFactory()) {
 return hasXmlRootElement(type) || 
JaxbHelper.getJaxbElementFactoryMethod(camelContext, type) != null;
 } else {
-   return hasXmlRootElement(type);
+return hasXmlRootElement(type);
 }
 }
 

camel git commit: Fixed CS

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 014520ca1 -> 81f5a3395


Fixed CS


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

Branch: refs/heads/master
Commit: 81f5a3395c4f61bfb752ecfa33698f84d9a70a9c
Parents: 014520c
Author: Andrea Cosentino 
Authored: Fri Jun 10 15:04:28 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 15:04:28 2016 +0200

--
 .../org/apache/camel/converter/jaxb/FallbackTypeConverter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/81f5a339/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 0ca881a..8283af6 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -70,7 +70,7 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 private final StaxConverter staxConverter = new StaxConverter();
 private TypeConverter parentTypeConverter;
 private boolean prettyPrint = true;
-private boolean objectFactory = false;
+private boolean objectFactory;
 private CamelContext camelContext;
 
 public boolean isPrettyPrint() {
@@ -216,7 +216,7 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 if (isObjectFactory()) {
 return hasXmlRootElement(type) || 
JaxbHelper.getJaxbElementFactoryMethod(camelContext, type) != null;
 } else {
-   return hasXmlRootElement(type);
+return hasXmlRootElement(type);
 }
 }
 

camel git commit: CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to performance degradation.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 4bab34ec0 -> 6c63eb100


CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to 
performance degradation.


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

Branch: refs/heads/camel-2.17.x
Commit: 6c63eb100439199eb27a1c6cdec7df6a4de67f9e
Parents: 4bab34e
Author: Andrea Cosentino 
Authored: Fri Jun 10 14:52:57 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 14:54:29 2016 +0200

--
 .../converter/jaxb/FallbackTypeConverter.java | 18 --
 .../jaxb/CamelJaxbFallbackConverterTest.java  |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6c63eb10/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 23e9f54..0ca881a 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -70,7 +70,7 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 private final StaxConverter staxConverter = new StaxConverter();
 private TypeConverter parentTypeConverter;
 private boolean prettyPrint = true;
-private boolean objectFactory = true;
+private boolean objectFactory = false;
 private CamelContext camelContext;
 
 public boolean isPrettyPrint() {
@@ -154,10 +154,12 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 if (hasXmlRootElement(value.getClass())) {
 return marshall(type, exchange, value, null);
 }
-CamelContext context = exchange != null ? 
exchange.getContext() : camelContext;
-Method objectFactoryMethod = 
JaxbHelper.getJaxbElementFactoryMethod(context, value.getClass());
-if (objectFactoryMethod != null) {
-return marshall(type, exchange, value, 
objectFactoryMethod);
+if (isObjectFactory()) {
+CamelContext context = exchange != null ? 
exchange.getContext() : camelContext;
+Method objectFactoryMethod = 
JaxbHelper.getJaxbElementFactoryMethod(context, value.getClass());
+if (objectFactoryMethod != null) {
+return marshall(type, exchange, value, 
objectFactoryMethod);
+}
 }
 }
 } catch (Exception e) {
@@ -211,7 +213,11 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 }
 
 protected  boolean isJaxbType(Class type) {
-return hasXmlRootElement(type) || 
JaxbHelper.getJaxbElementFactoryMethod(camelContext, type) != null;
+if (isObjectFactory()) {
+return hasXmlRootElement(type) || 
JaxbHelper.getJaxbElementFactoryMethod(camelContext, type) != null;
+} else {
+   return hasXmlRootElement(type);
+}
 }
 
 private  T castJaxbType(Object o, Class type) {

http://git-wip-us.apache.org/repos/asf/camel/blob/6c63eb10/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
--
diff --git 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
index c4559b3..2d31403 100644
--- 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
+++ 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import org.apache.camel.Exchange;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.TypeConverter;
+import org.apache.camel.converter.jaxb.FallbackTypeConverter;
 import org.apache.camel.converter.jaxb.message.Message;
 import org.apache.camel.example.Bar;
 import org.apache.camel.example.Foo;
@@ -124,7 +125,7 @@ public class CamelJaxbFallbackConverterTest extends 
CamelTestSupport {
 TypeConverter converter = context.getTypeConverter();
 String 

camel git commit: CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to performance degradation.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 2331f7c7f -> 014520ca1


CAMEL-10043: Camel-Jaxb: objectFactory is never checked. This leads to 
performance degradation.


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

Branch: refs/heads/master
Commit: 014520ca1f9f50e7cf24d07374b7f5821f543572
Parents: 2331f7c
Author: Andrea Cosentino 
Authored: Fri Jun 10 14:52:57 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 14:52:57 2016 +0200

--
 .../converter/jaxb/FallbackTypeConverter.java | 18 --
 .../jaxb/CamelJaxbFallbackConverterTest.java  |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/014520ca/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 23e9f54..0ca881a 100644
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -70,7 +70,7 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 private final StaxConverter staxConverter = new StaxConverter();
 private TypeConverter parentTypeConverter;
 private boolean prettyPrint = true;
-private boolean objectFactory = true;
+private boolean objectFactory = false;
 private CamelContext camelContext;
 
 public boolean isPrettyPrint() {
@@ -154,10 +154,12 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 if (hasXmlRootElement(value.getClass())) {
 return marshall(type, exchange, value, null);
 }
-CamelContext context = exchange != null ? 
exchange.getContext() : camelContext;
-Method objectFactoryMethod = 
JaxbHelper.getJaxbElementFactoryMethod(context, value.getClass());
-if (objectFactoryMethod != null) {
-return marshall(type, exchange, value, 
objectFactoryMethod);
+if (isObjectFactory()) {
+CamelContext context = exchange != null ? 
exchange.getContext() : camelContext;
+Method objectFactoryMethod = 
JaxbHelper.getJaxbElementFactoryMethod(context, value.getClass());
+if (objectFactoryMethod != null) {
+return marshall(type, exchange, value, 
objectFactoryMethod);
+}
 }
 }
 } catch (Exception e) {
@@ -211,7 +213,11 @@ public class FallbackTypeConverter extends ServiceSupport 
implements TypeConvert
 }
 
 protected  boolean isJaxbType(Class type) {
-return hasXmlRootElement(type) || 
JaxbHelper.getJaxbElementFactoryMethod(camelContext, type) != null;
+if (isObjectFactory()) {
+return hasXmlRootElement(type) || 
JaxbHelper.getJaxbElementFactoryMethod(camelContext, type) != null;
+} else {
+   return hasXmlRootElement(type);
+}
 }
 
 private  T castJaxbType(Object o, Class type) {

http://git-wip-us.apache.org/repos/asf/camel/blob/014520ca/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
--
diff --git 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
index c4559b3..2d31403 100644
--- 
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
+++ 
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import org.apache.camel.Exchange;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.TypeConverter;
+import org.apache.camel.converter.jaxb.FallbackTypeConverter;
 import org.apache.camel.converter.jaxb.message.Message;
 import org.apache.camel.example.Bar;
 import org.apache.camel.example.Foo;
@@ -124,7 +125,7 @@ public class CamelJaxbFallbackConverterTest extends 
CamelTestSupport {
 TypeConverter converter = context.getTypeConverter();
 String marshalled = 

[8/8] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats 
that has options that can be configured.


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

Branch: refs/heads/master
Commit: d76f047d6f89b70b19dcbd90fc016c7a039cda59
Parents: 234f57d
Author: Claus Ibsen 
Authored: Fri Jun 10 13:01:25 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 13:01:25 2016 +0200

--
 .../GzipDataFormatAutoConfiguration.java|  54 
 .../springboot/GzipDataFormatConfiguration.java |  28 ++
 ...erializationDataFormatAutoConfiguration.java |  56 
 .../SerializationDataFormatConfiguration.java   |  28 ++
 .../StringDataFormatAutoConfiguration.java  |  55 
 .../StringDataFormatConfiguration.java  |  42 +++
 .../ZipDataFormatAutoConfiguration.java |  54 
 .../springboot/ZipDataFormatConfiguration.java  |  42 +++
 .../AvroDataFormatAutoConfiguration.java|  54 
 .../springboot/AvroDataFormatConfiguration.java |  41 +++
 .../BarcodeDataFormatAutoConfiguration.java |  55 
 .../BarcodeDataFormatConfiguration.java |  77 +
 .../Base64DataFormatAutoConfiguration.java  |  55 
 .../Base64DataFormatConfiguration.java  |  68 
 .../BeanIODataFormatAutoConfiguration.java  |  55 
 .../BeanIODataFormatConfiguration.java  | 103 ++
 .../BindyCsvDataFormatAutoConfiguration.java|  55 
 .../BindyCsvDataFormatConfiguration.java|  67 
 ...yFixedLengthDataFormatAutoConfiguration.java |  56 
 ...BindyFixedLengthDataFormatConfiguration.java |  67 
 ...KeyValuePairDataFormatAutoConfiguration.java |  56 
 ...indyKeyValuePairDataFormatConfiguration.java |  67 
 .../BoonDataFormatAutoConfiguration.java|  54 
 .../springboot/BoonDataFormatConfiguration.java |  53 
 .../CastorDataFormatAutoConfiguration.java  |  55 
 .../CastorDataFormatConfiguration.java  |  89 ++
 .../CryptoDataFormatAutoConfiguration.java  |  55 
 .../CryptoDataFormatConfiguration.java  | 143 +
 .../PGPDataFormatAutoConfiguration.java |  54 
 .../springboot/PGPDataFormatConfiguration.java  | 235 ++
 .../CsvDataFormatAutoConfiguration.java |  54 
 .../springboot/CsvDataFormatConfiguration.java  | 310 +++
 .../FlatpackDataFormatAutoConfiguration.java|  55 
 .../FlatpackDataFormatConfiguration.java| 129 
 .../GsonDataFormatAutoConfiguration.java|  54 
 .../springboot/GsonDataFormatConfiguration.java | 244 +++
 .../HessianDataFormatAutoConfiguration.java |  55 
 .../HessianDataFormatConfiguration.java |  28 ++
 .../HL7DataFormatAutoConfiguration.java |  54 
 .../springboot/HL7DataFormatConfiguration.java  |  41 +++
 .../ICalDataFormatAutoConfiguration.java|  54 
 .../springboot/ICalDataFormatConfiguration.java |  41 +++
 .../JacksonDataFormatAutoConfiguration.java |  55 
 .../JacksonDataFormatConfiguration.java | 244 +++
 .../JacksonXMLDataFormatAutoConfiguration.java  |  55 
 .../JacksonXMLDataFormatConfiguration.java  | 208 +
 .../JaxbDataFormatAutoConfiguration.java|  54 
 .../springboot/JaxbDataFormatConfiguration.java | 227 ++
 .../JibxDataFormatAutoConfiguration.java|  54 
 .../springboot/JibxDataFormatConfiguration.java |  53 
 .../LZFDataFormatAutoConfiguration.java |  54 
 .../springboot/LZFDataFormatConfiguration.java  |  41 +++
 ...imeMultipartDataFormatAutoConfiguration.java |  56 
 .../MimeMultipartDataFormatConfiguration.java   |  94 ++
 .../ProtobufDataFormatAutoConfiguration.java|  55 
 .../ProtobufDataFormatConfiguration.java|  41 +++
 .../RssDataFormatAutoConfiguration.java |  54 
 .../springboot/RssDataFormatConfiguration.java  |  28 ++
 .../SnakeYAMLDataFormatAutoConfiguration.java   |  55 
 .../SnakeYAMLDataFormatConfiguration.java   | 128 
 .../SoapJaxbDataFormatAutoConfiguration.java|  55 
 .../SoapJaxbDataFormatConfiguration.java| 122 
 .../SyslogDataFormatAutoConfiguration.java  |  55 
 .../SyslogDataFormatConfiguration.java  |  28 ++
 .../TidyMarkupDataFormatAutoConfiguration.java  |  55 
 .../TidyMarkupDataFormatConfiguration.java  |  42 +++
 .../TarFileDataFormatAutoConfiguration.java |  55 
 .../TarFileDataFormatConfiguration.java |  43 +++
 ...UniVocityCsvDataFormatAutoConfiguration.java |  55 
 .../UniVocityCsvDataFormatConfiguration.java| 243 

[4/8] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats 
that has options that can be configured.


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

Branch: refs/heads/master
Commit: 234f57d43a093233eea6d51818765d45be043704
Parents: ccfe599
Author: Claus Ibsen 
Authored: Fri Jun 10 12:04:07 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 12:04:07 2016 +0200

--
 .../GzipDataFormatAutoConfiguration.java|  54 
 .../springboot/GzipDataFormatConfiguration.java |  28 --
 ...erializationDataFormatAutoConfiguration.java |  56 
 .../SerializationDataFormatConfiguration.java   |  28 --
 .../StringDataFormatAutoConfiguration.java  |  55 
 .../StringDataFormatConfiguration.java  |  42 ---
 .../ZipDataFormatAutoConfiguration.java |  54 
 .../springboot/ZipDataFormatConfiguration.java  |  42 ---
 .../AvroDataFormatAutoConfiguration.java|  54 
 .../springboot/AvroDataFormatConfiguration.java |  41 ---
 .../BarcodeDataFormatAutoConfiguration.java |  55 
 .../BarcodeDataFormatConfiguration.java |  77 -
 .../Base64DataFormatAutoConfiguration.java  |  55 
 .../Base64DataFormatConfiguration.java  |  68 
 .../BeanIODataFormatAutoConfiguration.java  |  55 
 .../BeanIODataFormatConfiguration.java  | 103 --
 .../BindyCsvDataFormatAutoConfiguration.java|  55 
 .../BindyCsvDataFormatConfiguration.java|  67 
 ...yFixedLengthDataFormatAutoConfiguration.java |  56 
 ...BindyFixedLengthDataFormatConfiguration.java |  67 
 ...KeyValuePairDataFormatAutoConfiguration.java |  56 
 ...indyKeyValuePairDataFormatConfiguration.java |  67 
 .../BoonDataFormatAutoConfiguration.java|  54 
 .../springboot/BoonDataFormatConfiguration.java |  53 
 .../CastorDataFormatAutoConfiguration.java  |  55 
 .../CastorDataFormatConfiguration.java  |  89 --
 .../CryptoDataFormatAutoConfiguration.java  |  55 
 .../CryptoDataFormatConfiguration.java  | 143 -
 .../PGPDataFormatAutoConfiguration.java |  54 
 .../springboot/PGPDataFormatConfiguration.java  | 235 --
 .../CsvDataFormatAutoConfiguration.java |  54 
 .../springboot/CsvDataFormatConfiguration.java  | 310 ---
 .../FlatpackDataFormatAutoConfiguration.java|  55 
 .../FlatpackDataFormatConfiguration.java| 129 
 .../GsonDataFormatAutoConfiguration.java|  54 
 .../springboot/GsonDataFormatConfiguration.java | 244 ---
 .../HessianDataFormatAutoConfiguration.java |  55 
 .../HessianDataFormatConfiguration.java |  28 --
 .../HL7DataFormatAutoConfiguration.java |  54 
 .../springboot/HL7DataFormatConfiguration.java  |  41 ---
 .../ICalDataFormatAutoConfiguration.java|  54 
 .../springboot/ICalDataFormatConfiguration.java |  41 ---
 .../JacksonDataFormatAutoConfiguration.java |  55 
 .../JacksonDataFormatConfiguration.java | 244 ---
 .../JacksonXMLDataFormatAutoConfiguration.java  |  55 
 .../JacksonXMLDataFormatConfiguration.java  | 208 -
 .../JaxbDataFormatAutoConfiguration.java|  54 
 .../springboot/JaxbDataFormatConfiguration.java | 227 --
 .../JibxDataFormatAutoConfiguration.java|  54 
 .../springboot/JibxDataFormatConfiguration.java |  53 
 .../LZFDataFormatAutoConfiguration.java |  54 
 .../springboot/LZFDataFormatConfiguration.java  |  41 ---
 ...imeMultipartDataFormatAutoConfiguration.java |  56 
 .../MimeMultipartDataFormatConfiguration.java   |  94 --
 .../ProtobufDataFormatAutoConfiguration.java|  55 
 .../ProtobufDataFormatConfiguration.java|  41 ---
 .../RssDataFormatAutoConfiguration.java |  54 
 .../springboot/RssDataFormatConfiguration.java  |  28 --
 .../SnakeYAMLDataFormatAutoConfiguration.java   |  55 
 .../SnakeYAMLDataFormatConfiguration.java   | 128 
 .../SoapJaxbDataFormatAutoConfiguration.java|  55 
 .../SoapJaxbDataFormatConfiguration.java| 122 
 .../SyslogDataFormatAutoConfiguration.java  |  55 
 .../SyslogDataFormatConfiguration.java  |  28 --
 .../TidyMarkupDataFormatAutoConfiguration.java  |  55 
 .../TidyMarkupDataFormatConfiguration.java  |  42 ---
 .../TarFileDataFormatAutoConfiguration.java |  55 
 .../TarFileDataFormatConfiguration.java |  43 ---
 ...UniVocityCsvDataFormatAutoConfiguration.java |  55 
 .../UniVocityCsvDataFormatConfiguration.java| 243 

[6/8] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/d76f047d/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
new file mode 100644
index 000..9b82553
--- /dev/null
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
@@ -0,0 +1,54 @@
+/**
+ * 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.converter.jaxb.springboot;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.converter.jaxb.JaxbDataFormat;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration
+@EnableConfigurationProperties(JaxbDataFormatConfiguration.class)
+public class JaxbDataFormatAutoConfiguration {
+
+@Bean
+@ConditionalOnClass(CamelContext.class)
+@ConditionalOnMissingBean(JaxbDataFormat.class)
+public JaxbDataFormat configureJaxbDataFormat(CamelContext camelContext,
+JaxbDataFormatConfiguration configuration) throws Exception {
+JaxbDataFormat dataformat = new JaxbDataFormat();
+if (dataformat instanceof CamelContextAware) {
+((CamelContextAware) dataformat).setCamelContext(camelContext);
+}
+Map parameters = new HashMap<>();
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), dataformat, parameters);
+return dataformat;
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/d76f047d/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
new file mode 100644
index 000..ef5de07
--- /dev/null
+++ 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
@@ -0,0 +1,227 @@
+/**
+ * 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.converter.jaxb.springboot;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Camel JAXB support
+ * 
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@ConfigurationProperties(prefix = 

[2/8] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/234f57d4/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
deleted file mode 100644
index 9b82553..000
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
+++ /dev/null
@@ -1,54 +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.
- */
-package org.apache.camel.converter.jaxb.springboot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.converter.jaxb.JaxbDataFormat;
-import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Configuration
-@EnableConfigurationProperties(JaxbDataFormatConfiguration.class)
-public class JaxbDataFormatAutoConfiguration {
-
-@Bean
-@ConditionalOnClass(CamelContext.class)
-@ConditionalOnMissingBean(JaxbDataFormat.class)
-public JaxbDataFormat configureJaxbDataFormat(CamelContext camelContext,
-JaxbDataFormatConfiguration configuration) throws Exception {
-JaxbDataFormat dataformat = new JaxbDataFormat();
-if (dataformat instanceof CamelContextAware) {
-((CamelContextAware) dataformat).setCamelContext(camelContext);
-}
-Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null,
-false);
-IntrospectionSupport.setProperties(camelContext,
-camelContext.getTypeConverter(), dataformat, parameters);
-return dataformat;
-}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/234f57d4/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
--
diff --git 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
 
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
deleted file mode 100644
index ef5de07..000
--- 
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
+++ /dev/null
@@ -1,227 +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.
- */
-package org.apache.camel.converter.jaxb.springboot;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Camel JAXB support
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@ConfigurationProperties(prefix = 

[05/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-boon/src/main/resources/META-INF/spring.factories
--
diff --git a/components/camel-boon/src/main/resources/META-INF/spring.factories 
b/components/camel-boon/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000..cbb2c73
--- /dev/null
+++ b/components/camel-boon/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.boon.springboot.BoonDataFormatAutoConfiguration

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
 
b/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
new file mode 100644
index 000..2e9f30b
--- /dev/null
+++ 
b/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
@@ -0,0 +1,54 @@
+/**
+ * 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.dataformat.castor.springboot;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.dataformat.castor.CastorDataFormat;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration
+@EnableConfigurationProperties(CastorDataFormatConfiguration.class)
+public class CastorDataFormatAutoConfiguration {
+
+@Bean
+@ConditionalOnClass(CamelContext.class)
+@ConditionalOnMissingBean(CastorDataFormat.class)
+public CastorDataFormat configureCastorDataFormat(
+CamelContext camelContext,
+CastorDataFormatConfiguration configuration) throws Exception {
+CastorDataFormat dataformat = new CastorDataFormat();
+if (dataformat instanceof CamelContextAware) {
+((CamelContextAware) dataformat).setCamelContext(camelContext);
+}
+Map parameters = new HashMap<>();
+IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), dataformat, parameters);
+return dataformat;
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatConfiguration.java
--
diff --git 

[09/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
--
diff --git 
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
 
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
index 0166086..300b9dc 100644
--- 
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
+++ 
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
@@ -43,7 +43,8 @@ public class DisruptorVmComponentAutoConfiguration {
 DisruptorVmComponent component = new DisruptorVmComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), component, parameters);
 return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
--
diff --git 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
index 254f0b1..cf29b2d 100644
--- 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
+++ 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
@@ -42,7 +42,8 @@ public class DockerComponentAutoConfiguration {
 DockerComponent component = new DockerComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), component, parameters);
 return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
--
diff --git 
a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
 
b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
index 3b2dceb..5743f48 100644
--- 
a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
+++ 
b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
@@ -42,7 +42,8 @@ public class EjbComponentAutoConfiguration {
 EjbComponent component = new EjbComponent();
 component.setCamelContext(camelContext);
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), component, parameters);
 return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
--
diff --git 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
index 0053c3f..3888147 100644
--- 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
+++ 

[01/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 9c2e0ef23 -> ccfe59920


CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats 
that has options that can be configured.


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

Branch: refs/heads/master
Commit: ccfe59920e2eb196189f3acb7d206ef28c9cdeb5
Parents: 3759e3c
Author: Claus Ibsen 
Authored: Fri Jun 10 11:35:02 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 11:55:06 2016 +0200

--
 .../maven/packaging/SpringBootAutoConfigurationMojo.java  | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ccfe5992/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 668a407..db6f0e5 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -62,6 +62,9 @@ import static 
org.apache.camel.maven.packaging.PackageHelper.loadText;
  */
 public class SpringBootAutoConfigurationMojo extends AbstractMojo {
 
+// xml beans does not work with Spring Boot APT compiler plugin
+private static final String[] EXCLUDE_DATAFORMATS = {"xmlBeans"};
+
 /**
  * The maven project.
  *
@@ -155,6 +158,13 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 if (json != null) {
 DataFormatModel model = 
generateDataFormatModel(dataFormatName, json);
 
+// should we skip the data format?
+for (String exclude : EXCLUDE_DATAFORMATS) {
+if (exclude.equals(model.getName())) {
+return;
+}
+}
+
 // only create source code if the component has options 
that can be used in auto configuration
 if (!model.getDataFormatOptions().isEmpty()) {
 

[03/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java
--
diff --git 
a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java
 
b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java
new file mode 100644
index 000..6a3a7fb
--- /dev/null
+++ 
b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java
@@ -0,0 +1,134 @@
+/**
+ * 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.dataformat.soap.springboot;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Camel SOAP support
+ * 
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@ConfigurationProperties(prefix = "camel.dataformat.soapjaxb")
+public class SoapJaxbDataFormatConfiguration {
+
+/**
+ * Package name where your JAXB classes are located.
+ */
+private String contextPath;
+/**
+ * To overrule and use a specific encoding
+ */
+private String encoding;
+/**
+ * Refers to an element strategy to lookup from the registry. An element
+ * name strategy is used for two purposes. The first is to find a xml
+ * element name for a given object and soap action when marshaling the
+ * object into a SOAP message. The second is to find an Exception class for
+ * a given soap fault name. The following three element strategy class name
+ * is provided out of the box. QNameStrategy - Uses a fixed qName that is
+ * configured on instantiation. Exception lookup is not supported
+ * TypeNameStrategy - Uses the name and namespace from the XMLType
+ * annotation of the given type. If no namespace is set then package-info 
is
+ * used. Exception lookup is not supported ServiceInterfaceStrategy - Uses
+ * information from a webservice interface to determine the type name and 
to
+ * find the exception class for a SOAP fault All three classes is located 
in
+ * the package name org.apache.camel.dataformat.soap.name If you have
+ * generated the web service stub code with cxf-codegen or a similar tool
+ * then you probably will want to use the ServiceInterfaceStrategy. In the
+ * case you have no annotated service interface you should use 
QNameStrategy
+ * or TypeNameStrategy.
+ */
+private String elementNameStrategyRef;
+/**
+ * SOAP version should either be 1.1 or 1.2. Is by default 1.1
+ */
+private String version;
+/**
+ * When marshalling using JAXB or SOAP then the JAXB implementation will
+ * automatic assign namespace prefixes such as ns2 ns3 ns4 etc. To control
+ * this mapping Camel allows you to refer to a map which contains the
+ * desired mapping.
+ */
+private String namespacePrefixRef;
+/**
+ * To validate against an existing schema. Your can use the prefix
+ * classpath: file: or http: to specify how the resource should by 
resolved.
+ * You can separate multiple schema files by using the '' character.
+ */
+private String schema;
+/**
+ * Sets the value of the id property.
+ */
+private String id;
+
+public String getContextPath() {
+return contextPath;
+}
+
+public void setContextPath(String contextPath) {
+this.contextPath = contextPath;
+}
+
+public String getEncoding() {
+return encoding;
+}
+
+public void setEncoding(String encoding) {
+this.encoding = encoding;
+}
+
+public String getElementNameStrategyRef() {
+return elementNameStrategyRef;
+}
+
+public void setElementNameStrategyRef(String elementNameStrategyRef) {
+this.elementNameStrategyRef = elementNameStrategyRef;
+}
+
+public String getVersion() {
+return version;
+}
+
+public void setVersion(String version) {
+this.version = version;
+}
+
+public String 

[07/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
index 0967519..9b3ac59 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
@@ -45,7 +45,8 @@ public class JsonDataFormatAutoConfiguration {
 ((CamelContextAware) dataformat).setCamelContext(camelContext);
 }
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), dataformat, parameters);
 return dataformat;

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
index db8d83b..3107246 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
@@ -121,10 +121,6 @@ public class JsonDataFormatConfiguration {
  * org.apache.camel.xstream.permissions.
  */
 private String permissions;
-/**
- * Sets the value of the id property.
- */
-private String id;
 
 public String getObjectMapper() {
 return objectMapper;
@@ -245,12 +241,4 @@ public class JsonDataFormatConfiguration {
 public void setPermissions(String permissions) {
 this.permissions = permissions;
 }
-
-public String getId() {
-return id;
-}
-
-public void setId(String id) {
-this.id = id;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
index ee96c63..065a531 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
@@ -46,7 +46,8 @@ public class XStreamDataFormatAutoConfiguration {
 ((CamelContextAware) dataformat).setCamelContext(camelContext);
 }
 Map parameters = new HashMap<>();
-IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
 IntrospectionSupport.setProperties(camelContext,
 camelContext.getTypeConverter(), dataformat, parameters);
 return dataformat;

http://git-wip-us.apache.org/repos/asf/camel/blob/3759e3c1/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
index cf0b0ca..a8236e0 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
@@ -84,10 +84,6 @@ public class 

[02/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-xmlrpc/src/main/resources/META-INF/spring.factories
--
diff --git 
a/components/camel-xmlrpc/src/main/resources/META-INF/spring.factories 
b/components/camel-xmlrpc/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000..4628753
--- /dev/null
+++ b/components/camel-xmlrpc/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.dataformat.xmlrpc.springboot.XmlRpcDataFormatAutoConfiguration

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
new file mode 100644
index 000..0cc4481
--- /dev/null
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
@@ -0,0 +1,54 @@
+/**
+ * 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.dataformat.xmlsecurity.springboot;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.dataformat.xmlsecurity.XMLSecurityDataFormat;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration
+@EnableConfigurationProperties(XMLSecurityDataFormatConfiguration.class)
+public class XMLSecurityDataFormatAutoConfiguration {
+
+@Bean
+@ConditionalOnClass(CamelContext.class)
+@ConditionalOnMissingBean(XMLSecurityDataFormat.class)
+public XMLSecurityDataFormat configureXMLSecurityDataFormat(
+CamelContext camelContext,
+XMLSecurityDataFormatConfiguration configuration) throws Exception 
{
+XMLSecurityDataFormat dataformat = new XMLSecurityDataFormat();
+if (dataformat instanceof CamelContextAware) {
+((CamelContextAware) dataformat).setCamelContext(camelContext);
+}
+Map parameters = new HashMap<>();
+IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), dataformat, parameters);
+return dataformat;
+}
+}
\ No newline at end of file

[10/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats 
that has options that can be configured.


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

Branch: refs/heads/master
Commit: 3759e3c19d02962c2bcf707fc739e2987ad2de0f
Parents: f9b58d3
Author: Claus Ibsen 
Authored: Fri Jun 10 11:22:12 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 11:55:06 2016 +0200

--
 .../DirectComponentAutoConfiguration.java   |  3 +-
 .../DirectVmComponentAutoConfiguration.java |  3 +-
 .../LogComponentAutoConfiguration.java  |  3 +-
 .../PropertiesComponentAutoConfiguration.java   |  3 +-
 .../SchedulerComponentAutoConfiguration.java|  3 +-
 .../SedaComponentAutoConfiguration.java |  3 +-
 .../StubComponentAutoConfiguration.java |  3 +-
 .../ValidatorComponentAutoConfiguration.java|  3 +-
 .../VmComponentAutoConfiguration.java   |  3 +-
 .../XsltComponentAutoConfiguration.java |  3 +-
 .../GzipDataFormatAutoConfiguration.java|  3 +-
 .../springboot/GzipDataFormatConfiguration.java | 13 
 ...erializationDataFormatAutoConfiguration.java |  3 +-
 .../SerializationDataFormatConfiguration.java   | 13 
 .../StringDataFormatAutoConfiguration.java  |  3 +-
 .../StringDataFormatConfiguration.java  | 12 
 .../ZipDataFormatAutoConfiguration.java |  3 +-
 .../springboot/ZipDataFormatConfiguration.java  | 12 
 .../WsComponentAutoConfiguration.java   |  3 +-
 .../AhcComponentAutoConfiguration.java  |  3 +-
 .../AMQPComponentAutoConfiguration.java |  3 +-
 .../ApnsComponentAutoConfiguration.java |  3 +-
 .../WebsocketComponentAutoConfiguration.java|  3 +-
 .../AvroComponentAutoConfiguration.java |  3 +-
 .../AvroDataFormatAutoConfiguration.java|  3 +-
 .../springboot/AvroDataFormatConfiguration.java | 12 
 .../BarcodeDataFormatAutoConfiguration.java |  3 +-
 .../BarcodeDataFormatConfiguration.java | 12 
 .../Base64DataFormatAutoConfiguration.java  |  3 +-
 .../Base64DataFormatConfiguration.java  | 12 
 .../BeanIODataFormatAutoConfiguration.java  |  3 +-
 .../BeanIODataFormatConfiguration.java  | 12 
 .../BeanstalkComponentAutoConfiguration.java|  3 +-
 .../BindyCsvDataFormatAutoConfiguration.java|  3 +-
 .../BindyCsvDataFormatConfiguration.java| 12 
 ...yFixedLengthDataFormatAutoConfiguration.java |  3 +-
 ...BindyFixedLengthDataFormatConfiguration.java | 12 
 ...KeyValuePairDataFormatAutoConfiguration.java |  3 +-
 ...indyKeyValuePairDataFormatConfiguration.java | 12 
 .../BoonDataFormatAutoConfiguration.java|  3 +-
 .../springboot/BoonDataFormatConfiguration.java | 12 
 .../BoxComponentAutoConfiguration.java  |  3 +-
 .../BraintreeComponentAutoConfiguration.java|  3 +-
 .../CacheComponentAutoConfiguration.java|  3 +-
 .../CastorDataFormatAutoConfiguration.java  |  3 +-
 .../CastorDataFormatConfiguration.java  | 12 
 .../CometdComponentAutoConfiguration.java   |  3 +-
 ...italSignatureComponentAutoConfiguration.java |  3 +-
 .../CryptoDataFormatAutoConfiguration.java  |  3 +-
 .../CryptoDataFormatConfiguration.java  | 12 
 .../PGPDataFormatAutoConfiguration.java |  3 +-
 .../springboot/PGPDataFormatConfiguration.java  | 12 
 .../CsvDataFormatAutoConfiguration.java |  3 +-
 .../springboot/CsvDataFormatConfiguration.java  | 12 
 .../CxfRsComponentAutoConfiguration.java|  3 +-
 .../CxfComponentAutoConfiguration.java  |  3 +-
 .../DisruptorComponentAutoConfiguration.java|  3 +-
 .../DisruptorVmComponentAutoConfiguration.java  |  3 +-
 .../DockerComponentAutoConfiguration.java   |  3 +-
 .../EjbComponentAutoConfiguration.java  |  3 +-
 ...ElasticsearchComponentAutoConfiguration.java |  3 +-
 .../ElsqlComponentAutoConfiguration.java|  3 +-
 .../EventAdminComponentAutoConfiguration.java   |  3 +-
 .../FacebookComponentAutoConfiguration.java |  3 +-
 .../FlatpackDataFormatAutoConfiguration.java|  3 +-
 .../FlatpackDataFormatConfiguration.java| 12 
 .../FlinkComponentAutoConfiguration.java|  3 +-
 .../FreemarkerComponentAutoConfiguration.java   |  3 +-
 .../GangliaComponentAutoConfiguration.java  |  3 +-
 ...oogleCalendarComponentAutoConfiguration.java |  3 +-
 .../GoogleDriveComponentAutoConfiguration.java  |  3 +-
 .../GoogleMailComponentAutoConfiguration.java   |  3 +-
 .../GsonDataFormatAutoConfiguration.java|  3 +-
 .../springboot/GsonDataFormatConfiguration.java | 12 
 

[04/11] camel git commit: CAMEL-10041: Generate spring-boot auto configuration for all Camel data formats that has options that can be configured.

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
--
diff --git 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
new file mode 100644
index 000..8f85084
--- /dev/null
+++ 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
@@ -0,0 +1,54 @@
+/**
+ * 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.jackson.springboot;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration
+@EnableConfigurationProperties(JacksonDataFormatConfiguration.class)
+public class JacksonDataFormatAutoConfiguration {
+
+@Bean
+@ConditionalOnClass(CamelContext.class)
+@ConditionalOnMissingBean(JacksonDataFormat.class)
+public JacksonDataFormat configureJacksonDataFormat(
+CamelContext camelContext,
+JacksonDataFormatConfiguration configuration) throws Exception {
+JacksonDataFormat dataformat = new JacksonDataFormat();
+if (dataformat instanceof CamelContextAware) {
+((CamelContextAware) dataformat).setCamelContext(camelContext);
+}
+Map parameters = new HashMap<>();
+IntrospectionSupport.getProperties(configuration, parameters, null);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), dataformat, parameters);
+return dataformat;
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/f9b58d31/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
--
diff --git 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
new file mode 100644
index 000..7f396c5
--- /dev/null
+++ 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -0,0 +1,256 @@
+/**
+ * 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.jackson.springboot;
+
+import org.apache.camel.model.dataformat.JsonLibrary;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+

camel git commit: Upgrade Joda-time to version 2.9.4

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master e59d3d7b2 -> 9c2e0ef23


Upgrade Joda-time to version 2.9.4


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

Branch: refs/heads/master
Commit: 9c2e0ef23f84c9497e56aacbc3d11688aa081ff8
Parents: e59d3d7
Author: Andrea Cosentino 
Authored: Fri Jun 10 10:21:32 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 10:21:32 2016 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9c2e0ef2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a8da831..19052bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -319,7 +319,7 @@
 20030619
 1.5
 1.6.2
-2.9.3
+2.9.4
 1.3.3
 0.0.21
 0.0.21_1

camel git commit: removed netty41-version placeholder

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master eab2b1cda -> e59d3d7b2


removed netty41-version placeholder


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

Branch: refs/heads/master
Commit: e59d3d7b22e480336f64b3e9827e131182754bf6
Parents: eab2b1c
Author: Arno Noordover 
Authored: Fri Jun 10 09:40:30 2016 +0200
Committer: Arno Noordover 
Committed: Fri Jun 10 09:40:30 2016 +0200

--
 parent/pom.xml|  1 -
 .../karaf/features/src/main/resources/features.xml| 14 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e59d3d7b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index bb13d24..a8da831 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -425,7 +425,6 @@
 3.0.1
 3.10.5.Final
 4.1.1.Final
-4.1.1.Final
 0.5_1
 
 1.2.7

http://git-wip-us.apache.org/repos/asf/camel/blob/e59d3d7b/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 68a74a8..7ed8366 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -446,13 +446,13 @@
 mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
 mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
 mvn:com.fasterxml.jackson.module/jackson-module-afterburner/${jackson2-version}
-mvn:io.netty/netty-common/${netty41-version}
-mvn:io.netty/netty-buffer/${netty41-version}
-mvn:io.netty/netty-resolver/${netty41-version}
-mvn:io.netty/netty-transport/${netty41-version}
-mvn:io.netty/netty-handler/${netty41-version}
-mvn:io.netty/netty-codec/${netty41-version}
-mvn:io.netty/netty-codec-http/${netty41-version}
+mvn:io.netty/netty-common/${netty-version}
+mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-resolver/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
+mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
+mvn:io.netty/netty-codec-http/${netty-version}
 mvn:org.mousio/etcd4j/${etcd4j-version}
 mvn:org.apache.camel/camel-etcd/${project.version}
   

[1/2] camel git commit: changed camel-version to 4.1.1.Final, maven-resource-plugin upgrade, features.xml solved

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 540daa010 -> eab2b1cda


changed camel-version to 4.1.1.Final, maven-resource-plugin upgrade, 
features.xml solved


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

Branch: refs/heads/master
Commit: eab2b1cdac1ec24e87955b8316f7baa19cab8c7f
Parents: 559cca8
Author: Arno Noordover 
Authored: Thu Jun 9 22:31:13 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 09:14:24 2016 +0200

--
 components/camel-netty4/pom.xml |  2 +-
 parent/pom.xml  |  4 ++--
 .../karaf/features/src/main/resources/features.xml  | 12 +---
 3 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/eab2b1cd/components/camel-netty4/pom.xml
--
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index 11ccf72..c9ff493 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -43,7 +43,7 @@
 
   io.netty
   netty-all
-  ${netty41-version}
+  ${netty-version}
 
 
   commons-pool

http://git-wip-us.apache.org/repos/asf/camel/blob/eab2b1cd/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 68fa304..bb13d24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -398,7 +398,7 @@
 
7.7.Final
 
1.4
 
-2.7
+3.0.1
 2.2.1
 2.0.5
 1.19.0
@@ -424,7 +424,7 @@
 3.4.0
 3.0.1
 3.10.5.Final
-4.0.37.Final
+4.1.1.Final
 4.1.1.Final
 0.5_1
 

http://git-wip-us.apache.org/repos/asf/camel/blob/eab2b1cd/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 6cfedbc..68a74a8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -95,10 +95,12 @@
 mvn:commons-collections/commons-collections/${commons-collections-version}
 wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}
 wrap:mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}
+mvn:io.netty/netty-resolver/${netty-version}
 mvn:io.netty/netty-common/${netty-version}
-mvn:io.netty/netty-transport/${netty-version}
 mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
 mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-transport-native-epoll/${netty-version}
 mvn:io.netty/netty-codec/${netty-version}
 mvn:org.apache.camel/camel-amqp/${project.version}
   
@@ -253,6 +255,7 @@
   
 camel-core
 mvn:com.google.guava/guava/${cassandra-driver-guava-version}
+mvn:io.netty/netty-resolver/${netty-version}
 mvn:io.netty/netty-handler/${netty-version}
 mvn:io.netty/netty-transport-native-epoll/${netty-version}
 mvn:io.netty/netty-buffer/${netty-version}
@@ -1184,12 +1187,13 @@
   
   
 camel-core
+mvn:io.netty/netty-resolver/${netty-version}
 mvn:io.netty/netty-common/${netty-version}
-mvn:io.netty/netty-transport/${netty-version}
 mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
 mvn:io.netty/netty-handler/${netty-version}
-mvn:io.netty/netty-codec/${netty-version}
 mvn:io.netty/netty-transport-native-epoll/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
 mvn:commons-pool/commons-pool/${commons-pool-version}
 mvn:org.apache.camel/camel-netty4/${project.version}
   
@@ -1280,6 +1284,7 @@
 mvn:io.netty/netty-transport/${netty-version}
 mvn:io.netty/netty-buffer/${netty-version}
 mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-resolver/${netty-version}
 mvn:io.netty/netty-codec/${netty-version}
 mvn:org.apache.camel/camel-pgevent/${project.version}
   
@@ -1762,6 +1767,7 @@
 mvn:io.netty/netty-handler/${netty-version}
 mvn:io.netty/netty-codec/${netty-version}
 mvn:io.netty/netty-codec-http/${netty-version}
+mvn:io.netty/netty-resolver/${netty-version}
 mvn:com.hazelcast/hazelcast/${hazelcast-version}
 mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}
 wrap:mvn:io.vertx/vertx-core/${vertx-version}

[2/2] camel git commit: CAMEL-10002: migrate to netty 4.1.0.Final

[acosentino]

CAMEL-10002: migrate to netty 4.1.0.Final


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

Branch: refs/heads/master
Commit: 559cca80db9451680327a1827cdc1c676633c65a
Parents: 540daa0
Author: Arno Noordover 
Authored: Wed Jun 8 13:53:56 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 09:14:24 2016 +0200

--
 components/camel-netty4/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/559cca80/components/camel-netty4/pom.xml
--
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index c9ff493..11ccf72 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -43,7 +43,7 @@
 
   io.netty
   netty-all
-  ${netty-version}
+  ${netty41-version}
 
 
   commons-pool

camel git commit: CAMEL-10036: Add api on rest-dsl to transform as routes using a specific rest configuration. Thanks to Jay mann for the patch.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 2f63b13ef -> 540daa010


CAMEL-10036: Add api on rest-dsl to transform as routes using a specific rest 
configuration. Thanks to Jay mann for the patch.


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

Branch: refs/heads/master
Commit: 540daa0102aa05253eb2953b8ea67cc7656fa422
Parents: 2f63b13
Author: Claus Ibsen 
Authored: Fri Jun 10 08:55:15 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 08:56:04 2016 +0200

--
 .../apache/camel/model/rest/RestDefinition.java | 24 
 1 file changed, 24 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/540daa01/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 840e567..c7ba4b8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -590,8 +590,12 @@ public class RestDefinition extends 
OptionalIdentifiedDefinition
  * Transforms this REST definition into a list of {@link 
org.apache.camel.model.RouteDefinition} which
  * Camel routing engine can add and run. This allows us to define REST 
services using this
  * REST DSL and turn those into regular Camel routes.
+ *
+ * @param camelContext The Camel context
  */
 public List asRouteDefinition(CamelContext camelContext) {
+ObjectHelper.notNull(camelContext, "CamelContext");
+
 // sanity check this rest definition do not have duplicates
 validateUniquePaths();
 
@@ -605,6 +609,26 @@ public class RestDefinition extends 
OptionalIdentifiedDefinition
 return answer;
 }
 
+/**
+ * Transforms this REST definition into a list of {@link 
org.apache.camel.model.RouteDefinition} which
+ * Camel routing engine can add and run. This allows us to define REST 
services using this
+ * REST DSL and turn those into regular Camel routes.
+ *
+ * @param camelContextThe Camel context
+ * @param restConfiguration   The rest configuration to use
+ */
+public List asRouteDefinition(CamelContext camelContext, 
RestConfiguration restConfiguration) {
+ObjectHelper.notNull(camelContext, "CamelContext");
+ObjectHelper.notNull(restConfiguration, "RestConfiguration");
+
+// sanity check this rest definition do not have duplicates
+validateUniquePaths();
+
+List answer = new ArrayList();
+addRouteDefinition(camelContext, answer, 
restConfiguration.getComponent());
+return answer;
+}
+
 protected void validateUniquePaths() {
 Set paths = new HashSet();
 for (VerbDefinition verb : verbs) {

camel git commit: CAMEL-10036: Add api on rest-dsl to transform as routes using a specific rest configuration. Thanks to Jay mann for the patch.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 368cb746a -> 4bab34ec0


CAMEL-10036: Add api on rest-dsl to transform as routes using a specific rest 
configuration. Thanks to Jay mann for the patch.


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

Branch: refs/heads/camel-2.17.x
Commit: 4bab34ec06fb8a8508471d3bb756b6e72639db95
Parents: 368cb74
Author: Claus Ibsen 
Authored: Fri Jun 10 08:55:15 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 08:55:45 2016 +0200

--
 .../apache/camel/model/rest/RestDefinition.java | 24 
 1 file changed, 24 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4bab34ec/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 840e567..c7ba4b8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -590,8 +590,12 @@ public class RestDefinition extends 
OptionalIdentifiedDefinition
  * Transforms this REST definition into a list of {@link 
org.apache.camel.model.RouteDefinition} which
  * Camel routing engine can add and run. This allows us to define REST 
services using this
  * REST DSL and turn those into regular Camel routes.
+ *
+ * @param camelContext The Camel context
  */
 public List asRouteDefinition(CamelContext camelContext) {
+ObjectHelper.notNull(camelContext, "CamelContext");
+
 // sanity check this rest definition do not have duplicates
 validateUniquePaths();
 
@@ -605,6 +609,26 @@ public class RestDefinition extends 
OptionalIdentifiedDefinition
 return answer;
 }
 
+/**
+ * Transforms this REST definition into a list of {@link 
org.apache.camel.model.RouteDefinition} which
+ * Camel routing engine can add and run. This allows us to define REST 
services using this
+ * REST DSL and turn those into regular Camel routes.
+ *
+ * @param camelContextThe Camel context
+ * @param restConfiguration   The rest configuration to use
+ */
+public List asRouteDefinition(CamelContext camelContext, 
RestConfiguration restConfiguration) {
+ObjectHelper.notNull(camelContext, "CamelContext");
+ObjectHelper.notNull(restConfiguration, "RestConfiguration");
+
+// sanity check this rest definition do not have duplicates
+validateUniquePaths();
+
+List answer = new ArrayList();
+addRouteDefinition(camelContext, answer, 
restConfiguration.getComponent());
+return answer;
+}
+
 protected void validateUniquePaths() {
 Set paths = new HashSet();
 for (VerbDefinition verb : verbs) {

camel git commit: Use Libphonenumer bundle in camel-cm-sms Karaf feature

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 741118e3f -> 2f63b13ef


Use Libphonenumer bundle in camel-cm-sms Karaf feature


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

Branch: refs/heads/master
Commit: 2f63b13ef302aef59e53b37b8585497343f62c06
Parents: 741118e
Author: Andrea Cosentino 
Authored: Fri Jun 10 08:52:33 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jun 10 08:53:15 2016 +0200

--
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f63b13e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e1d3d2a..68fa304 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -365,6 +365,7 @@
 2.3.0_3
 1.8
 7.4.0
+7.4.0_1
 
 1.0.0
 1.2.17

http://git-wip-us.apache.org/repos/asf/camel/blob/2f63b13e/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 31e8b3d..6cfedbc 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -293,7 +293,7 @@
   
 camel-core
 cxf-specs
-wrap:mvn:com.googlecode.libphonenumber/libphonenumber/${libphonenumber-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}
 mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
 mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
 mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}

[1/3] camel git commit: Replaced deprecated method ".groupExchanges()".

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master fd57cfcab -> 741118e3f


Replaced deprecated method ".groupExchanges()".

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

Branch: refs/heads/master
Commit: ad3bfc0f2014349954bb9058ef5f9dbd8afebcd1
Parents: f81f9da
Author: 1984shekhar 
Authored: Thu Jun 9 23:10:54 2016 +0530
Committer: Claus Ibsen 
Committed: Fri Jun 10 08:40:51 2016 +0200

--
 .../aggregator/AggregateGroupedExchangeBatchSizeTest.java | 7 +++
 .../AggregateGroupedExchangeCompletionSizeTest.java   | 4 ++--
 .../AggregateGroupedExchangeMultipleCorrelationTest.java  | 7 +++
 .../aggregator/AggregateGroupedExchangeSizePredicateTest.java | 3 ++-
 .../aggregator/AggregateGroupedExchangeSizeTest.java  | 3 ++-
 .../apache/camel/util/DumpModelAsXmlAggregateRouteTest.java   | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java
index f958547..f441940 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
 
 /**
  * Unit test for aggregate grouped exchanges.
@@ -75,12 +76,10 @@ public class AggregateGroupedExchangeBatchSizeTest extends 
ContextTestSupport {
 // our route is aggregating from the direct queue and sending 
the response to the mock
 from("direct:start")
 .log("Aggregator received ${body}")
-// aggregated all use same expression
-.aggregate(constant(true)).completionSize(2)
+// aggregated all use same expression and group the 
exchanges so we get one single exchange containing all the others
+.aggregate(new 
GroupedExchangeAggregationStrategy()).constant(true).completionSize(2)
 // wait for 0.5 seconds to aggregate
 .completionTimeout(500L)
-// group the exchanges so we get one single exchange 
containing all the others
-.groupExchanges()
 .to("mock:result");
 // END SNIPPET: e1
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java
index 7031add..d9e96e0 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.processor.aggregator;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
 
 /**
  * Unit test for aggregate grouped exchanges.
@@ -44,8 +45,7 @@ public class AggregateGroupedExchangeCompletionSizeTest 
extends ContextTestSuppo
 return new RouteBuilder() {
 public void configure() throws Exception {
 from("direct:start")
-.aggregate(constant(true)).completionSize(3)
-.groupExchanges()
+.aggregate(new 
GroupedExchangeAggregationStrategy()).constant(true).completionSize(3)
 .to("mock:result");
 }
 };

[3/3] camel git commit: Fixed CS. This closes #1021

[davsclaus]

Fixed CS. This closes #1021


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

Branch: refs/heads/master
Commit: 741118e3f2b6ac07e5585adc0daabb0cd3dce773
Parents: ad3bfc0
Author: Claus Ibsen 
Authored: Fri Jun 10 08:43:53 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jun 10 08:43:53 2016 +0200

--
 .../AggregateGroupedExchangeMultipleCorrelationTest.java   | 2 +-
 .../org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/741118e3/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
index 86c35af..447d104 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java
@@ -79,7 +79,7 @@ public class AggregateGroupedExchangeMultipleCorrelationTest 
extends ContextTest
 // our route is aggregating from the direct queue and sending 
the response to the mock
 from("direct:start")
 // aggregate all using the foo header and group the 
exchanges so we get one single exchange containing all the others
-.aggregate(header("foo"),new 
GroupedExchangeAggregationStrategy())
+.aggregate(header("foo"), new 
GroupedExchangeAggregationStrategy())
 // wait for 1 seconds to aggregate
 .completionTimeout(1000L)
 .to("mock:result");

http://git-wip-us.apache.org/repos/asf/camel/blob/741118e3/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
 
b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
index 7148d6d..f172942 100644
--- 
a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
@@ -43,7 +43,7 @@ public class DumpModelAsXmlAggregateRouteTest extends 
ContextTestSupport {
 public void configure() throws Exception {
 from("direct:start").routeId("myRoute")
 .to("log:input")
-.aggregate(header("userId"),new 
GroupedExchangeAggregationStrategy()).completionSize(3)
+.aggregate(header("userId"), new 
GroupedExchangeAggregationStrategy()).completionSize(3)
 .to("mock:aggregate")
 .end()
 .to("mock:result");

[2/3] camel git commit: Modified AggregateGroupedExchangeTest replacing deprecated groupExchanges() method.

[davsclaus]

Modified AggregateGroupedExchangeTest replacing deprecated
groupExchanges() method.

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

Branch: refs/heads/master
Commit: f81f9da47131a266cc4a16df51090c565bfa9cdc
Parents: fd57cfc
Author: 1984shekhar 
Authored: Thu Jun 9 18:02:57 2016 +0530
Committer: Claus Ibsen 
Committed: Fri Jun 10 08:40:51 2016 +0200

--
 .../processor/aggregator/AggregateGroupedExchangeTest.java| 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f81f9da4/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeTest.java
index 4628462..b055197 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
 
 /**
  * Unit test for aggregate grouped exchanges.
@@ -65,12 +66,10 @@ public class AggregateGroupedExchangeTest extends 
ContextTestSupport {
 // START SNIPPET: e1
 // our route is aggregating from the direct queue and sending 
the response to the mock
 from("direct:start")
-// aggregate all using same expression
-.aggregate(constant(true))
+// aggregate all using same expression and group the 
exchanges so we get one single exchange containing all the others
+.aggregate(new 
GroupedExchangeAggregationStrategy()).constant(true)
 // wait for 0.5 seconds to aggregate
 .completionTimeout(500L)
-// group the exchanges so we get one single exchange 
containing all the others
-.groupExchanges()
 .to("mock:result");
 // END SNIPPET: e1
 }

camel git commit: CAMEL-10039: Fixed callback url parsing in LinkedIn and Box Components

[dhirajsb]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 16eb380b6 -> 368cb746a


CAMEL-10039: Fixed callback url parsing in LinkedIn and Box Components


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

Branch: refs/heads/camel-2.17.x
Commit: 368cb746a3467c5ea51030ce5affb76f9d079667
Parents: 16eb380
Author: Dhiraj Bokde 
Authored: Thu Jun 9 23:20:28 2016 -0700
Committer: Dhiraj Bokde 
Committed: Thu Jun 9 23:22:26 2016 -0700

--
 .../org/apache/camel/component/box/internal/LoginAuthFlowUI.java | 4 ++--
 .../camel/component/linkedin/api/LinkedInOAuthRequestFilter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/368cb746/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
--
diff --git 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
index 8044ecd..778db59 100644
--- 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
+++ 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
@@ -17,13 +17,13 @@
 package org.apache.camel.component.box.internal;
 
 import java.io.IOException;
+import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.net.ssl.SSLContext;
 
 import com.box.boxjavalibv2.BoxClient;
@@ -165,7 +165,7 @@ public final class LoginAuthFlowUI implements IAuthFlowUI {
 throw e;
 }
 final String location = 
e.getResponse().getResponseHeaderValue("Location");
-redirectQuery = location.substring(location.indexOf('?') + 1);
+redirectQuery = new URL(location).getQuery();
 }
 final Map params = new HashMap();
 final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);

http://git-wip-us.apache.org/repos/asf/camel/blob/368cb746/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index 4d781d1..e30910a 100644
--- 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -202,7 +202,7 @@ public final class LinkedInOAuthRequestFilter implements 
ClientRequestFilter {
 throw e;
 }
 final String location = 
e.getResponse().getResponseHeaderValue("Location");
-redirectQuery = location.substring(location.indexOf('?') + 1);
+redirectQuery = new URL(location).getQuery();
 }
 final Map params = new HashMap();
 final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);

camel git commit: CAMEL-10039: Fixed callback url parsing in LinkedIn and Box Components

[dhirajsb]

Repository: camel
Updated Branches:
  refs/heads/master a19962b10 -> fd57cfcab


CAMEL-10039: Fixed callback url parsing in LinkedIn and Box Components


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

Branch: refs/heads/master
Commit: fd57cfcabcb93e64d3a51737b470faf32de1404e
Parents: a19962b
Author: Dhiraj Bokde 
Authored: Thu Jun 9 23:20:28 2016 -0700
Committer: Dhiraj Bokde 
Committed: Thu Jun 9 23:20:59 2016 -0700

--
 .../org/apache/camel/component/box/internal/LoginAuthFlowUI.java | 4 ++--
 .../camel/component/linkedin/api/LinkedInOAuthRequestFilter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fd57cfca/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
--
diff --git 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
index 8044ecd..778db59 100644
--- 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
+++ 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
@@ -17,13 +17,13 @@
 package org.apache.camel.component.box.internal;
 
 import java.io.IOException;
+import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.net.ssl.SSLContext;
 
 import com.box.boxjavalibv2.BoxClient;
@@ -165,7 +165,7 @@ public final class LoginAuthFlowUI implements IAuthFlowUI {
 throw e;
 }
 final String location = 
e.getResponse().getResponseHeaderValue("Location");
-redirectQuery = location.substring(location.indexOf('?') + 1);
+redirectQuery = new URL(location).getQuery();
 }
 final Map params = new HashMap();
 final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);

http://git-wip-us.apache.org/repos/asf/camel/blob/fd57cfca/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index 4d781d1..e30910a 100644
--- 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -202,7 +202,7 @@ public final class LinkedInOAuthRequestFilter implements 
ClientRequestFilter {
 throw e;
 }
 final String location = 
e.getResponse().getResponseHeaderValue("Location");
-redirectQuery = location.substring(location.indexOf('?') + 1);
+redirectQuery = new URL(location).getQuery();
 }
 final Map params = new HashMap();
 final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);