buildbot success in on camel-site-production

[buildbot]

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

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

Buildslave for this Build: bb-cms-slave

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

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

[buildbot]

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

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

Buildslave for this Build: bb-cms-slave

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[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"]
 |===

camel git commit: Fix CS

[lburgazzoli]

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


Fix CS


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

Branch: refs/heads/master
Commit: e0fed4569f1a6d66eab0d4d07b9d20cf031c
Parents: dbd6834
Author: lburgazzoli 
Authored: Fri Apr 7 18:16:06 2017 +0200
Committer: lburgazzoli 
Committed: Fri Apr 7 18:16:06 2017 +0200

--
 .../camel-infinispan/src/main/docs/infinispan-component.adoc   | 3 ++-
 .../component/infinispan/policy/InfinispanRoutePolicy.java | 4 ++--
 .../infinispan/policy/InfinispanRoutePolicyTestBase.java   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e0fed456/components/camel-infinispan/src/main/docs/infinispan-component.adoc
--
diff --git 
a/components/camel-infinispan/src/main/docs/infinispan-component.adoc 
b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
index 9dfa579..85f2615 100644
--- a/components/camel-infinispan/src/main/docs/infinispan-component.adoc
+++ b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
@@ -59,7 +59,7 @@ with the following path and query parameters:
 | **host** | *Required* Specifies the host of the cache on Infinispan instance 
|  | String
 |===
 
- Query Parameters (14 parameters):
+ Query Parameters (15 parameters):
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
@@ -75,6 +75,7 @@ with the following path and query parameters:
 | **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
 | **command** (producer) | The operation to perform. | put | String
+| **configurationProperties** (advanced) | Infinispan configuration 
properties. |  | Map
 | **configurationUri** (advanced) | An implementation specific URI for the 
CacheManager |  | String
 | **flags** (advanced) | A comma separated list of Flag to be applied by 
default on each cache invocation not applicable to remote caches. |  | String
 | **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean

http://git-wip-us.apache.org/repos/asf/camel/blob/e0fed456/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java
--
diff --git 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java
 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java
index 7103edf..7afc26a 100644
--- 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java
+++ 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java
@@ -356,7 +356,7 @@ public class InfinispanRoutePolicy extends 
RoutePolicySupport implements CamelCo
 private Cache cache;
 private ScheduledFuture future;
 
-public EmbeddedCacheService(Cache cache) {
+EmbeddedCacheService(Cache cache) {
 this.cache = cache;
 this.future = null;
 }
@@ -427,7 +427,7 @@ public class InfinispanRoutePolicy extends 
RoutePolicySupport implements CamelCo
 private ScheduledFuture future;
 private Long version;
 
-public RemoteCacheService(RemoteCache cache) {
+RemoteCacheService(RemoteCache cache) {
 this.cache = cache;
 this.future = null;
 this.version = null;

http://git-wip-us.apache.org/repos/asf/camel/blob/e0fed456/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java
--
diff --git 

camel git commit: CAMEL-10287: Infinispan RoutePolicy to have one route being master, and others as slaves

[lburgazzoli]

Repository: camel
Updated Branches:
  refs/heads/master bef3d9224 -> dbd68347b


CAMEL-10287: Infinispan RoutePolicy to have one route being master, and others 
as slaves


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

Branch: refs/heads/master
Commit: dbd68347b29ce7813262ed2a63fb31e36e94a034
Parents: bef3d92
Author: lburgazzoli 
Authored: Wed Apr 5 18:37:21 2017 +0200
Committer: lburgazzoli 
Committed: Fri Apr 7 17:36:32 2017 +0200

--
 components/camel-infinispan/pom.xml |  14 +-
 .../infinispan/InfinispanConfiguration.java |  26 +
 .../component/infinispan/InfinispanManager.java |  44 +-
 .../component/infinispan/InfinispanUtil.java|   2 +-
 .../policy/InfinispanRoutePolicy.java   | 522 +++
 .../InfinispanEmbeddedRoutePolicyTest.java  |  28 +
 .../policy/InfinispanRemoteRoutePolicyTest.java |  40 ++
 .../policy/InfinispanRoutePolicyTestBase.java   | 118 +
 .../src/test/resources/log4j.xml|   2 +-
 9 files changed, 771 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dbd68347/components/camel-infinispan/pom.xml
--
diff --git a/components/camel-infinispan/pom.xml 
b/components/camel-infinispan/pom.xml
index ddd590d..ea8751c 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -112,31 +112,25 @@
 
 org.apache.logging.log4j
 log4j-api
-${log4j2-25-version}
+${log4j2-version}
 test
 
 
 org.apache.logging.log4j
 log4j-core
-${log4j2-25-version}
+${log4j2-version}
 test
 
 
 org.apache.logging.log4j
 log4j-slf4j-impl
-${log4j2-25-version}
-test
-
-
-org.apache.logging.log4j
-log4j-1.2-api
-${log4j2-25-version}
+${log4j2-version}
 test
 
 
 org.apache.logging.log4j
 log4j-jcl
-${log4j2-25-version}
+${log4j2-version}
 test
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/dbd68347/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
--
diff --git 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
index 0ab5852..0835974 100644
--- 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
+++ 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
@@ -17,7 +17,9 @@
 package org.apache.camel.component.infinispan;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.camel.spi.Metadata;
@@ -60,6 +62,8 @@ public class InfinispanConfiguration {
 private Flag[] flags;
 @UriParam(label = "advanced")
 private String configurationUri;
+@UriParam(label = "advanced")
+private Map configurationProperties;
 
 
 public String getCommand() {
@@ -223,4 +227,26 @@ public class InfinispanConfiguration {
 public void setConfigurationUri(String configurationUri) {
 this.configurationUri = configurationUri;
 }
+
+public Map getConfigurationProperties() {
+return configurationProperties;
+}
+
+/**
+ * Infinispan configuration properties.
+ */
+public void setConfigurationProperties(Map 
configurationProperties) {
+this.configurationProperties = configurationProperties;
+}
+
+/**
+ * Add configuration
+ */
+public void addConfigurationProperty(String key, String value) {
+if (this.configurationProperties == null) {
+this.configurationProperties = new HashMap<>();
+}
+
+this.configurationProperties.put(key, value);
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/dbd68347/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
--
diff --git 

camel git commit: Camel connector allow to do custom logic before producer or consumer does anything.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 3e1f66d04 -> bef3d9224


Camel connector allow to do custom logic before producer or consumer does 
anything.


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

Branch: refs/heads/master
Commit: bef3d9224d73fa54d67f3c3f8f572ba5062efad4
Parents: 3e1f66d
Author: Claus Ibsen 
Authored: Fri Apr 7 15:32:18 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 15:32:18 2017 +0200

--
 .../connector/ConnectorConsumerProcessor.java   | 29 +++--
 .../component/connector/ConnectorProducer.java  | 44 +---
 .../connector/DefaultConnectorEndpoint.java |  4 +-
 3 files changed, 45 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bef3d922/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
index b8d6eaa..aa717ec 100644
--- 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
+++ 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
@@ -19,9 +19,7 @@ package org.apache.camel.component.connector;
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.Route;
 import org.apache.camel.processor.DelegateAsyncProcessor;
-import org.apache.camel.support.SynchronizationAdapter;
 
 /**
  * Connector {@link Processor} which is capable of performing before and after 
custom processing
@@ -39,20 +37,20 @@ public class ConnectorConsumerProcessor extends 
DelegateAsyncProcessor {
 }
 
 @Override
-public boolean process(Exchange exchange, AsyncCallback callback) {
-if (afterConsumer != null) {
-exchange.getUnitOfWork().addSynchronization(new 
SynchronizationAdapter() {
-@Override
-public void onAfterRoute(Route route, Exchange exchange) {
-try {
-afterConsumer.process(exchange);
-} catch (Exception e) {
-// ignore
-}
+public boolean process(Exchange exchange, final AsyncCallback callback) {
+// setup callback for after consumer
+AsyncCallback delegate = doneSync -> {
+if (afterConsumer != null) {
+try {
+afterConsumer.process(exchange);
+} catch (Throwable e) {
+exchange.setException(e);
 }
-});
-}
+}
+callback.done(doneSync);
+};
 
+// perform any before consumer
 if (beforeConsumer != null) {
 try {
 beforeConsumer.process(exchange);
@@ -63,7 +61,8 @@ public class ConnectorConsumerProcessor extends 
DelegateAsyncProcessor {
 }
 }
 
-return super.process(exchange, callback);
+// process the consumer
+return super.process(exchange, delegate);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/bef3d922/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
index 2904ac6..2cdc1d7 100644
--- 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
+++ 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
@@ -16,47 +16,59 @@
  */
 package org.apache.camel.component.connector;
 
-import java.util.concurrent.RejectedExecutionException;
-
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.impl.DefaultAsyncProducer;
+import org.apache.camel.util.AsyncProcessorConverterHelper;
 import 

camel git commit: Camel connector allow to do custom logic before producer or consumer does anything.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 38c3cfa50 -> 3e1f66d04


 Camel connector allow to do custom logic before producer or consumer does 
anything.


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

Branch: refs/heads/master
Commit: 3e1f66d04d352a890bc591e99afd3a94d51e5499
Parents: 38c3cfa
Author: Claus Ibsen 
Authored: Fri Apr 7 15:13:59 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 15:13:59 2017 +0200

--
 .../connector/ConnectorConsumerProcessor.java   | 69 
 .../component/connector/ConnectorProducer.java  |  4 ++
 .../connector/DefaultConnectorEndpoint.java |  4 +-
 3 files changed, 75 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3e1f66d0/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
new file mode 100644
index 000..b8d6eaa
--- /dev/null
+++ 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java
@@ -0,0 +1,69 @@
+/**
+ * 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.connector;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Route;
+import org.apache.camel.processor.DelegateAsyncProcessor;
+import org.apache.camel.support.SynchronizationAdapter;
+
+/**
+ * Connector {@link Processor} which is capable of performing before and after 
custom processing
+ * while consuming a message (ie from the consumer).
+ */
+public class ConnectorConsumerProcessor extends DelegateAsyncProcessor {
+
+private final Processor beforeConsumer;
+private final Processor afterConsumer;
+
+public ConnectorConsumerProcessor(Processor processor, Processor 
beforeConsumer, Processor afterConsumer) {
+super(processor);
+this.beforeConsumer = beforeConsumer;
+this.afterConsumer = afterConsumer;
+}
+
+@Override
+public boolean process(Exchange exchange, AsyncCallback callback) {
+if (afterConsumer != null) {
+exchange.getUnitOfWork().addSynchronization(new 
SynchronizationAdapter() {
+@Override
+public void onAfterRoute(Route route, Exchange exchange) {
+try {
+afterConsumer.process(exchange);
+} catch (Exception e) {
+// ignore
+}
+}
+});
+}
+
+if (beforeConsumer != null) {
+try {
+beforeConsumer.process(exchange);
+} catch (Throwable e) {
+exchange.setException(e);
+callback.done(true);
+return true;
+}
+}
+
+return super.process(exchange, callback);
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3e1f66d0/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
index b0d7225..2904ac6 100644
--- 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
+++ 

camel git commit: Camel connector allow to do custom logic before producer or consumer does anything.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master e8bfc8cfb -> 38c3cfa50


Camel connector allow to do custom logic before producer or consumer does 
anything.


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

Branch: refs/heads/master
Commit: 38c3cfa505c75dc52ea3cc80a1723250dfd925dc
Parents: e8bfc8c
Author: Claus Ibsen 
Authored: Fri Apr 7 14:32:07 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 14:32:19 2017 +0200

--
 .../component/connector/ConnectorComponent.java | 28 +++
 .../component/connector/ConnectorProducer.java  | 82 
 .../connector/DefaultConnectorComponent.java| 45 +++
 .../connector/DefaultConnectorEndpoint.java | 12 ++-
 4 files changed, 164 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/38c3cfa5/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
index 4a7dbce..901ed0b 100644
--- 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
+++ 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
@@ -20,6 +20,7 @@ import java.net.URISyntaxException;
 import java.util.Map;
 
 import org.apache.camel.Component;
+import org.apache.camel.Processor;
 import org.apache.camel.catalog.CamelCatalog;
 
 /**
@@ -76,4 +77,31 @@ public interface ConnectorComponent extends Component {
  */
 void setComponentOptions(Map baseComponentOptions);
 
+/**
+ * To perform custom processing before the producer is sending the message.
+ */
+void setBeforeProducer(Processor processor);
+
+Processor getBeforeProducer();
+
+/**
+ * To perform custom processing after the producer has sent the message 
and received any reply (if InOut).
+ */
+void setAfterProducer(Processor processor);
+
+Processor getAfterProducer();
+
+/**
+ * To perform custom processing when the consumer has just received a new 
incoming message.
+ */
+void setBeforeConsumer(Processor processor);
+
+Processor getBeforeConsumer();
+
+/**
+ * To perform custom processing when the consumer is about to send back a 
reply message to the caller (if InOut).
+ */
+void setAfterConsumer(Processor processor);
+
+Processor getAfterConsumer();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/38c3cfa5/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
--
diff --git 
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
new file mode 100644
index 000..b0d7225
--- /dev/null
+++ 
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorProducer.java
@@ -0,0 +1,82 @@
+/**
+ * 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.connector;
+
+import java.util.concurrent.RejectedExecutionException;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ServiceHelper;
+
+public class ConnectorProducer extends DefaultProducer {
+
+private final Producer producer;
+private final Processor beforeProducer;
+   

[4/4] camel git commit: CAMEL-11107: Create a new camel-grpc component

[acosentino]

CAMEL-11107: Create a new camel-grpc component


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

Branch: refs/heads/master
Commit: 45b17fc76272a00e4be6bd37fa48becf6d050ab7
Parents: 2f3b023
Author: Dmitry Volodin 
Authored: Wed Apr 5 12:25:13 2017 +0300
Committer: Andrea Cosentino 
Committed: Fri Apr 7 13:45:45 2017 +0200

--
 components/camel-grpc/pom.xml   | 127 
 .../src/main/docs/grpc-component.adoc   | 144 +
 .../src/main/java/META-INF/MANIFEST.MF  |   3 +
 .../camel/component/grpc/GrpcComponent.java |  51 +
 .../camel/component/grpc/GrpcConfiguration.java | 132 
 .../camel/component/grpc/GrpcConstants.java |  28 +++
 .../camel/component/grpc/GrpcEndpoint.java  |  56 +
 .../camel/component/grpc/GrpcProducer.java  | 134 
 .../apache/camel/component/grpc/GrpcUtils.java  | 117 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/grpc|  18 ++
 .../src/test/java/META-INF/MANIFEST.MF  |   3 +
 .../camel/component/grpc/GrpcProducerTest.java  | 200 ++
 .../camel-grpc/src/test/proto/pingpong.proto|  44 
 .../src/test/resources/log4j2.properties|  28 +++
 components/pom.xml  |   1 +
 parent/pom.xml  |   6 +
 .../camel-grpc-starter/pom.xml  |  59 ++
 .../GrpcComponentAutoConfiguration.java |  80 
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 ...dditional-spring-configuration-metadata.json |  10 +
 .../main/resources/META-INF/spring.factories|  19 ++
 .../src/main/resources/META-INF/spring.provides |  18 ++
 .../spring-boot/components-starter/pom.xml  |   1 +
 26 files changed, 1707 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/45b17fc7/components/camel-grpc/pom.xml
--
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
new file mode 100644
index 000..4d45f0c
--- /dev/null
+++ b/components/camel-grpc/pom.xml
@@ -0,0 +1,127 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+  4.0.0
+
+  
+org.apache.camel
+components
+2.19.0-SNAPSHOT
+  
+
+  camel-grpc
+  jar
+  Camel :: gRPC
+  Camel component for gRPC (Remote Procedure Call) 
support
+  
+  
+
org.apache.camel.component.grpc.*;${camel.osgi.version}
+
org.apache.camel.spi.ComponentResolver;component=grpc
+  
+
+  
+
+  org.apache.camel
+  camel-core
+
+
+  io.grpc
+  grpc-netty
+  ${grpc-version}
+
+
+  io.grpc
+  grpc-protobuf
+  ${grpc-version}
+
+
+  io.grpc
+  grpc-stub
+  ${grpc-version}
+
+
+
+  org.springframework
+  spring-core
+
+
+
+
+  org.apache.camel
+  camel-test
+  test
+
+
+
+
+  org.apache.logging.log4j
+  log4j-api
+  test
+
+
+  org.apache.logging.log4j
+  log4j-core
+  test
+
+
+  org.apache.logging.log4j
+  log4j-slf4j-impl
+  test
+
+
+  org.apache.logging.log4j
+  log4j-1.2-api
+  test
+
+  
+  
+  
+
+  
+  
+kr.motd.maven
+os-maven-plugin
+1.4.1.Final
+  
+
+
+
+  
+  
+org.xolstice.maven.plugins
+protobuf-maven-plugin
+0.5.0
+
+  
com.google.protobuf:protoc:${protobuf-version}:exe:${os.detected.classifier}
+  grpc-java
+  
io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}
+
+
+  
+
+  test-compile
+  test-compile-custom
+
+  
+
+  
+
+  
+  
+

http://git-wip-us.apache.org/repos/asf/camel/blob/45b17fc7/components/camel-grpc/src/main/docs/grpc-component.adoc
--
diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc 
b/components/camel-grpc/src/main/docs/grpc-component.adoc
new file mode 100644
index 000..417387e
--- /dev/null
+++ b/components/camel-grpc/src/main/docs/grpc-component.adoc
@@ -0,0 

[1/4] camel git commit: Regen

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 2f3b023e5 -> e8bfc8cfb


Regen


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

Branch: refs/heads/master
Commit: e8bfc8cfbdce7fd3bf63fb5a138646c784acc707
Parents: bd317a8
Author: Andrea Cosentino 
Authored: Fri Apr 7 13:45:04 2017 +0200
Committer: Andrea Cosentino 
Committed: Fri Apr 7 13:45:45 2017 +0200

--
 components/readme.adoc  | 5 -
 docs/user-manual/en/SUMMARY.md  | 1 +
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml   | 5 +
 3 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e8bfc8cf/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index f9a434a..e54b2ba 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^
 
 // components: START
-Number of Components: 227 in 181 JAR artifacts (14 deprecated)
+Number of Components: 228 in 182 JAR artifacts (14 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -263,6 +263,9 @@ Number of Components: 227 in 181 JAR artifacts (14 
deprecated)
 | link:camel-grape/src/main/docs/grape-component.adoc[Grape] (camel-grape) +
 `grape:defaultCoordinates` | 2.16 | Grape component allows you to fetch, load 
and manage additional jars when CamelContext is running.
 
+| link:camel-grpc/src/main/docs/grpc-component.adoc[gRPC] (camel-grpc) +
+`grpc:service` | 2.19 | The gRPC component is using for calling remote 
procedures via HTTP/2
+
 | link:camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc[Guava 
EventBus] (camel-guava-eventbus) +
 `guava-eventbus:eventBusRef` | 2.10 | The guava-eventbus component provides 
integration bridge between Camel and Google Guava EventBus.
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e8bfc8cf/docs/user-manual/en/SUMMARY.md
--
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index e6c6900..e5330bf 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -199,6 +199,7 @@
* [Google Pubsub](google-pubsub-component.adoc)
* [Gora](gora-component.adoc)
* [Grape](grape-component.adoc)
+   * [gRPC](grpc-component.adoc)
* [Guava EventBus](guava-eventbus-component.adoc)
* [Hazelcast](hazelcast-component.adoc)
* [HBase](hbase-component.adoc)

http://git-wip-us.apache.org/repos/asf/camel/blob/e8bfc8cf/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
--
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 e09ca98..76b 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
@@ -1034,6 +1034,11 @@
   
   
 org.apache.camel
+camel-grpc
+${project.version}
+  
+  
+org.apache.camel
 camel-gson
 ${project.version}
   

[2/4] camel git commit: CAMEL-11107: Changing camel-grpc documentation

[acosentino]

CAMEL-11107: Changing camel-grpc documentation


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

Branch: refs/heads/master
Commit: bd317a8a9e3b69241f99c7b2d95b561e7218e68c
Parents: 45b17fc
Author: Dmitry Volodin 
Authored: Wed Apr 5 12:38:37 2017 +0300
Committer: Andrea Cosentino 
Committed: Fri Apr 7 13:45:45 2017 +0200

--
 .../src/main/docs/grpc-component.adoc   | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd317a8a/components/camel-grpc/src/main/docs/grpc-component.adoc
--
diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc 
b/components/camel-grpc/src/main/docs/grpc-component.adoc
index 417387e..3f06f14 100644
--- a/components/camel-grpc/src/main/docs/grpc-component.adoc
+++ b/components/camel-grpc/src/main/docs/grpc-component.adoc
@@ -3,8 +3,8 @@
 *Available as of Camel version 2.19*
 
 The gRPC component allows you to do Remote Procedure Call (RPC) 
-using https://developers.google.com/protocol-buffers/docs/overview[Protocol 
Buffers (protobuf)] format
-over HTTP/2 transport.
+using https://developers.google.com/protocol-buffers/docs/overview[Protocol 
Buffers (protobuf)] 
+exchange format over HTTP/2 transport.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -72,23 +72,23 @@ Below is a simple synchronous method invoke with host and 
port parameters
 [source,java]
 ---
 from("direct:grpc-sync")
-.to("grpc://org.apache.camel.component.grpc.PingPong?method=sendPing=localhost=1000");
+.to("grpc://org.apache.camel.component.grpc.PingPong?method=sendPing=localhost=1000=true");
 ---
 
 [source,java]
 
---
 
-
-
+
+
 
 
---
 
-A asynchronous method invoke with target host and port parameter
+An asynchronous method invoke with target host and port parameter
 
 [source,java]
 ---
 from("direct:index")
-.to("grpc://org.apache.camel.component.grpc.PingPong?method=sendPing=ASYNC=dns:///hostname:8000");
+.to("grpc://org.apache.camel.component.grpc.PingPong?method=pingAsyncResponse=dns:///hostname:8000");
 ---
 
 It's it is recommended to use Maven Protocol Buffers Plugin which calls 
Protocol Buffer Compiler (protoc) tool to generate Java source files from 
.proto (protocol buffer definition) files for the custom project. This plugin 
will generate procedures request and response classes, their builders and gRPC 
procedures stubs classes as well.
@@ -124,6 +124,8 @@ Insert gRPC and protobuf Java code generator plugin 
 tag of the pro
   
 compile
 compile-custom
+test-compile
+test-compile-custom
   
 
   
@@ -138,7 +140,9 @@ https://www.xolstice.org/protobuf-maven-plugin[Maven 
Protocol Buffers Plugin]
 
 ### See Also
 
+* link:getting-started.html[Getting Started]
 * link:configuring-camel.html[Configuring Camel]
 * link:component.html[Component]
 * link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
+* link:protobuf.html[Protocol Buffers Data Format]
+

[3/4] camel git commit: CAMEL-11107: Create a new camel-grpc component

[acosentino]

http://git-wip-us.apache.org/repos/asf/camel/blob/45b17fc7/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--
diff --git 
a/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 
b/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 000..ab3c415
--- /dev/null
+++ 
b/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,10 @@
+{
+  "properties": [
+{
+  "defaultValue": true,
+  "name": "camel.component.grpc.enabled",
+  "description": "Enable grpc component",
+  "type": "java.lang.Boolean"
+}
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/45b17fc7/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.factories
--
diff --git 
a/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.factories
 
b/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000..54ce7cb
--- /dev/null
+++ 
b/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.grpc.springboot.GrpcComponentAutoConfiguration

http://git-wip-us.apache.org/repos/asf/camel/blob/45b17fc7/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.provides
--
diff --git 
a/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.provides
 
b/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 000..b6d67ee
--- /dev/null
+++ 
b/platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+provides: camel-grpc
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/45b17fc7/platforms/spring-boot/components-starter/pom.xml
--
diff --git a/platforms/spring-boot/components-starter/pom.xml 
b/platforms/spring-boot/components-starter/pom.xml
index ec74327..d757699 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -145,6 +145,7 @@
 camel-gora-starter
 camel-grape-starter
 camel-groovy-starter
+camel-grpc-starter
 camel-gson-starter
 camel-guava-eventbus-starter
 camel-guice-starter

[2/2] camel git commit: CAMEL-11111: Disabled test until its implemented

[davsclaus]

CAMEL-1: Disabled test until its implemented


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

Branch: refs/heads/master
Commit: 2f3b023e5ad12a1d068bd2ebcd5189ed0f20ec5f
Parents: 643c3e3
Author: Claus Ibsen 
Authored: Fri Apr 7 13:23:52 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 13:23:52 2017 +0200

--
 .../undertow/UndertowProducerThrowExceptionOnFailureTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f3b023e/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
index 074590b..f0d2472 100644
--- 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
@@ -18,10 +18,12 @@ package org.apache.camel.component.undertow;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;
 
+@Ignore("CAMEL-1")
 public class UndertowProducerThrowExceptionOnFailureTest extends 
BaseUndertowTest {
 
 @Test

[1/2] camel git commit: CAMEL-11111: added unit test for throwExceptionOnFailure

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 5fa359bc5 -> 2f3b023e5


CAMEL-1: added unit test for throwExceptionOnFailure


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

Branch: refs/heads/master
Commit: 643c3e3e0059c80b067814dffb4df41d003906ce
Parents: 5fa359b
Author: Scott Cranton 
Authored: Wed Apr 5 07:49:04 2017 -0400
Committer: Claus Ibsen 
Committed: Fri Apr 7 13:18:04 2017 +0200

--
 ...HttpProducerThrowExceptionOnFailureTest.java | 58 +++
 ...rtowProducerThrowExceptionOnFailureTest.java | 60 
 2 files changed, 118 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/643c3e3e/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
new file mode 100644
index 000..d5b7a60
--- /dev/null
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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.netty4.http;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class NettyHttpProducerThrowExceptionOnFailureTest extends 
BaseNettyTest {
+
+@Test
+public void testFailWithoutException() throws Exception {
+try {
+String out = 
template().requestBody("netty4-http:http://localhost:{{port}}/fail?throwExceptionOnFailure=false;,
 null, String.class);
+assertEquals("Fail", out);
+} catch (Throwable t) {
+t.printStackTrace();
+fail("Should not throw an exception");
+}
+}
+
+@Test
+public void testFailWithException() throws Exception {
+try {
+String out = 
template().requestBody("netty4-http:http://localhost:{{port}}/fail?throwExceptionOnFailure=true;,
 null, String.class);
+fail("Should throw an exception");
+} catch (Throwable t) {
+//t.printStackTrace();
+assertNotNull(t);
+}
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("netty4-http:http://localhost:{{port}}/fail;)
+.setHeader(Exchange.HTTP_RESPONSE_CODE).constant(404)
+.transform(constant("Fail"));
+}
+};
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/643c3e3e/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
new file mode 100644
index 000..074590b
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
@@ -0,0 +1,60 @@
+/**
+ * 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 

[2/3] camel git commit: Upgrade CDI 2 to version 2.0-PFD2

[astefanutti]

Upgrade CDI 2 to version 2.0-PFD2


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

Branch: refs/heads/master
Commit: 9cdb693a10a41acd5008c1324151e795e5e9b1ce
Parents: c75c0ae
Author: Antonin Stefanutti 
Authored: Fri Apr 7 11:56:16 2017 +0200
Committer: Antonin Stefanutti 
Committed: Fri Apr 7 12:14:43 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9cdb693a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c2b895b..2985113 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
 1.0-SP4
 1.1
 1.2
-2.0.Beta1
+2.0-PFD2
 3.2.4_1
 3.2.4
 1.7.35

[1/3] camel git commit: Polish camel-cdi

[astefanutti]

Repository: camel
Updated Branches:
  refs/heads/master a88c016a2 -> 5fa359bc5


Polish camel-cdi


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

Branch: refs/heads/master
Commit: 5fa359bc59e21e74a973f136ad36f63a6d112e57
Parents: 9cdb693
Author: Antonin Stefanutti 
Authored: Fri Apr 7 12:14:15 2017 +0200
Committer: Antonin Stefanutti 
Committed: Fri Apr 7 12:14:43 2017 +0200

--
 .../org/apache/camel/cdi/CdiCamelBeanPostProcessor.java  | 11 +--
 .../main/java/org/apache/camel/cdi/CdiCamelFactory.java  |  2 +-
 .../main/java/org/apache/camel/cdi/CdiCamelRegistry.java |  2 +-
 .../main/java/org/apache/camel/cdi/CdiEventEndpoint.java |  2 +-
 .../main/java/org/apache/camel/cdi/CdiEventNotifier.java |  2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index f19a3a5..707ebbb 100644
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -97,16 +97,7 @@ final class CdiCamelBeanPostProcessor extends 
DefaultCamelBeanPostProcessor {
 }
 
 private CamelPostProcessorHelper getPostProcessorHelper(String 
contextName) {
-CamelPostProcessorHelper helper = 
postProcessorHelpers.get(contextName);
-if (helper == null) {
-CamelContext context = getOrLookupCamelContext(contextName);
-if (context == null) {
-throw new UnsatisfiedResolutionException("No Camel context 
with name [" + contextName + "] is deployed!");
-}
-helper = new CamelPostProcessorHelper(context);
-postProcessorHelpers.put(contextName, helper);
-}
-return helper;
+return postProcessorHelpers.computeIfAbsent(contextName, k -> new 
CamelPostProcessorHelper(getOrLookupCamelContext(k)));
 }
 
 private CamelContext getOrLookupCamelContext(String contextName) {

http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
index 8c4c0f3..e5e0ca8 100755
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
@@ -215,7 +215,7 @@ final class CdiCamelFactory {
 if (qualifiers.isEmpty() && !instance.select(DEFAULT).isUnsatisfied()) 
{
 return instance.select(DEFAULT).get();
 }
-return 
instance.select(qualifiers.stream().toArray(Annotation[]::new)).get();
+return instance.select(qualifiers.toArray(new Annotation[0])).get();
 }
 
 private static  Optional 
getQualifierByType(InjectionPoint ip, Class type) {

http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/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 9593955..7a3c2c5 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,7 +33,7 @@ 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.ObjectHelper.notEmpty;
+import static org.apache.camel.util.StringHelper.notEmpty;
 import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java

[3/3] camel git commit: Upgrade Weld 3 to version 3.0.0.CR2

[astefanutti]

Upgrade Weld 3 to version 3.0.0.CR2


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

Branch: refs/heads/master
Commit: c75c0ae7619b3e4b9d38a838d31a827cbfa1949e
Parents: a88c016
Author: Antonin Stefanutti 
Authored: Fri Apr 7 11:52:59 2017 +0200
Committer: Antonin Stefanutti 
Committed: Fri Apr 7 12:14:43 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/c75c0ae7/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 258557a..2c2b895b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -652,7 +652,7 @@
 0.7
 1.1.28.Final
 2.4.2.Final
-3.0.0.Beta1
+3.0.0.CR2
 0.9.4_5
 2.5.1
 4.4.1

camel git commit: Fixed CamelContext.addLogListener wrong case, added support for log component and log eip

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 97f442c6d -> a88c016a2


Fixed CamelContext.addLogListener wrong case, added support for log component 
and log eip


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

Branch: refs/heads/master
Commit: a88c016a20c48a979a00d7e346e7edfd63695af6
Parents: 97f442c
Author: Gary Brown 
Authored: Thu Apr 6 20:14:48 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Apr 7 12:01:39 2017 +0200

--
 .../java/org/apache/camel/CamelContext.java |  4 +--
 .../apache/camel/impl/DefaultCamelContext.java  |  2 +-
 .../camel/component/log/LogListenerTest.java|  2 +-
 .../camel/processor/LogEipListenerTest.java |  2 +-
 .../camel/opentracing/OpenTracingTracer.java| 33 -
 .../apache/camel/opentracing/SpanDecorator.java |  8 +
 .../decorators/AbstractSpanDecorator.java   |  5 +++
 .../decorators/LogSpanDecorator.java| 31 
 .../org.apache.camel.opentracing.SpanDecorator  |  1 +
 .../apache/camel/opentracing/ABCRouteTest.java  |  8 ++---
 .../CamelOpenTracingTestSupport.java| 37 
 .../opentracing/MulticastParallelRouteTest.java |  6 ++--
 .../apache/camel/opentracing/SpanTestData.java  | 12 +++
 13 files changed, 124 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a88c016a/camel-core/src/main/java/org/apache/camel/CamelContext.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java 
b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 8aec529..b0789c4 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -1975,6 +1975,6 @@ public interface CamelContext extends SuspendableService, 
RuntimeConfiguration {
 /**
  * Adds a {@link LogListener}.
  */
-void addlogListener(LogListener listener);
+void addLogListener(LogListener listener);
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/a88c016a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index f16de74..bea497d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -2691,7 +2691,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 return logListeners;
 }
 
-public void addlogListener(LogListener listener) {
+public void addLogListener(LogListener listener) {
 logListeners.add(listener);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/a88c016a/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java 
b/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java
index dbdaf12..4b506e7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java
@@ -35,7 +35,7 @@ public class LogListenerTest {
 CamelContext context = createCamelContext();
 MockEndpoint mock = context.getEndpoint("mock:foo", 
MockEndpoint.class);
 mock.expectedMessageCount(1);
-context.addlogListener((exchange, camelLogger, message) -> {
+context.addLogListener((exchange, camelLogger, message) -> {
 Assert.assertEquals("Exchange[ExchangePattern: InOnly, BodyType: 
String, Body: hello]", message);
 listenerFired = true;
 return message + " - modified by listener";

http://git-wip-us.apache.org/repos/asf/camel/blob/a88c016a/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java 
b/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java
index 0e52fde..dbebc66 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java
+++ 

[3/3] camel git commit: CAMEL-11021: Add missing docs

[davsclaus]

CAMEL-11021: Add missing docs


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

Branch: refs/heads/master
Commit: 97f442c6dc2f7928a09fcdb8c8c46706d7df067b
Parents: f9d021a
Author: Claus Ibsen 
Authored: Fri Apr 7 10:47:44 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 10:47:44 2017 +0200

--
 .../org/apache/camel/model/RouteDefinition.java | 42 
 .../tools/apt/CoreEipAnnotationProcessor.java   |  7 +++-
 2 files changed, 32 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/97f442c6/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index 2b4a942..5196da8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -48,7 +48,6 @@ import org.apache.camel.model.rest.RestBindingDefinition;
 import org.apache.camel.model.rest.RestDefinition;
 import org.apache.camel.processor.interceptor.HandleFault;
 import org.apache.camel.spi.AsEndpointUri;
-import org.apache.camel.spi.Contract;
 import org.apache.camel.spi.LifecycleStrategy;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.RouteContext;
@@ -664,8 +663,9 @@ public class RouteDefinition extends 
ProcessorDefinition {
  * at runtime, camel look for a required {@link Transformer} and apply if 
exists.
  * The type name consists of two parts, 'scheme' and 'name' connected with 
':'. For Java type 'name'
  * is a fully qualified class name. For example {@code 
java:java.lang.String}, {@code json:ABCOrder}.
- * 
- * @see {@link org.apache.camel.spi.Transformer}
+ *
+ * @see org.apache.camel.spi.Transformer
+ *
  * @param urn input type URN
  * @return the builder
  */
@@ -682,8 +682,10 @@ public class RouteDefinition extends 
ProcessorDefinition {
  * {@link Transformer} and apply if exists, and then applies {@link 
Validator} as well.
  * The type name consists of two parts, 'scheme' and 'name' connected with 
':'. For Java type 'name'
  * is a fully qualified class name. For example {@code 
java:java.lang.String}, {@code json:ABCOrder}.
- * 
- * @see {@link org.apache.camel.spi.Transformer}, {@link 
org.apache.camel.spi.Validator}
+ *
+ * @see org.apache.camel.spi.Transformer
+ * @see org.apache.camel.spi.Validator
+ *
  * @param urn input type URN
  * @return the builder
  */
@@ -698,8 +700,9 @@ public class RouteDefinition extends 
ProcessorDefinition {
  * Declare the expected data type of the input message by Java class.
  * If the actual message type is different at runtime, camel look for a 
required
  * {@link Transformer} and apply if exists.
- * 
- * @see {@link org.apache.camel.spi.Transformer}
+ *
+ * @see org.apache.camel.spi.Transformer
+ *
  * @param clazz Class object of the input type
  * @return the builder
  */
@@ -714,8 +717,10 @@ public class RouteDefinition extends 
ProcessorDefinition {
  * Declare the expected data type of the input message by Java class with 
content validation enabled.
  * If the actual message type is different at runtime, camel look for a 
required
  * {@link Transformer} and apply if exists, and then applies {@link 
Validator} as well.
- * 
- * @see {@link org.apache.camel.spi.Transformer}, {@link 
org.apache.camel.spi.Validator}
+ *
+ * @see org.apache.camel.spi.Transformer
+ * @see org.apache.camel.spi.Validator
+ *
  * @param clazz Class object of the input type
  * @return the builder
  */
@@ -731,8 +736,9 @@ public class RouteDefinition extends 
ProcessorDefinition {
  * at runtime, camel look for a required {@link Transformer} and apply if 
exists.
  * The type name consists of two parts, 'scheme' and 'name' connected with 
':'. For Java type 'name'
  * is a fully qualified class name. For example {@code 
java:java.lang.String}, {@code json:ABCOrder}.
- * 
- * @see {@link org.apache.camel.spi.Transformer}
+ *
+ * @see org.apache.camel.spi.Transformer
+ *
  * @param urn output type URN
  * @return the builder
  */
@@ -750,7 +756,9 @@ public class RouteDefinition extends 
ProcessorDefinition {
  * The type name consists of two parts, 'scheme' and 'name' connected with 
':'. For Java 

[1/3] camel git commit: CAMEL-11021: Add missing docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 077e5df4f -> 97f442c6d


CAMEL-11021: Add missing docs


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

Branch: refs/heads/master
Commit: 6c284f7be78c6f85a61afc67c85825577b4d60ca
Parents: 077e5df
Author: Claus Ibsen 
Authored: Fri Apr 7 10:16:40 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 10:16:40 2017 +0200

--
 .../org/apache/camel/spring/CamelContextFactoryBean.java  | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6c284f7b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
--
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index d839146..3faa12d 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -974,6 +974,9 @@ public class CamelContextFactoryBean extends 
AbstractCamelContextFactoryBean 
serviceCallConfigurations) {
 this.serviceCallConfigurations = serviceCallConfigurations;
@@ -1000,12 +1003,15 @@ public class CamelContextFactoryBean extends 
AbstractCamelContextFactoryBean 
hystrixConfigurations) {
 this.hystrixConfigurations = hystrixConfigurations;

[2/3] camel git commit: CAMEL-11021: Add missing docs

[davsclaus]

CAMEL-11021: Add missing docs


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

Branch: refs/heads/master
Commit: f9d021a59e8755d5780fb6f4ab468259254871cc
Parents: 6c284f7
Author: Claus Ibsen 
Authored: Fri Apr 7 10:29:48 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Apr 7 10:29:48 2017 +0200

--
 .../camel/model/rest/RestBindingDefinition.java | 39 +++---
 .../apache/camel/model/rest/VerbDefinition.java | 56 ++--
 2 files changed, 47 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f9d021a5/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
index 1c037d4..17f195e 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
@@ -244,8 +244,8 @@ public class RestBindingDefinition extends 
OptionalIdentifiedDefinition
+ * The default value is off
  */
 public void setBindingMode(RestBindingMode bindingMode) {
 this.bindingMode = bindingMode;
@@ -309,9 +309,9 @@ public class RestBindingDefinition extends 
OptionalIdentifiedDefinition
+ * The canonical name of the class of the input data. Append a [] to the 
end of the canonical name
+ * if you want the input to be an array type.
  */
 public void setType(String type) {
 this.type = type;
@@ -323,9 +323,9 @@ public class RestBindingDefinition extends 
OptionalIdentifiedDefinition
+ * The canonical name of the class of the input data. Append a [] to the 
end of the canonical name
+ * if you want the input to be an array type.
  */
 public void setOutType(String outType) {
 this.outType = outType;
@@ -336,11 +336,8 @@ public class RestBindingDefinition extends 
OptionalIdentifiedDefinition
+ * The default value is false.
  */
 public void setEnableCORS(Boolean enableCORS) {
 this.enableCORS = enableCORS;

http://git-wip-us.apache.org/repos/asf/camel/blob/f9d021a5/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index 35f66e9..f9c8d3f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -140,7 +140,7 @@ public class VerbDefinition extends 
OptionalIdentifiedDefinition
 }
 
 /**
- * @param method the HTTP verb name such as {@code get, post, put, patch, 
delete, head}.
+ * The HTTP verb such as GET, POST, DELETE, etc.
  */
 public void setMethod(String method) {
 this.method = method;
@@ -151,7 +151,7 @@ public class VerbDefinition extends 
OptionalIdentifiedDefinition
 }
 
 /**
- * @param uri the query path for this REST service, such as {@code 
/id}.
+ * Uri template of this REST service such as /{id}.
  */
 public void setUri(String uri) {
 this.uri = uri;
@@ -162,8 +162,8 @@ public class VerbDefinition extends 
OptionalIdentifiedDefinition
 }
 
 /**
- * @param consumes the HTTP Content Type of the input data, such as {@code 
application/xml} or {@code application/json}.
- * This option will override what may be configured on a 
parent level.
+ * To define the content type what the REST service consumes (accept as 
input), such as application/xml or application/json.
+ * This option will override what may be configured on a parent level
  */
 public void setConsumes(String consumes) {
 this.consumes = consumes;
@@ -174,8 +174,8 @@ public class VerbDefinition extends 
OptionalIdentifiedDefinition
 }
 
 /**
- * @param produces the HTTP Content Type of the output data, such as 
{@code application/xml} or {@code application/json}.
- * This option will override what may be configured on a 
parent level.
+ * To define the content type what the REST service produces (uses for 
output), such as application/xml or application/json
+ * This option will override what may be configured on a parent level
  */
 public