[camel] branch master updated: Update NOTICE copyright year to 2019

[janstey]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 25096f6  Update NOTICE copyright year to 2019
25096f6 is described below

commit 25096f6ae920f68ffcc3cd263aa24aa87aa0af0f
Author: Jonathan Anstey 
AuthorDate: Thu Oct 3 00:19:40 2019 -0230

Update NOTICE copyright year to 2019
---
 apache-camel/src/main/release/NOTICE.txt| 2 +-
 apache-camel/src/main/resources/META-INF/NOTICE.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-camel/src/main/release/NOTICE.txt 
b/apache-camel/src/main/release/NOTICE.txt
index d38d787..9549490 100644
--- a/apache-camel/src/main/release/NOTICE.txt
+++ b/apache-camel/src/main/release/NOTICE.txt
@@ -5,7 +5,7 @@
 =
 
 Apache Camel
-Copyright 2007-2016 The Apache Software Foundation
+Copyright 2007-2019 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/apache-camel/src/main/resources/META-INF/NOTICE.txt 
b/apache-camel/src/main/resources/META-INF/NOTICE.txt
index 0b5c3b3..80f9bae 100644
--- a/apache-camel/src/main/resources/META-INF/NOTICE.txt
+++ b/apache-camel/src/main/resources/META-INF/NOTICE.txt
@@ -5,7 +5,7 @@
 =
 
 Apache Camel
-Copyright 2007-2016 The Apache Software Foundation
+Copyright 2007-2019 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

[camel] 03/04: Upgrade to gmail v1-rev81-1.22.0

[janstey]

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

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

commit b4a5d56a4b1b0b9f9c274543b6347f61b00cd722
Author: Jonathan Anstey <jans...@gmail.com>
AuthorDate: Wed Feb 14 15:23:57 2018 -0330

Upgrade to gmail v1-rev81-1.22.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 3771541..eb55649 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -267,7 +267,7 @@
 1.22.0
 
v2-rev297-1.22.0
 
v3-rev291-1.22.0
-
v1-rev63-1.22.0
+
v1-rev81-1.22.0
 
v2-rev352-1.22.0
 
v1-rev12-1.22.0
 0.30

-- 
To stop receiving notification emails like this one, please contact
jans...@apache.org.

[camel] 02/04: Upgrade to google calendar v3-rev291-1.22.0

[janstey]

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

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

commit 376cc4b1866d98c2a39558516cdecb176cca0437
Author: Jonathan Anstey <jans...@gmail.com>
AuthorDate: Wed Feb 14 15:20:53 2018 -0330

Upgrade to google calendar v3-rev291-1.22.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4ab648d..3771541 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -266,7 +266,7 @@
 19.0
 1.22.0
 
v2-rev297-1.22.0
-
v3-rev243-1.22.0
+
v3-rev291-1.22.0
 
v1-rev63-1.22.0
 
v2-rev352-1.22.0
 
v1-rev12-1.22.0

-- 
To stop receiving notification emails like this one, please contact
jans...@apache.org.

[camel] 04/04: Fix CS

[janstey]

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

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

commit fff38e1f1b4589fa7ca2e39ea3c0e889bb6bf620
Author: Jonathan Anstey <jans...@gmail.com>
AuthorDate: Wed Feb 14 16:16:40 2018 -0330

Fix CS
---
 .../src/main/java/org/apache/camel/component/ahc/AhcBinding.java  | 4 ++--
 .../src/main/java/org/apache/camel/component/ahc/AhcProducer.java | 4 ++--
 .../main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcBinding.java
 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcBinding.java
index b6d940f..2537197 100644
--- 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcBinding.java
+++ 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcBinding.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.ahc;
 
 import java.io.ByteArrayOutputStream;
 
+import io.netty.handler.codec.http.HttpHeaders;
+
 import org.apache.camel.Exchange;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Request;
 
-import io.netty.handler.codec.http.HttpHeaders;
-
 /**
  * Binding from Camel to/from {@link com.ning.http.client.AsyncHttpClient}
  */
diff --git 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
index dbec1a0..cc02349 100644
--- 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
+++ 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.ahc;
 
 import java.io.ByteArrayOutputStream;
 
+import io.netty.handler.codec.http.HttpHeaders;
+
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultAsyncProducer;
@@ -27,8 +29,6 @@ import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Request;
 
-import io.netty.handler.codec.http.HttpHeaders;
-
 /**
  *
  */
diff --git 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
index 86466fa..b6bbac6 100644
--- 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
+++ 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import io.netty.handler.codec.http.HttpHeaders;
+
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -50,8 +52,6 @@ import 
org.asynchttpclient.request.body.generator.InputStreamBodyGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.netty.handler.codec.http.HttpHeaders;
-
 public class DefaultAhcBinding implements AhcBinding {
 
 protected final Logger log = LoggerFactory.getLogger(this.getClass());

-- 
To stop receiving notification emails like this one, please contact
jans...@apache.org.

[camel] branch master updated (3eb2ac1 -> fff38e1)

[janstey]

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

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


from 3eb2ac1  Fixed small typos in LRUSoftCache javadoc
 new faa1bde  Upgrade to google drive v2-rev297-1.22.0
 new 376cc4b  Upgrade to google calendar v3-rev291-1.22.0
 new b4a5d56  Upgrade to gmail v1-rev81-1.22.0
 new fff38e1  Fix CS

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


Summary of changes:
 .../src/main/java/org/apache/camel/component/ahc/AhcBinding.java| 4 ++--
 .../src/main/java/org/apache/camel/component/ahc/AhcProducer.java   | 4 ++--
 .../main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java | 4 ++--
 parent/pom.xml  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jans...@apache.org.

[camel] 01/04: Upgrade to google drive v2-rev297-1.22.0

[janstey]

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

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

commit faa1bde6c820ff1e96e95027c13f94b1dab3134b
Author: Jonathan Anstey <jans...@gmail.com>
AuthorDate: Wed Feb 14 15:18:35 2018 -0330

Upgrade to google drive v2-rev297-1.22.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d2e4f35..4ab648d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -265,7 +265,7 @@
 1.0.10
 19.0
 1.22.0
-
v2-rev263-1.22.0
+
v2-rev297-1.22.0
 
v3-rev243-1.22.0
 
v1-rev63-1.22.0
 
v2-rev352-1.22.0

-- 
To stop receiving notification emails like this one, please contact
jans...@apache.org.

[camel] branch master updated: Regen

[janstey]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e34a207  Regen
e34a207 is described below

commit e34a207a8345d097d30e81505911f5b9313cf885
Author: Jonathan Anstey <jans...@gmail.com>
AuthorDate: Thu Oct 26 09:56:31 2017 -0230

Regen
---
 .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 5556aff..284b87f 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -43,7 +43,7 @@
   
 com.alibaba
 fastjson
-1.2.37
+1.2.39
   
   
 com.atlassian.jira

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].

[camel] branch master updated: Fix CS

[janstey]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new c1c1db0  Fix CS
c1c1db0 is described below

commit c1c1db0a15b21fa3f7892a436072df322b9f5d0b
Author: Jonathan Anstey <jans...@gmail.com>
AuthorDate: Thu Oct 26 09:21:53 2017 -0230

Fix CS
---
 .../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index 36ba108..b4f754d 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -108,7 +108,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
  * @parameter property="camel.anonymousRoutes"
  *default-value="false"
  */
-private boolean anonymousRoutes = false;
+private boolean anonymousRoutes;
 
 // CHECKSTYLE:OFF
 @Override

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].

[2/5] camel git commit: add profile for testing zendesk

[janstey]

add profile for testing zendesk


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

Branch: refs/heads/master
Commit: 4ad56f1befefd9defd930b55a843b47bd324c87f
Parents: 14a6ade
Author: Jonathan Anstey 
Authored: Wed Apr 12 17:06:28 2017 -0230
Committer: Jonathan Anstey 
Committed: Wed Apr 12 17:13:00 2017 -0230

--
 components/camel-zendesk/pom.xml | 26 ++
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4ad56f1b/components/camel-zendesk/pom.xml
--
diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml
index 016b15b..12a02d2 100644
--- a/components/camel-zendesk/pom.xml
+++ b/components/camel-zendesk/pom.xml
@@ -240,6 +240,32 @@
 
   
 
+  
+
+  zendesk-test
+  
+
+  
+maven-surefire-plugin
+
+  false
+  true
+  1
+  true
+  
300
+  
+**/*XXXTest.java
+  
+  
+**/*Test.java
+  
+
+  
+
+  
+
+  
+
   
 
   

[4/5] camel git commit: upgrade to zendesk client 0.5.4

[janstey]

upgrade to zendesk client 0.5.4


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

Branch: refs/heads/master
Commit: 14a6adea6b1923cc26d0efe0a3dc3a9653f7e5d0
Parents: 1262a81
Author: Jonathan Anstey 
Authored: Wed Apr 12 17:00:14 2017 -0230
Committer: Jonathan Anstey 
Committed: Wed Apr 12 17:13:00 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/14a6adea/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 64d33ce..65387c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -691,7 +691,7 @@
 1.4.9
 1.2.5
 2.2.0
-0.5.3
+0.5.4
 1.19.4
 0.6.13
 0.3.0

[5/5] camel git commit: tidy

[janstey]

tidy


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

Branch: refs/heads/master
Commit: 514840908bfebbf4112aeefdf9f3751dcc539a11
Parents: f0bf7ba
Author: Jonathan Anstey 
Authored: Wed Apr 12 17:11:25 2017 -0230
Committer: Jonathan Anstey 
Committed: Wed Apr 12 17:13:01 2017 -0230

--
 .../camel/component/zendesk/ZendeskComponent.java   |  1 -
 .../component/zendesk/ZendeskConfiguration.java |  4 
 .../camel/component/zendesk/ZendeskConsumer.java|  3 ---
 .../camel/component/zendesk/ZendeskEndpoint.java|  5 -
 .../camel/component/zendesk/ZendeskProducer.java|  2 --
 .../component/zendesk/internal/ZendeskHelper.java   | 16 
 6 files changed, 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/51484090/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java
--
diff --git 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java
 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java
index c52366c..199734c 100644
--- 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java
+++ 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java
@@ -23,7 +23,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.component.zendesk.internal.ZendeskApiCollection;
 import org.apache.camel.component.zendesk.internal.ZendeskApiName;
 import org.apache.camel.component.zendesk.internal.ZendeskHelper;
-import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.component.AbstractApiComponent;

http://git-wip-us.apache.org/repos/asf/camel/blob/51484090/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java
--
diff --git 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java
 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java
index 15c755d..d4bae86 100644
--- 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java
+++ 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.component.zendesk;
 
-import java.util.Map;
-
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.zendesk.internal.ZendeskApiName;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;

http://git-wip-us.apache.org/repos/asf/camel/blob/51484090/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConsumer.java
--
diff --git 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConsumer.java
 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConsumer.java
index 944f059..d39e492 100644
--- 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConsumer.java
+++ 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConsumer.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.zendesk;
 
-import java.util.List;
-import java.util.Stack;
-
 import org.apache.camel.Processor;
 import org.apache.camel.component.zendesk.internal.ZendeskApiName;
 import org.apache.camel.util.component.AbstractApiConsumer;

http://git-wip-us.apache.org/repos/asf/camel/blob/51484090/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
--
diff --git 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
index 5b44b1f..4e60c37 100644
--- 
a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
+++ 
b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.zendesk;
 
-import java.lang.reflect.Proxy;
 import java.util.Map;
 
 import 

[3/5] camel git commit: Fix CS

[janstey]

Fix CS


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

Branch: refs/heads/master
Commit: 1262a81a16ef0b1063af579fde0152c963048233
Parents: 67ab9a9
Author: Jonathan Anstey 
Authored: Wed Apr 12 16:33:17 2017 -0230
Committer: Jonathan Anstey 
Committed: Wed Apr 12 17:13:00 2017 -0230

--
 .../java/org/apache/camel/component/http4/HttpComponent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1262a81a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index b465374..dd09fea 100644
--- 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -85,8 +85,6 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
 + " Important: Only one instance of 
org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent."
 + " If you need to use 2 or more different instances, you need to 
define a new HttpComponent per instance you need.")
 protected SSLContextParameters sslContextParameters;
-@Metadata(label = "security", defaultValue = "false")
-private boolean useGlobalSslContextParameters;
 @Metadata(label = "security", description = "To use a custom 
X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier.")
 protected HostnameVerifier x509HostnameVerifier = new 
DefaultHostnameVerifier();
 @Metadata(label = "producer", description = "To use a custom 
org.apache.http.client.CookieStore."
@@ -103,6 +101,8 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
 // It's MILLISECONDS, the default value is always keep alive
 @Metadata(label = "advanced", description = "The time for connection to 
live, the time unit is millisecond, the default value is always keep alive.")
 protected long connectionTimeToLive = -1;
+@Metadata(label = "security", defaultValue = "false")
+private boolean useGlobalSslContextParameters;
 
 public HttpComponent() {
 super(HttpEndpoint.class);

[1/5] camel git commit: tidy

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 67ab9a972 -> 514840908


tidy


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

Branch: refs/heads/master
Commit: f0bf7ba1cf16ed0d9e60977f80c3f7ef05896583
Parents: 4ad56f1
Author: Jonathan Anstey 
Authored: Wed Apr 12 17:07:42 2017 -0230
Committer: Jonathan Anstey 
Committed: Wed Apr 12 17:13:00 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/f0bf7ba1/components/camel-zendesk/pom.xml
--
diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml
index 12a02d2..c318753 100644
--- a/components/camel-zendesk/pom.xml
+++ b/components/camel-zendesk/pom.xml
@@ -251,7 +251,7 @@
   false
   true
   1
-  true
+  true
   
300
   
 **/*XXXTest.java

[1/4] camel git commit: update to google drive v2-rev263-1.22.0

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 985be58d1 -> 9f1d11de0


update to google drive v2-rev263-1.22.0


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

Branch: refs/heads/master
Commit: 62fcec5c0b3222a5058d61951a65a969e09e1690
Parents: 985be58
Author: Jonathan Anstey 
Authored: Fri Apr 7 15:50:28 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 15:50:28 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/62fcec5c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a3dd42b..3fd0e52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -236,7 +236,7 @@
 1.0.10
 19.0
 1.22.0
-
v2-rev240-1.22.0
+
v2-rev263-1.22.0
 
v3-rev214-1.22.0
 
v1-rev48-1.22.0
 
v1-rev12-1.22.0

[3/4] camel git commit: update to google mail v1-rev63-1.22.0

[janstey]

update to google mail v1-rev63-1.22.0


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

Branch: refs/heads/master
Commit: 169cc9c5ba02d7687dec3fb59b38e15b664e57db
Parents: a39786f
Author: Jonathan Anstey 
Authored: Fri Apr 7 16:08:12 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 16:08:12 2017 -0230

--
 components/camel-google-mail/pom.xml | 8 +++-
 parent/pom.xml   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/169cc9c5/components/camel-google-mail/pom.xml
--
diff --git a/components/camel-google-mail/pom.xml 
b/components/camel-google-mail/pom.xml
index 4b39fd6..27f65dc 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -199,7 +199,13 @@
   content
   
com.google.api.services.gmail.model.ModifyMessageRequest
   modifyMessageRequest
-
+   
+
+  ^.+$
+  content
+  
com.google.api.services.gmail.model.BatchModifyMessagesRequest
+  batchModifyMessagesRequest
+
 
   ^.+$
   content

http://git-wip-us.apache.org/repos/asf/camel/blob/169cc9c5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ac4f81e..13cbae0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -238,7 +238,7 @@
 1.22.0
 
v2-rev263-1.22.0
 
v3-rev243-1.22.0
-
v1-rev48-1.22.0
+
v1-rev63-1.22.0
 
v1-rev12-1.22.0
 0.30
 2.3.25

[4/4] camel git commit: cleanup

[janstey]

cleanup


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

Branch: refs/heads/master
Commit: 9f1d11de0eac69808eb56f1de770223ad286bbe8
Parents: 169cc9c
Author: Jonathan Anstey 
Authored: Fri Apr 7 16:09:35 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 16:09:35 2017 -0230

--
 components/camel-google-calendar/pom.xml | 16 
 components/camel-google-drive/pom.xml| 16 
 2 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9f1d11de/components/camel-google-calendar/pom.xml
--
diff --git a/components/camel-google-calendar/pom.xml 
b/components/camel-google-calendar/pom.xml
index 687bfd0..da1fbee 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -168,14 +168,14 @@
   
  
 
   
-  
-
-  ^.+$
-  content
-  
com.google.api.services.calendar.model.Channel
-  contentChannel
-
-  
+  
+
+  ^.+$
+  content
+  
com.google.api.services.calendar.model.Channel
+  contentChannel
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/9f1d11de/components/camel-google-drive/pom.xml
--
diff --git a/components/camel-google-drive/pom.xml 
b/components/camel-google-drive/pom.xml
index fd2af42..115a7ea 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -193,14 +193,14 @@
   
 
   
-  
-
-  ^.+$
-  content
-  
com.google.api.services.drive.model.Channel
-  contentChannel
-
-  
+  
+
+  ^.+$
+  content
+  
com.google.api.services.drive.model.Channel
+  contentChannel
+
+  
 
   
 

[2/4] camel git commit: update to google calendar v3-rev243-1.22.0

[janstey]

update to google calendar v3-rev243-1.22.0


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

Branch: refs/heads/master
Commit: a39786f50a9b19d0dee40a67bfad9f13a6ae4a2c
Parents: 62fcec5
Author: Jonathan Anstey 
Authored: Fri Apr 7 15:53:21 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 15:53:21 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/a39786f5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3fd0e52..ac4f81e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -237,7 +237,7 @@
 19.0
 1.22.0
 
v2-rev263-1.22.0
-
v3-rev214-1.22.0
+
v3-rev243-1.22.0
 
v1-rev48-1.22.0
 
v1-rev12-1.22.0
 0.30

camel git commit: Fix CS

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 179399aa8 -> 985be58d1


Fix CS


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

Branch: refs/heads/master
Commit: 985be58d177f3da6c4f0a947c1dd3ed16b79bd7f
Parents: 179399a
Author: Jonathan Anstey 
Authored: Fri Apr 7 15:32:15 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 15:32:15 2017 -0230

--
 .../src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java   | 2 +-
 .../java/org/apache/camel/test/karaf/AbstractFeatureTest.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/985be58d/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
index 7a3c2c5..bf809d0 100755
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
@@ -33,8 +33,8 @@ import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.BeanManagerHelper.getReference;
 import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName;
 import static org.apache.camel.cdi.BeanManagerHelper.getReferencesByType;
-import static org.apache.camel.util.StringHelper.notEmpty;
 import static org.apache.camel.util.ObjectHelper.notNull;
+import static org.apache.camel.util.StringHelper.notEmpty;
 
 /**
  * The {@link Registry} used by Camel to perform lookup into the CDI {@link 
BeanManager}.

http://git-wip-us.apache.org/repos/asf/camel/blob/985be58d/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
--
diff --git 
a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
 
b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index e4edf4c..2639091 100644
--- 
a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ 
b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -107,7 +107,7 @@ public abstract class AbstractFeatureTest {
 }
 
 protected Bundle installBlueprintAsBundle(String name, URL url, boolean 
start) throws BundleException {
-return installBlueprintAsBundle(name, url, start, bundle -> {});
+return installBlueprintAsBundle(name, url, start, bundle -> { });
 }
 
 protected Bundle installBlueprintAsBundle(String name, URL url, boolean 
start, Consumer consumer) throws BundleException {
@@ -128,7 +128,7 @@ public abstract class AbstractFeatureTest {
 }
 
 protected Bundle installSpringAsBundle(String name, URL url, boolean 
start) throws BundleException {
-return installSpringAsBundle(name, url, start, bundle -> {});
+return installSpringAsBundle(name, url, start, bundle -> { });
 }
 
 protected Bundle installSpringAsBundle(String name, URL url, boolean 
start, Consumer consumer) throws BundleException {
@@ -172,7 +172,7 @@ public abstract class AbstractFeatureTest {
 if (currentProperties == null) {
 currentProperties = newProps;
 }
-for (Enumeration ek = currentProperties.keys(); 
ek.hasMoreElements(); ) {
+for (Enumeration ek = currentProperties.keys(); 
ek.hasMoreElements();) {
 String k = ek.nextElement();
 newProps.put(k, currentProperties.get(k));
 }

[6/7] camel git commit: few more refs to sslContextParametersRef

[janstey]

few more refs to sslContextParametersRef


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

Branch: refs/heads/master
Commit: d969258bc9a7cb6adcbc7fd0e7d33cc76c9543e7
Parents: 039e672
Author: Jonathan Anstey 
Authored: Fri Apr 7 14:59:03 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 14:59:03 2017 -0230

--
 components/camel-http4/src/main/docs/http4-component.adoc| 2 +-
 .../http4/HttpsTwoComponentsSslContextParametersGetTest.java | 4 ++--
 .../http4/HttpsTwoDifferentSslContextParametersGetTest.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d969258b/components/camel-http4/src/main/docs/http4-component.adoc
--
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc 
b/components/camel-http4/src/main/docs/http4-component.adoc
index 00e7442..43644df 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -555,7 +555,7 @@ Spring DSL based configuration of endpoint
 
   ...
 ...
-  ...
+  ...
 
--
 
 [[HTTP4-ConfiguringApacheHTTPClientDirectly]]

http://git-wip-us.apache.org/repos/asf/camel/blob/d969258b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
index 03ac012..8d33d72 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -83,10 +83,10 @@ public class HttpsTwoComponentsSslContextParametersGetTest 
extends BaseHttpsTest
 port2 = 
AvailablePortFinder.getNextAvailable(localServer.getLocalPort());
 
 from("direct:foo")
-.to("http4s-foo://127.0.0.1:" + 
localServer.getLocalPort() + 
"/mail?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters");
+.to("http4s-foo://127.0.0.1:" + 
localServer.getLocalPort() + 
"/mail?x509HostnameVerifier=x509HostnameVerifier=#sslContextParameters");
 
 from("direct:bar")
-.to("http4s-bar://127.0.0.1:" + port2 + 
"/mail?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters2");
+.to("http4s-bar://127.0.0.1:" + port2 + 
"/mail?x509HostnameVerifier=x509HostnameVerifier=#sslContextParameters2");
 }
 });
 

http://git-wip-us.apache.org/repos/asf/camel/blob/d969258b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
index fc0c1ee..96f732f 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
@@ -78,10 +78,10 @@ public class HttpsTwoDifferentSslContextParametersGetTest 
extends BaseHttpsTest
 @Override
 public void configure() throws Exception {
 from("direct:foo")
-.to("https4://127.0.0.1:" + localServer.getLocalPort() 
+ 
"/mail?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters");
+.to("https4://127.0.0.1:" + localServer.getLocalPort() 
+ 
"/mail?x509HostnameVerifier=x509HostnameVerifier=#sslContextParameters");
 
 from("direct:bar")
-.to("https4://127.0.0.1:" + localServer.getLocalPort() 
+ 
"/mail?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters2");
+.to("https4://127.0.0.1:" + localServer.getLocalPort() 

[1/7] camel git commit: remove deprecated sslContextParametersRef that is already removed elsewhere

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master e0fed4569 -> 179399aa8


remove deprecated sslContextParametersRef that is already removed elsewhere


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

Branch: refs/heads/master
Commit: 8bd8ee11887276c85d66533914135a1f47c82e9a
Parents: e0fed45
Author: Jonathan Anstey 
Authored: Fri Apr 7 10:20:09 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 14:44:58 2017 -0230

--
 .../camel/component/websocket/WebsocketComponent.java   | 12 ++--
 .../WebsocketSSLContextInUriRouteExampleTest.java   |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8bd8ee11/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 9b8c878..04169d0 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -276,11 +276,8 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 
 @Override
 protected Endpoint createEndpoint(String uri, String remaining, 
Map parameters) throws Exception {
-// TODO cmueller: remove the "sslContextParametersRef" look up in 
Camel 3.0
-SSLContextParameters sslContextParameters = 
resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", 
SSLContextParameters.class);
-if (sslContextParameters == null) {
-sslContextParameters = 
resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", 
SSLContextParameters.class);
-}
+SSLContextParameters sslContextParameters = 
resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", 
SSLContextParameters.class);
+
 Boolean enableJmx = getAndRemoveParameter(parameters, "enableJmx", 
Boolean.class);
 String staticResources = getAndRemoveParameter(parameters, 
"staticResources", String.class);
 int port = extractPortNumber(remaining);
@@ -294,11 +291,6 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 endpoint.setEnableJmx(isEnableJmx());
 }
 
-/*
-if (sslContextParameters == null) {
-sslContextParameters = this.sslContextParameters;
-} */
-
 // prefer to use endpoint configured over component configured
 if (sslContextParameters == null) {
 // fallback to component configured

http://git-wip-us.apache.org/repos/asf/camel/blob/8bd8ee11/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
--
diff --git 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
index 7e87226..235b641 100644
--- 
a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
+++ 
b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
@@ -67,7 +67,7 @@ public class WebsocketSSLContextInUriRouteExampleTest extends 
CamelTestSupport {
 
 URL trustStoreUrl = 
this.getClass().getClassLoader().getResource("jsse/localhost.ks");
 setSystemProp("javax.net.ssl.trustStore", 
trustStoreUrl.toURI().getPath());
-uri = "websocket://" + server + ":" + port + 
"/test?sslContextParametersRef=#sslContextParameters";
+uri = "websocket://" + server + ":" + port + 
"/test?sslContextParameters=#sslContextParameters";
 
 super.setUp();
 }

[4/7] camel git commit: get rid of deprecated sslContextParametersRef option in jetty, was removed elsewhere ages ago

[janstey]

get rid of deprecated sslContextParametersRef option in jetty, was removed 
elsewhere ages ago


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

Branch: refs/heads/master
Commit: 19f6a4ecac86987ba4f8b374abc6dc3e24be9f19
Parents: 296fc70
Author: Jonathan Anstey 
Authored: Fri Apr 7 12:27:53 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 14:44:59 2017 -0230

--
 .../camel/component/jetty/JettyHttpComponent.java  |  2 +-
 .../camel/component/jetty/JettyHttpEndpoint.java   | 17 -
 .../src/main/docs/jetty-component.adoc |  3 +--
 .../HttpsRouteSslContextParametersInUriTest.java   |  8 
 .../JettyHttpsProducerSslContextInUriTest.java | 12 ++--
 5 files changed, 12 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 2071e4a..6e7e667 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -183,7 +183,7 @@ public abstract class JettyHttpComponent extends 
HttpCommonComponent implements
 Boolean enableCors = getAndRemoveParameter(parameters, "enableCORS", 
Boolean.class, false);
 HeaderFilterStrategy headerFilterStrategy = 
resolveAndRemoveReferenceParameter(parameters, "headerFilterStrategy", 
HeaderFilterStrategy.class);
 UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, 
"urlRewrite", UrlRewrite.class);
-SSLContextParameters sslContextParameters = 
resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", 
SSLContextParameters.class);
+SSLContextParameters sslContextParameters = 
resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", 
SSLContextParameters.class);
 SSLContextParameters ssl = sslContextParameters != null ? 
sslContextParameters : this.sslContextParameters;
 String proxyHost = getAndRemoveParameter(parameters, "proxyHost", 
String.class, getProxyHost());
 Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", 
Integer.class, getProxyPort());

http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
index 9d2a291..dc7ea51 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
@@ -126,10 +126,6 @@ public abstract class JettyHttpEndpoint extends 
HttpCommonEndpoint {
 @UriParam(label = "security",
 description = "To configure security using SSLContextParameters")
 private SSLContextParameters sslContextParameters;
-@UriParam(label = "security",
-description = "To configure security using SSLContextParameters")
-@Deprecated
-private String sslContextParametersRef;
 @UriParam(label = "producer", description = "Configure a cookie handler to 
maintain a HTTP session")
 private CookieHandler cookieHandler;
 
@@ -367,19 +363,6 @@ public abstract class JettyHttpEndpoint extends 
HttpCommonEndpoint {
 this.sslContextParameters = sslContextParameters;
 }
 
-@Deprecated
-public String getSslContextParametersRef() {
-return sslContextParametersRef;
-}
-
-/**
- * To configure security using SSLContextParameters
- */
-@Deprecated
-public void setSslContextParametersRef(String sslContextParametersRef) {
-this.sslContextParametersRef = sslContextParametersRef;
-}
-
 public Integer getHttpClientMinThreads() {
 return httpClientMinThreads;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty9/src/main/docs/jetty-component.adoc

[5/7] camel git commit: align tests with docs

[janstey]

align tests with docs


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

Branch: refs/heads/master
Commit: 039e672990e70f777db4d9e4d09cd1f613d10666
Parents: ca4f856
Author: Jonathan Anstey 
Authored: Fri Apr 7 14:54:15 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 14:54:15 2017 -0230

--
 .../ahc/AhcComponentClientConfigSslContextParametersTest.java| 4 ++--
 .../component/ahc/AhcProduceSSLContextParametersGetTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/039e6729/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index cce907c..dc429cd 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -28,11 +28,11 @@ public class 
AhcComponentClientConfigSslContextParametersTest extends AhcCompone
 }
 
 protected String getTestServerEndpointUri() {
-return super.getTestServerEndpointUri() + 
"?sslContextParametersRef=sslContextParameters";
+return super.getTestServerEndpointUri() + 
"?sslContextParameters=sslContextParameters";
 }
 
 protected String getTestServerEndpointTwoUri() {
-return super.getTestServerEndpointTwoUri() + 
"?sslContextParametersRef=sslContextParameters";
+return super.getTestServerEndpointTwoUri() + 
"?sslContextParameters=sslContextParameters";
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/039e6729/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index a5ed453..4737415 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.ahc;
 public class AhcProduceSSLContextParametersGetTest extends AhcProduceGetTest {
 
 protected String getTestServerEndpointUri() {
-return super.getTestServerEndpointUri() + 
"?sslContextParametersRef=sslContextParameters";
+return super.getTestServerEndpointUri() + 
"?sslContextParameters=#sslContextParameters";
 }
 
 protected String getAhcEndpointUri() {

[3/7] camel git commit: fix sslContextParameters prop in test

[janstey]

fix sslContextParameters prop in test


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

Branch: refs/heads/master
Commit: 296fc70aab4b52c04a72efea70eaa62cfb9ce7f0
Parents: 8bd8ee1
Author: Jonathan Anstey 
Authored: Fri Apr 7 12:07:35 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 14:44:59 2017 -0230

--
 .../camel/component/http4/HttpsSslContextParametersGetTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/296fc70a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
index abd3aaa..d9b9bcf 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
@@ -68,7 +68,7 @@ public class HttpsSslContextParametersGetTest extends 
HttpsGetTest {
 public void httpsGet() throws Exception {
 
 Exchange exchange = template.request("https4://127.0.0.1:" + 
localServer.getLocalPort() 
-+ 
"/mail/?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters",
 new Processor() {
++ 
"/mail/?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters",
 new Processor() {
 public void process(Exchange exchange) throws Exception {
 }
 });

[7/7] camel git commit: should be using references everywhere

[janstey]

should be using references everywhere


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

Branch: refs/heads/master
Commit: 179399aa88576e72d77450518b5824a07bed492c
Parents: d969258
Author: Jonathan Anstey 
Authored: Fri Apr 7 15:14:18 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 15:14:18 2017 -0230

--
 .../AhcComponentClientConfigSslContextParametersTest.java |  4 ++--
 .../component/http4/HttpsSslContextParametersGetTest.java |  2 +-
 .../apache/camel/component/http4/CamelHttp4Context.xml|  8 
 .../camel-jetty9/src/main/docs/jetty-component.adoc   |  2 +-
 .../jetty/HttpsRouteSslContextParametersInUriTest.java|  6 +++---
 .../JettyHttpsProducerSslContextInUriTest.java| 10 +-
 6 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index dc429cd..f0cc8b3 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -28,11 +28,11 @@ public class 
AhcComponentClientConfigSslContextParametersTest extends AhcCompone
 }
 
 protected String getTestServerEndpointUri() {
-return super.getTestServerEndpointUri() + 
"?sslContextParameters=sslContextParameters";
+return super.getTestServerEndpointUri() + 
"?sslContextParameters=#sslContextParameters";
 }
 
 protected String getTestServerEndpointTwoUri() {
-return super.getTestServerEndpointTwoUri() + 
"?sslContextParameters=sslContextParameters";
+return super.getTestServerEndpointTwoUri() + 
"?sslContextParameters=#sslContextParameters";
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
index d9b9bcf..0071290 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
@@ -68,7 +68,7 @@ public class HttpsSslContextParametersGetTest extends 
HttpsGetTest {
 public void httpsGet() throws Exception {
 
 Exchange exchange = template.request("https4://127.0.0.1:" + 
localServer.getLocalPort() 
-+ 
"/mail/?x509HostnameVerifier=x509HostnameVerifier=sslContextParameters",
 new Processor() {
++ 
"/mail/?x509HostnameVerifier=x509HostnameVerifier=#sslContextParameters",
 new Processor() {
 public void process(Exchange exchange) throws Exception {
 }
 });

http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
--
diff --git 
a/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
 
b/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
index 221947b..7969a8b 100644
--- 
a/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
+++ 
b/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
@@ -60,18 +60,18 @@
   http://camel.apache.org/schema/spring;>
 
   
-  
+  
 
 
   
-  
+  
 
 
   
-  
+  
 
   
 
   
 
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-jetty9/src/main/docs/jetty-component.adoc

[2/7] camel git commit: doc update

[janstey]

doc update


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

Branch: refs/heads/master
Commit: ca4f8567814c5679fb8a4ef8056a463400b0a286
Parents: 19f6a4e
Author: Jonathan Anstey 
Authored: Fri Apr 7 14:44:53 2017 -0230
Committer: Jonathan Anstey 
Committed: Fri Apr 7 14:44:59 2017 -0230

--
 components/camel-jetty9/src/main/docs/jetty-component.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ca4f8567/components/camel-jetty9/src/main/docs/jetty-component.adoc
--
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc 
b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index 770a6a9..4052e39 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -117,7 +117,7 @@ with the following path and query parameters:
 | **httpUri** | *Required* The url of the HTTP endpoint to call. |  | URI
 |===
 
- Query Parameters (55 parameters):
+ Query Parameters (54 parameters):
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===

[2/3] camel git commit: update jetty 9.2.x version

[janstey]

update jetty 9.2.x version


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

Branch: refs/heads/camel-2.18.x
Commit: 2beb05b90cdbdb8cd340361bc31209ad428ed30f
Parents: 6952e07
Author: Jonathan Anstey 
Authored: Mon Mar 13 17:36:14 2017 -0230
Committer: Jonathan Anstey 
Committed: Mon Mar 13 17:38:23 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/2beb05b9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f454727..9764dc6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -323,7 +323,7 @@
 2.8.1_1
 2.11
 6.1.26_4
-9.2.19.v20160908
+9.2.21.v20170120
 ${jetty9-version}
 ${jetty-version}
 org.eclipse.jetty

[1/3] camel git commit: update jetty 9.2.x version

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x a3a30e929 -> 8aa189cf7
  refs/heads/camel-2.18.x 6952e0700 -> 2beb05b90
  refs/heads/master f8234821b -> 3ce4ad86e


update jetty 9.2.x version


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

Branch: refs/heads/master
Commit: 3ce4ad86e1440dd171f6d3358c65318745fa2a55
Parents: f823482
Author: Jonathan Anstey 
Authored: Mon Mar 13 17:36:14 2017 -0230
Committer: Jonathan Anstey 
Committed: Mon Mar 13 17:36:14 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/3ce4ad86/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b30738a..cf601ce 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -336,7 +336,7 @@
 2.8.1_1
 2.11
 6.1.26_4
-9.2.19.v20160908
+9.2.21.v20170120
 
 
 9.3.14.v20161028

[3/3] camel git commit: update jetty 9.2.x version

[janstey]

update jetty 9.2.x version


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

Branch: refs/heads/camel-2.17.x
Commit: 8aa189cf78b0968765b703210484ab38a3241d8a
Parents: a3a30e9
Author: Jonathan Anstey 
Authored: Mon Mar 13 17:36:14 2017 -0230
Committer: Jonathan Anstey 
Committed: Mon Mar 13 17:39:53 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8aa189cf/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d4e0b36..4bd6b6a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -303,7 +303,7 @@
 6.1.26_4
 6.1.26
 8.1.17.v20150415
-9.2.17.v20160517
+9.2.21.v20170120
 ${jetty8-version}
 
 8.1.16.v20140903

camel git commit: remove test options

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master bd1274ce4 -> 0c0c74876


remove test options


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

Branch: refs/heads/master
Commit: 0c0c74876fd0c1e9c31636d90ba25ceb8e81ad76
Parents: bd1274c
Author: Jonathan Anstey 
Authored: Mon Mar 6 10:47:20 2017 -0330
Committer: Jonathan Anstey 
Committed: Mon Mar 6 10:47:20 2017 -0330

--
 .../tmp/test-options.properties | 67 
 1 file changed, 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0c0c7487/components/camel-box/camel-box-component/tmp/test-options.properties
--
diff --git 
a/components/camel-box/camel-box-component/tmp/test-options.properties 
b/components/camel-box/camel-box-component/tmp/test-options.properties
deleted file mode 100644
index 9cee863..000
--- a/components/camel-box/camel-box-component/tmp/test-options.properties
+++ /dev/null
@@ -1,67 +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.
-#
-
-###
-## Authentication properties for Box Component
-###
-
-#
-## Authentication properties for Box Component using STANDARD_AUTHENTICATION
-#
-authenticationType=STANDARD_AUTHENTICATION
-## User name and password
-## Create a free developer account on http://developers.box.com/ and provide 
user name password
-userName=punkhor...@gmail.com
-userPassword=RedHat12!@
-## Application client id and secret
-## Create a test Box.com application and provide its clientId and clientSecret
-clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-
-###
-## Authentication properties for Box Component using 
APP_ENTERPRISE_AUTHENTICATION
-###
-#authenticationType=APP_ENTERPRISE_AUTHENTICATION
-#enterpriseId=8962085
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-#publicKeyId=b22nf9qt
-#privateKeyFile=/Volumes/Development/Dev/box-java-sdk/private_key.pem
-#privateKeyPassword=RedHat12!@
-#encryptionAlgorithm=RSA_SHA_256
-#maxCacheEntries=100
-### Application client id and secret
-### Create a test Box.com application and provide its clientId and clientSecret
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-
-###
-## Authentication properties for Box Component using APP_USER_AUTHENTICATION
-###
-#authenticationType=APP_USER_AUTHENTICATION
-#userId=punkhor...@gmail.com
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-#publicKeyId=b22nf9qt
-#privateKeyFile=/Volumes/Development/Dev/box-java-sdk/private_key.pem
-#privateKeyPassword=RedHat12!@
-#encryptionAlgorithm=RSA_SHA_256
-#maxCacheEntries=100
-### Application client id and secret
-### Create a test Box.com application and provide its clientId and clientSecret
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr

[1/3] camel git commit: use camel BOM for dependency versions

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 7dfdefb8b -> 25877b6b7


use camel BOM for dependency versions


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

Branch: refs/heads/master
Commit: bbb6502199dfb945073585041eb8f05589dbfb99
Parents: 8b2d8e8
Author: Jonathan Anstey 
Authored: Mon Oct 17 14:26:23 2016 -0230
Committer: Jonathan Anstey 
Committed: Mon Oct 17 14:26:29 2016 -0230

--
 .../__artifactId__-component/pom.xml|  4 
 .../src/main/resources/archetype-resources/pom.xml  | 12 
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bbb65021/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index a9ac553..0b8210e 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -44,7 +44,6 @@
 
   org.apache.camel
   camel-core
-  ${camelVersion}
 
 
   ${groupId}
@@ -56,14 +55,12 @@
 
   org.apache.camel
   apt
-  ${camelVersion}
 
 
 
 
   org.apache.camel
   spi-annotations
-  ${camelVersion}
   provided
 
 
@@ -97,7 +94,6 @@
 
   org.apache.camel
   camel-test
-  ${camelVersion}
   test
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/bbb65021/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
index 4803a68..bf2c88c 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
@@ -33,6 +33,18 @@
 ${artifactId}-api
   
 
+  
+
+  
+org.apache.camel
+camel-parent
+${camel-version}
+import
+pom
+  
+
+  
+
   
 
   

[2/3] camel git commit: don't hardcode camel version in camel-archetype-api-component projects

[janstey]

don't hardcode camel version in camel-archetype-api-component projects


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

Branch: refs/heads/master
Commit: 8b2d8e8a90ee856784a4c651ceaf7172aced33dd
Parents: 7dfdefb
Author: Jonathan Anstey 
Authored: Mon Oct 17 14:20:46 2016 -0230
Committer: Jonathan Anstey 
Committed: Mon Oct 17 14:26:29 2016 -0230

--
 .../__artifactId__-component/pom.xml   | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8b2d8e8a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index feedd0e..a9ac553 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -35,6 +35,7 @@
 ${name}
 ${package}
 ${package}.internal
+${camel-version}
 UTF-8
 UTF-8
   
@@ -43,7 +44,7 @@
 
   org.apache.camel
   camel-core
-  ${camel-version}
+  ${camelVersion}
 
 
   ${groupId}
@@ -55,14 +56,14 @@
 
   org.apache.camel
   apt
-  ${camel-version}
+  ${camelVersion}
 
 
 
 
   org.apache.camel
   spi-annotations
-  ${camel-version}
+  ${camelVersion}
   provided
 
 
@@ -96,7 +97,7 @@
 
   org.apache.camel
   camel-test
-  ${camel-version}
+  ${camelVersion}
   test
 
   
@@ -140,7 +141,7 @@
 
   ${componentPackage}.api;version=${project.version},
   ${componentPackage};version=${project.version},
-  org.apache.camel.*;version=${camel-version}
+  org.apache.camel.*;version=${camelVersion}
 
 ${outPackage}
 Apache Camel
@@ -239,7 +240,7 @@
   
 org.apache.camel
 camel-package-maven-plugin
-${camel-version}
+${camelVersion}
 
   
 prepare
@@ -296,7 +297,7 @@
 
   org.apache.camel
   camel-api-component-maven-plugin
-  ${camel-version}
+  ${camelVersion}
   
 ${schemeName}
 ${componentName}
@@ -314,7 +315,7 @@
   
 org.apache.camel
 camel-api-component-maven-plugin
-${camel-version}
+${camelVersion}
 
   ${schemeName}
   ${componentName}

[3/5] camel git commit: CAMEL-10381 - fix NPE from calendar component configuration

[janstey]

CAMEL-10381 - fix NPE from calendar component configuration


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

Branch: refs/heads/camel-2.17.x
Commit: 37c1da9552b9b526358b93ad25980b60f4506641
Parents: 65cb2c3
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:32:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:30 2016 -0230

--
 .../calendar/GoogleCalendarComponent.java   | 15 +++--
 .../google/calendar/GoogleCalendarEndpoint.java |  2 +-
 .../calendar/CalendarConfigurationTest.java | 66 
 3 files changed, 76 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37c1da95/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index d140ee4..84e3092 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -44,13 +44,13 @@ public class GoogleCalendarComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/37c1da95/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index e955f6c..7ad7f9d 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -111,7 +111,7 @@ public class GoogleCalendarEndpoint extends 
AbstractApiEndpointhttp://git-wip-us.apache.org/repos/asf/camel/blob/37c1da95/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
new file mode 100644
index 000..a70934e
--- /dev/null
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.calendar;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
+import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
+private static final String PATH_PREFIX = 

[2/5] camel git commit: add missed test case

[janstey]

add missed test case


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

Branch: refs/heads/camel-2.17.x
Commit: 65cb2c3d5ab6cfdaed2038ce94035a1e7486b793
Parents: 4f39c68
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:24 2016 -0230

--
 .../google/drive/DriveConfigurationTest.java| 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/65cb2c3d/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
new file mode 100644
index 000..3d113d3
--- /dev/null
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.drive;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import 
org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DriveConfigurationTest extends AbstractGoogleDriveTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DriveConfigurationTest.class);
+private static final String PATH_PREFIX = 
GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName();
+private static final String TEST_URI = "google-drive://" + PATH_PREFIX + 
"/copy?clientId=a=b=c=d=e";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+final CamelContext context = new DefaultCamelContext(createRegistry());
+
+// add GoogleDriveComponent to Camel context but don't set up 
configuration
+final GoogleDriveComponent component = new 
GoogleDriveComponent(context);
+context.addComponent("google-drive", component);
+
+return context;
+}
+
+@Test
+public void testConfiguration() throws Exception {
+GoogleDriveEndpoint endpoint = getMandatoryEndpoint(TEST_URI, 
GoogleDriveEndpoint.class);
+GoogleDriveConfiguration configuration = endpoint.getConfiguration();
+assertNotNull(configuration);
+assertEquals("a", configuration.getClientId());
+assertEquals("b", configuration.getClientSecret());
+assertEquals("c", configuration.getApplicationName());
+assertEquals("d", configuration.getAccessToken());
+assertEquals("e", configuration.getRefreshToken());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct://COPY").to(TEST_URI);
+}
+};
+}
+}

[1/5] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 592e7cf7d -> 95a3166d8


CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.17.x
Commit: 4f39c68f2840423141ae0b23cba55c2a92df8755
Parents: 592e7cf
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:27 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:15 2016 -0230

--
 .../component/google/drive/GoogleDriveComponent.java  | 10 +++---
 .../camel/component/google/drive/GoogleDriveEndpoint.java |  2 +-
 .../component/google/drive/GoogleDriveFilesConverter.java |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4f39c68f/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 2554d0e..84dc9e2 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -44,10 +44,11 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/4f39c68f/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index ede52d5..b80a2df 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -124,7 +124,7 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[4/5] camel git commit: fix test error

[janstey]

fix test error


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

Branch: refs/heads/camel-2.17.x
Commit: a4d32c07c2b4dccd85fb861b1c667dd5c91ddc91
Parents: 37c1da9
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:36:18 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:47:36 2016 -0230

--
 .../calendar/CalendarConfigurationTest.java   | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4d32c07/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index a70934e..c22915f 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -16,28 +16,44 @@
  */
 package org.apache.camel.component.google.calendar;
 
+import java.util.Random;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.api.services.calendar.model.Calendar;
+
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
 private static final String PATH_PREFIX = 
GoogleCalendarApiCollection.getCollection().getApiName(CalendarCalendarsApiMethod.class).getName();
 private static final String TEST_URI = "google-calendar://" + PATH_PREFIX 
+ 
"/get?clientId=a=b=c=d=e";
 
+@Before
+@Override
+public void createTestCalendar() {
+}
+
+@After
+@Override
+public void deleteTestCalendar() {
+}
+
 @Override
 protected CamelContext createCamelContext() throws Exception {
 final CamelContext context = new DefaultCamelContext(createRegistry());
 
 // add GoogleCalendarComponent to Camel context but don't set up 
configuration
 final GoogleCalendarComponent component = new 
GoogleCalendarComponent(context);
-context.addComponent("google-drive", component);
+context.addComponent("google-calendar", component);
 
 return context;
 }

[10/12] camel git commit: CAMEL-10381 - fix NPE from calendar component configuration

[janstey]

CAMEL-10381 - fix NPE from calendar component configuration


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

Branch: refs/heads/camel-2.18.x
Commit: 6d663971259650b626303ca30e77004abcdd3b0a
Parents: fbcaded
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:32:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:21 2016 -0230

--
 .../calendar/GoogleCalendarComponent.java   | 15 +++--
 .../google/calendar/GoogleCalendarEndpoint.java |  2 +-
 .../calendar/CalendarConfigurationTest.java | 66 
 3 files changed, 76 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6d663971/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index d140ee4..84e3092 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -44,13 +44,13 @@ public class GoogleCalendarComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/6d663971/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index e955f6c..7ad7f9d 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -111,7 +111,7 @@ public class GoogleCalendarEndpoint extends 
AbstractApiEndpointhttp://git-wip-us.apache.org/repos/asf/camel/blob/6d663971/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
new file mode 100644
index 000..a70934e
--- /dev/null
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.calendar;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
+import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
+private static final String PATH_PREFIX = 

[01/12] camel git commit: remove non spring boot compatible starters

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 37a12df6a -> b15c2f5d6
  refs/heads/master 5d79ddc35 -> 471e25a31


remove non spring boot compatible starters


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

Branch: refs/heads/master
Commit: 404ecc5625b34dd011f5257206cda4d60341bfac
Parents: 5d79ddc
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:25:12 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 19:25:12 2016 -0230

--
 components-starter/pom.xml | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/404ecc56/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 4aca1b4..72bf37a 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,14 +77,12 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
-camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
-camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -107,7 +105,6 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
-camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -143,7 +140,6 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
-camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -157,7 +153,6 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
-camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -215,7 +210,6 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
-camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -245,7 +239,6 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
-camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -269,8 +262,6 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
-camel-test-starter
-camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

[12/12] camel git commit: fix CS

[janstey]

fix CS


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

Branch: refs/heads/camel-2.18.x
Commit: b15c2f5d62eb0285c5d48b9e9199e48abce365aa
Parents: 8de429e
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:37:48 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:21 2016 -0230

--
 .../component/google/calendar/CalendarConfigurationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b15c2f5d/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index c22915f..6777434 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.google.calendar;
 
 import java.util.Random;
 
+import com.google.api.services.calendar.model.Calendar;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
@@ -29,8 +31,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.api.services.calendar.model.Calendar;
-
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);

[05/12] camel git commit: fix test error

[janstey]

fix test error


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

Branch: refs/heads/master
Commit: 329aca67f5d2fc0d4eaa8226a346c7c4c10ed871
Parents: d843200
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:36:18 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:36:18 2016 -0230

--
 .../calendar/CalendarConfigurationTest.java   | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/329aca67/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index a70934e..c22915f 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -16,28 +16,44 @@
  */
 package org.apache.camel.component.google.calendar;
 
+import java.util.Random;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.api.services.calendar.model.Calendar;
+
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
 private static final String PATH_PREFIX = 
GoogleCalendarApiCollection.getCollection().getApiName(CalendarCalendarsApiMethod.class).getName();
 private static final String TEST_URI = "google-calendar://" + PATH_PREFIX 
+ 
"/get?clientId=a=b=c=d=e";
 
+@Before
+@Override
+public void createTestCalendar() {
+}
+
+@After
+@Override
+public void deleteTestCalendar() {
+}
+
 @Override
 protected CamelContext createCamelContext() throws Exception {
 final CamelContext context = new DefaultCamelContext(createRegistry());
 
 // add GoogleCalendarComponent to Camel context but don't set up 
configuration
 final GoogleCalendarComponent component = new 
GoogleCalendarComponent(context);
-context.addComponent("google-drive", component);
+context.addComponent("google-calendar", component);
 
 return context;
 }

[03/12] camel git commit: add missed test case

[janstey]

add missed test case


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

Branch: refs/heads/master
Commit: d0af43db34f10c4a3c1bd6efacd668b398e9ca4d
Parents: fab550a
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 19:47:58 2016 -0230

--
 .../google/drive/DriveConfigurationTest.java| 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d0af43db/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
new file mode 100644
index 000..3d113d3
--- /dev/null
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.drive;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import 
org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DriveConfigurationTest extends AbstractGoogleDriveTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DriveConfigurationTest.class);
+private static final String PATH_PREFIX = 
GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName();
+private static final String TEST_URI = "google-drive://" + PATH_PREFIX + 
"/copy?clientId=a=b=c=d=e";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+final CamelContext context = new DefaultCamelContext(createRegistry());
+
+// add GoogleDriveComponent to Camel context but don't set up 
configuration
+final GoogleDriveComponent component = new 
GoogleDriveComponent(context);
+context.addComponent("google-drive", component);
+
+return context;
+}
+
+@Test
+public void testConfiguration() throws Exception {
+GoogleDriveEndpoint endpoint = getMandatoryEndpoint(TEST_URI, 
GoogleDriveEndpoint.class);
+GoogleDriveConfiguration configuration = endpoint.getConfiguration();
+assertNotNull(configuration);
+assertEquals("a", configuration.getClientId());
+assertEquals("b", configuration.getClientSecret());
+assertEquals("c", configuration.getApplicationName());
+assertEquals("d", configuration.getAccessToken());
+assertEquals("e", configuration.getRefreshToken());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct://COPY").to(TEST_URI);
+}
+};
+}
+}

[08/12] camel git commit: add missed test case

[janstey]

add missed test case


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

Branch: refs/heads/camel-2.18.x
Commit: fbcaded8349754e574d6900dca863bbdec71b6c9
Parents: 645d024
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:20 2016 -0230

--
 .../google/drive/DriveConfigurationTest.java| 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fbcaded8/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
new file mode 100644
index 000..3d113d3
--- /dev/null
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.drive;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
+import 
org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DriveConfigurationTest extends AbstractGoogleDriveTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DriveConfigurationTest.class);
+private static final String PATH_PREFIX = 
GoogleDriveApiCollection.getCollection().getApiName(DriveFilesApiMethod.class).getName();
+private static final String TEST_URI = "google-drive://" + PATH_PREFIX + 
"/copy?clientId=a=b=c=d=e";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+final CamelContext context = new DefaultCamelContext(createRegistry());
+
+// add GoogleDriveComponent to Camel context but don't set up 
configuration
+final GoogleDriveComponent component = new 
GoogleDriveComponent(context);
+context.addComponent("google-drive", component);
+
+return context;
+}
+
+@Test
+public void testConfiguration() throws Exception {
+GoogleDriveEndpoint endpoint = getMandatoryEndpoint(TEST_URI, 
GoogleDriveEndpoint.class);
+GoogleDriveConfiguration configuration = endpoint.getConfiguration();
+assertNotNull(configuration);
+assertEquals("a", configuration.getClientId());
+assertEquals("b", configuration.getClientSecret());
+assertEquals("c", configuration.getApplicationName());
+assertEquals("d", configuration.getAccessToken());
+assertEquals("e", configuration.getRefreshToken());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct://COPY").to(TEST_URI);
+}
+};
+}
+}

[06/12] camel git commit: fix CS

[janstey]

fix CS


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

Branch: refs/heads/master
Commit: 471e25a31c95aabc9718430f2c1fed6a88677c1c
Parents: 329aca6
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:37:48 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:37:48 2016 -0230

--
 .../component/google/calendar/CalendarConfigurationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/471e25a3/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index c22915f..6777434 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.google.calendar;
 
 import java.util.Random;
 
+import com.google.api.services.calendar.model.Calendar;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
@@ -29,8 +31,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.api.services.calendar.model.Calendar;
-
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);

[04/12] camel git commit: CAMEL-10381 - fix NPE from calendar component configuration

[janstey]

CAMEL-10381 - fix NPE from calendar component configuration


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

Branch: refs/heads/master
Commit: d84320047b3070e99a48e5d478fd9fecd7174b07
Parents: d0af43d
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:32:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:32:37 2016 -0230

--
 .../calendar/GoogleCalendarComponent.java   | 15 +++--
 .../google/calendar/GoogleCalendarEndpoint.java |  2 +-
 .../calendar/CalendarConfigurationTest.java | 66 
 3 files changed, 76 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d8432004/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index d140ee4..84e3092 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -44,13 +44,13 @@ public class GoogleCalendarComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/d8432004/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
--
diff --git 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index e955f6c..7ad7f9d 100644
--- 
a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ 
b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -111,7 +111,7 @@ public class GoogleCalendarEndpoint extends 
AbstractApiEndpointhttp://git-wip-us.apache.org/repos/asf/camel/blob/d8432004/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
new file mode 100644
index 000..a70934e
--- /dev/null
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.google.calendar;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
+import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
+private static final String PATH_PREFIX = 

[09/12] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.18.x
Commit: 645d024b442bb130eaebbff41a494ac313bc6868
Parents: 7a1ee6b
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:27 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:20 2016 -0230

--
 .../component/google/drive/GoogleDriveComponent.java  | 10 +++---
 .../camel/component/google/drive/GoogleDriveEndpoint.java |  2 +-
 .../component/google/drive/GoogleDriveFilesConverter.java |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/645d024b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 2554d0e..84dc9e2 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -44,10 +44,11 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/645d024b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index ede52d5..b80a2df 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -124,7 +124,7 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[11/12] camel git commit: fix test error

[janstey]

fix test error


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

Branch: refs/heads/camel-2.18.x
Commit: 8de429e1236f1f2fb24098a924eb651ede85adc8
Parents: 6d66397
Author: Jonathan Anstey 
Authored: Tue Oct 11 23:36:18 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:21 2016 -0230

--
 .../calendar/CalendarConfigurationTest.java   | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8de429e1/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
--
diff --git 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
index a70934e..c22915f 100644
--- 
a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
+++ 
b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java
@@ -16,28 +16,44 @@
  */
 package org.apache.camel.component.google.calendar;
 
+import java.util.Random;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import 
org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import 
org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.api.services.calendar.model.Calendar;
+
 public class CalendarConfigurationTest extends 
AbstractGoogleCalendarTestSupport {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CalendarConfigurationTest.class);
 private static final String PATH_PREFIX = 
GoogleCalendarApiCollection.getCollection().getApiName(CalendarCalendarsApiMethod.class).getName();
 private static final String TEST_URI = "google-calendar://" + PATH_PREFIX 
+ 
"/get?clientId=a=b=c=d=e";
 
+@Before
+@Override
+public void createTestCalendar() {
+}
+
+@After
+@Override
+public void deleteTestCalendar() {
+}
+
 @Override
 protected CamelContext createCamelContext() throws Exception {
 final CamelContext context = new DefaultCamelContext(createRegistry());
 
 // add GoogleCalendarComponent to Camel context but don't set up 
configuration
 final GoogleCalendarComponent component = new 
GoogleCalendarComponent(context);
-context.addComponent("google-drive", component);
+context.addComponent("google-calendar", component);
 
 return context;
 }

[07/12] camel git commit: remove non spring boot compatible starters

[janstey]

remove non spring boot compatible starters


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

Branch: refs/heads/camel-2.18.x
Commit: 7a1ee6bedc1c3572e7abdb0262f08d3435e5d293
Parents: 37a12df
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:25:12 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 23:44:20 2016 -0230

--
 components-starter/pom.xml | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7a1ee6be/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index e8a168a..c284305 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,14 +77,12 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
-camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
-camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -107,7 +105,6 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
-camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -143,7 +140,6 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
-camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -157,7 +153,6 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
-camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -215,7 +210,6 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
-camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -245,7 +239,6 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
-camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -269,8 +262,6 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
-camel-test-starter
-camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

[02/12] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/master
Commit: fab550a7e21467acff6307e707c09d4a90820267
Parents: 404ecc5
Author: Jonathan Anstey 
Authored: Tue Oct 11 19:47:27 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 19:47:27 2016 -0230

--
 .../component/google/drive/GoogleDriveComponent.java  | 10 +++---
 .../camel/component/google/drive/GoogleDriveEndpoint.java |  2 +-
 .../component/google/drive/GoogleDriveFilesConverter.java |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fab550a7/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 2554d0e..84dc9e2 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -44,10 +44,11 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/fab550a7/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index ede52d5..b80a2df 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -124,7 +124,7 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[3/3] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.17.x
Commit: 592e7cf7de4cbe64066b3f814ced35f4917767ac
Parents: 9fc87f2
Author: Jonathan Anstey 
Authored: Tue Oct 11 16:39:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 16:43:42 2016 -0230

--
 .../google/mail/GoogleMailComponent.java| 10 ++-
 .../google/mail/GoogleMailEndpoint.java |  2 +-
 .../google/mail/GmailConfigurationTest.java | 73 
 3 files changed, 81 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/592e7cf7/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index b6896d6..7871a51 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -45,10 +45,11 @@ public class GoogleMailComponent extends 
AbstractApiComponent

[1/3] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 9fc87f2c4 -> 592e7cf7d
  refs/heads/camel-2.18.x fa1789a36 -> 37a12df6a
  refs/heads/master da614b730 -> 5d79ddc35


CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/master
Commit: 5d79ddc352d5a5266d359dc1c2a597184343abd4
Parents: da614b7
Author: Jonathan Anstey 
Authored: Tue Oct 11 16:39:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 16:39:15 2016 -0230

--
 components-starter/pom.xml  |  9 +++
 .../google/mail/GoogleMailComponent.java| 10 ++-
 .../google/mail/GoogleMailEndpoint.java |  2 +-
 .../google/mail/GmailConfigurationTest.java | 73 
 4 files changed, 90 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5d79ddc3/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 72bf37a..4aca1b4 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,12 +77,14 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
+camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
+camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -105,6 +107,7 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
+camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -140,6 +143,7 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
+camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -153,6 +157,7 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
+camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -210,6 +215,7 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
+camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -239,6 +245,7 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
+camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -262,6 +269,8 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
+camel-test-starter
+camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

http://git-wip-us.apache.org/repos/asf/camel/blob/5d79ddc3/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index b6896d6..7871a51 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -45,10 +45,11 @@ public class GoogleMailComponent extends 
AbstractApiComponent

[2/3] camel git commit: CAMEL-10381 - fix NPE from component configuration

[janstey]

CAMEL-10381 - fix NPE from component configuration


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

Branch: refs/heads/camel-2.18.x
Commit: 37a12df6a3d6780495b249b959a25966b62afb69
Parents: fa1789a
Author: Jonathan Anstey 
Authored: Tue Oct 11 16:39:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Oct 11 16:41:00 2016 -0230

--
 components-starter/pom.xml  |  9 +++
 .../google/mail/GoogleMailComponent.java| 10 ++-
 .../google/mail/GoogleMailEndpoint.java |  2 +-
 .../google/mail/GmailConfigurationTest.java | 73 
 4 files changed, 90 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37a12df6/components-starter/pom.xml
--
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index c284305..e8a168a 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -77,12 +77,14 @@
 camel-beanio-starter
 camel-beanstalk-starter
 camel-bindy-starter
+camel-blueprint-starter
 camel-boon-starter
 camel-box-starter
 camel-braintree-starter
 camel-cache-starter
 camel-cassandraql-starter
 camel-castor-starter
+camel-cdi-starter
 camel-chronicle-starter
 camel-chunk-starter
 camel-cm-sms-starter
@@ -105,6 +107,7 @@
 camel-dropbox-starter
 camel-eclipse-starter
 camel-ehcache-starter
+camel-ejb-starter
 camel-elasticsearch-starter
 camel-elsql-starter
 camel-etcd-starter
@@ -140,6 +143,7 @@
 camel-http-starter
 camel-http4-starter
 camel-hystrix-starter
+camel-ibatis-starter
 camel-ical-starter
 camel-ignite-starter
 camel-infinispan-starter
@@ -153,6 +157,7 @@
 camel-jaxb-starter
 camel-jbpm-starter
 camel-jcache-starter
+camel-jclouds-starter
 camel-jcr-starter
 camel-jdbc-starter
 camel-jetty-common-starter
@@ -210,6 +215,7 @@
 camel-pgevent-starter
 camel-printer-starter
 camel-protobuf-starter
+camel-quartz-starter
 camel-quartz2-starter
 camel-quickfix-starter
 camel-rabbitmq-starter
@@ -239,6 +245,7 @@
 camel-snmp-starter
 camel-soap-starter
 camel-solr-starter
+camel-spark-rest-starter
 camel-spark-starter
 camel-splunk-starter
 camel-spring-batch-starter
@@ -262,6 +269,8 @@
 camel-tagsoup-starter
 camel-tarfile-starter
 camel-telegram-starter
+camel-test-starter
+camel-testng-starter
 camel-twitter-starter
 camel-undertow-starter
 camel-univocity-parsers-starter

http://git-wip-us.apache.org/repos/asf/camel/blob/37a12df6/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index b6896d6..7871a51 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -45,10 +45,11 @@ public class GoogleMailComponent extends 
AbstractApiComponent

[1/2] camel git commit: update to google cal v3-rev214-1.22.0

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 37c1b6617 -> b462bd745


update to google cal v3-rev214-1.22.0


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

Branch: refs/heads/master
Commit: 11fe2a5b2d2973b70fdadc062df325699c89d3dc
Parents: 37c1b66
Author: Jonathan Anstey 
Authored: Fri Oct 7 14:34:52 2016 -0230
Committer: Jonathan Anstey 
Committed: Fri Oct 7 14:34:52 2016 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/11fe2a5b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index adbc456..20e59be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -223,7 +223,7 @@
 19.0
 1.22.0
 
v2-rev234-1.22.0
-
v3-rev208-1.22.0
+
v3-rev214-1.22.0
 
v1-rev48-1.22.0
 0.27
 2.3.25

[2/2] camel git commit: update to google drive v2-rev240-1.22.0

[janstey]

update to google drive v2-rev240-1.22.0


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

Branch: refs/heads/master
Commit: b462bd745a39bcc826647d38990e5dc0715869c0
Parents: 11fe2a5
Author: Jonathan Anstey 
Authored: Fri Oct 7 14:37:14 2016 -0230
Committer: Jonathan Anstey 
Committed: Fri Oct 7 14:37:14 2016 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/b462bd74/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 20e59be..3d77d85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -222,7 +222,7 @@
 1.0.10
 19.0
 1.22.0
-
v2-rev234-1.22.0
+
v2-rev240-1.22.0
 
v3-rev214-1.22.0
 
v1-rev48-1.22.0
 0.27

camel git commit: add my public key

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 4fbc9c7d0 -> c13e2b394


add my public key


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

Branch: refs/heads/master
Commit: c13e2b394575617d361944812a0dcb10251e8ef3
Parents: 4fbc9c7
Author: Jonathan Anstey 
Authored: Fri Sep 23 09:57:31 2016 -0230
Committer: Jonathan Anstey 
Committed: Fri Sep 23 09:57:31 2016 -0230

--
 KEYS | 59 +++
 1 file changed, 59 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c13e2b39/KEYS
--
diff --git a/KEYS b/KEYS
index eda7eb7..2bf7c2b 100644
--- a/KEYS
+++ b/KEYS
@@ -1457,3 +1457,62 @@ 
leNvaMo98VMZTkFFg0c4N40D369pN6bOe+ca25bHTtR5gDBIij8PuoOxCbOgNEF4
 =FJmK
 -END PGP PUBLIC KEY BLOCK-
 
+pub   4096R/1AC2F4BA 2013-03-06
+uid  Jonathan Anstey (CODE SIGNING KEY) 
+sig 31AC2F4BA 2013-03-06  Jonathan Anstey (CODE SIGNING KEY) 

+sub   4096R/8F2837E7 2013-03-06
+sig  1AC2F4BA 2013-03-06  Jonathan Anstey (CODE SIGNING KEY) 

+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFE2oIUBEADb/1b6Ef9/zQT6u0UF0FARiq6QoAvSKseqWaqdNaiq66ROvaxB
+b6QrmqpHyz8y9/rxHLB5gJSx9jXo+vo4/FtBYM/sndSI4w4EasVLwr9cJqn3NzyM
+R++8R2YhSttfyTznADctoDfFPvFxOEiW2Y9RQ57DIphLGIRpMUhO4WOtZW/UW21D
+qqYEr5QRLnxogryNUp7gA26dnnHcjVJXOXlqSke12NIypgA78DYhml87zTgaKo+R
+TsOb7bUgzBiEIu9IJ0ScJD/85G95pLi5GlmqOXyjAXQC7sDRVA4MzywAzLxWwkdc
+fs03uoQXk0b7ECNeB+hvluf7aLfBDZI+13cRcpXfMKZ+iJNMSdUem03sUhHROPRA
+4K0VwaHYWok1CAj+70SXa2t467ZvL4utlfEc/Nx5htRKdOHXXK7vtLf1Qm2TuI+V
+mWYdKxe572tT96E9sYZuCSkCvSBKozZ7e9oeCex6gxR/VV1Nf6HHGU8z1doh+u8t
+j/4RUh29Z6pJzmcU+kNo5+3VeqZ4b2PlOkfUXNw+ev6Q6pQqYixrVq6B9bsOG7c9
+sq7i/X6IDOaa2aAmx1LCrmLwCX98AWPOzSJPt31m0D4W7Bp1dk8lAJdIg/WlIxEg
+replg5G057OYrRc2ELaB+syLWBq7SYE6RkPl1XQ97J2QqHWJUUnk/vJb+wARAQAB
+tDZKb25hdGhhbiBBbnN0ZXkgKENPREUgU0lHTklORyBLRVkpIDxqYW5zdGV5QGdt
+YWlsLmNvbT6JAjgEEwECACIFAlE2oIUCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4B
+AheAAAoJEHXtbYMawvS67fsQAIQB12GiGJOwr3yLbFXlOTh1c3LDBKahd0yWcUID
+LLQs3v+qm6siaIrrw884JHWWyxVgk0XMJk5WpRWFQyHaOeIBRNNkjg9/BhX6YUpE
+adisvKJjZLog9hpoflm7eVKSJqyufJpbDQw/5N95G11PZINVZJeizDVgVts5e3fa
+U8/nny7ln0sOVuiJx33LSl7f2q9EBwjzwOe/pYFbPLeZ4z+Xg+869w4b9JR/MTWP
+ScVi0JphQh80TvePhj44tlKQY0bWVIrEVeNDZWjqh0cGN37l/w/XmHEJv8nyP6/U
+t872WZSj8020cI5JeDMJKtV8yJ2ACZS0Y9u1/osGleDEqMO6WEM9UqRvfIGXET+P
+v2dCoqeaEGdM47M2GEJMhHnk/zvDZGE4nbp8PTv3ANXWrei+RmnOEjalONFBkAWu
+T42GrswDmOji3PXceWo9UMmAfqLErj9JcEcvjFouhuZ0fzCjAj2BxYCcFnMBaqM0
+2k+n+AGIp8AuDkrDcRJywK16CcV4PSlXTFcgfoSqIOQ1kxmU+X0qodYPGbT58WZ4
+LTZpVJy0M5YL56vpWt6O0VWpWcckPt/H/bF19hAgbGMi9hJYL2TP/yMZD6ZtYM7E
+irJLtJwbnle4AyOnJo6VnZ5UNhVKaoKEYjGZorl//X0Sd03+J2HG+Upki6tEofvd
+9lvUuQINBFE2oIUBEADJxG3GNjwcaZuW/owmf0Zhx3c9KcOxFBlzYxXDxSEfhnR7
+o19Ham/gABDUGUxA6cvjmkgnZiV3NWUhoFq9duRjg85l/vznJZ20J/Zn17xtX6KK
+BVfF6MGVWsc6wJ4VfiaoeVwN/Cf2KCYY4wdnLe95WxwONNrhIJGQy2sC+FRarmVG
+Ax4dziT4bTP5jm+Z7I634w4KaXqT82hGLzd31kxk72STXZ5p9a7pvus1I9NjQEu1
+V9yyEeQl2J9QcV5xzK2a4m8tXTRe9II+FHJvnojqtCx1zlFjp5fRqMhTbfmGVONI
+wSqCEGtdnDHYDS8E92ByyDv9/KfgdPw1VbFYLmyVky5WnUPDFyXP4snx4RiZ2JLK
+wkCluwaGeE5hJciRr9atYG6sVjF4olCFgcTaT9ww64kXWMUeTqmi13TqlK/QvaJz
+w006s2wUHg0ri4NYjUKRH7uSTwT9byYEjn7NhQjPxs/dmtUJlFO8Tx0XEQHZB36j
+Mw3XLnPBZgCmD1wJ9wlR3KvLrTSahn1ymqD2osxU2vDfUARkMG9Hp4kNhHbk2LTJ
+0j6cTQT8enueK4xp/LXAPzwRZm6Jv78aNMML1EW5NDGBme61M6zDrmSSWT3cmlA8
+Mjd8SqQdECQeuJhqfzq2eJ/xmQ+7FdkyIXunLzsZsiPVcTjeRf0APprWdNayHQAR
+AQABiQIfBBgBAgAJBQJRNqCFAhsMAAoJEHXtbYMawvS65XAP+wYxeoGPuwtYo4qo
+BTvzeg0wNCRUHCNSial36T/7y9tIUtLLkQFDIiUqrVAZizeqte1Kp7CHhsat4fV9
+YhCxV+BTJEzH3RoQk1M0zsguN+ANou1D0eeu1YBxrrgTZSzwf9U9gAjumVCGsVkT
+zENxMA9nu/KknLkEWECnpaQPk89s8ZoNuuPaoiNpd0rrexni5+TTJ6uLG/tsk/jO
+rZi9eWsP7GUZykBRumUTJHWh5+cKNOhDWt1+0pfcnCiiCLsbcGg9l72pP/4pxYXo
+pMLkMoJ8Ly0QTUlO4cNZIsqQYGdqpTI/plaJyrMTVBdwK0JorlEexICR73CYGBaz
+7jIysIIsy59QZXKaedYmhOc8OaZa/mz/IFASUV7FOpGxjSRgFtLUW74yfBj5uZJb
+Zo1Kd/yu/sg7E2/ROdvkGoARSBXyQwFw5Wp5xg7c0WZbXRXNR+Cv0Vpbe06NN0cp
+xHVxu7cc3di5+INpPywxxJIyS7JEGR/dIc4PnTb27fTc39AIQWuqKpprMQF3Oaoz
+xnNtapHHdaoFVykAN+B9czsUMH6YbDPD8cfxK97Xloh5p1aPKNtRDvgkq/l7LN9X
+YLxMAFiJVxTO4pYZx08oOSxZwc8WsRXFPYXbVgGYmGLjQIrT5TJAEmlxPFydSJcc
+advtsGhpGw2bQvnPEt4JVU+CV6/I
+=SRdD
+-END PGP PUBLIC KEY BLOCK-
+

[1/3] camel git commit: Update to google api client 1.22

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 3b60136ab -> 25cce84a7


Update to google api client 1.22


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

Branch: refs/heads/master
Commit: a1e716dfe7f67b99cd29cb73db1f68de973192ed
Parents: 3b60136
Author: Jonathan Anstey 
Authored: Thu Aug 25 12:22:23 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 12:22:23 2016 -0230

--
 components/camel-google-mail/pom.xml | 6 ++
 parent/pom.xml   | 8 
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a1e716df/components/camel-google-mail/pom.xml
--
diff --git a/components/camel-google-mail/pom.xml 
b/components/camel-google-mail/pom.xml
index 57a0717..0977de1 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -200,6 +200,12 @@
   
com.google.api.services.gmail.model.ModifyMessageRequest
   modifyMessageRequest
 
+
+  ^.+$
+  content
+  
com.google.api.services.gmail.model.BatchDeleteMessagesRequest
+  batchDeleteMessagesRequest
+
   
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/a1e716df/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e6b655e..8390bb9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -220,10 +220,10 @@
 1.4
 1.0.10
 19.0
-1.19.0
-
v2-rev193-1.19.0
-
v3-rev152-1.19.0
-
v1-rev34-1.19.0
+1.22.0
+
v2-rev234-1.22.0
+
v3-rev208-1.22.0
+
v1-rev48-1.22.0
 0.27
 2.3.25
 2.4.7

[2/3] camel git commit: fix CS

[janstey]

fix CS


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

Branch: refs/heads/master
Commit: 8cad23cdbde00f6c51ed71dcc6a9e3be9091956d
Parents: a1e716d
Author: Jonathan Anstey 
Authored: Thu Aug 25 12:25:16 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 12:25:16 2016 -0230

--
 .../apache/camel/maven/packaging/PrepareReadmeMojo.java   | 10 +-
 .../camel/maven/packaging/PrepareUserGuideMojo.java   | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8cad23cd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index 9ae8685..7a744b5 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -420,7 +420,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
 try {
 String text = loadText(new FileInputStream(file));
 
-String existing = StringHelper.between(text, "// eips: START" , 
"// eips: END");
+String existing = StringHelper.between(text, "// eips: START", "// 
eips: END");
 if (existing != null) {
 // remove leading line breaks etc
 existing = existing.trim();
@@ -454,7 +454,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
 try {
 String text = loadText(new FileInputStream(file));
 
-String existing = StringHelper.between(text, "// components: 
START" , "// components: END");
+String existing = StringHelper.between(text, "// components: 
START", "// components: END");
 if (existing != null) {
 // remove leading line breaks etc
 existing = existing.trim();
@@ -488,7 +488,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
 try {
 String text = loadText(new FileInputStream(file));
 
-String existing = StringHelper.between(text, "// dataformats: 
START" , "// dataformats: END");
+String existing = StringHelper.between(text, "// dataformats: 
START", "// dataformats: END");
 if (existing != null) {
 // remove leading line breaks etc
 existing = existing.trim();
@@ -522,7 +522,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
 try {
 String text = loadText(new FileInputStream(file));
 
-String existing = StringHelper.between(text, "// languages: START" 
, "// languages: END");
+String existing = StringHelper.between(text, "// languages: 
START", "// languages: END");
 if (existing != null) {
 // remove leading line breaks etc
 existing = existing.trim();
@@ -658,4 +658,4 @@ public class PrepareReadmeMojo extends AbstractMojo {
 return language;
 }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/8cad23cd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
index 88697be..1004458 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
@@ -269,7 +269,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
 try {
 String text = loadText(new FileInputStream(file));
 
-String existing = StringHelper.between(text, "" , "");
+String existing = StringHelper.between(text, "", "");
 if (existing != null) {
 // remove leading line breaks etc
 existing = existing.trim();
@@ -303,7 +303,7 @@ public class PrepareUserGuideMojo 

[3/3] camel git commit: update sample config in camel-archetype-api-component

[janstey]

update sample config in camel-archetype-api-component


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

Branch: refs/heads/master
Commit: 25cce84a77111733773ce95ae4bcd2a42d4f10b9
Parents: 8cad23c
Author: Jonathan Anstey 
Authored: Thu Aug 25 12:31:35 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 12:31:35 2016 -0230

--
 .../archetype-resources/__artifactId__-component/pom.xml| 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/25cce84a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 555bcb6..feedd0e 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -201,6 +201,11 @@
 
   
   -->
+  
 
 
   hello-javadoc
@@ -209,6 +214,7 @@
 
@@ -219,9 +225,10 @@
   
   
   
-  
+  
   
   
+  
   -->
 
   

[3/4] camel git commit: bump rev on google service libs

[janstey]

bump rev on google service libs


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

Branch: refs/heads/camel-2.17.x
Commit: 6ab52a3a80709cb14fea6f10c2ab5c6df79e7196
Parents: 68a90d9
Author: Jonathan Anstey 
Authored: Thu Aug 25 11:23:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 11:43:23 2016 -0230

--
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6ab52a3a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 29776bf..26cfadc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -206,9 +206,9 @@
 1.41.1_1
 19.0
 1.19.0
-
v2-rev151-1.19.0
-
v3-rev99-1.19.0
-
v1-rev15-1.19.0
+
v2-rev193-1.19.0
+
v3-rev152-1.19.0
+
v1-rev34-1.19.0
 0.27
 2.3.24
 2.4.6

[1/4] camel git commit: bump rev on google service libs

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 68a90d9ad -> ac501457d
  refs/heads/master 432d41d33 -> 3b60136ab


bump rev on google service libs


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

Branch: refs/heads/master
Commit: 5caa9d2856f9f5999cb17f51189b4f991f37118e
Parents: 432d41d
Author: Jonathan Anstey 
Authored: Thu Aug 25 11:23:58 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 11:23:58 2016 -0230

--
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5caa9d28/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fb5d7db..e6b655e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -221,9 +221,9 @@
 1.0.10
 19.0
 1.19.0
-
v2-rev151-1.19.0
-
v3-rev99-1.19.0
-
v1-rev15-1.19.0
+
v2-rev193-1.19.0
+
v3-rev152-1.19.0
+
v1-rev34-1.19.0
 0.27
 2.3.25
 2.4.7

[2/4] camel git commit: fix google drive unit test failure

[janstey]

fix google drive unit test failure


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

Branch: refs/heads/master
Commit: 3b60136abf1e6970f2318084df0a069fbfdbdb29
Parents: 5caa9d2
Author: Jonathan Anstey 
Authored: Thu Aug 25 11:42:52 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 11:42:52 2016 -0230

--
 .../component/google/drive/AbstractGoogleDriveTestSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3b60136a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index 067bbe6..fac64bc 100644
--- 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -42,7 +42,7 @@ public abstract class AbstractGoogleDriveTestSupport extends 
CamelTestSupport {
 protected static String testFolderId;
 protected static String testFileId;
 
-protected static final String TEST_UPLOAD_FILE = 
"src/test/resources/log4j.properties";
+protected static final String TEST_UPLOAD_FILE = 
"src/test/resources/log4j2.properties";
 protected static final String TEST_UPLOAD_IMG = 
"src/test/resources/camel-box-small.png";
 protected static final java.io.File UPLOAD_FILE = new 
java.io.File(TEST_UPLOAD_FILE);
 

[4/4] camel git commit: fix google drive unit test failure

[janstey]

fix google drive unit test failure


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

Branch: refs/heads/camel-2.17.x
Commit: ac501457d38d2d83ff3992eb9864f8807fb55ae8
Parents: 6ab52a3
Author: Jonathan Anstey 
Authored: Thu Aug 25 11:42:52 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Aug 25 11:43:30 2016 -0230

--
 .../component/google/drive/AbstractGoogleDriveTestSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac501457/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
--
diff --git 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index 067bbe6..fac64bc 100644
--- 
a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ 
b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -42,7 +42,7 @@ public abstract class AbstractGoogleDriveTestSupport extends 
CamelTestSupport {
 protected static String testFolderId;
 protected static String testFileId;
 
-protected static final String TEST_UPLOAD_FILE = 
"src/test/resources/log4j.properties";
+protected static final String TEST_UPLOAD_FILE = 
"src/test/resources/log4j2.properties";
 protected static final String TEST_UPLOAD_IMG = 
"src/test/resources/camel-box-small.png";
 protected static final java.io.File UPLOAD_FILE = new 
java.io.File(TEST_UPLOAD_FILE);
 

[1/2] camel git commit: add spi-annotations to bom

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x f28d32e02 -> 68a90d9ad
  refs/heads/master 19e9c2fc8 -> c8111d6fd


add spi-annotations to bom


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

Branch: refs/heads/master
Commit: c8111d6fdcae9f8b7abb9fa80115746a3275185d
Parents: 19e9c2f
Author: Jonathan Anstey 
Authored: Mon Aug 22 22:52:46 2016 -0230
Committer: Jonathan Anstey 
Committed: Mon Aug 22 22:52:46 2016 -0230

--
 components-starter/camel-cache-starter/pom.xml | 2 +-
 components/camel-bindy/src/main/docs/bindy-dataformat.adoc | 2 +-
 parent/pom.xml | 5 +
 3 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c8111d6f/components-starter/camel-cache-starter/pom.xml
--
diff --git a/components-starter/camel-cache-starter/pom.xml 
b/components-starter/camel-cache-starter/pom.xml
index ee5ea5e..105ceaa 100644
--- a/components-starter/camel-cache-starter/pom.xml
+++ b/components-starter/camel-cache-starter/pom.xml
@@ -25,7 +25,7 @@
 
 camel-cache-starter
 jar
-Spring-Boot Starter :: Camel :: Cache
+Spring-Boot Starter :: Camel :: Cache (deprecated)
 Spring-Boot Starter for Camel Cache support based on 
ehCache
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/c8111d6f/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
--
diff --git a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc 
b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
index 59aa943..090b6d2 100644
--- a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
+++ b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
@@ -74,7 +74,7 @@ The Bindy dataformat supports 3 options which are listed 
below.
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
-| type | KeyValue | BindyType | Whether to use csv fixed or key value pairs 
mode.
+| type | Csv | BindyType | Whether to use csv fixed or key value pairs mode.
 | classType |  | String | Name of model class to use.
 | locale |  | String | To configure a default locale to use such as us for 
united states. To use the JVM platform default locale then use the name default
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/c8111d6f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ee4e20..eca354e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1950,6 +1950,11 @@
 org.apache.camel.tests.mock-javamail_1.7
 ${project.version}
   
+  
+org.apache.camel
+spi-annotations
+${project.version}
+  
 
   
 

[2/2] camel git commit: add spi-annotations to bom

[janstey]

add spi-annotations to bom


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

Branch: refs/heads/camel-2.17.x
Commit: 68a90d9ad48ce93865ad9ab0d8f6a73c4c4748ff
Parents: f28d32e
Author: Jonathan Anstey 
Authored: Mon Aug 22 22:55:09 2016 -0230
Committer: Jonathan Anstey 
Committed: Mon Aug 22 22:55:09 2016 -0230

--
 parent/pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/68a90d9a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8df753d..29776bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1840,6 +1840,11 @@
 org.apache.camel.tests.mock-javamail_1.7
 ${project.version}
   
+  
+org.apache.camel
+spi-annotations
+${project.version}
+  
 
   
   

camel git commit: fix reg ex for sample substitution

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 8c9018522 -> 5d697024a


fix reg ex for sample substitution


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

Branch: refs/heads/master
Commit: 5d697024a3baf18fd64a6b7be7f3cdda4c5a92e7
Parents: 8c90185
Author: Jonathan Anstey 
Authored: Sun Aug 21 23:00:39 2016 -0230
Committer: Jonathan Anstey 
Committed: Sun Aug 21 23:00:39 2016 -0230

--
 .../archetype-resources/__artifactId__-component/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5d697024/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 009048a..555bcb6 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -171,8 +171,8 @@
   

[1/2] camel git commit: CAMEL-10243 - Force camel-atom feature to install abdera-parser

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 291ea10af -> e500ce34a
  refs/heads/master e3c9f1b01 -> db1f8eae1


CAMEL-10243 - Force camel-atom feature to install abdera-parser


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

Branch: refs/heads/master
Commit: db1f8eae18ec8a32b1ea420ac4d868f7c8093a83
Parents: e3c9f1b
Author: Jonathan Anstey 
Authored: Fri Aug 12 15:05:59 2016 -0230
Committer: Jonathan Anstey 
Committed: Fri Aug 12 15:05:59 2016 -0230

--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/db1f8eae/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 4332102..76b13b9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -129,7 +129,7 @@
 mvn:org.apache.abdera/abdera-core/${abdera-version}
 mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}
 mvn:org.apache.abdera/abdera-i18n/${abdera-version}
-mvn:org.apache.abdera/abdera-parser/${abdera-version}
+mvn:org.apache.abdera/abdera-parser/${abdera-version}
 mvn:org.apache.james/apache-mime4j-core/${apache-mime4j-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.camel/camel-atom/${project.version}

[2/2] camel git commit: CAMEL-10243 - Force camel-atom feature to install abdera-parser

[janstey]

CAMEL-10243 - Force camel-atom feature to install abdera-parser


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

Branch: refs/heads/camel-2.17.x
Commit: e500ce34aa3bacdcb59938701d0a2c033b48d7e2
Parents: 291ea10
Author: Jonathan Anstey 
Authored: Fri Aug 12 15:05:59 2016 -0230
Committer: Jonathan Anstey 
Committed: Fri Aug 12 15:06:45 2016 -0230

--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e500ce34/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 1e9cde4..df2774b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -118,7 +118,7 @@
 mvn:org.apache.abdera/abdera-core/${abdera-version}
 mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}
 mvn:org.apache.abdera/abdera-i18n/${abdera-version}
-mvn:org.apache.abdera/abdera-parser/${abdera-version}
+mvn:org.apache.abdera/abdera-parser/${abdera-version}
 mvn:org.apache.james/apache-mime4j-core/${apache-mime4j-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.camel/camel-atom/${project.version}

svn commit: r994377 [4/4] - in /websites/production/camel/content/schema: blueprint/camel-blueprint.xsd cxf/camel-cxf-blueprint.xsd spring/camel-spring.xsd

[janstey]

Modified: websites/production/camel/content/schema/spring/camel-spring.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring.xsd (original)
+++ websites/production/camel/content/schema/spring/camel-spring.xsd Wed Aug  3 
14:08:57 2016
@@ -2,43 +2,57 @@
 
   
 
-  Aggregates many messages into a single 
message
+  
 
   
 
   
 
-  Does processing before and/or after the 
route is completed
+  
 
   
 
   
 
-  Avro data format
+  
 
   
 
   
 
-  Barcode data format
+  
 
   
 
   
 
-  Base64 data format
+  
 
   
 
   
 
-  Configures batch-processing resequence 
eip.
+  
 
   
 
   
 
-  Calls a java bean
+  
 
   
 
@@ -46,13 +60,25 @@
 
   
 
-  BeanIO data format
+  
 
   
 
   
 
-  Bindy data format
+  
+
+  
+
+  
+
+  
 
   
 
@@ -60,25 +86,33 @@
 
   
 
-  Castor data format
+  
 
   
 
   
 
-  Routes messages based on a series of 
predicates
+  
 
   
 
   
 
-  Circuit break load 
balancer
+  
 
   
 
   
 
-  For expressions and predicates using a 
constant
+  
 
   
 
@@ -86,91 +120,122 @@
 
   
 
-  Scans for Java 
org.apache.camel.builder.RouteBuilder instances in the context 
org.apache.camel.spi.Registry.
+  
 
   
 
   
 
-  Converts the message body to another 
type
+  
 
   
 
   
 
-  Crypto data format
+  
 
   
 
   
 
-  CSV data format
+  
 
   
 
   
 
-  Custom data format
+  
 
   
 
   
 
-  Custom load balancer
+  
 
   
 
   
 
-  To configure data 
formats
+  
 
   
 
   
 
-  Delays processing for a specified length 
of time
+  
 
   
 
   
 
-  Rest DELETE command
+  
 
   
 
   
 
-  To provide comments about the 
node.
+  
 
   
 
   
 
-  Catches exceptions as part of a try 
catch finally block
+  
 
   
 
   
 
-  Path traversed when a try catch finally 
block exits
+  
 
   
 
   
 
-  Marks the beginning of a try catch 
finally block
+  
 
   
 
   
 
-  Routes messages based on dynamic 
rules
+  
 
   
 
   
 
-  For EL expressions and 
predicates
+  
 
   
 
@@ -178,7 +243,9 @@
 
   
 
-  Enriches a message with data from a 
secondary resource
+  
 
   
 
@@ -186,7 +253,9 @@
 
   
 
-  An expression which extracts the named 
exchange property
+  
 
   
 
@@ -194,7 +263,9 @@
 
   
 
-  A useful base class for an 
expression
+  
 
   
 
@@ -202,121 +273,177 @@
 
   
 
-  Failover load balancer
+  
 
   
 
   
 
-  Filter out messages based using a 
predicate
+  
 
   
 
   
 
-  Flatpack data format
+  
 
   
 
   
 
-  Act as a message source as input to a 
route
+  
 
   
 
   
 
-  Rest GET command
+  
 
   
 
   
 
-  For Groovy expressions and 
predicates
+  
 
   
 
   
 
-  GZip data format
+  
 
   
 
   
 
-  Rest HEAD command
+  
 
   
 
   
 
-  An expression which extracts the named 
exchange header
+  
+
+  
+
+  
+
+  
 
   
 
   
 
-  HL7 data format
+  
 
   
 
   
 
-  iCal data format
+  
 
   
 
   
 
-  Filters out duplicate 
messages
+  
 
   
 
   
 
-  Marks the exchange pattern for the route 
to one way
+  
 
   
 
   
 
-  Marks the exchange pattern for the route 
to request/reply
+  
 
   
 
   
 
-  Intercepts a message at each step in the 
route
+  
 
   
 
   
 
-  Intercepts incoming 
messages
+  
 
   
 
   
 
-  Intercepts messages being sent to an 
endpoint
+  
+
+  
+
+  
+
+  
 
   
 
   
 
-  For JavaScript expressions and 
predicates
+  
 
   
 
   
 
-  JAXB data format
+  
 
   
 
   
 
-  JiBX data format
+  
 
   
 
@@ -324,19 +451,25 @@
 
   
 
-  Json data format
+  
 
   
 
   
 
-  For JSonPath expressions and 
predicates
+  
 
   
 
   
 
-  For JXPath expressions and 
predicates
+  
 
   
 
@@ -344,133 +477,219 @@
 
   
 
-  Represents a parameterised language 
expression which can support any language at runtime using the language 
attribute.
+  
 
   
 
   
 
-  Balances message processing among a 
number of nodes
+  
 
   
 
   
 
-  Logs the defined message to the 
logger
+  
 
   
 
   
 
-  Processes a message multiple 
times
+  
+
+  
+
+  
+
+  
 
   
 
   
  

svn commit: r994377 [2/4] - in /websites/production/camel/content/schema: blueprint/camel-blueprint.xsd cxf/camel-cxf-blueprint.xsd spring/camel-spring.xsd

[janstey]

Modified: websites/production/camel/content/schema/blueprint/camel-blueprint.xsd
==
--- websites/production/camel/content/schema/blueprint/camel-blueprint.xsd 
(original)
+++ websites/production/camel/content/schema/blueprint/camel-blueprint.xsd Wed 
Aug  3 14:08:57 2016
@@ -2,55 +2,81 @@
 
   
 
-  Aggregates many messages into a single 
message
+  
 
   
 
   
 
-  Does processing before and/or after the 
route is completed
+  
 
   
 
   
 
-  Avro data format
+  
 
   
 
   
 
-  Barcode data format
+  
 
   
 
   
 
-  Base64 data format
+  
 
   
 
   
 
-  Configures batch-processing resequence 
eip.
+  
 
   
 
   
 
-  Calls a java bean
+  
 
   
 
   
 
-  BeanIO data format
+  
 
   
 
   
 
-  Bindy data format
+  
+
+  
+
+  
+
+  
 
   
 
@@ -58,25 +84,33 @@
 
   
 
-  Castor data format
+  
 
   
 
   
 
-  Routes messages based on a series of 
predicates
+  
 
   
 
   
 
-  Circuit break load 
balancer
+  
 
   
 
   
 
-  For expressions and predicates using a 
constant
+  
 
   
 
@@ -84,91 +118,122 @@
 
   
 
-  Scans for Java 
org.apache.camel.builder.RouteBuilder instances in the context 
org.apache.camel.spi.Registry.
+  
 
   
 
   
 
-  Converts the message body to another 
type
+  
 
   
 
   
 
-  Crypto data format
+  
 
   
 
   
 
-  CSV data format
+  
 
   
 
   
 
-  Custom data format
+  
 
   
 
   
 
-  Custom load balancer
+  
 
   
 
   
 
-  To configure data 
formats
+  
 
   
 
   
 
-  Delays processing for a specified length 
of time
+  
 
   
 
   
 
-  Rest DELETE command
+  
 
   
 
   
 
-  To provide comments about the 
node.
+  
 
   
 
   
 
-  Catches exceptions as part of a try 
catch finally block
+  
 
   
 
   
 
-  Path traversed when a try catch finally 
block exits
+  
 
   
 
   
 
-  Marks the beginning of a try catch 
finally block
+  
 
   
 
   
 
-  Routes messages based on dynamic 
rules
+  
 
   
 
   
 
-  For EL expressions and 
predicates
+  
 
   
 
@@ -176,7 +241,9 @@
 
   
 
-  Enriches a message with data from a 
secondary resource
+  
 
   
 
@@ -184,7 +251,9 @@
 
   
 
-  An expression which extracts the named 
exchange property
+  
 
   
 
@@ -192,7 +261,9 @@
 
   
 
-  A useful base class for an 
expression
+  
 
   
 
@@ -200,121 +271,177 @@
 
   
 
-  Failover load balancer
+  
 
   
 
   
 
-  Filter out messages based using a 
predicate
+  
 
   
 
   
 
-  Flatpack data format
+  
 
   
 
   
 
-  Act as a message source as input to a 
route
+  
 
   
 
   
 
-  Rest GET command
+  
 
   
 
   
 
-  For Groovy expressions and 
predicates
+  
 
   
 
   
 
-  GZip data format
+  
 
   
 
   
 
-  Rest HEAD command
+  
 
   
 
   
 
-  An expression which extracts the named 
exchange header
+  
+
+  
+
+  
+
+  
 
   
 
   
 
-  HL7 data format
+  
 
   
 
   
 
-  iCal data format
+  
 
   
 
   
 
-  Filters out duplicate 
messages
+  
 
   
 
   
 
-  Marks the exchange pattern for the route 
to one way
+  
 
   
 
   
 
-  Marks the exchange pattern for the route 
to request/reply
+  
 
   
 
   
 
-  Intercepts a message at each step in the 
route
+  
 
   
 
   
 
-  Intercepts incoming 
messages
+  
 
   
 
   
 
-  Intercepts messages being sent to an 
endpoint
+  
+
+  
+
+  
+
+  
 
   
 
   
 
-  For JavaScript expressions and 
predicates
+  
 
   
 
   
 
-  JAXB data format
+  
 
   
 
   
 
-  JiBX data format
+  
 
   
 
@@ -322,19 +449,25 @@
 
   
 
-  Json data format
+  
 
   
 
   
 
-  For JSonPath expressions and 
predicates
+  
 
   
 
   
 
-  For JXPath expressions and 
predicates
+  
 
   
 
@@ -342,133 +475,219 @@
 
   
 
-  Represents a parameterised language 
expression which can support any language at runtime using the language 
attribute.
+  
 
   
 
   
 
-  Balances message processing among a 
number of nodes
+  
 
   
 
   
 
-  Logs the defined message to the 
logger
+  
 
   
 
   
 
-  Processes a message multiple 
times
+  
+
+  
+
+  
+
+  
 
   
 
   

svn commit: r994377 [3/4] - in /websites/production/camel/content/schema: blueprint/camel-blueprint.xsd cxf/camel-cxf-blueprint.xsd spring/camel-spring.xsd

[janstey]

Modified: websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd 
(original)
+++ websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd Wed 
Aug  3 14:08:57 2016
@@ -25,9 +25,9 @@
 targetNamespace="http://camel.apache.org/schema/blueprint/cxf;
 elementFormDefault="qualified"
 attributeFormDefault="unqualified"
-xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;>
+xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 
https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;>
 
-  http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
+  http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation="https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
   http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
   

svn commit: r994377 [1/4] - in /websites/production/camel/content/schema: blueprint/camel-blueprint.xsd cxf/camel-cxf-blueprint.xsd spring/camel-spring.xsd

[janstey]

Author: janstey
Date: Wed Aug  3 14:08:57 2016
New Revision: 994377

Log:
Update schemas to latest version (2.17.2)

Modified:
websites/production/camel/content/schema/blueprint/camel-blueprint.xsd
websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd
websites/production/camel/content/schema/spring/camel-spring.xsd

[2/2] camel git commit: Update to shiro 1.2.5

[janstey]

Update to shiro 1.2.5


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

Branch: refs/heads/camel-2.17.x
Commit: bf56add3e0dcc791e0da502b766abdef59dc9e5f
Parents: 135c3ce
Author: Jonathan Anstey 
Authored: Tue Jun 28 14:28:47 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Jun 28 14:29:17 2016 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/bf56add3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5135d78..1af2e33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -483,7 +483,7 @@
 2.6.0
 1.0
 [3,4)
-1.2.4
+1.2.5
 
2.0.0-alpha-8
 1.1
 1.7.21

[1/2] camel git commit: Update to shiro 1.2.5

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 135c3ced2 -> bf56add3e
  refs/heads/master 6393a5602 -> f0484bf55


Update to shiro 1.2.5


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

Branch: refs/heads/master
Commit: f0484bf55485eda181ae646ce98383eaf3fb2090
Parents: 6393a56
Author: Jonathan Anstey 
Authored: Tue Jun 28 14:28:47 2016 -0230
Committer: Jonathan Anstey 
Committed: Tue Jun 28 14:28:47 2016 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/f0484bf5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6897981..b81aa9e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -498,7 +498,7 @@
 2.7.0
 1.0
 [3,4)
-1.2.4
+1.2.5
 
2.0.0-alpha-8
 2.2.2
 1.2.3

[5/6] camel git commit: get rid of redundant dependency

[janstey]

get rid of redundant dependency


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

Branch: refs/heads/camel-2.17.x
Commit: 87e7e31b22b4c8f870841642ad8a63f1f96c0b25
Parents: d3dcf62
Author: Jonathan Anstey 
Authored: Thu Jun 2 00:26:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Jun 2 12:31:20 2016 -0230

--
 components/camel-leveldb/pom.xml | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/87e7e31b/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 316c8d2..e86d6ec 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -46,11 +46,6 @@
 ${leveldbjni-version}
 
 
-org.fusesource.leveldbjni
-leveldbjni
-${leveldbjni-version}
-
-
 org.fusesource.hawtbuf
 hawtbuf
 ${hawtbuf-version}

[2/6] camel git commit: get rid of redundant dependency

[janstey]

get rid of redundant dependency


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

Branch: refs/heads/master
Commit: b902fb51b7682009cae4815e20222eb2d6c96843
Parents: 22e0a3e
Author: Jonathan Anstey 
Authored: Thu Jun 2 00:26:37 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Jun 2 12:17:30 2016 -0230

--
 components/camel-leveldb/pom.xml | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b902fb51/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 5947f45..ede0589 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -46,11 +46,6 @@
 ${leveldbjni-version}
 
 
-org.fusesource.leveldbjni
-leveldbjni
-${leveldbjni-version}
-
-
 org.fusesource.hawtbuf
 hawtbuf
 ${hawtbuf-version}

[4/6] camel git commit: CAMEL-10011 - fix Overlap in management name for multiple contexts in OSGi bundle

[janstey]

CAMEL-10011 - fix Overlap in management name for multiple contexts in OSGi 
bundle


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

Branch: refs/heads/camel-2.17.x
Commit: d3dcf6205055718288d71ada448a052d04586aff
Parents: 3628697
Author: Jonathan Anstey 
Authored: Thu Jun 2 12:16:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Jun 2 12:31:20 2016 -0230

--
 .../org/apache/camel/core/osgi/OsgiManagementNameStrategy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d3dcf620/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
index 78468c6..d372aa1 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
@@ -46,7 +46,7 @@ public class OsgiManagementNameStrategy extends 
DefaultManagementNameStrategy {
 private final BundleContext bundleContext;
 
 public OsgiManagementNameStrategy(CamelContext camelContext, BundleContext 
bundleContext) {
-super(camelContext, "#symbolicName#", "#symbolicName#-#counter#");
+super(camelContext, "#symbolicName#-#name#", 
"#symbolicName#-#name#-#counter#");
 this.bundleContext = bundleContext;
 }
 

[1/6] camel git commit: CAMEL-10011 - fix Overlap in management name for multiple contexts in OSGi bundle

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 3628697f3 -> 4d90ef903
  refs/heads/master a24158b45 -> fbd0a358f


CAMEL-10011 - fix Overlap in management name for multiple contexts in OSGi 
bundle


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

Branch: refs/heads/master
Commit: 22e0a3e78c93874f89db5d56b3c542afb7e9fd0e
Parents: a24158b
Author: Jonathan Anstey 
Authored: Thu Jun 2 12:16:15 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Jun 2 12:17:29 2016 -0230

--
 .../org/apache/camel/core/osgi/OsgiManagementNameStrategy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22e0a3e7/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
index 78468c6..d372aa1 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
@@ -46,7 +46,7 @@ public class OsgiManagementNameStrategy extends 
DefaultManagementNameStrategy {
 private final BundleContext bundleContext;
 
 public OsgiManagementNameStrategy(CamelContext camelContext, BundleContext 
bundleContext) {
-super(camelContext, "#symbolicName#", "#symbolicName#-#counter#");
+super(camelContext, "#symbolicName#-#name#", 
"#symbolicName#-#name#-#counter#");
 this.bundleContext = bundleContext;
 }
 

[6/6] camel git commit: widen jms version range on camel-amqp to match camel-jms

[janstey]

widen jms version range on camel-amqp to match camel-jms


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

Branch: refs/heads/camel-2.17.x
Commit: 4d90ef903c7a8fc9300cfe20acfceec8bd66b1e5
Parents: 87e7e31
Author: Jonathan Anstey 
Authored: Thu Jun 2 12:21:50 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Jun 2 12:31:21 2016 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/4d90ef90/components/camel-amqp/pom.xml
--
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 16fe612..1ca76d3 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -34,6 +34,7 @@
 Remove this after migration to ServiceMix bundles. -->
 
   org.apache.qpid.jms,
+  javax.jms;version="[1.1,3)",
   ${camel.osgi.import.defaults},
   *
 

[3/6] camel git commit: widen jms version range on camel-amqp to match camel-jms

[janstey]

widen jms version range on camel-amqp to match camel-jms


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

Branch: refs/heads/master
Commit: fbd0a358fafaba9fa1a92a3358860fd2707495f2
Parents: b902fb5
Author: Jonathan Anstey 
Authored: Thu Jun 2 12:21:50 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Jun 2 12:21:50 2016 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/fbd0a358/components/camel-amqp/pom.xml
--
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 70986ab..51a37ad 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -34,6 +34,7 @@
 Remove this after migration to ServiceMix bundles. -->
 
   org.apache.qpid.jms,
+  javax.jms;version="[1.1,3)",
   ${camel.osgi.import.defaults},
   *
 

camel git commit: Ensure context scan works with both SpringRouteBuilder and RouteBuilder

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 2ad2672f6 -> 1ec00be81


Ensure context scan works with both SpringRouteBuilder and RouteBuilder


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

Branch: refs/heads/master
Commit: 1ec00be81ba0404f6d8dc28a39b371f528e927fe
Parents: 2ad2672
Author: Jonathan Anstey 
Authored: Sun May 15 14:18:23 2016 -0230
Committer: Jonathan Anstey 
Committed: Sun May 15 14:18:36 2016 -0230

--
 .../apache/camel/spring/issues/contextscan2/MyOtherRoute.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1ec00be8/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
index 2b2341e..7e7a250 100644
--- 
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
@@ -16,17 +16,17 @@
  */
 package org.apache.camel.spring.issues.contextscan2;
 
-import org.apache.camel.spring.SpringRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
 import org.springframework.stereotype.Component;
 
 /**
  * @version 
  */
 @Component("coolRoute")
-public class MyOtherRoute extends SpringRouteBuilder {
+public class MyOtherRoute extends RouteBuilder {
 
 @Override
 public void configure() throws Exception {
 from("direct:start").to("mock:result");
 }
-}
\ No newline at end of file
+}

[3/3] camel git commit: Add doc for allowReplyManagerQuickStop

[janstey]

Add doc for allowReplyManagerQuickStop


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

Branch: refs/heads/camel-2.17.x
Commit: 00cb4b89b81887cca97f13a84f82b5af8bbdb099
Parents: c17c01a
Author: Jonathan Anstey 
Authored: Thu Apr 21 19:36:51 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Apr 21 19:36:51 2016 -0230

--
 components/camel-jms/src/main/docs/jms.adoc | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/00cb4b89/components/camel-jms/src/main/docs/jms.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms.adoc 
b/components/camel-jms/src/main/docs/jms.adoc
index e63dc8d..fcdbc10 100644
--- a/components/camel-jms/src/main/docs/jms.adoc
+++ b/components/camel-jms/src/main/docs/jms.adoc
@@ -337,6 +337,15 @@ acknowledgment mode. For the regular modes, it is 
preferable to use the
 messages with no body. If this option is `false` and the message body is
 null, then an `JMSException` is thrown.
 
+| 'allowReplyManagerQuickStop' | 'false' | Whether the 
+DefaultMessageListenerContainer used in the reply managers for request-
+reply messaging allow the DefaultMessageListenerContainer.runningAllowed
+ flag to quick stop in case link 
+JmsConfigurationisAcceptMessagesWhileStopping() is enabled and 
+org.apache.camel.CamelContext is currently being stopped. This quick 
+stop ability is enabled by default in the regular JMS consumers but to 
+enable for reply managers you must enable this flag.
+
 |`alwaysCopyMessage` |`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 some situations, such as when

[1/3] camel git commit: CAMEL-9900 - provide option for MessageListenerContainer for reply managers to stop quicker when CamelContext is stopping

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x e8bff3a0a -> 00cb4b89b
  refs/heads/master a4c43a6ca -> d403cc908


CAMEL-9900 - provide option for MessageListenerContainer for reply managers to 
stop quicker when CamelContext is stopping


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

Branch: refs/heads/master
Commit: d403cc9084123667e29398dad5a0eaa109521de3
Parents: a4c43a6
Author: Jonathan Anstey 
Authored: Thu Apr 21 19:21:48 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Apr 21 19:21:48 2016 -0230

--
 components/camel-jms/src/main/docs/jms.adoc | 10 +++--
 .../camel/component/jms/JmsComponent.java   | 12 ++-
 .../camel/component/jms/JmsConfiguration.java   | 22 +++-
 .../apache/camel/component/jms/JmsEndpoint.java | 10 +
 .../ExclusiveQueueMessageListenerContainer.java |  3 +--
 .../SharedQueueMessageListenerContainer.java|  5 ++---
 .../jms/reply/TemporaryQueueReplyManager.java   |  3 +--
 .../camel/component/jms/JmsComponentTest.java   |  2 ++
 .../jms/JmsEndpointConfigurationTest.java   |  4 
 9 files changed, 60 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d403cc90/components/camel-jms/src/main/docs/jms.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms.adoc 
b/components/camel-jms/src/main/docs/jms.adoc
index a930518..3745626 100644
--- a/components/camel-jms/src/main/docs/jms.adoc
+++ b/components/camel-jms/src/main/docs/jms.adoc
@@ -207,8 +207,9 @@ Component options
 +
 
 
+
 // component options: START
-The JMS component supports 68 options which are listed below.
+The JMS component supports 69 options which are listed below.
 
 
 
@@ -217,6 +218,7 @@ The JMS component supports 68 options which are listed 
below.
 | Name | Java Type | Description
 | configuration | JmsConfiguration | To use a shared JMS configuration
 | acceptMessagesWhileStopping | boolean | Specifies whether the consumer 
accept messages while it is stopping. You may consider enabling this option if 
you start and stop JMS routes at runtime while there are still messages enqued 
on the queue. If this option is false and you stop the JMS route then messages 
may be rejected and the JMS broker would have to attempt redeliveries which yet 
again may be rejected and eventually the message may be moved at a dead letter 
queue on the JMS broker. To avoid this its recommended to enable this option.
+| allowReplyManagerQuickStop | boolean | Whether the 
DefaultMessageListenerContainer used in the reply managers for request-reply 
messaging allow the DefaultMessageListenerContainer.runningAllowed flag to 
quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and 
org.apache.camel.CamelContext is currently being stopped. This quick stop 
ability is enabled by default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.
 | acknowledgementMode | int | The JMS acknowledgement mode defined as an 
Integer. Allows you to set vendor-specific extensions to the acknowledgment 
mode. For the regular modes it is preferable to use the acknowledgementModeName 
instead.
 | eagerLoadingOfProperties | boolean | Enables eager loading of JMS properties 
as soon as a message is loaded which generally is inefficient as the JMS 
properties may not be required but sometimes can catch early any issues with 
the underlying JMS provider and the use of JMS properties
 | acknowledgementModeName | String | The JMS acknowledgement name which is one 
of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
@@ -287,13 +289,15 @@ The JMS component supports 68 options which are listed 
below.
 // component options: END
 
 
+
 [[JMS-Endpointoptions]]
 Endpoint options
 
 
 
+
 // endpoint options: START
-The JMS component supports 75 endpoint options which are listed below:
+The JMS component supports 76 endpoint options which are listed below:
 
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
@@ -316,6 +320,7 @@ The JMS component supports 75 endpoint options which are 
listed below:
 | replyToDeliveryPersistent | consumer | true | boolean | Specifies whether to 
use persistent delivery by default for replies.
 | selector | consumer |  | String | Sets the JMS selector to use
 | acceptMessagesWhileStopping | consumer (advanced) | false | boolean | 
Specifies whether the consumer accept messages while it is 

[2/3] camel git commit: CAMEL-9900 - provide option for MessageListenerContainer for reply managers to stop quicker when CamelContext is stopping

[janstey]

CAMEL-9900 - provide option for MessageListenerContainer for reply managers to 
stop quicker when CamelContext is stopping


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

Branch: refs/heads/camel-2.17.x
Commit: c17c01a10d7bca46485f3792ffb3a0070461560c
Parents: e8bff3a
Author: Jonathan Anstey 
Authored: Thu Apr 21 19:21:48 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Apr 21 19:32:06 2016 -0230

--
 .../camel/component/jms/JmsComponent.java   | 12 ++-
 .../camel/component/jms/JmsConfiguration.java   | 22 +++-
 .../apache/camel/component/jms/JmsEndpoint.java | 10 +
 .../ExclusiveQueueMessageListenerContainer.java |  3 +--
 .../SharedQueueMessageListenerContainer.java|  5 ++---
 .../jms/reply/TemporaryQueueReplyManager.java   |  3 +--
 .../camel/component/jms/JmsComponentTest.java   |  2 ++
 .../jms/JmsEndpointConfigurationTest.java   |  4 
 8 files changed, 52 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c17c01a1/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 46ef75d..4ff90e9 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -172,7 +172,17 @@ public class JmsComponent extends UriEndpointComponent 
implements ApplicationCon
  * may be moved at a dead letter queue on the JMS broker. To avoid this 
its recommended to enable this option.
  */
 public void setAcceptMessagesWhileStopping(boolean 
acceptMessagesWhileStopping) {
-
getConfiguration().setAcceptMessagesWhileStopping(acceptMessagesWhileStopping);
+
getConfiguration().setAcceptMessagesWhileStopping(acceptMessagesWhileStopping); 
  
+}
+
+/**
+ * Whether the DefaultMessageListenerContainer used in the reply managers 
for request-reply messaging allow 
+ * the DefaultMessageListenerContainer.runningAllowed flag to quick stop 
in case JmsConfiguration#isAcceptMessagesWhileStopping
+ * is enabled, and org.apache.camel.CamelContext is currently being 
stopped. This quick stop ability is enabled by
+ * default in the regular JMS consumers but to enable for reply managers 
you must enable this flag.
+  */
+public void setAllowReplyManagerQuickStop(boolean 
allowReplyManagerQuickStop) {
+
getConfiguration().setAllowReplyManagerQuickStop(allowReplyManagerQuickStop);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/c17c01a1/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index c9a7117..a4c57e2 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -98,12 +98,18 @@ public class JmsConfiguration implements Cloneable {
 description = "Specifies whether the consumer container should 
auto-startup.")
 private boolean autoStartup = true;
 @UriParam(label = "consumer,advanced",
+description = "Whether the DefaultMessageListenerContainer used in 
the reply managers for request-reply messaging allow "
++ " the DefaultMessageListenerContainer.runningAllowed 
flag to quick stop in case JmsConfiguration#isAcceptMessagesWhileStopping"
++ " is enabled, and org.apache.camel.CamelContext is 
currently being stopped. This quick stop ability is enabled by"
++ " default in the regular JMS consumers but to enable for 
reply managers you must enable this flag.")
+private boolean allowReplyManagerQuickStop;   
+@UriParam(label = "consumer,advanced",
 description = "Specifies whether the consumer accept messages 
while it is stopping."
 + " You may consider enabling this option, if you start 
and stop JMS routes at runtime, while there are still messages"
 + " enqued on the queue. If this option is 

[2/2] camel git commit: CAMEL-9838 - Add ends with operator to simple language

[janstey]

CAMEL-9838 - Add ends with operator to simple language


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

Branch: refs/heads/camel-2.17.x
Commit: 8bdbe398c2231de0f8e5e269f015e0fb7f716f57
Parents: f465ab5
Author: Jonathan Anstey 
Authored: Thu Apr 7 16:33:06 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Apr 7 16:55:45 2016 -0230

--
 .../apache/camel/language/simple/SimpleTokenizer.java   |  1 +
 .../camel/language/simple/ast/BinaryExpression.java |  2 ++
 .../camel/language/simple/types/BinaryOperatorType.java |  8 +++-
 .../camel/language/simple/SimpleOperatorTest.java   | 12 +++-
 4 files changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8bdbe398/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
index 3977260..8956fad 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
@@ -66,6 +66,7 @@ public final class SimpleTokenizer {
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, "in"));
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, 
"range"));
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, "not 
range"));
+KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, "ends 
with"));
 
 // unary operators
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.unaryOperator, "++"));

http://git-wip-us.apache.org/repos/asf/camel/blob/8bdbe398/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
index 6d0e779..3c76c31 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
@@ -104,6 +104,8 @@ public class BinaryExpression extends BaseSimpleNode {
 return createInExpression(leftExp, rightExp);
 } else if (operator == BinaryOperatorType.RANGE || operator == 
BinaryOperatorType.NOT_RANGE) {
 return createRangeExpression(expression, leftExp, rightExp);
+} else if (operator == BinaryOperatorType.ENDS_WITH) {
+return createExpression(leftExp, rightExp, 
PredicateBuilder.endsWith(leftExp, rightExp));
 }
 
 throw new SimpleParserException("Unknown binary operator " + operator, 
token.getIndex());

http://git-wip-us.apache.org/repos/asf/camel/blob/8bdbe398/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
index 2156c30..02e7665 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
@@ -22,7 +22,7 @@ package org.apache.camel.language.simple.types;
 public enum BinaryOperatorType {
 
 EQ, EQ_IGNORE, GT, GTE, LT, LTE, NOT_EQ, CONTAINS, NOT_CONTAINS, REGEX, 
NOT_REGEX,
-IN, NOT_IN, IS, NOT_IS, RANGE, NOT_RANGE;
+IN, NOT_IN, IS, NOT_IS, RANGE, NOT_RANGE, ENDS_WITH;
 
 public static BinaryOperatorType asOperator(String text) {
 if ("==".equals(text)) {
@@ -59,6 +59,8 @@ public enum BinaryOperatorType {
 return RANGE;
 } else if ("not range".equals(text)) {
 return NOT_RANGE;
+} else if ("ends with".equals(text)) {
+return ENDS_WITH;
 }
 throw new IllegalArgumentException("Operator not supported: " + text);
 }
@@ -98,6 +100,8 @@ public enum BinaryOperatorType {
 return "range";
 } else if (operator == NOT_RANGE) {
 return "not range";
+} else if (operator == ENDS_WITH) {
+return "ends with";
 }
 return "";
 }
@@ 

[1/2] camel git commit: CAMEL-9838 - Add ends with operator to simple language

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x f465ab51d -> 8bdbe398c
  refs/heads/master c134e5a6e -> ff085260d


CAMEL-9838 - Add ends with operator to simple language


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

Branch: refs/heads/master
Commit: ff085260d530e7bc5b23c124acdca8094739ee7d
Parents: c134e5a
Author: Jonathan Anstey 
Authored: Thu Apr 7 16:33:06 2016 -0230
Committer: Jonathan Anstey 
Committed: Thu Apr 7 16:33:12 2016 -0230

--
 .../apache/camel/language/simple/SimpleTokenizer.java   |  1 +
 .../camel/language/simple/ast/BinaryExpression.java |  2 ++
 .../camel/language/simple/types/BinaryOperatorType.java |  8 +++-
 .../camel/language/simple/SimpleOperatorTest.java   | 12 +++-
 4 files changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ff085260/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
index 3977260..8956fad 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
@@ -66,6 +66,7 @@ public final class SimpleTokenizer {
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, "in"));
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, 
"range"));
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, "not 
range"));
+KNOWN_TOKENS.add(new SimpleTokenType(TokenType.binaryOperator, "ends 
with"));
 
 // unary operators
 KNOWN_TOKENS.add(new SimpleTokenType(TokenType.unaryOperator, "++"));

http://git-wip-us.apache.org/repos/asf/camel/blob/ff085260/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
index 6d0e779..3c76c31 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
@@ -104,6 +104,8 @@ public class BinaryExpression extends BaseSimpleNode {
 return createInExpression(leftExp, rightExp);
 } else if (operator == BinaryOperatorType.RANGE || operator == 
BinaryOperatorType.NOT_RANGE) {
 return createRangeExpression(expression, leftExp, rightExp);
+} else if (operator == BinaryOperatorType.ENDS_WITH) {
+return createExpression(leftExp, rightExp, 
PredicateBuilder.endsWith(leftExp, rightExp));
 }
 
 throw new SimpleParserException("Unknown binary operator " + operator, 
token.getIndex());

http://git-wip-us.apache.org/repos/asf/camel/blob/ff085260/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
 
b/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
index 2156c30..02e7665 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
@@ -22,7 +22,7 @@ package org.apache.camel.language.simple.types;
 public enum BinaryOperatorType {
 
 EQ, EQ_IGNORE, GT, GTE, LT, LTE, NOT_EQ, CONTAINS, NOT_CONTAINS, REGEX, 
NOT_REGEX,
-IN, NOT_IN, IS, NOT_IS, RANGE, NOT_RANGE;
+IN, NOT_IN, IS, NOT_IS, RANGE, NOT_RANGE, ENDS_WITH;
 
 public static BinaryOperatorType asOperator(String text) {
 if ("==".equals(text)) {
@@ -59,6 +59,8 @@ public enum BinaryOperatorType {
 return RANGE;
 } else if ("not range".equals(text)) {
 return NOT_RANGE;
+} else if ("ends with".equals(text)) {
+return ENDS_WITH;
 }
 throw new IllegalArgumentException("Operator not supported: " + text);
 }
@@ -98,6 +100,8 @@ public enum BinaryOperatorType {
 return "range";
 } else if (operator == NOT_RANGE) {
 return "not 

[3/3] camel git commit: fix up camel-example-reportincident-wssecurity

[janstey]

fix up camel-example-reportincident-wssecurity


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

Branch: refs/heads/camel-2.16.x
Commit: 371461690d89abaa0c38165cb19586d0d390f329
Parents: 598f2d5
Author: Jonathan Anstey 
Authored: Tue Feb 23 17:06:11 2016 -0330
Committer: Jonathan Anstey 
Committed: Tue Feb 23 17:06:11 2016 -0330

--
 examples/camel-example-reportincident-wssecurity/README.txt | 7 +--
 examples/camel-example-reportincident-wssecurity/pom.xml| 4 
 2 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37146169/examples/camel-example-reportincident-wssecurity/README.txt
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.txt 
b/examples/camel-example-reportincident-wssecurity/README.txt
index 53e1fb6..439e9b7 100644
--- a/examples/camel-example-reportincident-wssecurity/README.txt
+++ b/examples/camel-example-reportincident-wssecurity/README.txt
@@ -39,12 +39,15 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
   features:install camel-cxf
   features:install camel-mail
   features:install camel-velocity
+  features:install cxf-bindings-corba
+  features:install cxf-transports-jms
+  features:install cxf-ws-security
   
   remark: As the camel route sends email to a SMTP server, you must configure 
a user/password in your favorite
   SMTP Server (James by example). User = someone and password = secret
   
   3) Deploy our example
-  osgi:install -s mvn:org.apache.camel/camel-example-reportincident-wssecurity
+   osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
   
   4) Verify that your service is available using in the browser the following 
url
   http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
@@ -53,7 +56,7 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
   Create a new project called camel-example-reportincident-wssecurity
   Point to the following url : 
http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
   Open the request 1 (under camel-example-reportincident-wssecurity --> 
ReportIncidentBinding --> ReportIncident) and copy/paste the SOAP
-  message generated by the unit test
+  message generated by the unit test (don't copy the payload below as it's 
credentials expired minutes after we pasted them into this readme!)
   
   ex :
   

http://git-wip-us.apache.org/repos/asf/camel/blob/37146169/examples/camel-example-reportincident-wssecurity/pom.xml
--
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml 
b/examples/camel-example-reportincident-wssecurity/pom.xml
index 44e2260..e26e5ac 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -205,16 +205,12 @@
org.apache.cxf.phase,
org.apache.cxf.resource,

org.apache.cxf.transport,
-   
org.apache.cxf.transport.http,

org.apache.cxf.transport.http.policy,

org.apache.cxf.transport.http_jetty,

org.apache.cxf.transport.jms,
-   
org.apache.cxf.transports.http,

org.apache.cxf.workqueue,
org.apache.cxf.wsdl,
org.apache.cxf.wsdl11,
-   
org.apache.ws.security.action,
-   
org.apache.ws.security.processor,

org.springframework.beans.factory.config,

org.springframework.mail.javamail,
*

[1/3] camel git commit: fix up camel-example-reportincident-wssecurity

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 598f2d56d -> 371461690
  refs/heads/master 17324e6a6 -> ff6efb807


fix up camel-example-reportincident-wssecurity


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

Branch: refs/heads/master
Commit: ac94e94b9ae05ae46db958fa6b54b663ddb6cd9c
Parents: 17324e6
Author: Jonathan Anstey 
Authored: Tue Feb 23 17:00:03 2016 -0330
Committer: Jonathan Anstey 
Committed: Tue Feb 23 17:00:03 2016 -0330

--
 .../README.md   |   7 +-
 .../README.txt  | 122 +++
 .../pom.xml |   4 -
 3 files changed, 127 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac94e94b/examples/camel-example-reportincident-wssecurity/README.md
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.md 
b/examples/camel-example-reportincident-wssecurity/README.md
index 580f47c..9146ac6 100644
--- a/examples/camel-example-reportincident-wssecurity/README.md
+++ b/examples/camel-example-reportincident-wssecurity/README.md
@@ -47,13 +47,16 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
features:install camel-cxf
features:install camel-mail
features:install camel-velocity
+features:install cxf-bindings-corba
+features:install cxf-transports-jms
+features:install cxf-ws-security
 
   remark: As the camel route sends email to a SMTP server, you must configure 
a user/password in your favorite
   SMTP Server (James by example). User = someone and password = secret
 
  Step 3: Deploy our example
 
-   osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity
+   osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
 
  Step 4: Verify that your service is available using in the browser the 
following url
 
@@ -65,7 +68,7 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
   Create a new project called `camel-example-reportincident-wssecurity`
   Point to the following url : 

   Open the request 1 (under camel-example-reportincident-wssecurity --> 
ReportIncidentBinding --> ReportIncident) and copy/paste the SOAP
-  message generated by the unit test
+  message generated by the unit test (don't copy the payload below as it's 
credentials expired minutes after we pasted them into this readme!)
 
   ex :
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ac94e94b/examples/camel-example-reportincident-wssecurity/README.txt
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.txt 
b/examples/camel-example-reportincident-wssecurity/README.txt
new file mode 100644
index 000..fa0aa33
--- /dev/null
+++ b/examples/camel-example-reportincident-wssecurity/README.txt
@@ -0,0 +1,122 @@
+Report Incident Example
+===
+
+An example based on real life use case for reporting incidents using webservice
+that are transformed and send as emails to a backing system. WS-security has 
been
+implemented. So, the user must generates a SOAP envelope containing a SOAP 
header
+with wsse xml tag. A simple property map has been created containing user and 
password.
+We use Apache CXF WSS4JInterceptor to get the user/password and timestamp and 
authenticate
+the user using the WSS4J callback
+
+You will need to compile this example first:
+  mvn install
+
+Remarks:
+- During the compilation phase, a unit test will be performed, this unit test 
simulates the
+  communication between a client calling the web services exposed by our 
camel/cxf routes. During the call,
+  the user "charles" is used to authenticate the web service call and the SOAP 
message created can be
+  retrieved from log file target/camel-example-reportincident-wssecurity.log
+- A mock SMTP server is used during unit test
+- In Eclipse, I have used the following option when starting the junit test 
case. This option tells
+  CXF that it must use log4j : 
-Dorg.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
+
+To run the example on Apache ServiceMix 4.x or Apache Karaf 2.x
+
+  1) launch the server
+  karaf.bat
+  
+  For Karaf: edit the file jre.properties to add the following packages to be 
exported
+  jre-1.6=, \
+ com.sun.org.apache.xerces.internal.dom, \
+ 

[2/3] camel git commit: remove README.txt

[janstey]

remove README.txt


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

Branch: refs/heads/master
Commit: ff6efb8076fd0652c58aaaf7b08f3ad591ae32c4
Parents: ac94e94
Author: Jonathan Anstey 
Authored: Tue Feb 23 17:01:15 2016 -0330
Committer: Jonathan Anstey 
Committed: Tue Feb 23 17:01:15 2016 -0330

--
 .../README.txt  | 122 ---
 1 file changed, 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ff6efb80/examples/camel-example-reportincident-wssecurity/README.txt
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.txt 
b/examples/camel-example-reportincident-wssecurity/README.txt
deleted file mode 100644
index fa0aa33..000
--- a/examples/camel-example-reportincident-wssecurity/README.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-Report Incident Example
-===
-
-An example based on real life use case for reporting incidents using webservice
-that are transformed and send as emails to a backing system. WS-security has 
been
-implemented. So, the user must generates a SOAP envelope containing a SOAP 
header
-with wsse xml tag. A simple property map has been created containing user and 
password.
-We use Apache CXF WSS4JInterceptor to get the user/password and timestamp and 
authenticate
-the user using the WSS4J callback
-
-You will need to compile this example first:
-  mvn install
-
-Remarks:
-- During the compilation phase, a unit test will be performed, this unit test 
simulates the
-  communication between a client calling the web services exposed by our 
camel/cxf routes. During the call,
-  the user "charles" is used to authenticate the web service call and the SOAP 
message created can be
-  retrieved from log file target/camel-example-reportincident-wssecurity.log
-- A mock SMTP server is used during unit test
-- In Eclipse, I have used the following option when starting the junit test 
case. This option tells
-  CXF that it must use log4j : 
-Dorg.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
-
-To run the example on Apache ServiceMix 4.x or Apache Karaf 2.x
-
-  1) launch the server
-  karaf.bat
-  
-  For Karaf: edit the file jre.properties to add the following packages to be 
exported
-  jre-1.6=, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- 
- They are required by the following bundle : 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/1.3.2_1
-  
-  2) Add features required
-  features:addUrl 
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
-  features:install http
-  features:install camel
-  features:install camel-cxf
-  features:install camel-mail
-  features:install camel-velocity
-  features:install cxf-bindings-corba
-  features:install cxf-transports-jms
-  features:install cxf-ws-security
-  
-  remark: As the camel route sends email to a SMTP server, you must configure 
a user/password in your favorite
-  SMTP Server (James by example). User = someone and password = secret
-  
-  3) Deploy our example
-  osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
-  
-  4) Verify that your service is available using in the browser the following 
url
-  http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
-
-  5) Start SOAPUI (2.x)
-  Create a new project called camel-example-reportincident-wssecurity
-  Point to the following url : 
http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
-  Open the request 1 (under camel-example-reportincident-wssecurity --> 
ReportIncidentBinding --> ReportIncident) and copy/paste the SOAP
-  message generated by the unit test (don't copy the payload below as it's 
credentials expired 5 minutes after we pasted them into this readme!)
-  
-  ex :
-  
-   2010-07-14 09:57:54,403 [main   ] INFO  LoggingOutInterceptor   
   - Outbound Message
-   ---
-   ID: 1
-   Address: 
http://localhost:9081/camel-example-reportincident/webservices/incident
-   Encoding: UTF-8
-   Content-Type: text/xml
-   Headers: 
{SOAPAction=["http://reportincident.example.camel.apache.org/ReportIncident;], 
Accept=[*/*]}
-   Payload: http://schemas.xmlsoap.org/soap/envelope/;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;
 soap:mustUnderstand="1">http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;
 

[2/3] camel git commit: CAMEL-9543 - Discovering new type converters in OSGi wipes out those manually added

[janstey]

CAMEL-9543 - Discovering new type converters in OSGi wipes out those manually 
added


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

Branch: refs/heads/camel-2.16.x
Commit: 206a4643461c4f715b5f8c17453e63e651f1e1b3
Parents: b4f2374
Author: Jonathan Anstey 
Authored: Wed Jan 27 23:53:45 2016 -0330
Committer: Jonathan Anstey 
Committed: Wed Jan 27 23:54:12 2016 -0330

--
 .../apache/camel/core/osgi/OsgiTypeConverter.java  | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/206a4643/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index c25e479..46767fe 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -62,19 +62,8 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 
 public Object addingService(ServiceReference 
serviceReference) {
-LOG.trace("AddingService: {}", serviceReference);
+LOG.trace("AddingService: {}, Bundle: {}", serviceReference, 
serviceReference.getBundle());
 TypeConverterLoader loader = 
bundleContext.getService(serviceReference);
-// just make sure we don't load the bundle converter this time
-if (delegate != null) {
-try {
-ServiceHelper.stopService(this.delegate);
-} catch (Exception e) {
-// ignore
-LOG.debug("Error stopping service due: " + e.getMessage() + ". 
This exception will be ignored.", e);
-}
-// It can force camel to reload the type converter again
-this.delegate = null;
-}
 return loader;
 }
 
@@ -82,7 +71,7 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 
 public void removedService(ServiceReference 
serviceReference, Object o) {
-LOG.trace("RemovedService: {}", serviceReference);
+LOG.trace("RemovedService: {}, Bundle: {}", serviceReference, 
serviceReference.getBundle());  
 try {
 ServiceHelper.stopService(this.delegate);
 } catch (Exception e) {
@@ -91,6 +80,8 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 // It can force camel to reload the type converter again
 this.delegate = null;
+
+// TODO: reloading all type converters when one service is removed is 
suboptimal...
 }
 
 @Override

[1/3] camel git commit: CAMEL-9543 - Discovering new type converters in OSGi wipes out those manually added

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x cb67fe978 -> 508c1dfab
  refs/heads/camel-2.16.x b4f2374ea -> 206a46434
  refs/heads/master e4223b9a0 -> d3bfca99d


CAMEL-9543 - Discovering new type converters in OSGi wipes out those manually 
added


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

Branch: refs/heads/master
Commit: d3bfca99d8dfdf51ee3e52d4622f7ecd71ed66f9
Parents: e4223b9
Author: Jonathan Anstey 
Authored: Wed Jan 27 23:53:45 2016 -0330
Committer: Jonathan Anstey 
Committed: Wed Jan 27 23:53:45 2016 -0330

--
 .../apache/camel/core/osgi/OsgiTypeConverter.java  | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d3bfca99/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index c25e479..46767fe 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -62,19 +62,8 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 
 public Object addingService(ServiceReference 
serviceReference) {
-LOG.trace("AddingService: {}", serviceReference);
+LOG.trace("AddingService: {}, Bundle: {}", serviceReference, 
serviceReference.getBundle());
 TypeConverterLoader loader = 
bundleContext.getService(serviceReference);
-// just make sure we don't load the bundle converter this time
-if (delegate != null) {
-try {
-ServiceHelper.stopService(this.delegate);
-} catch (Exception e) {
-// ignore
-LOG.debug("Error stopping service due: " + e.getMessage() + ". 
This exception will be ignored.", e);
-}
-// It can force camel to reload the type converter again
-this.delegate = null;
-}
 return loader;
 }
 
@@ -82,7 +71,7 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 
 public void removedService(ServiceReference 
serviceReference, Object o) {
-LOG.trace("RemovedService: {}", serviceReference);
+LOG.trace("RemovedService: {}, Bundle: {}", serviceReference, 
serviceReference.getBundle());  
 try {
 ServiceHelper.stopService(this.delegate);
 } catch (Exception e) {
@@ -91,6 +80,8 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 // It can force camel to reload the type converter again
 this.delegate = null;
+
+// TODO: reloading all type converters when one service is removed is 
suboptimal...
 }
 
 @Override

[3/3] camel git commit: CAMEL-9543 - Discovering new type converters in OSGi wipes out those manually added

[janstey]

CAMEL-9543 - Discovering new type converters in OSGi wipes out those manually 
added


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

Branch: refs/heads/camel-2.15.x
Commit: 508c1dfabfced364e021af6b7969e9eda35448d4
Parents: cb67fe9
Author: Jonathan Anstey 
Authored: Wed Jan 27 23:53:45 2016 -0330
Committer: Jonathan Anstey 
Committed: Wed Jan 27 23:54:27 2016 -0330

--
 .../apache/camel/core/osgi/OsgiTypeConverter.java  | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/508c1dfa/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index 00f3349..b6d5f8c 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -59,19 +59,8 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 
 public Object addingService(ServiceReference 
serviceReference) {
-LOG.trace("AddingService: {}", serviceReference);
+LOG.trace("AddingService: {}, Bundle: {}", serviceReference, 
serviceReference.getBundle());
 TypeConverterLoader loader = 
bundleContext.getService(serviceReference);
-// just make sure we don't load the bundle converter this time
-if (delegate != null) {
-try {
-ServiceHelper.stopService(this.delegate);
-} catch (Exception e) {
-// ignore
-LOG.debug("Error stopping service due: " + e.getMessage() + ". 
This exception will be ignored.", e);
-}
-// It can force camel to reload the type converter again
-this.delegate = null;
-}
 return loader;
 }
 
@@ -79,7 +68,7 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 
 public void removedService(ServiceReference 
serviceReference, Object o) {
-LOG.trace("RemovedService: {}", serviceReference);
+LOG.trace("RemovedService: {}, Bundle: {}", serviceReference, 
serviceReference.getBundle());  
 try {
 ServiceHelper.stopService(this.delegate);
 } catch (Exception e) {
@@ -88,6 +77,8 @@ public class OsgiTypeConverter extends ServiceSupport 
implements TypeConverter,
 }
 // It can force camel to reload the type converter again
 this.delegate = null;
+
+// TODO: reloading all type converters when one service is removed is 
suboptimal...
 }
 
 @Override

[2/3] camel git commit: CAMEL-9526 - allow depends-on to contain multiple bean ids

[janstey]

CAMEL-9526 - allow depends-on to contain multiple bean ids


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

Branch: refs/heads/camel-2.16.x
Commit: ea6262b44c0d4d15f8662efc9351ebd79baf3e43
Parents: eaefb7c
Author: Jonathan Anstey 
Authored: Wed Jan 20 16:54:10 2016 -0330
Committer: Jonathan Anstey 
Committed: Wed Jan 20 16:55:06 2016 -0330

--
 .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ea6262b4/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
--
diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 393004a..e03cbc0 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -261,7 +261,7 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 factory2.addDependsOn(propertiesComponentResolver.getId());
 // We need to add other components which the camel context dependsOn
 if (ObjectHelper.isNotEmpty(ccfb.getDependsOn())) {
-factory2.addDependsOn(ccfb.getDependsOn());
+factory2.setDependsOn(Arrays.asList(ccfb.getDependsOn().split(" 
|,")));
 }
 
context.getComponentDefinitionRegistry().registerComponentDefinition(factory2);
 
@@ -342,6 +342,7 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 try {
 binder = getJaxbContext().createBinder();
 } catch (JAXBException e) {
+
 throw new ComponentDefinitionException("Failed to create the JAXB 
binder : " + e, e);
 }
 Object value = parseUsingJaxb(element, context, binder);

[3/3] camel git commit: CAMEL-9526 - allow depends-on to contain multiple bean ids

[janstey]

CAMEL-9526 - allow depends-on to contain multiple bean ids


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

Branch: refs/heads/camel-2.15.x
Commit: 1805c6b459043c4dc6e37bc94a2b9a9e4feaff1a
Parents: 91fbaa4
Author: Jonathan Anstey 
Authored: Wed Jan 20 16:54:10 2016 -0330
Committer: Jonathan Anstey 
Committed: Wed Jan 20 16:55:22 2016 -0330

--
 .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1805c6b4/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
--
diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 474d130..9096bc1 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -261,7 +261,7 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 factory2.addDependsOn(propertiesComponentResolver.getId());
 // We need to add other components which the camel context dependsOn
 if (ObjectHelper.isNotEmpty(ccfb.getDependsOn())) {
-factory2.addDependsOn(ccfb.getDependsOn());
+factory2.setDependsOn(Arrays.asList(ccfb.getDependsOn().split(" 
|,")));
 }
 
context.getComponentDefinitionRegistry().registerComponentDefinition(factory2);
 
@@ -342,6 +342,7 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 try {
 binder = getJaxbContext().createBinder();
 } catch (JAXBException e) {
+
 throw new ComponentDefinitionException("Failed to create the JAXB 
binder : " + e, e);
 }
 Object value = parseUsingJaxb(element, context, binder);

[1/3] camel git commit: CAMEL-9526 - allow depends-on to contain multiple bean ids

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 91fbaa449 -> 1805c6b45
  refs/heads/camel-2.16.x eaefb7c3d -> ea6262b44
  refs/heads/master 6705ca952 -> b6355aed7


CAMEL-9526 - allow depends-on to contain multiple bean ids


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

Branch: refs/heads/master
Commit: b6355aed758572b18a5be5449f9f3bb5deb7c35d
Parents: 6705ca9
Author: Jonathan Anstey 
Authored: Wed Jan 20 16:54:10 2016 -0330
Committer: Jonathan Anstey 
Committed: Wed Jan 20 16:54:10 2016 -0330

--
 .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b6355aed/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
--
diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 393004a..e03cbc0 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -261,7 +261,7 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 factory2.addDependsOn(propertiesComponentResolver.getId());
 // We need to add other components which the camel context dependsOn
 if (ObjectHelper.isNotEmpty(ccfb.getDependsOn())) {
-factory2.addDependsOn(ccfb.getDependsOn());
+factory2.setDependsOn(Arrays.asList(ccfb.getDependsOn().split(" 
|,")));
 }
 
context.getComponentDefinitionRegistry().registerComponentDefinition(factory2);
 
@@ -342,6 +342,7 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 try {
 binder = getJaxbContext().createBinder();
 } catch (JAXBException e) {
+
 throw new ComponentDefinitionException("Failed to create the JAXB 
binder : " + e, e);
 }
 Object value = parseUsingJaxb(element, context, binder);

[2/3] camel git commit: CAMEL-9368 - don't fail the exchange if we actually specify to disconnect

[janstey]

CAMEL-9368 - don't fail the exchange if we actually specify to disconnect


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

Branch: refs/heads/camel-2.16.x
Commit: 9c8b250e49066cc933adbe23d49f822a77401294
Parents: 0535e48
Author: Jonathan Anstey 
Authored: Thu Dec 17 15:55:09 2015 -0330
Committer: Jonathan Anstey 
Committed: Thu Dec 17 15:59:53 2015 -0330

--
 .../camel/component/netty4/handlers/ClientChannelHandler.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9c8b250e/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index 8905540..160adf4 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -121,7 +121,10 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Channel closed but no message received from 
address: {}", address);
 }
-exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
+// don't fail the exchange if we actually specify to disconnect
+if (!configuration.isDisconnect()) {
+exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
+}
 // signal callback
 callback.done(false);
 }

[3/3] camel git commit: CAMEL-9368 - don't fail the exchange if we actually specify to disconnect

[janstey]

CAMEL-9368 - don't fail the exchange if we actually specify to disconnect


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

Branch: refs/heads/camel-2.15.x
Commit: ec2d2394c13a4936c8e5a80732e235038ccbca73
Parents: 86f1de5
Author: Jonathan Anstey 
Authored: Thu Dec 17 15:55:09 2015 -0330
Committer: Jonathan Anstey 
Committed: Thu Dec 17 16:00:34 2015 -0330

--
 .../camel/component/netty4/handlers/ClientChannelHandler.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ec2d2394/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index 81c67cc..9e51053 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -116,7 +116,10 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Channel closed but no message received from 
address: {}", address);
 }
-exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
+// don't fail the exchange if we actually specify to disconnect
+if (!configuration.isDisconnect()) {
+exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
+}
 // signal callback
 callback.done(false);
 }

[1/3] camel git commit: CAMEL-9368 - don't fail the exchange if we actually specify to disconnect

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 86f1de519 -> ec2d2394c
  refs/heads/camel-2.16.x 0535e4829 -> 9c8b250e4
  refs/heads/master 2c6cc6a7b -> 904a49b68


CAMEL-9368 - don't fail the exchange if we actually specify to disconnect


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

Branch: refs/heads/master
Commit: 904a49b68cf210c37dae9bacb82caed2dbf2d08e
Parents: 2c6cc6a
Author: Jonathan Anstey 
Authored: Thu Dec 17 15:55:09 2015 -0330
Committer: Jonathan Anstey 
Committed: Thu Dec 17 15:55:26 2015 -0330

--
 .../camel/component/netty4/handlers/ClientChannelHandler.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/904a49b6/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index 8905540..160adf4 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -121,7 +121,10 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Channel closed but no message received from 
address: {}", address);
 }
-exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
+// don't fail the exchange if we actually specify to disconnect
+if (!configuration.isDisconnect()) {
+exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
+}
 // signal callback
 callback.done(false);
 }

[3/3] camel git commit: CAMEL-9368 - Netty4 producer hangs when connection is prematurely closed

[janstey]

CAMEL-9368 - Netty4 producer hangs when connection is prematurely closed


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

Branch: refs/heads/camel-2.15.x
Commit: 2df8ed4e3f0dba69dad59745c9ebc68600c1ddf4
Parents: 5347e63
Author: Jonathan Anstey 
Authored: Thu Nov 26 16:05:37 2015 -0330
Committer: Jonathan Anstey 
Committed: Thu Nov 26 16:06:26 2015 -0330

--
 .../netty4/handlers/ClientChannelHandler.java   | 21 +++--
 .../netty4/handlers/ServerChannelHandler.java   |  8 +-
 .../component/netty4/NettyProducerHangTest.java | 93 
 3 files changed, 113 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2df8ed4e/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index e7d0d13..81c67cc 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.netty4.NettyCamelState;
+import org.apache.camel.component.netty4.NettyConfiguration;
 import org.apache.camel.component.netty4.NettyConstants;
 import org.apache.camel.component.netty4.NettyHelper;
 import org.apache.camel.component.netty4.NettyPayloadHelper;
@@ -47,12 +48,14 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 }
 
 @Override
-public void channelActive(ChannelHandlerContext ctx) {
+public void channelActive(ChannelHandlerContext ctx) throws Exception {
 if (LOG.isTraceEnabled()) {
 LOG.trace("Channel open: {}", ctx.channel());
 }
 // to keep track of open sockets
 producer.getAllChannels().add(ctx.channel());
+
+super.channelActive(ctx);
 }
 
 @Override
@@ -89,7 +92,7 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 }
 
 @Override
-public void channelInactive(ChannelHandlerContext ctx) {
+public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 if (LOG.isTraceEnabled()) {
 LOG.trace("Channel closed: {}", ctx.channel());
 }
@@ -103,18 +106,23 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 // to keep track of open sockets
 producer.getAllChannels().remove(ctx.channel());
 
-if (producer.getConfiguration().isSync() && !messageReceived && 
!exceptionHandled) {
+NettyConfiguration configuration = producer.getConfiguration();
+if (configuration.isSync() && !exceptionHandled) {
 // To avoid call the callback.done twice
 exceptionHandled = true;
 // session was closed but no message received. This could be 
because the remote server had an internal error
-// and could not return a response. We should count down to stop 
waiting for a response
+// and could not return a response. We should count down to stop 
waiting for a response
+String address = configuration != null ? 
configuration.getAddress() : "";
 if (LOG.isDebugEnabled()) {
-LOG.debug("Channel closed but no message received from 
address: {}", producer.getConfiguration().getAddress());
+LOG.debug("Channel closed but no message received from 
address: {}", address);
 }
-exchange.setException(new CamelExchangeException("No response 
received from remote server: " + producer.getConfiguration().getAddress(), 
exchange));
+exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
 // signal callback
 callback.done(false);
 }
+
+// make sure the event can be processed by other handlers
+super.channelInactive(ctx);
 }
 
 @Override
@@ -198,7 +206,6 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
  * @throws Exception is thrown if error getting the response message
  */
 protected Message 

[1/3] camel git commit: CAMEL-9368 - Netty4 producer hangs when connection is prematurely closed

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 5347e630a -> 2df8ed4e3
  refs/heads/camel-2.16.x 083b89bfa -> 7bb44ce60
  refs/heads/master 3f749f781 -> 2c96cb137


CAMEL-9368 - Netty4 producer hangs when connection is prematurely closed


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

Branch: refs/heads/master
Commit: 2c96cb1374cccb30525e5330190006a1e1fb79f0
Parents: 3f749f7
Author: Jonathan Anstey 
Authored: Thu Nov 26 16:05:37 2015 -0330
Committer: Jonathan Anstey 
Committed: Thu Nov 26 16:05:37 2015 -0330

--
 .../netty4/handlers/ClientChannelHandler.java   | 21 +++--
 .../netty4/handlers/ServerChannelHandler.java   |  8 +-
 .../component/netty4/NettyProducerHangTest.java | 93 
 3 files changed, 113 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2c96cb13/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index dd64cb6..8905540 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.netty4.NettyCamelState;
+import org.apache.camel.component.netty4.NettyConfiguration;
 import org.apache.camel.component.netty4.NettyConstants;
 import org.apache.camel.component.netty4.NettyHelper;
 import org.apache.camel.component.netty4.NettyPayloadHelper;
@@ -47,12 +48,14 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 }
 
 @Override
-public void channelActive(ChannelHandlerContext ctx) {
+public void channelActive(ChannelHandlerContext ctx) throws Exception {
 if (LOG.isTraceEnabled()) {
 LOG.trace("Channel open: {}", ctx.channel());
 }
 // to keep track of open sockets
 producer.getAllChannels().add(ctx.channel());
+
+super.channelActive(ctx);
 }
 
 @Override
@@ -94,7 +97,7 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 }
 
 @Override
-public void channelInactive(ChannelHandlerContext ctx) {
+public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 if (LOG.isTraceEnabled()) {
 LOG.trace("Channel closed: {}", ctx.channel());
 }
@@ -108,18 +111,23 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 // to keep track of open sockets
 producer.getAllChannels().remove(ctx.channel());
 
-if (producer.getConfiguration().isSync() && !messageReceived && 
!exceptionHandled) {
+NettyConfiguration configuration = producer.getConfiguration();
+if (configuration.isSync() && !exceptionHandled) {
 // To avoid call the callback.done twice
 exceptionHandled = true;
 // session was closed but no message received. This could be 
because the remote server had an internal error
-// and could not return a response. We should count down to stop 
waiting for a response
+// and could not return a response. We should count down to stop 
waiting for a response
+String address = configuration != null ? 
configuration.getAddress() : "";
 if (LOG.isDebugEnabled()) {
-LOG.debug("Channel closed but no message received from 
address: {}", producer.getConfiguration().getAddress());
+LOG.debug("Channel closed but no message received from 
address: {}", address);
 }
-exchange.setException(new CamelExchangeException("No response 
received from remote server: " + producer.getConfiguration().getAddress(), 
exchange));
+exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
 // signal callback
 callback.done(false);
 }
+
+// make sure the event can be processed by other handlers
+super.channelInactive(ctx);
 }
 
 @Override
@@ -202,7 +210,6 @@ public class 

[2/3] camel git commit: CAMEL-9368 - Netty4 producer hangs when connection is prematurely closed

[janstey]

CAMEL-9368 - Netty4 producer hangs when connection is prematurely closed


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

Branch: refs/heads/camel-2.16.x
Commit: 7bb44ce60dbb827ec72ff30adc40778f18a450bd
Parents: 083b89b
Author: Jonathan Anstey 
Authored: Thu Nov 26 16:05:37 2015 -0330
Committer: Jonathan Anstey 
Committed: Thu Nov 26 16:06:08 2015 -0330

--
 .../netty4/handlers/ClientChannelHandler.java   | 21 +++--
 .../netty4/handlers/ServerChannelHandler.java   |  8 +-
 .../component/netty4/NettyProducerHangTest.java | 93 
 3 files changed, 113 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7bb44ce6/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index dd64cb6..8905540 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.netty4.NettyCamelState;
+import org.apache.camel.component.netty4.NettyConfiguration;
 import org.apache.camel.component.netty4.NettyConstants;
 import org.apache.camel.component.netty4.NettyHelper;
 import org.apache.camel.component.netty4.NettyPayloadHelper;
@@ -47,12 +48,14 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 }
 
 @Override
-public void channelActive(ChannelHandlerContext ctx) {
+public void channelActive(ChannelHandlerContext ctx) throws Exception {
 if (LOG.isTraceEnabled()) {
 LOG.trace("Channel open: {}", ctx.channel());
 }
 // to keep track of open sockets
 producer.getAllChannels().add(ctx.channel());
+
+super.channelActive(ctx);
 }
 
 @Override
@@ -94,7 +97,7 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 }
 
 @Override
-public void channelInactive(ChannelHandlerContext ctx) {
+public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 if (LOG.isTraceEnabled()) {
 LOG.trace("Channel closed: {}", ctx.channel());
 }
@@ -108,18 +111,23 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
 // to keep track of open sockets
 producer.getAllChannels().remove(ctx.channel());
 
-if (producer.getConfiguration().isSync() && !messageReceived && 
!exceptionHandled) {
+NettyConfiguration configuration = producer.getConfiguration();
+if (configuration.isSync() && !exceptionHandled) {
 // To avoid call the callback.done twice
 exceptionHandled = true;
 // session was closed but no message received. This could be 
because the remote server had an internal error
-// and could not return a response. We should count down to stop 
waiting for a response
+// and could not return a response. We should count down to stop 
waiting for a response
+String address = configuration != null ? 
configuration.getAddress() : "";
 if (LOG.isDebugEnabled()) {
-LOG.debug("Channel closed but no message received from 
address: {}", producer.getConfiguration().getAddress());
+LOG.debug("Channel closed but no message received from 
address: {}", address);
 }
-exchange.setException(new CamelExchangeException("No response 
received from remote server: " + producer.getConfiguration().getAddress(), 
exchange));
+exchange.setException(new CamelExchangeException("No response 
received from remote server: " + address, exchange));
 // signal callback
 callback.done(false);
 }
+
+// make sure the event can be processed by other handlers
+super.channelInactive(ctx);
 }
 
 @Override
@@ -202,7 +210,6 @@ public class ClientChannelHandler extends 
SimpleChannelInboundHandler {
  * @throws Exception is thrown if error getting the response message
  */
 protected Message 

camel git commit: CAMEL-9290 - reconnect netty4 consumer on channel close as well

[janstey]

Repository: camel
Updated Branches:
  refs/heads/master 62d6fa52a -> 79396207c


CAMEL-9290 - reconnect netty4 consumer on channel close as well


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

Branch: refs/heads/master
Commit: 79396207c59ac7f52d7f4abf6673c02825494a3f
Parents: 62d6fa5
Author: Jonathan Anstey 
Authored: Wed Nov 4 16:53:45 2015 -0330
Committer: Jonathan Anstey 
Committed: Wed Nov 4 16:53:57 2015 -0330

--
 ...lientModeTCPNettyServerBootstrapFactory.java | 45 ++--
 1 file changed, 31 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/79396207/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
index 202e9dd..6305156 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
@@ -31,6 +31,7 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoop;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
 import org.apache.camel.support.ServiceSupport;
@@ -185,21 +186,10 @@ public class ClientModeTCPNettyServerBootstrapFactory 
extends ServiceSupport imp
 }
 
 if (!channelFuture.isDone() || !channelFuture.isSuccess()) {
-//check if reconnect is enabled and schedule a reconnect, if from 
handler then dont schedule a reconnect
+//check if reconnect is enabled and schedule a reconnect, if from 
handler then don't schedule a reconnect
 if (configuration.isReconnect()) {
-final EventLoop loop = channelFuture.channel().eventLoop();
-loop.schedule(new Runnable() {
-@Override
-public void run() {
-try {
-LOG.trace("Re-connecting to {} if needed", 
configuration.getAddress());
-doReconnectIfNeeded();
-} catch (Exception e) {
-LOG.warn("Error during re-connect to " + 
configuration.getAddress() + ". Will attempt again in "
-+ configuration.getReconnectInterval() + " 
millis. This exception is ignored.", e);
-}
-}
-}, configuration.getReconnectInterval(), 
TimeUnit.MILLISECONDS);
+scheduleReconnect(channelFuture);
+return null;
 } else {
 ConnectException cause = new ConnectException("Cannot connect 
to " + configuration.getAddress());
 if (channelFuture.cause() != null) {
@@ -213,7 +203,34 @@ public class ClientModeTCPNettyServerBootstrapFactory 
extends ServiceSupport imp
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating connector to address: {}", 
configuration.getAddress());
 }
+
+// schedule a reconnect to happen when the channel closes
+if (configuration.isReconnect()) {
+answer.closeFuture().addListener(new ChannelFutureListener() {
+@Override
+public void operationComplete(ChannelFuture future) throws 
Exception {
+scheduleReconnect(channelFuture);
+};
+});
+}
+
 return answer;
 }
 
+private void scheduleReconnect(final ChannelFuture channelFuture) {
+final EventLoop loop = channelFuture.channel().eventLoop();
+loop.schedule(new Runnable() {
+@Override
+public void run() {
+try {
+LOG.trace("Re-connecting to {} if needed", 
configuration.getAddress());
+doReconnectIfNeeded();
+} catch (Exception e) {
+LOG.warn("Error during re-connect to " + 
configuration.getAddress() + ". Will attempt again in "
++ configuration.getReconnectInterval() + " millis. 
This exception is ignored.", e);
+}
+

camel git commit: CAMEL-9290 - reconnect netty4 consumer on channel close as well

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x f5f8310bc -> d7f48d56c


CAMEL-9290 - reconnect netty4 consumer on channel close as well


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

Branch: refs/heads/camel-2.16.x
Commit: d7f48d56c5c394c8a204e56ce59f4071f01bf9b3
Parents: f5f8310
Author: Jonathan Anstey 
Authored: Wed Nov 4 16:53:45 2015 -0330
Committer: Jonathan Anstey 
Committed: Wed Nov 4 16:54:28 2015 -0330

--
 ...lientModeTCPNettyServerBootstrapFactory.java | 45 ++--
 1 file changed, 31 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d7f48d56/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
index 202e9dd..6305156 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
@@ -31,6 +31,7 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoop;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
 import org.apache.camel.support.ServiceSupport;
@@ -185,21 +186,10 @@ public class ClientModeTCPNettyServerBootstrapFactory 
extends ServiceSupport imp
 }
 
 if (!channelFuture.isDone() || !channelFuture.isSuccess()) {
-//check if reconnect is enabled and schedule a reconnect, if from 
handler then dont schedule a reconnect
+//check if reconnect is enabled and schedule a reconnect, if from 
handler then don't schedule a reconnect
 if (configuration.isReconnect()) {
-final EventLoop loop = channelFuture.channel().eventLoop();
-loop.schedule(new Runnable() {
-@Override
-public void run() {
-try {
-LOG.trace("Re-connecting to {} if needed", 
configuration.getAddress());
-doReconnectIfNeeded();
-} catch (Exception e) {
-LOG.warn("Error during re-connect to " + 
configuration.getAddress() + ". Will attempt again in "
-+ configuration.getReconnectInterval() + " 
millis. This exception is ignored.", e);
-}
-}
-}, configuration.getReconnectInterval(), 
TimeUnit.MILLISECONDS);
+scheduleReconnect(channelFuture);
+return null;
 } else {
 ConnectException cause = new ConnectException("Cannot connect 
to " + configuration.getAddress());
 if (channelFuture.cause() != null) {
@@ -213,7 +203,34 @@ public class ClientModeTCPNettyServerBootstrapFactory 
extends ServiceSupport imp
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating connector to address: {}", 
configuration.getAddress());
 }
+
+// schedule a reconnect to happen when the channel closes
+if (configuration.isReconnect()) {
+answer.closeFuture().addListener(new ChannelFutureListener() {
+@Override
+public void operationComplete(ChannelFuture future) throws 
Exception {
+scheduleReconnect(channelFuture);
+};
+});
+}
+
 return answer;
 }
 
+private void scheduleReconnect(final ChannelFuture channelFuture) {
+final EventLoop loop = channelFuture.channel().eventLoop();
+loop.schedule(new Runnable() {
+@Override
+public void run() {
+try {
+LOG.trace("Re-connecting to {} if needed", 
configuration.getAddress());
+doReconnectIfNeeded();
+} catch (Exception e) {
+LOG.warn("Error during re-connect to " + 
configuration.getAddress() + ". Will attempt again in "
++ configuration.getReconnectInterval() + " millis. 
This exception is ignored.", e);
+