[camel] 01/02: CAMEL-12599: Upgrade to CXF 3.2.5

[dkulp]

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

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

commit 10a2925ce34ffd0a5f1eb4b7d80804d6ec01ccb5
Author: Peter Palaga 
AuthorDate: Tue Jun 26 22:00:52 2018 +0200

CAMEL-12599: Upgrade to CXF 3.2.5
---
 parent/pom.xml |  2 +-
 .../camel-spring-boot-dependencies/pom.xml | 56 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4b698f5..ed2d020 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -174,7 +174,7 @@
 1.4.13
 1.4.13_1
 2.12.0
-3.2.2
+3.2.5
 [3.1,4.0)
 3.2.0
 3.2.0
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 ff7230f..2db49de 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
@@ -3052,142 +3052,142 @@
   
 org.apache.cxf.services.sts
 cxf-services-sts-core
-3.2.2
+3.2.5
   
   
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-core
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-bindings-soap
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-bindings-xml
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-databinding-jaxb
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-features-clustering
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-features-logging
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-frontend-simple
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-management
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-client
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-extension-providers
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-security-oauth2
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-service-description-swagger
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-http
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-jms
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-local
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-addr
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-mex
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-policy
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-rm
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-security
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-security-oauth2
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-wsdl
-3.2.2
+3.2.5
   
   
 org.apache.cxf
 cxf-testutils
-3.2.2
+3.2.5
   
   
 org.apache.ftpserver

[camel] branch camel-2.21.x updated (f659a84 -> 9bb0bc7)

[dkulp]

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

dkulp pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


from f659a84  CAMEL-12601: DefaultFactoryRegistry.unregister throws 
ConcurrentModificationException
 new 10a2925  CAMEL-12599: Upgrade to CXF 3.2.5
 new 9bb0bc7  CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a 
bunch of copy/paste from CXF

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


Summary of changes:
 .../apache/camel/component/cxf/CxfEndpoint.java| 81 ++
 parent/pom.xml |  2 +-
 .../camel-spring-boot-dependencies/pom.xml | 56 +++
 3 files changed, 36 insertions(+), 103 deletions(-)

[camel] 02/02: CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF

[dkulp]

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

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

commit 9bb0bc7f58f4f8b34e37d382295c0d035dbfbdc1
Author: Daniel Kulp 
AuthorDate: Wed Jun 27 18:50:32 2018 +0200

CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of 
copy/paste from CXF
---
 .../apache/camel/component/cxf/CxfEndpoint.java| 81 ++
 1 file changed, 7 insertions(+), 74 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 5a80cb1..c6d34f1 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -1176,85 +1176,18 @@ public class CxfEndpoint extends DefaultEndpoint 
implements AsyncEndpoint, Heade
 CamelCxfClientImpl(Bus bus, Endpoint ep) {
 super(bus, ep);
 }
-
-public Bus getBus() {
-return bus;
-}
-
+  
 @Override
 protected Object[] processResult(Message message, 
org.apache.cxf.message.Exchange exchange,
  BindingOperationInfo oi, Map resContext)
  throws Exception {
-Exception ex = null;
-// Check to see if there is a Fault from the outgoing chain if 
it's an out Message
-if (!message.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) {
-ex = message.getContent(Exception.class);
-}
-boolean mepCompleteCalled = false;
-if (ex != null) {
-completeExchange(exchange);
-mepCompleteCalled = true;
-if (message.getContent(Exception.class) != null) {
-throw ex;
-}
-}
-ex = message.getExchange().get(Exception.class);
-if (ex != null) {
-if (!mepCompleteCalled) {
-completeExchange(exchange);
-}
-throw ex;
-}
-
-Integer responseCode = 
(Integer)exchange.get(Message.RESPONSE_CODE);
-if (null != responseCode && 202 == responseCode) {
-Endpoint ep = exchange.getEndpoint();
-if (null != ep && null != ep.getEndpointInfo() && null == 
ep.getEndpointInfo()
-
.getProperty("org.apache.cxf.ws.addressing.MAPAggregator.decoupledDestination"))
 {
-return null;
-}
-}
-
-// Wait for a response if we need to
-if (oi != null && !oi.getOperationInfo().isOneWay()) {
-waitResponse(exchange);
-}
-
-// leave the input stream open for the caller
-Boolean keepConduitAlive = 
(Boolean)exchange.get(Client.KEEP_CONDUIT_ALIVE);
-if (keepConduitAlive == null || !keepConduitAlive) {
-completeExchange(exchange);
-}
-
-// Grab the response objects if there are any
-List resList = null;
-Message inMsg = exchange.getInMessage();
-if (inMsg != null) {
-if (null != resContext) {
-resContext.putAll(inMsg);
-// remove the recursive reference if present
-resContext.remove(Message.INVOCATION_CONTEXT);
-responseContext.put(Thread.currentThread(), resContext);
-}
-resList = CastUtils.cast(inMsg.getContent(List.class));
-}
-
-// check for an incoming fault
-ex = getException(exchange);
-
-if (ex != null) {
-throw ex;
-}
-
-if (resList != null) {
-return resList.toArray();
+try {
+return super.processResult(message, exchange, oi, resContext);
+} catch (IllegalEmptyResponseException ex) {
+//Camel does not strickly enforce returning a value when a 
value is required from the WSDL/contract
+//Thus, we'll capture the exception raised and return a null
+return null;
 }
-
-return null;
-}
-
-private void completeExchange(org.apache.cxf.message.Exchange 
exchange) {
-getConduitSelector().complete(exchange);
 }
 
 @SuppressWarnings("unchecked")

[camel] 01/02: CAMEL-12599: Upgrade to CXF 3.2.5

[dkulp]

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

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

commit e78c34d02f7c461a354f5ecaf4e0e36894f9baad
Author: Peter Palaga 
AuthorDate: Tue Jun 26 22:00:52 2018 +0200

CAMEL-12599: Upgrade to CXF 3.2.5
---
 parent/pom.xml |  2 +-
 .../camel-spring-boot-dependencies/pom.xml | 56 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d599f50..6fd6216 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -170,7 +170,7 @@
 1.4.13
 1.4.13_1
 2.12.0
-3.2.4
+3.2.5
 [3.1,4.0)
 3.2.0
 3.2.0
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 ab91351..6026c50 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
@@ -3117,142 +3117,142 @@
   
 org.apache.cxf.services.sts
 cxf-services-sts-core
-3.2.4
+3.2.5
   
   
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-core
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-bindings-soap
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-bindings-xml
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-databinding-jaxb
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-features-clustering
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-features-logging
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-frontend-simple
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-management
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-client
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-extension-providers
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-security-oauth2
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-rs-service-description-swagger
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-http
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-jms
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-transports-local
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-addr
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-mex
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-policy
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-rm
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-security
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-ws-security-oauth2
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-rt-wsdl
-3.2.4
+3.2.5
   
   
 org.apache.cxf
 cxf-testutils
-3.2.4
+3.2.5
   
   
 org.apache.ftpserver

[camel] 02/02: CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF

[dkulp]

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

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

commit 7ac5f347bad2049bacd619215ffcb360c85f8fca
Author: Daniel Kulp 
AuthorDate: Wed Jun 27 18:50:32 2018 +0200

CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of 
copy/paste from CXF
---
 .../apache/camel/component/cxf/CxfEndpoint.java| 83 +++---
 1 file changed, 8 insertions(+), 75 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 81316be..58051c2 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -88,12 +88,12 @@ import org.apache.cxf.databinding.source.SourceDataBinding;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.ext.logging.AbstractLoggingInterceptor;
 import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.frontend.ClientFactoryBean;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.headers.Header;
-import org.apache.cxf.interceptor.AbstractLoggingInterceptor;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxws.JaxWsClientFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
@@ -1177,85 +1177,18 @@ public class CxfEndpoint extends DefaultEndpoint 
implements AsyncEndpoint, Heade
 CamelCxfClientImpl(Bus bus, Endpoint ep) {
 super(bus, ep);
 }
-
-public Bus getBus() {
-return bus;
-}
-
+  
 @Override
 protected Object[] processResult(Message message, 
org.apache.cxf.message.Exchange exchange,
  BindingOperationInfo oi, Map resContext)
  throws Exception {
-Exception ex = null;
-// Check to see if there is a Fault from the outgoing chain if 
it's an out Message
-if (!message.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) {
-ex = message.getContent(Exception.class);
-}
-boolean mepCompleteCalled = false;
-if (ex != null) {
-completeExchange(exchange);
-mepCompleteCalled = true;
-if (message.getContent(Exception.class) != null) {
-throw ex;
-}
-}
-ex = message.getExchange().get(Exception.class);
-if (ex != null) {
-if (!mepCompleteCalled) {
-completeExchange(exchange);
-}
-throw ex;
-}
-
-Integer responseCode = 
(Integer)exchange.get(Message.RESPONSE_CODE);
-if (null != responseCode && 202 == responseCode) {
-Endpoint ep = exchange.getEndpoint();
-if (null != ep && null != ep.getEndpointInfo() && null == 
ep.getEndpointInfo()
-
.getProperty("org.apache.cxf.ws.addressing.MAPAggregator.decoupledDestination"))
 {
-return null;
-}
-}
-
-// Wait for a response if we need to
-if (oi != null && !oi.getOperationInfo().isOneWay()) {
-waitResponse(exchange);
-}
-
-// leave the input stream open for the caller
-Boolean keepConduitAlive = 
(Boolean)exchange.get(Client.KEEP_CONDUIT_ALIVE);
-if (keepConduitAlive == null || !keepConduitAlive) {
-completeExchange(exchange);
-}
-
-// Grab the response objects if there are any
-List resList = null;
-Message inMsg = exchange.getInMessage();
-if (inMsg != null) {
-if (null != resContext) {
-resContext.putAll(inMsg);
-// remove the recursive reference if present
-resContext.remove(Message.INVOCATION_CONTEXT);
-responseContext.put(Thread.currentThread(), resContext);
-}
-resList = CastUtils.cast(inMsg.getContent(List.class));
-}
-
-// check for an incoming fault
-ex = getException(exchange);
-
-if (ex != null) {
-throw ex;
-}
-
-if (resList != null) {
-return resList.toArray();
+try {
+return super.processResult(message, exchange, oi, resContext);
+} catch (IllegalEmptyResponseException ex) {
+//Camel d

[camel] branch master updated (b53f408 -> 7ac5f34)

[dkulp]

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

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


from b53f408  CAMEL-12559: camel-testcontainers : add documentation
 new e78c34d  CAMEL-12599: Upgrade to CXF 3.2.5
 new 7ac5f34  CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a 
bunch of copy/paste from CXF

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


Summary of changes:
 .../apache/camel/component/cxf/CxfEndpoint.java| 83 +++---
 parent/pom.xml |  2 +-
 .../camel-spring-boot-dependencies/pom.xml | 56 +++
 3 files changed, 37 insertions(+), 104 deletions(-)

[camel] branch camel-2.21.x updated: [CAMEL-12428] Make sure response code and content type are propagated to cxfrs

[dkulp]

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

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


The following commit(s) were added to refs/heads/camel-2.21.x by this push:
 new 4280d66  [CAMEL-12428] Make sure response code and content type are 
propagated to cxfrs
4280d66 is described below

commit 4280d660ed7bdce2c79d7d5d3da8b63567391f5d
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Apr 9 16:18:54 2018 -0400

[CAMEL-12428] Make sure response code and content type are propagated to 
cxfrs

(cherry picked from commit e4ad40f2eebb68cfde175b171538e26b278f63f6)
---
 .../component/cxf/jaxrs/DefaultCxfRsBinding.java   | 45 +-
 .../component/cxf/jaxrs/CxfRsConsumerTest.java | 23 +--
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 1658a94..0ecfd7b 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.cxf.jaxrs;
 
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.security.auth.Subject;
 import javax.ws.rs.client.Entity;
@@ -38,6 +40,7 @@ import 
org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.spi.HeaderFilterStrategyAware;
 import org.apache.camel.util.ExchangeHelper;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.HttpHeaderHelper;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.model.OperationResourceInfoStack;
@@ -82,7 +85,47 @@ public class DefaultCxfRsBinding implements CxfRsBinding, 
HeaderFilterStrategyAw
 LOG.trace("Get the response from the in message");
 }
 
-return response.getBody();
+Object o = response.getBody();
+if (!(o instanceof Response)) {
+//not a JAX-RS Response object, we need to set the headers from 
the Camel values
+
+
+if 
(response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS) != null) {
+Map<String, Object> headers = CastUtils.cast((Map)response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
 
+new 
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map<String, List> cxfHeaders =
+CastUtils.cast((Map) 
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+for (Map.Entry<String, Object> ent : headers.entrySet()) {
+List v;
+if (ent.getValue() instanceof List) {
+v = CastUtils.cast((List)ent.getValue());
+} else {
+v = Arrays.asList(ent.getValue().toString());
+}
+cxfHeaders.put(ent.getKey(), v);
+}
+}
+
+
+if (response.getHeader(Exchange.HTTP_RESPONSE_CODE) != null && 
!cxfExchange.containsKey(org.apache.cxf.message.Message.RESPONSE_CODE)) {
+cxfExchange.put(org.apache.cxf.message.Message.RESPONSE_CODE, 
response.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class));
+}
+if (response.getHeader(Exchange.CONTENT_TYPE) != null) {
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
 
+new 
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map<String, List> cxfHeaders =
+CastUtils.cast((Map) 
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+if (!cxfHeaders.containsKey(Exchange.CONTENT_TYPE)) {
+List a = 
Arrays.asList((String)response.getHeader(Exchange.CONTENT_TYPE));
+cxfHeaders.put(Exchange.CONTENT_TYPE, a);
+cxfExchange.getOutMessage().put(Exchange.CONTENT_TYPE, 
response.getHeader(Exchange.CONTENT_TYPE));
+}
+}
+}
+return o;
 }
 
 public void 
populateExchangeFromCxfRsRequest(org.apache.cxf.mess

[camel] branch master updated: [CAMEL-12428] Make sure response code and content type are propagated to cxfrs

[dkulp]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e4ad40f  [CAMEL-12428] Make sure response code and content type are 
propagated to cxfrs
e4ad40f is described below

commit e4ad40f2eebb68cfde175b171538e26b278f63f6
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Apr 9 16:18:54 2018 -0400

[CAMEL-12428] Make sure response code and content type are propagated to 
cxfrs
---
 .../component/cxf/jaxrs/DefaultCxfRsBinding.java   | 45 +-
 .../component/cxf/jaxrs/CxfRsConsumerTest.java | 23 +--
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 1658a94..0ecfd7b 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.cxf.jaxrs;
 
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.security.auth.Subject;
 import javax.ws.rs.client.Entity;
@@ -38,6 +40,7 @@ import 
org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.spi.HeaderFilterStrategyAware;
 import org.apache.camel.util.ExchangeHelper;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.HttpHeaderHelper;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.model.OperationResourceInfoStack;
@@ -82,7 +85,47 @@ public class DefaultCxfRsBinding implements CxfRsBinding, 
HeaderFilterStrategyAw
 LOG.trace("Get the response from the in message");
 }
 
-return response.getBody();
+Object o = response.getBody();
+if (!(o instanceof Response)) {
+//not a JAX-RS Response object, we need to set the headers from 
the Camel values
+
+
+if 
(response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS) != null) {
+Map<String, Object> headers = CastUtils.cast((Map)response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
 
+new 
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map<String, List> cxfHeaders =
+CastUtils.cast((Map) 
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+for (Map.Entry<String, Object> ent : headers.entrySet()) {
+List v;
+if (ent.getValue() instanceof List) {
+v = CastUtils.cast((List)ent.getValue());
+} else {
+v = Arrays.asList(ent.getValue().toString());
+}
+cxfHeaders.put(ent.getKey(), v);
+}
+}
+
+
+if (response.getHeader(Exchange.HTTP_RESPONSE_CODE) != null && 
!cxfExchange.containsKey(org.apache.cxf.message.Message.RESPONSE_CODE)) {
+cxfExchange.put(org.apache.cxf.message.Message.RESPONSE_CODE, 
response.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class));
+}
+if (response.getHeader(Exchange.CONTENT_TYPE) != null) {
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
 
+new 
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map<String, List> cxfHeaders =
+CastUtils.cast((Map) 
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+if (!cxfHeaders.containsKey(Exchange.CONTENT_TYPE)) {
+List a = 
Arrays.asList((String)response.getHeader(Exchange.CONTENT_TYPE));
+cxfHeaders.put(Exchange.CONTENT_TYPE, a);
+cxfExchange.getOutMessage().put(Exchange.CONTENT_TYPE, 
response.getHeader(Exchange.CONTENT_TYPE));
+}
+}
+}
+return o;
 }
 
 public void 
populateExchangeFromCxfRsRequest(org.apache.cxf.message.Exchange cxfExchange,
diff --git 
a/components/camel-cxf/src/test/java/org/apache/cam

camel git commit: Update to CXF 3.2.0

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 9dd869b44 -> bf5484eb1


Update to CXF 3.2.0


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

Branch: refs/heads/master
Commit: bf5484eb1b7941abb11e56bbc1c951a5b8159876
Parents: 9dd869b
Author: Daniel Kulp 
Authored: Tue Sep 19 10:59:31 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Sep 19 10:59:45 2017 -0400

--
 parent/pom.xml  |  8 +--
 .../camel-spring-boot-dependencies/pom.xml  | 54 ++--
 2 files changed, 31 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bf5484eb/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 87ba38d..b4636e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -171,10 +171,10 @@
 1.4.13
 1.4.13_1
 2.12.0
-3.1.12
-[3.0,4.0)
-3.0.5
-3.0.5
+3.2.0
+[3.1,4.0)
+3.2.0
+3.2.0
 1.8.0
 1.3.1
 10.11.1.1

http://git-wip-us.apache.org/repos/asf/camel/blob/bf5484eb/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 6061e3f..42a8ae8 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
@@ -2937,137 +2937,137 @@
   
 org.apache.cxf.services.sts
 cxf-services-sts-core
-3.1.12
+3.2.0
   
   
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-core
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-bindings-soap
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-bindings-xml
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-databinding-jaxb
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-features-clustering
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-frontend-simple
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-management
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-rs-client
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-rs-extension-providers
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-rs-security-oauth2
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-rs-service-description-swagger
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-transports-http
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-transports-http-jetty
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-transports-jms
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-transports-local
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-ws-addr
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-ws-mex
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-ws-policy
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-ws-rm
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-ws-security
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-ws-security-oauth2
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-rt-wsdl
-3.1.12
+3.2.0
   
   
 org.apache.cxf
 cxf-testutils
-3.1.12
+3.2.0
   
   
 org.apache.ftpserver

camel git commit: Fix that will be required when updating to CXF 3.2.0

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 858a7c6c1 -> e201f1235


Fix that will be required when updating to CXF 3.2.0


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

Branch: refs/heads/master
Commit: e201f1235f271762ac42da6e9de2307805858c95
Parents: 858a7c6
Author: Daniel Kulp 
Authored: Mon Sep 11 16:18:15 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Sep 11 16:18:42 2017 -0400

--
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e201f123/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index ecb16ae..015918a 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -46,6 +46,7 @@ import org.apache.camel.util.jsse.SSLContextParameters;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
@@ -290,7 +291,7 @@ public class CxfRsEndpoint extends DefaultEndpoint 
implements HeaderFilterStrate
  */
 private void processUserResources(JAXRSServerFactoryBean sfb, 
List resources) {
 for (UserResource resource : resources) {
-if (resource.getName() == null) {
+if (StringUtils.isEmpty(resource.getName())) {
 resource.setName(DefaultModelResource.class.getName());
 }
 }

[1/2] camel git commit: Start using Files.newXXputStream instead of "new FileXXputStream" to reduce finalizer contention

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 98d346612 -> d8c0a53b6


Start using Files.newXXputStream instead of "new FileXXputStream" to reduce 
finalizer contention


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

Branch: refs/heads/master
Commit: d8c0a53b6787778661fb4cde3c59a50b5691efac
Parents: 81de0f5
Author: Daniel Kulp 
Authored: Wed Jul 26 17:29:23 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Jul 26 17:33:13 2017 -0400

--
 .../camel/component/file/FileOperations.java| 54 +++-
 .../converter/stream/FileInputStreamCache.java  | 28 ++
 .../java/org/apache/camel/util/FileUtil.java| 24 ++---
 3 files changed, 26 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d8c0a53b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java 
b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
index ac6304e..2ee56fe 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
@@ -17,17 +17,17 @@
 package org.apache.camel.component.file;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.RandomAccessFile;
 import java.io.Reader;
 import java.io.Writer;
 import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
+import java.nio.channels.SeekableByteChannel;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.Date;
@@ -37,10 +37,10 @@ import java.util.Set;
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.WrappedFile;
-import org.apache.camel.converter.IOConverter;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -157,7 +157,7 @@ public class FileOperations implements 
GenericFileOperations {
 path = endpointPath;
 } else {
 // relative after the endpoint path
-String afterRoot = ObjectHelper.after(directory, 
endpointPath.getPath() + File.separator);
+String afterRoot = StringHelper.after(directory, 
endpointPath.getPath() + File.separator);
 if (ObjectHelper.isNotEmpty(afterRoot)) {
 // dir is under the root path
 path = new File(endpoint.getFile(), afterRoot);
@@ -430,26 +430,12 @@ public class FileOperations implements 
GenericFileOperations {
 }
 
 private void writeFileByFile(File source, File target) throws IOException {
-FileChannel in = new FileInputStream(source).getChannel();
-FileChannel out = null;
-try {
-out = prepareOutputFileChannel(target);
-LOG.debug("Using FileChannel to write file: {}", target);
-long size = in.size();
-long position = 0;
-while (position < size) {
-position += in.transferTo(position, endpoint.getBufferSize(), 
out);
-}
-} finally {
-IOHelper.close(in, source.getName(), LOG);
-IOHelper.close(out, target.getName(), LOG, 
endpoint.isForceWrites());
-}
+Files.copy(source.toPath(), target.toPath(), 
StandardCopyOption.REPLACE_EXISTING);
 }
 
 private void writeFileByStream(InputStream in, File target) throws 
IOException {
-FileChannel out = null;
-try {
-out = prepareOutputFileChannel(target);
+try (SeekableByteChannel out = prepareOutputFileChannel(target)) {
+
 LOG.debug("Using InputStream to write file: {}", target);
 int size = endpoint.getBufferSize();
 byte[] buffer = new byte[size];
@@ -464,21 +450,20 @@ public class FileOperations implements 
GenericFileOperations {
 }
 } finally {
 IOHelper.close(in, target.getName(), LOG);
-IOHelper.close(out, target.getName(), LOG, 

[2/2] camel git commit: Put jackson-core in test scope as well as jackson-databinding has classes that depend on it and not having it makes the eclipse compiler complain and not compile anything.

[dkulp]

Put jackson-core in test scope as well as jackson-databinding has classes that 
depend on it and not having it makes the eclipse compiler complain and not 
compile anything.


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

Branch: refs/heads/master
Commit: 81de0f5808b0c8877d762481150a494fe26b8d32
Parents: 98d3466
Author: Daniel Kulp 
Authored: Wed Jul 26 16:00:28 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Jul 26 17:33:13 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/81de0f58/camel-core/pom.xml
--
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 598e216..6726527 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -195,6 +195,11 @@
   jackson-databind
   test
 
+
+com.fasterxml.jackson.core
+jackson-core
+test
+
 
 
 

camel git commit: Fix checkstyle whitespace

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 01821f2a6 -> 33ff7aee6


Fix checkstyle whitespace


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

Branch: refs/heads/master
Commit: 33ff7aee6643111911462025f251988eb02364a8
Parents: 01821f2
Author: Daniel Kulp 
Authored: Wed Jul 26 13:15:17 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Jul 26 13:15:37 2017 -0400

--
 .../org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/33ff7aee/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
index 9736311..ae30ce7 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
@@ -576,7 +576,7 @@ public class CoreEipAnnotationProcessor {
 deprecationNote = metadata.deprecationNode();
 }
 
-EipOption ep = new EipOption(name, displayName, kind, 
fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, 
false,null, true, oneOfTypes, false);
+EipOption ep = new EipOption(name, displayName, kind, 
fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, 
false, null, true, oneOfTypes, false);
 eipOptions.add(ep);
 }
 }
@@ -814,7 +814,7 @@ public class CoreEipAnnotationProcessor {
 deprecationNote = metadata.deprecationNode();
 }
 
-EipOption ep = new EipOption(name, displayName, kind, 
fieldTypeName, true, "", "", deprecated, deprecationNote,false, null, true, 
oneOfTypes, false);
+EipOption ep = new EipOption(name, displayName, kind, 
fieldTypeName, true, "", "", deprecated, deprecationNote, false, null, true, 
oneOfTypes, false);
 eipOptions.add(ep);
 }
 }

camel git commit: Add comment about new jetty versions

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master f51df7039 -> e00b4fcfc


Add comment about new jetty versions


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

Branch: refs/heads/master
Commit: e00b4fcfccbf964bc090aa22a6b1453e0d6f9688
Parents: f51df70
Author: Daniel Kulp 
Authored: Thu Mar 9 15:42:08 2017 -0500
Committer: Daniel Kulp 
Committed: Thu Mar 9 15:42:08 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/e00b4fcf/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cea56c..e1d891d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -334,6 +334,8 @@
 2.11
 6.1.26_4
 9.2.19.v20160908
+
+
 9.3.14.v20161028
 ${jetty9-version}
 ${jetty-version}

camel git commit: Add release to spring.schemas

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x a53540da1 -> fcffe3e63


Add release to spring.schemas


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

Branch: refs/heads/camel-2.17.x
Commit: fcffe3e630b9668372f16c4ab57b35ea42d05cd9
Parents: a53540d
Author: Daniel Kulp 
Authored: Tue Dec 20 14:38:05 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Dec 20 14:39:11 2016 -0500

--
 components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 components/camel-spring/src/main/resources/META-INF/spring.schemas  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fcffe3e6/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas 
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index af4c766..b56b9f2 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -92,6 +92,7 @@ 
http\://camel.apache.org/schema/cxf/camel-cxf-2.16.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.2.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.3.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.16.5.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.2.xsd=schema/cxfEndpoint.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/fcffe3e6/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index 48e0e14..6922132 100644
--- 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -89,6 +89,7 @@ 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.2.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.3.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.5.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.1.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.2.xsd=schema/camel-spring-integration.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/fcffe3e6/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 5e157e7..c2ed9e1 100644
--- 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -83,6 +83,7 @@ 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.1.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.2.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.3.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.4.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.5.xsd=schema/camel-spring-security.xsd
 

camel git commit: Add release to spring.schemas

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 1e341f52e -> 68cf50f59


Add release to spring.schemas


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

Branch: refs/heads/camel-2.18.x
Commit: 68cf50f59e437320bd9421b2cc93310c53b61d91
Parents: 1e341f5
Author: Daniel Kulp 
Authored: Tue Dec 20 14:38:05 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Dec 20 14:38:50 2016 -0500

--
 components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 components/camel-spring/src/main/resources/META-INF/spring.schemas  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/68cf50f5/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas 
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index c533f1c..b3e1d90 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -93,6 +93,7 @@ 
http\://camel.apache.org/schema/cxf/camel-cxf-2.16.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.2.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.3.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.16.5.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.2.xsd=schema/cxfEndpoint.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/68cf50f5/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index ad67831..43a2503 100644
--- 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -90,6 +90,7 @@ 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.2.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.3.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.5.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.1.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.2.xsd=schema/camel-spring-integration.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/68cf50f5/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 62f237a..c105c94 100644
--- 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -84,6 +84,7 @@ 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.1.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.2.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.3.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.4.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.5.xsd=schema/camel-spring-security.xsd
 

camel git commit: Add release to spring.schemas

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 1785d0fd7 -> ea025880e


Add release to spring.schemas


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

Branch: refs/heads/master
Commit: ea025880e07ec960a86a4ee5dbdfe60119e8087a
Parents: 1785d0f
Author: Daniel Kulp 
Authored: Tue Dec 20 14:38:05 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Dec 20 14:38:05 2016 -0500

--
 components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 .../src/main/resources/META-INF/spring.schemas  | 1 +
 components/camel-spring/src/main/resources/META-INF/spring.schemas  | 1 +
 4 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ea025880/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas 
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 4ba929b..f337ad5 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -93,6 +93,7 @@ 
http\://camel.apache.org/schema/cxf/camel-cxf-2.16.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.2.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.3.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.16.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.16.5.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.17.2.xsd=schema/cxfEndpoint.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/ea025880/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index a14fbde..bab7ebc 100644
--- 
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -90,6 +90,7 @@ 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.2.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.3.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.16.5.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.0.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.1.xsd=schema/camel-spring-integration.xsd
 
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.17.2.xsd=schema/camel-spring-integration.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/ea025880/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
--
diff --git 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 9cec203..31d8025 100644
--- 
a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ 
b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -84,6 +84,7 @@ 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.1.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.2.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.3.xsd=schema/camel-spring-security.xsd
 
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.4.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.16.5.xsd=schema/camel-spring-security.xsd
 

svn commit: r17499 - /release/camel/apache-camel/2.16.5/

[dkulp]

Author: dkulp
Date: Tue Dec 20 16:52:30 2016
New Revision: 17499

Log:
Add 2.16.5

Added:
release/camel/apache-camel/2.16.5/
release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip   (with props)
release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.asc
release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.md5
release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.sha1
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz   (with props)
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz.asc
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz.md5
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz.sha1
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.zip   (with props)
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.zip.asc
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.zip.md5
release/camel/apache-camel/2.16.5/apache-camel-2.16.5.zip.sha1

Added: release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.asc
==
--- release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.asc (added)
+++ release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.asc Tue Dec 
20 16:52:30 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJYVCqQAAoJEIWPxMT0OFajyBsP/3YqMTxw2hFTA3GU9OlzalRk
+acPtSlrkYPo8E1bz4X9O3aMv6F30YoQFUJvT373wHP02C3fW4VF3CE87XnSxD7UE
+8gnbAE7P8odpkm7PPHvSrlwllqtK9tssbzL6g+o/xJlLW1jvDMgXKoOgQDNB4+lV
+o9um5YGiAc3l7rDGjQK+ZAwKfwBkIXyeimw+z0k0zU3cZJZt5ZF8zr0r+5BN7shP
+vPf3q1nRPpHoufVe7YvydL150QQc9i9Y7aYSmsEMPqLX7g8eBU8aSu1XCjG0KgoR
+BInEWvLg0byMfkvTurm68T7lZt+rzZf8Vw0sQjEoUMEUsZaDTZyBZ3O6AjFeT6Cj
+M+DLa+M3tUNma95qZ8Yfo64fp9jFcNBCKSxyBQJCk/IiykNgus3+9gsHiezyjLSV
+X944WWSMYwxH4OKdcWKKaabmeaPR/HdVb8Q4fOwVv7g2TeP0U5pFfBuGe7z+LXZl
+PKeSIHjJw0+U2Le9u8+WuJ6bX/eWVJvbUNlgVKR0uaTOECQIWJODgJ/D6zOBFHi1
+SNu7fer5RYipe5rK9CLzFfCaNu5xJI2aZQNiEX8oNdVRk+9GDRcO7ko7Khr8ENs/
+mH1kAKKWo1jIUkI7oAVv52sF8vUIuZKQY5tRKj+xbl9O3GwpiX/ArxUybc3leqyt
+7dTU9Km/HvEPfxAWOvBo
+=3th+
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.md5
==
--- release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.md5 (added)
+++ release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.md5 Tue Dec 
20 16:52:30 2016
@@ -0,0 +1 @@
+c9ddbcae6a3b4c819639e37343c0ded2
\ No newline at end of file

Added: release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.sha1
==
--- release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.16.5/apache-camel-2.16.5-src.zip.sha1 Tue Dec 
20 16:52:30 2016
@@ -0,0 +1 @@
+6c47b8d3ec73cc2edc19ac09049117186fbdc00b
\ No newline at end of file

Added: release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz.asc
==
--- release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz.asc (added)
+++ release/camel/apache-camel/2.16.5/apache-camel-2.16.5.tar.gz.asc Tue Dec 20 
16:52:30 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJYVCqPAAoJEIWPxMT0OFajPw8P/35rMnbxGaAtfn8d990G/ZI0
+vQaBxiocofwB3BTJER/5W1bj/1IROGoniEnyRqSu+UW9zvgip56pTJ1s0p3cYba3
+bRts2tf2F5d07Ce9TfxG/I5ATHVGWxqWxPFgQRT5Sd7bgzkvNfbWMY2Kmlo/Mwdk
+c2gaxueTiUDoEY5vRNgNhpUU0mjZgvES+9SNG0/JYYnYhutdEPzn2aKmvPYS55qK
+vVtLDPf37poF6U2rXvSAftCVH/mZQ1lLtWV8XuzzUAR82AruSMJ2AALIkbRaWKdz
+SeHQKmXE69QcbkCskzVaqCAy+oHdskhQheNqG11Nn99J+r5K5YyrVytbl8dw5CL0
+B/cdSIESU1oDaIKazkydE6AMOwjDI8WpO1B38m/kvxwp45TsmmKGcx/+qlBgLcLR
+l5NpkS/1biLoZDL7NkxRKSLoufvBLjEVWSby4NqrV18ckCsYPn/j/DzR/B5zJUL2
+d8W2Bdp6IgYxbEYnJ4IKFetvyIwXW1J8CrXap4TXibGfp5RDhhcFWR5JvfmBGRot
+qOamj8ENJfiJcXpPVL0h3K6jYXfoxv5OtBHmHdP7Olkhb0oKh1uftKmBRUZWrjjZ
+cQzMyY2lHP6QATBSeXZftpugDqjo/0bRGpb9lGI62GLif13nitIYwURI310OrLl1
+d9UJiExoDFp8Qh8lCh12
+=RmXB
+-END PGP SIGNATURE-

Added: release/camel/apache-camel

[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 95234b7..add4b49 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 2059859..2db344b 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 2b8d09a..79a22ba 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index b75c5b0..8172e46 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 15f28fd..b4a45fd 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index a108bf9..8336c5c 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index f395973..25ca9e9 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 4c1e466..b617c75 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 6d7bef8..07b0e8d 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index 8dfe10d..7e72841 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.5
+2.16.6-SNAPSHOT
   
 
   

[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.5

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 8050631..95234b7 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 850277a..2059859 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 717c9b6..2b8d09a 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index ce09cdc..b75c5b0 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 39d53ac..15f28fd 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 185f3ee..a108bf9 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 88f4d04..f395973 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 145b72a..4c1e466 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index af0702c..6d7bef8 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index a70b5e4..8dfe10d 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.5-SNAPSHOT
+2.16.5
   
 
   

[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.5

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x ccf149c76 -> 589dadb6b


http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index 2644df3..b126989 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index e9e83cb..a266edd 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index 65a1a7022..ce007f7 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index 41c8493..c1a3590 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index 01f6f61..3bb3106 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index a14c437..f4c77d7 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 5705f95..c456143 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.5-SNAPSHOT
+2.16.5
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index f341875..03296ca 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.5-SNAPSHOT
+2.16.5
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/589dadb6/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git 

[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/camel-2.16.x
Commit: 4ad8bb40a932f852adf81d1112dc044fe221
Parents: 589dadb
Author: Daniel Kulp 
Authored: Fri Dec 16 10:57:53 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Dec 16 10:57:53 2016 -0500

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml | 2 +-
 components/camel-github/pom.xml  | 2 +-
 

[camel] Git Push Summary

[dkulp]

Repository: camel
Updated Tags:  refs/tags/camel-2.16.5 [created] 0f4562325

[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 589dadb6b -> 4ad8bb40a


http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index b126989..8497c8d 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index a266edd..157e13c 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index ce007f7..b891d12 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index c1a3590..f1e25f3 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index 3bb3106..35507b8 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index f4c77d7..a195df3 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index c456143..d82ee7e 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.5
+2.16.6-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index 03296ca..98bdedb 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.5
+2.16.6-SNAPSHOT
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/4ad8bb40/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git 

[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.5

[dkulp]

[maven-release-plugin] prepare release camel-2.16.5


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

Branch: refs/heads/camel-2.16.x
Commit: 589dadb6bcdae641206bd7317f6c55881cde164d
Parents: ccf149c
Author: Daniel Kulp 
Authored: Fri Dec 16 10:57:37 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Dec 16 10:57:37 2016 -0500

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml | 2 +-
 components/camel-github/pom.xml  | 2 +-
 components/camel-google-calendar/pom.xml

[3/3] camel git commit: CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header use. Fix test

[dkulp]

CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header 
use. Fix test


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

Branch: refs/heads/camel-2.16.x
Commit: b093ebdb97d8d5cb05887b8ebf7bcecbbfe41f81
Parents: 57d01e2
Author: Andrea Cosentino 
Authored: Fri Dec 9 11:30:36 2016 +0100
Committer: Daniel Kulp 
Committed: Wed Dec 14 14:35:21 2016 -0500

--
 .../jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java  | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b093ebdb/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
--
diff --git 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
index ffabeeb..7af7ed8 100644
--- 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
+++ 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.jackson;
 
-import java.util.LinkedHashMap;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -29,7 +27,6 @@ public class JacksonMarshalUnmarshalTypeHeaderNotAllowedTest 
extends CamelTestSu
 public void testUnmarshalPojo() throws Exception {
 MockEndpoint mock = getMockEndpoint("mock:reversePojo");
 mock.expectedMessageCount(1);
-mock.message(0).body().isInstanceOf(LinkedHashMap.class);
 
 String json = "{\"name\":\"Camel\"}";
 template.sendBodyAndHeader("direct:backPojo", json, 
JacksonConstants.UNMARSHAL_TYPE, TestPojo.class.getName());

[1/3] camel git commit: CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header use

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 2f204b742 -> b093ebdb9


CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header use


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

Branch: refs/heads/camel-2.16.x
Commit: 235036d2396ae45b6809b72a1983dee33b5ba326
Parents: 2f204b7
Author: Andrea Cosentino 
Authored: Wed Dec 7 18:18:45 2016 +0100
Committer: Daniel Kulp 
Committed: Wed Dec 14 14:35:03 2016 -0500

--
 .../component/jackson/JacksonDataFormat.java| 19 ++-
 ...arshalUnmarshalTypeHeaderNotAllowedTest.java | 54 
 .../JacksonMarshalUnmarshalTypeHeaderTest.java  |  1 +
 3 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/235036d2/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
--
diff --git 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index 381b81a..553387c 100644
--- 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++ 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -68,6 +68,7 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
 private String enableFeatures;
 private String disableFeatures;
 private boolean enableJacksonTypeConverter;
+private boolean allowJacksonUnmarshallType;
 
 /**
  * Use the default Jackson {@link ObjectMapper} and {@link Map}
@@ -159,7 +160,10 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
 
 // is there a header with the unmarshal type?
 Class clazz = unmarshalType;
-String type = 
exchange.getIn().getHeader(JacksonConstants.UNMARSHAL_TYPE, String.class);
+String type = null;
+if (allowJacksonUnmarshallType) {
+type = exchange.getIn().getHeader(JacksonConstants.UNMARSHAL_TYPE, 
String.class);
+}
 if (type == null && isAllowJmsType()) {
 type = exchange.getIn().getHeader("JMSType", String.class);
 }
@@ -323,6 +327,19 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
 public void setEnableJacksonTypeConverter(boolean 
enableJacksonTypeConverter) {
 this.enableJacksonTypeConverter = enableJacksonTypeConverter;
 }
+
+public boolean isAllowJacksonUnmarshallType() {
+return allowJacksonUnmarshallType;
+}
+
+/**
+ * If enabled then Jackson is allowed to attempt to use the 
CamelJacksonUnmarshalType header during the unmarshalling.
+ * 
+ * This should only be enabled when desired to be used.
+ */
+public void setAllowJacksonUnmarshallType(boolean 
allowJacksonUnmarshallType) {
+this.allowJacksonUnmarshallType = allowJacksonUnmarshallType;
+}
 
 public String getEnableFeatures() {
 return enableFeatures;

http://git-wip-us.apache.org/repos/asf/camel/blob/235036d2/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
--
diff --git 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
new file mode 100644
index 000..ffabeeb
--- /dev/null
+++ 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[2/3] camel git commit: CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header use

[dkulp]

CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header use


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

Branch: refs/heads/camel-2.16.x
Commit: 57d01e2fc8923263df896e9810329ee5b7f9b69e
Parents: 235036d
Author: Andrea Cosentino 
Authored: Thu Dec 8 09:51:19 2016 +0100
Committer: Daniel Kulp 
Committed: Wed Dec 14 14:35:13 2016 -0500

--
 .../camel/component/jackson/JacksonDataFormat.java  | 12 ++--
 .../jackson/JacksonMarshalUnmarshalTypeHeaderTest.java  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/57d01e2f/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
--
diff --git 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index 553387c..a87dc67 100644
--- 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++ 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -68,7 +68,7 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
 private String enableFeatures;
 private String disableFeatures;
 private boolean enableJacksonTypeConverter;
-private boolean allowJacksonUnmarshallType;
+private boolean allowUnmarshallType;
 
 /**
  * Use the default Jackson {@link ObjectMapper} and {@link Map}
@@ -161,7 +161,7 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
 // is there a header with the unmarshal type?
 Class clazz = unmarshalType;
 String type = null;
-if (allowJacksonUnmarshallType) {
+if (allowUnmarshallType) {
 type = exchange.getIn().getHeader(JacksonConstants.UNMARSHAL_TYPE, 
String.class);
 }
 if (type == null && isAllowJmsType()) {
@@ -328,8 +328,8 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
 this.enableJacksonTypeConverter = enableJacksonTypeConverter;
 }
 
-public boolean isAllowJacksonUnmarshallType() {
-return allowJacksonUnmarshallType;
+public boolean isAllowUnmarshallType() {
+return allowUnmarshallType;
 }
 
 /**
@@ -337,8 +337,8 @@ public class JacksonDataFormat extends ServiceSupport 
implements DataFormat, Dat
  * 
  * This should only be enabled when desired to be used.
  */
-public void setAllowJacksonUnmarshallType(boolean 
allowJacksonUnmarshallType) {
-this.allowJacksonUnmarshallType = allowJacksonUnmarshallType;
+public void setAllowUnmarshallType(boolean allowJacksonUnmarshallType) {
+this.allowUnmarshallType = allowJacksonUnmarshallType;
 }
 
 public String getEnableFeatures() {

http://git-wip-us.apache.org/repos/asf/camel/blob/57d01e2f/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
--
diff --git 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
index 623b32e..775e7ea 100644
--- 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
+++ 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
@@ -46,7 +46,7 @@ public class JacksonMarshalUnmarshalTypeHeaderTest extends 
CamelTestSupport {
 @Override
 public void configure() throws Exception {
 JacksonDataFormat format = new JacksonDataFormat();
-format.setAllowJacksonUnmarshallType(true);
+format.setAllowUnmarshallType(true);
 
 
from("direct:backPojo").unmarshal(format).to("mock:reversePojo");
 

camel git commit: Update the cxf-xjc version

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 9b160895f -> 2f204b742


Update the cxf-xjc version


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

Branch: refs/heads/camel-2.16.x
Commit: 2f204b742f265912e649c5f50971273bd94f982b
Parents: 9b16089
Author: Daniel Kulp 
Authored: Tue Dec 13 09:12:08 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Dec 13 09:12:08 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/2f204b74/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a82357..cadee91 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -126,8 +126,8 @@
 2.7
 3.1.9
 [3.0,4.0)
-3.0.4
-3.0.4
+3.0.5
+3.0.5
 1.5.3
 10.11.1.1
 3.3.2

camel git commit: Upgrade CXF

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 975f1a18e -> 9b160895f


Upgrade CXF


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

Branch: refs/heads/camel-2.16.x
Commit: 9b160895fc34f5aa64e829ce9738ff1c42f527ae
Parents: 975f1a1
Author: Claus Ibsen 
Authored: Tue Dec 13 13:07:46 2016 +0100
Committer: Daniel Kulp 
Committed: Tue Dec 13 09:11:25 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9b160895/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b3fa213..6a82357 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -124,7 +124,7 @@
 2.0
 1.4.2
 2.7
-3.1.5
+3.1.9
 [3.0,4.0)
 3.0.4
 3.0.4

camel git commit: Upgrade CXF

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x dc838bb4d -> d16e902ac


Upgrade CXF


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

Branch: refs/heads/camel-2.17.x
Commit: d16e902ac978fadf96e27bd484f5eb6f03e7a2a5
Parents: dc838bb
Author: Claus Ibsen 
Authored: Tue Dec 13 13:07:46 2016 +0100
Committer: Daniel Kulp 
Committed: Tue Dec 13 09:10:08 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d16e902a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8190bff..8dfad4b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,7 @@
 1.0.3
 1.4.2
 2.7
-3.1.7
+3.1.9
 [3.0,4.0)
 3.0.5
 3.0.5

camel git commit: [CAMEL-10578] Use proper methods for adding namespace declarations to DOM

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 7bc1957e3 -> 9a58b0dd1


[CAMEL-10578] Use proper methods for adding namespace declarations to DOM


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

Branch: refs/heads/camel-2.16.x
Commit: 9a58b0dd1d41754c3dab69d1edf29e7c64583d6f
Parents: 7bc1957
Author: Daniel Kulp 
Authored: Thu Dec 8 14:08:07 2016 -0500
Committer: Daniel Kulp 
Committed: Thu Dec 8 14:11:50 2016 -0500

--
 .../camel/component/cxf/DefaultCxfBinding.java   | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9a58b0dd/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index aad23d5..f6367e5 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -56,6 +56,7 @@ import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.headers.Header;
@@ -180,9 +181,7 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 
 // propagate protocol headers
 propagateHeadersFromCxfToCamel(cxfMessage, camelExchange.getOut(), 
camelExchange);
-DataFormat dataFormat = 
camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY,  
-  DataFormat.class);
-boolean isXop = 
Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
+
 // propagate attachments
 if (cxfMessage.getAttachments() != null) {
 // propagate attachments
@@ -761,15 +760,19 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 }
 
 protected static void addNamespace(Element element, Map 
nsMap) {
-for (String ns : nsMap.keySet()) {
+for (Map.Entry ns : nsMap.entrySet()) {
 // We should not override the namespace setting of the element
-if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns)) {
+if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns.getKey())) {
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, ns.getKey(), 
ns.getValue());
+}
+} else if (StringUtils.isEmpty(ns.getKey())) {
 if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
-element.setAttribute(ns, nsMap.get(ns));
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns", 
ns.getValue());
 }
 } else {
-if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns))) {
-element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns, nsMap.get(ns));
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns.getKey( {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, 
XMLConstants.XMLNS_ATTRIBUTE + ":" + ns.getKey(), ns.getValue());
 }
 }
 }

camel git commit: [CAMEL-10578] Use proper methods for adding namespace declarations to DOM

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 54826e8a7 -> a7aee7cbd


[CAMEL-10578] Use proper methods for adding namespace declarations to DOM


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

Branch: refs/heads/camel-2.17.x
Commit: a7aee7cbd6a242c592cbad99edf9d9413f9327a6
Parents: 54826e8
Author: Daniel Kulp 
Authored: Thu Dec 8 14:08:07 2016 -0500
Committer: Daniel Kulp 
Committed: Thu Dec 8 14:10:25 2016 -0500

--
 .../camel/component/cxf/DefaultCxfBinding.java   | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a7aee7cb/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index aad23d5..f6367e5 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -56,6 +56,7 @@ import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.headers.Header;
@@ -180,9 +181,7 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 
 // propagate protocol headers
 propagateHeadersFromCxfToCamel(cxfMessage, camelExchange.getOut(), 
camelExchange);
-DataFormat dataFormat = 
camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY,  
-  DataFormat.class);
-boolean isXop = 
Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
+
 // propagate attachments
 if (cxfMessage.getAttachments() != null) {
 // propagate attachments
@@ -761,15 +760,19 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 }
 
 protected static void addNamespace(Element element, Map 
nsMap) {
-for (String ns : nsMap.keySet()) {
+for (Map.Entry ns : nsMap.entrySet()) {
 // We should not override the namespace setting of the element
-if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns)) {
+if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns.getKey())) {
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, ns.getKey(), 
ns.getValue());
+}
+} else if (StringUtils.isEmpty(ns.getKey())) {
 if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
-element.setAttribute(ns, nsMap.get(ns));
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns", 
ns.getValue());
 }
 } else {
-if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns))) {
-element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns, nsMap.get(ns));
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns.getKey( {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, 
XMLConstants.XMLNS_ATTRIBUTE + ":" + ns.getKey(), ns.getValue());
 }
 }
 }

camel git commit: [CAMEL-10578] Use proper methods for adding namespace declarations to DOM

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x acca238c7 -> 6ca087065


[CAMEL-10578] Use proper methods for adding namespace declarations to DOM


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

Branch: refs/heads/camel-2.18.x
Commit: 6ca087065f0632da9a0c3e7d1f4808bcb0d26071
Parents: acca238
Author: Daniel Kulp 
Authored: Thu Dec 8 14:08:07 2016 -0500
Committer: Daniel Kulp 
Committed: Thu Dec 8 14:09:46 2016 -0500

--
 .../camel/component/cxf/DefaultCxfBinding.java   | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6ca08706/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 89acf0f..7f04fe1 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -56,6 +56,7 @@ import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.headers.Header;
@@ -185,9 +186,7 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 
 // propagate protocol headers
 propagateHeadersFromCxfToCamel(cxfMessage, camelExchange.getOut(), 
camelExchange);
-DataFormat dataFormat = 
camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY,  
-  DataFormat.class);
-boolean isXop = 
Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
+
 // propagate attachments
 if (cxfMessage.getAttachments() != null) {
 // propagate attachments
@@ -782,15 +781,19 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 }
 
 protected static void addNamespace(Element element, Map 
nsMap) {
-for (String ns : nsMap.keySet()) {
+for (Map.Entry ns : nsMap.entrySet()) {
 // We should not override the namespace setting of the element
-if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns)) {
+if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns.getKey())) {
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, ns.getKey(), 
ns.getValue());
+}
+} else if (StringUtils.isEmpty(ns.getKey())) {
 if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
-element.setAttribute(ns, nsMap.get(ns));
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns", 
ns.getValue());
 }
 } else {
-if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns))) {
-element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns, nsMap.get(ns));
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns.getKey( {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, 
XMLConstants.XMLNS_ATTRIBUTE + ":" + ns.getKey(), ns.getValue());
 }
 }
 }

camel git commit: [CAMEL-10578] Use proper methods for adding namespace declarations to DOM

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 62ffa5e5e -> 8fd99a50d


[CAMEL-10578] Use proper methods for adding namespace declarations to DOM


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

Branch: refs/heads/master
Commit: 8fd99a50dc823b14b5061128afe6001328fee537
Parents: 62ffa5e
Author: Daniel Kulp 
Authored: Thu Dec 8 14:08:07 2016 -0500
Committer: Daniel Kulp 
Committed: Thu Dec 8 14:08:07 2016 -0500

--
 .../camel/component/cxf/DefaultCxfBinding.java   | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8fd99a50/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 89acf0f..7f04fe1 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -56,6 +56,7 @@ import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.headers.Header;
@@ -185,9 +186,7 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 
 // propagate protocol headers
 propagateHeadersFromCxfToCamel(cxfMessage, camelExchange.getOut(), 
camelExchange);
-DataFormat dataFormat = 
camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY,  
-  DataFormat.class);
-boolean isXop = 
Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
+
 // propagate attachments
 if (cxfMessage.getAttachments() != null) {
 // propagate attachments
@@ -782,15 +781,19 @@ public class DefaultCxfBinding implements CxfBinding, 
HeaderFilterStrategyAware
 }
 
 protected static void addNamespace(Element element, Map 
nsMap) {
-for (String ns : nsMap.keySet()) {
+for (Map.Entry ns : nsMap.entrySet()) {
 // We should not override the namespace setting of the element
-if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns)) {
+if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns.getKey())) {
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, ns.getKey(), 
ns.getValue());
+}
+} else if (StringUtils.isEmpty(ns.getKey())) {
 if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE))) {
-element.setAttribute(ns, nsMap.get(ns));
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns", 
ns.getValue());
 }
 } else {
-if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns))) {
-element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns, nsMap.get(ns));
+if 
(ObjectHelper.isEmpty(element.getAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + 
ns.getKey( {
+
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, 
XMLConstants.XMLNS_ATTRIBUTE + ":" + ns.getKey(), ns.getValue());
 }
 }
 }

[2/2] camel git commit: Add a quick test to make sure the gridfs feature will install correctly

[dkulp]

Add a quick test to make sure the gridfs feature will install correctly


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

Branch: refs/heads/master
Commit: 1f082895f460bb67157b951523f973bc9efa22a9
Parents: b8d95f6
Author: Daniel Kulp 
Authored: Fri Sep 2 12:19:04 2016 -0400
Committer: Daniel Kulp 
Committed: Fri Sep 2 12:19:04 2016 -0400

--
 .../itest/karaf/CamelMongodbGridfsTest.java | 34 
 1 file changed, 34 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f082895/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
new file mode 100644
index 000..c59fc0b
--- /dev/null
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbGridfsTest.java
@@ -0,0 +1,34 @@
+/**
+ * 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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelMongodbGridfsTest extends BaseKarafTest {
+
+public static final String COMPONENT = "gridfs"; 
//extractName(CamelMongodbGridfsTest.class);
+
+@Test
+public void test() throws Exception {
+testComponent("mongodb-gridfs", "gridfs");
+}
+
+
+}
\ No newline at end of file

[1/2] camel git commit: Fix javadoc typo

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master ee2c7f4f5 -> 1f082895f


Fix javadoc typo


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

Branch: refs/heads/master
Commit: b8d95f6a7adb448ad0a36e3138fe76e16cd56cb6
Parents: ee2c7f4
Author: Daniel Kulp 
Authored: Fri Sep 2 12:12:40 2016 -0400
Committer: Daniel Kulp 
Committed: Fri Sep 2 12:12:40 2016 -0400

--
 .../jetty9/springboot/JettyHttpComponentConfiguration9.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b8d95f6a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
--
diff --git 
a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
 
b/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index ee6fc07..85f7172 100644
--- 
a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
+++ 
b/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -445,4 +445,4 @@ public class JettyHttpComponentConfiguration9 {
 HeaderFilterStrategy headerFilterStrategy) {
 this.headerFilterStrategy = headerFilterStrategy;
 }
-}
\ No newline at end of file
+}

svn commit: r995677 [1/4] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/

[dkulp]

Author: dkulp
Date: Mon Aug 22 17:26:09 2016
New Revision: 995677

Log:
Add schemas

Added:

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

websites/production/camel/content/schema/spring-security/camel-spring-security-2.17.3.xsd
websites/production/camel/content/schema/spring/camel-spring-2.17.3.xsd

svn commit: r995677 [2/4] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/

[dkulp]

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.17.3.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.17.3.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.17.3.xsd 
Mon Aug 22 17:26:09 2016
@@ -0,0 +1,8971 @@
+http://www.w3.org/2001/XMLSchema; 
xmlns:tns="http://camel.apache.org/schema/blueprint; 
elementFormDefault="qualified" 
targetNamespace="http://camel.apache.org/schema/blueprint; version="1.0">
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+

svn commit: r995677 [4/4] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/

[dkulp]

Added: websites/production/camel/content/schema/spring/camel-spring-2.17.3.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.17.3.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.17.3.xsd Mon 
Aug 22 17:26:09 2016
@@ -0,0 +1,8969 @@
+http://www.w3.org/2001/XMLSchema; 
xmlns:tns="http://camel.apache.org/schema/spring; 
elementFormDefault="qualified" 
targetNamespace="http://camel.apache.org/schema/spring; version="1.0">
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  

svn commit: r995677 [3/4] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/

[dkulp]

Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.17.3-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.17.3-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.17.3-blueprint.xsd 
Mon Aug 22 17:26:09 2016
@@ -0,0 +1,178 @@
+
+
+http://camel.apache.org/schema/blueprint/cxf;
+xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0;
+xmlns:cxf-beans="http://cxf.apache.org/configuration/beans;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+targetNamespace="http://camel.apache.org/schema/blueprint/cxf;
+elementFormDefault="qualified"
+attributeFormDefault="unqualified"
+xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 
https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;>
+
+  http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation="https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
+  http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+
+
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
\ No newline at end of file

Added: websites/production/camel/content/schema/cxf/camel-cxf-2.17.3-spring.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.17.3-spring.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.17.3-spring.xsd 
Mon Aug 22 17:26:09 2016
@@ -0,0 +1,179 @@
+
+
+http://camel.apache.org/schema/cxf;
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+  xmlns:beans="http://www.springframework.org/schema/beans;
+  xmlns:cxf-beans="http://cxf.apache.org/configuration/beans;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  targetNamespace="http://camel.apache.org/schema/cxf; 
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  http://www.springframework.org/schema/beans; 
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+  
+
+  
+
+  
+
+ 
   
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+ 
 
+  
+  
+
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+
+
+   

svn commit: r14703 - in /release/camel/apache-camel: 2.16.2/ 2.17.3/

[dkulp]

Author: dkulp
Date: Mon Aug  8 14:21:39 2016
New Revision: 14703

Log:
Add 2.17.3

Added:
release/camel/apache-camel/2.17.3/
release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip   (with props)
release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.asc
release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.md5
release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.sha1
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz   (with props)
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz.asc
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz.md5
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz.sha1
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.zip   (with props)
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.zip.asc
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.zip.md5
release/camel/apache-camel/2.17.3/apache-camel-2.17.3.zip.sha1
Removed:
release/camel/apache-camel/2.16.2/

Added: release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.asc
==
--- release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.asc (added)
+++ release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.asc Mon Aug  
8 14:21:39 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIbBAABCAAGBQJXo5P4AAoJEIWPxMT0OFajqEIP+Lc9KfJSkLdSKzB8+8T7/b1j
+rvisju9TRSy/Xnt5CiJz5ydjhJbD6Nax4UsuMHte2pfNZJkI7IaPxqV88ONjJvU0
+c06/IhpP+2QW5lFHVKdE2MAxIGLRe33YLfW4iYJaZPs5LWpmX7V7Anz0l/Ifp1/b
+9dmTKkn9Koc8MVuRuy8pZhrIAZMScsIqvQv4kaHBJQnqzZMxbDGqAP/Qpthz5yIQ
+6vjFKsD6fvTkeSxTZNfxFB2UbzJekUW5DzFyLgE4wU3U0ohXPQBWtoiyO9mNwxjC
+PM+LvrSldJUtI2rovKH0uSoayUcr6MU3qKKln+7LExaPXahrriGpNbMtcJ9Lkav1
+oa4mlWILGvnFILrSSoL7enqtgRbZ6SDLbrc3/PMCRDBF+IEtuoIr1NtNfEdXiNxZ
+BQcLjHIKgAd83if8gVleDwEvYC4gyLBIrCX7hLC5WpPhgl8nM3rUAamLziUiFBfk
+yDKB158mJRD/xAlGJJ13qf6nEh6DvuO9XmxKOAn8HdzG9V76vTxauBB1i7DwOOcd
+vjvLiziovXxkFhot8aFHZMqq45Xv2yFiUJjmjPhgBh0uZzu7R8tomo/P5GU4EJ2l
+ifBs5atmJt5DFMApWqJ+hyagSzDvkMjE9JUiCnsR7VsVXhBSRWr/7Cb9/UV/ogGV
+d4RjQ5eH33aWn7TLbA8=
+=DTyh
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.md5
==
--- release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.md5 (added)
+++ release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.md5 Mon Aug  
8 14:21:39 2016
@@ -0,0 +1 @@
+a1e5134fe58cc70325e1b0e3817889de
\ No newline at end of file

Added: release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.sha1
==
--- release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.17.3/apache-camel-2.17.3-src.zip.sha1 Mon Aug  
8 14:21:39 2016
@@ -0,0 +1 @@
+16c2be7ce33614c0121eb5a400c7e7b16aa82b04
\ No newline at end of file

Added: release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz.asc
==
--- release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz.asc (added)
+++ release/camel/apache-camel/2.17.3/apache-camel-2.17.3.tar.gz.asc Mon Aug  8 
14:21:39 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJXo5P3AAoJEIWPxMT0OFajaPQP/3rcTMvbD2f0+uzfqJRMO8hp
+r70Jdg9k0nhLSKfb/xZ6MydN1+noWXzOZZexTl+tDC2aofPp57gQOmh/tGy9rWDQ
+aJBaQ/MLJ3WQfqwfNWGiAV41qOLP0S+0mK2971sZspfNHsJBMo8X+4XCr+ak+f6g
+9VQ4acLtf4p7+PMcuiAvQi2yKCXvQb98tuB8nIDxlPcZvrGDTL7UrrJAVdsAcDF+
+XJ4Ue+inWsjSR8oiQC1uyOIy0ePyZQNnEylleGDV0oG0Y/vly2o+HbTGxmPCNEC1
+jY7WgDszggsw6McDIHXe5MVTxfGp2T8Q0Os3jThwzh00cYRljqWT6OkmCZ0RwOOZ
+UFU8KDFl4u/n+7+cAX1qNg2wpH4g254tMt8UOlGS0q3j9H7Fql3IC9paAe125c/l
+zy07RtvilxJxDFCsFAs2WO/YYCcXGfPq/btHuvucT+RGbB6xERwsnop90ebEjpT0
+pRmQvQsGWAEOAxmkH4fF62AaFaP5eWowuDMQmO9DzRJmtYKzBmDwzDO5eY7bk/Xn
+LZXk3ZL2E7fgnKubiPt7ETwlaWMsHxAUFhqwtifg6pkBdBWR8Z9DaWRYAqMHLeVG
+VTVYsmdm1dzj0ewv7o90JpksFpxscXwACVW8/FQSKI0l+VUXps1Kgb9pzDHc2axT
+UxA8VNjBkB/+044Ep/OM
+=zlCm
+-END PGP

[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x af7064e6c -> 1880db6f0


http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index 887f0f3..f82ec2a 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index d28a37f..6097ff4 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-example-cxf

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-etl/pom.xml
--
diff --git a/examples/camel-example-etl/pom.xml 
b/examples/camel-example-etl/pom.xml
index 1d3fffa..44501ea 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-example-etl

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-ftp/pom.xml
--
diff --git a/examples/camel-example-ftp/pom.xml 
b/examples/camel-example-ftp/pom.xml
index 7970e24..adfab34 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-example-ftp

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-gae/pom.xml
--
diff --git a/examples/camel-example-gae/pom.xml 
b/examples/camel-example-gae/pom.xml
index e7bb2ff..559aaa3 100644
--- a/examples/camel-example-gae/pom.xml
+++ b/examples/camel-example-gae/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-example-gae

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-gauth/pom.xml
--
diff --git a/examples/camel-example-gauth/pom.xml 
b/examples/camel-example-gauth/pom.xml
index dfa1fb4..6eb26fd 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-example-gauth

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml 
b/examples/camel-example-guice-jms/pom.xml
index a242c21..cd17c12 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-example-guice-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index be7418d..d4378b1 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-example-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-jms-file/pom.xml
--
diff --git a/examples/camel-example-jms-file/pom.xml 
b/examples/camel-example-jms-file/pom.xml
index 24d9c89..d5e9efd 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -21,7 +21,7 @@

org.apache.camel
examples
-   2.17.3
+   2.17.4-SNAPSHOT

 
camel-example-jms-file

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/examples/camel-example-jmx/pom.xml
--
diff --git a/examples/camel-example-jmx/pom.xml 
b/examples/camel-example-jmx/pom.xml
index 

[camel] Git Push Summary

[dkulp]

Repository: camel
Updated Tags:  refs/tags/camel-2.17.3 [created] ad245911c

[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jms/pom.xml
--
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index f76d3e9..89edefa 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jmx/pom.xml
--
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 5e78555..82b65ba 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
 
 
 camel-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jolt/pom.xml
--
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index e0a75c7..8d74154 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-jolt

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-josql/pom.xml
--
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 631b340..1028dc8 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-josql

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jpa/pom.xml
--
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 9746015..9db45b9 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-jpa

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jsch/pom.xml
--
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index b9ce9ed..9decd88 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-jsch

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index 871de31..e35c32d 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-jsonpath

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jt400/pom.xml
--
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index 537c078..f56013a 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-jt400

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-juel/pom.xml
--
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index 64a2d10..faf19f4 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-juel

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 506d65e..c66e268 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3
+2.17.4-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/1880db6f/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index ad0ad27..641cd76 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3

[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.17.3

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jms/pom.xml
--
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 5a66c20..f76d3e9 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jmx/pom.xml
--
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index a1b0531..5e78555 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jolt/pom.xml
--
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index d9255a8..e0a75c7 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-jolt

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-josql/pom.xml
--
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 9822c6d..631b340 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-josql

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jpa/pom.xml
--
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index e2f6fad..9746015 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-jpa

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jsch/pom.xml
--
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index e71c2e3..b9ce9ed 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-jsch

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index 06a4dc7..871de31 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-jsonpath

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jt400/pom.xml
--
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index 115d15f..537c078 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-jt400

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-juel/pom.xml
--
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index a899ee8..64a2d10 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-juel

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 5e12bc3..506d65e 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index c2f1c00..ad0ad27 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-

[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.17.3

[dkulp]

[maven-release-plugin] prepare release camel-2.17.3


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

Branch: refs/heads/camel-2.17.x
Commit: af7064e6c1a754bb65eacb5f653bd551e4219cc6
Parents: 4eb2784
Author: Daniel Kulp 
Authored: Thu Aug 4 13:56:51 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 4 13:56:51 2016 -0400

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-braintree/pom.xml   | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-etcd/pom.xml| 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml  

[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/camel-2.17.x
Commit: 1880db6f0f16d20764eeaf906b441bf1558f56e7
Parents: af7064e
Author: Daniel Kulp 
Authored: Thu Aug 4 13:57:24 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 4 13:57:24 2016 -0400

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-braintree/pom.xml   | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-etcd/pom.xml| 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml

[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.17.3

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 4eb2784af -> af7064e6c


http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index 8e2dce4..887f0f3 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index b18b628..d28a37f 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-example-cxf

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-etl/pom.xml
--
diff --git a/examples/camel-example-etl/pom.xml 
b/examples/camel-example-etl/pom.xml
index 6b4fd7d..1d3fffa 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-example-etl

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-ftp/pom.xml
--
diff --git a/examples/camel-example-ftp/pom.xml 
b/examples/camel-example-ftp/pom.xml
index 948d1f7..7970e24 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-example-ftp

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-gae/pom.xml
--
diff --git a/examples/camel-example-gae/pom.xml 
b/examples/camel-example-gae/pom.xml
index 181dac3..e7bb2ff 100644
--- a/examples/camel-example-gae/pom.xml
+++ b/examples/camel-example-gae/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-example-gae

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-gauth/pom.xml
--
diff --git a/examples/camel-example-gauth/pom.xml 
b/examples/camel-example-gauth/pom.xml
index d6ab961..dfa1fb4 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-example-gauth

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml 
b/examples/camel-example-guice-jms/pom.xml
index 11a8213..a242c21 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
 
 
 camel-example-guice-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index 9fc247a..be7418d 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.17.3-SNAPSHOT
+2.17.3
   
 
   camel-example-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-jms-file/pom.xml
--
diff --git a/examples/camel-example-jms-file/pom.xml 
b/examples/camel-example-jms-file/pom.xml
index f8365a1..24d9c89 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -21,7 +21,7 @@

org.apache.camel
examples
-   2.17.3-SNAPSHOT
+   2.17.3

 
camel-example-jms-file

http://git-wip-us.apache.org/repos/asf/camel/blob/af7064e6/examples/camel-example-jmx/pom.xml
--
diff --git a/examples/camel-example-jmx/pom.xml 
b/examples/camel-example-jmx/pom.xml
index 

camel git commit: [CAMEL-10214] Fix test

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 0dbf59bf2 -> 4eb2784af


[CAMEL-10214] Fix test


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

Branch: refs/heads/camel-2.17.x
Commit: 4eb2784af023c140d0231594f2a6f4d7fb5634f9
Parents: 0dbf59b
Author: Daniel Kulp 
Authored: Thu Aug 4 13:09:13 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Aug 4 13:09:13 2016 -0400

--
 .../file/FileComponentConfigurationAndDocumentationTest.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4eb2784a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java
index 35f0072..b8626c1 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java
@@ -41,10 +41,10 @@ public class FileComponentConfigurationAndDocumentationTest 
extends ContextTestS
 String json = compConf.createParameterJsonSchema();
 assertNotNull(json);
 
-assertTrue(json.contains("\"directoryName\": { \"kind\": \"path\", 
\"group\": \"common\", \"required\": \"true\""));
-assertTrue(json.contains("\"doneFileName\": { \"kind\": \"parameter\", 
\"group\": \"producer\", \"label\": \"producer\", \"type\": \"string\""));
-assertTrue(json.contains("\"autoCreate\": { \"kind\": \"parameter\", 
\"group\": \"advanced\", \"label\": \"advanced\", \"type\": \"boolean\""));
-assertTrue(json.contains("\"readLockMinAge\": { \"kind\": 
\"parameter\", \"group\": \"lock\", \"label\": \"consumer,lock\""));
+assertTrue(json, json.contains("\"directoryName\": { \"kind\": 
\"path\", \"group\": \"common\", \"required\": \"true\""));
+assertTrue(json, json.contains("\"doneFileName\": { \"kind\": 
\"parameter\", \"group\": \"common\", \"type\": \"string\""));
+assertTrue(json, json.contains("\"autoCreate\": { \"kind\": 
\"parameter\", \"group\": \"advanced\", \"label\": \"advanced\", \"type\": 
\"boolean\""));
+assertTrue(json, json.contains("\"readLockMinAge\": { \"kind\": 
\"parameter\", \"group\": \"lock\", \"label\": \"consumer,lock\""));
 }
 
 @Test

camel git commit: Update to newer jaxb osgi bundle

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x b50948f44 -> 6a1b57ca9


Update to newer jaxb osgi bundle


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

Branch: refs/heads/camel-2.17.x
Commit: 6a1b57ca977d2d1bb99ce3c98b16e4a582e4db35
Parents: b50948f
Author: Daniel Kulp 
Authored: Tue Aug 2 10:02:31 2016 -0400
Committer: Daniel Kulp 
Committed: Tue Aug 2 10:03:25 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/6a1b57ca/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 894aff8..55eabbe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -281,7 +281,7 @@
 1_2
 1.5.5
 3.1.0
-2.2.6_1
+2.2.11_1
 1.1.6
 6.3.0.Final
 1.0.0.Final

camel git commit: Update to newer jaxb osgi bundle

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 28d81a053 -> cef1b5446


Update to newer jaxb osgi bundle


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

Branch: refs/heads/master
Commit: cef1b5446079469b005feb8296ae674721796b32
Parents: 28d81a0
Author: Daniel Kulp 
Authored: Tue Aug 2 10:02:31 2016 -0400
Committer: Daniel Kulp 
Committed: Tue Aug 2 10:02:47 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/cef1b544/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 85a58a9..a32374c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -298,7 +298,7 @@
 1_2
 1.5.5
 3.1.0
-2.2.6_1
+2.2.11_1
 1.1.6
 6.4.0.Final
 1.0.0.Final

camel git commit: Update to CXF 3.1.7, expand spring version range to work with DM

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 9fedf6aa6 -> 284cc6780


Update to CXF 3.1.7, expand spring version range to work with DM


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

Branch: refs/heads/camel-2.17.x
Commit: 284cc6780de1e32468ef2ae50ad357a444e79da1
Parents: 9fedf6a
Author: Daniel Kulp 
Authored: Sun Jul 31 19:34:13 2016 -0400
Committer: Daniel Kulp 
Committed: Sun Jul 31 19:35:10 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/284cc678/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c98ce78..894aff8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,7 @@
 1.0.3
 1.4.2
 2.7
-3.1.5
+3.1.7
 [3.0,4.0)
 3.0.5
 3.0.5
@@ -514,8 +514,8 @@
 1.0.3.RELEASE
 
 [3.2,4)
-
-[4.1,5)
+
+[3.2,5)
 
 [4.0,4.1)
 

camel git commit: Update cxf version to 3.1.7

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master ca5ff50b7 -> eba32174a


Update cxf version to 3.1.7


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

Branch: refs/heads/master
Commit: eba32174a62155ae0c3fc9132e267d51523660c0
Parents: ca5ff50
Author: Daniel Kulp 
Authored: Mon Aug 1 08:11:27 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Aug 1 08:11:27 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/eba32174/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b6205d..5582554 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -143,7 +143,7 @@
 0.12.2
 0.12.0_1
 2.7
-3.1.6
+3.1.7
 [3.0,4.0)
 3.0.5
 3.0.5

camel git commit: [CAMEL-10087, CAMEL-10069] Port 10069 to consumer (as much as can be), set consumer TCCL to null since not all can be worked around.

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 1d3e4a2d6 -> fe35f0034


[CAMEL-10087, CAMEL-10069] Port 10069 to consumer (as much as can be), set 
consumer TCCL to null since not all can be worked around.


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

Branch: refs/heads/camel-2.17.x
Commit: fe35f0034518c99163273cf05e1cfdaf213ba19f
Parents: 1d3e4a2
Author: Daniel Kulp 
Authored: Sat Jun 25 08:50:29 2016 -0400
Committer: Daniel Kulp 
Committed: Sat Jun 25 09:17:40 2016 -0400

--
 .../camel/component/kafka/KafkaConsumer.java| 10 ++-
 .../camel/component/kafka/KafkaEndpoint.java| 64 +++-
 .../camel/component/kafka/KafkaProducer.java| 57 +
 3 files changed, 73 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fe35f003/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 04b60cc..daae07a 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -53,6 +53,7 @@ public class KafkaConsumer extends DefaultConsumer {
 
 Properties getProps() {
 Properties props = 
endpoint.getConfiguration().createConsumerProperties();
+endpoint.updateClassProperties(props);
 props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, 
endpoint.getBrokers());
 props.put(ConsumerConfig.GROUP_ID_CONFIG, endpoint.getGroupId());
 return props;
@@ -94,7 +95,14 @@ public class KafkaConsumer extends DefaultConsumer {
 this.topicName = topicName;
 this.threadId = topicName + "-" + "Thread " + id;
 this.kafkaProps = kafkaProps;
-this.consumer = new 
org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps);
+
+ClassLoader threadClassLoader = 
Thread.currentThread().getContextClassLoader();
+try {
+Thread.currentThread().setContextClassLoader(null);
+this.consumer = new 
org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps);
+} finally {
+
Thread.currentThread().setContextClassLoader(threadClassLoader);
+}
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/fe35f003/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index 7303c44..4116800 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.lang.reflect.Field;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 
@@ -27,16 +28,24 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.SynchronousDelegateProducer;
+import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.CastUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.producer.Partitioner;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.Serializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The kafka component allows messages to be sent to (or consumed from) Apache 
Kafka brokers.
  */
 @UriEndpoint(scheme = "kafka", title = "Kafka", syntax = "kafka:brokers", 
consumerClass = KafkaConsumer.class, label = "messaging")
 public class KafkaEndpoint extends DefaultEndpoint implements 
MultipleConsumersSupport {
-
+private static final Logger LOG = 
LoggerFactory.getLogger(KafkaEndpoint.class);
+
 @UriParam
 private KafkaConfiguration configuration = new KafkaConfiguration();
 @UriParam
@@ -91,6 +100,59 @@ public class 

camel git commit: [CAMEL-10087, CAMEL-10069] Port 10069 to consumer (as much as can be), set consumer TCCL to null since not all can be worked around.

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 67b17a5bd -> 349e7a5c9


[CAMEL-10087, CAMEL-10069] Port 10069 to consumer (as much as can be), set 
consumer TCCL to null since not all can be worked around.


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

Branch: refs/heads/master
Commit: 349e7a5c987838a2a21c9229eea72b739cdcb06e
Parents: 67b17a5
Author: Daniel Kulp 
Authored: Sat Jun 25 08:50:29 2016 -0400
Committer: Daniel Kulp 
Committed: Sat Jun 25 08:50:29 2016 -0400

--
 .../camel/component/kafka/KafkaConsumer.java| 10 ++-
 .../camel/component/kafka/KafkaEndpoint.java| 64 +++-
 .../camel/component/kafka/KafkaProducer.java| 57 +
 3 files changed, 73 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/349e7a5c/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 8b995ff..3c6e18c 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -57,6 +57,7 @@ public class KafkaConsumer extends DefaultConsumer {
 
 Properties getProps() {
 Properties props = 
endpoint.getConfiguration().createConsumerProperties();
+endpoint.updateClassProperties(props);
 props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, 
endpoint.getBrokers());
 props.put(ConsumerConfig.GROUP_ID_CONFIG, endpoint.getGroupId());
 return props;
@@ -98,7 +99,14 @@ public class KafkaConsumer extends DefaultConsumer {
 this.topicName = topicName;
 this.threadId = topicName + "-" + "Thread " + id;
 this.kafkaProps = kafkaProps;
-this.consumer = new 
org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps);
+
+ClassLoader threadClassLoader = 
Thread.currentThread().getContextClassLoader();
+try {
+Thread.currentThread().setContextClassLoader(null);
+this.consumer = new 
org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps);
+} finally {
+
Thread.currentThread().setContextClassLoader(threadClassLoader);
+}
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/349e7a5c/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index ec75c4b..f640bdb 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.lang.reflect.Field;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 
@@ -27,16 +28,24 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.SynchronousDelegateProducer;
+import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.CastUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.producer.Partitioner;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.Serializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The kafka component allows messages to be sent to (or consumed from) Apache 
Kafka brokers.
  */
 @UriEndpoint(scheme = "kafka", title = "Kafka", syntax = "kafka:brokers", 
consumerClass = KafkaConsumer.class, label = "messaging")
 public class KafkaEndpoint extends DefaultEndpoint implements 
MultipleConsumersSupport {
-
+private static final Logger LOG = 
LoggerFactory.getLogger(KafkaEndpoint.class);
+
 @UriParam
 private KafkaConfiguration configuration = new KafkaConfiguration();
 @UriParam
@@ -91,6 +100,59 @@ public class KafkaEndpoint 

camel git commit: [CAMEL-10069] Update to use ClassResolver to help search for the partitioner and serializers Also pull search for Partitioner out into separate try block to allow for use with 0.8 ka

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 164512979 -> 38c75c5cc


[CAMEL-10069] Update to use ClassResolver to help search for the partitioner 
and serializers
Also pull search for Partitioner out into separate try block to allow for use 
with 0.8 kafka client (which doesn't have partitioner)


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

Branch: refs/heads/camel-2.17.x
Commit: 38c75c5cc2ac127898aa19268901df7360d5631c
Parents: 1645129
Author: Daniel Kulp 
Authored: Wed Jun 22 15:30:14 2016 -0400
Committer: Daniel Kulp 
Committed: Wed Jun 22 15:49:30 2016 -0400

--
 .../camel/component/kafka/KafkaConsumer.java|  2 +-
 .../camel/component/kafka/KafkaProducer.java| 70 
 .../component/kafka/KafkaProducerFullTest.java  |  2 +-
 3 files changed, 44 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/38c75c5c/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index d4cfe49..04b60cc 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -90,7 +90,7 @@ public class KafkaConsumer extends DefaultConsumer {
 private final String threadId;
 private final Properties kafkaProps;
 
-public KafkaFetchRecords(String topicName, String id, Properties 
kafkaProps) {
+KafkaFetchRecords(String topicName, String id, Properties kafkaProps) {
 this.topicName = topicName;
 this.threadId = topicName + "-" + "Thread " + id;
 this.kafkaProps = kafkaProps;

http://git-wip-us.apache.org/repos/asf/camel/blob/38c75c5c/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index f3a2fb9..a81ec15 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -30,15 +31,20 @@ import org.apache.camel.CamelException;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultAsyncProducer;
+import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.util.CastUtils;
 import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.Partitioner;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.clients.producer.RecordMetadata;
 import org.apache.kafka.common.serialization.Serializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KafkaProducer extends DefaultAsyncProducer {
-
+private static final Logger LOG = 
LoggerFactory.getLogger(KafkaProducer.class);
+
 private org.apache.kafka.clients.producer.KafkaProducer kafkaProducer;
 private final KafkaEndpoint endpoint;
 private ExecutorService workerPool;
@@ -49,36 +55,22 @@ public class KafkaProducer extends DefaultAsyncProducer {
 this.endpoint = endpoint;
 }
 
-
-Class loadClass(Object o, ClassLoader loader) {
+ Class loadClass(Object o, ClassResolver resolver, Class type) {
 if (o == null || o instanceof Class) {
-return (Class)o;
+return CastUtils.cast((Class)o);
 }
 String name = o.toString();
-Class c;
-try {
-c = Class.forName(name, true, loader);
-} catch (ClassNotFoundException e) {
-c = null;
-}
+Class c = resolver.resolveClass(name, type);
 if (c == null) {
-try {
-c = Class.forName(name, true, getClass().getClassLoader());
-} catch (ClassNotFoundException e) {
-c = 

camel git commit: [CAMEL-10069] Update to use ClassResolver to help search for the partitioner and serializers Also pull search for Partitioner out into separate try block to allow for use with 0.8 ka

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master b8f5da747 -> ccef28fbc


[CAMEL-10069] Update to use ClassResolver to help search for the partitioner 
and serializers
Also pull search for Partitioner out into separate try block to allow for use 
with 0.8 kafka client (which doesn't have partitioner)


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

Branch: refs/heads/master
Commit: ccef28fbc003c541eb9ebd3b584092d0ea6c0f5d
Parents: b8f5da7
Author: Daniel Kulp 
Authored: Wed Jun 22 15:30:14 2016 -0400
Committer: Daniel Kulp 
Committed: Wed Jun 22 15:30:14 2016 -0400

--
 .../camel/component/kafka/KafkaConsumer.java|  2 -
 .../camel/component/kafka/KafkaProducer.java| 73 
 .../component/kafka/KafkaProducerFullTest.java  |  2 +-
 3 files changed, 47 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ccef28fb/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index a317b54..8b995ff 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.kafka;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +29,6 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.kafka.common.PartitionInfo;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.InterruptException;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/camel/blob/ccef28fb/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index ae2f2a4..a81ec15 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -30,15 +31,20 @@ import org.apache.camel.CamelException;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultAsyncProducer;
+import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.util.CastUtils;
 import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.Partitioner;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.clients.producer.RecordMetadata;
 import org.apache.kafka.common.serialization.Serializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KafkaProducer extends DefaultAsyncProducer {
-
+private static final Logger LOG = 
LoggerFactory.getLogger(KafkaProducer.class);
+
 private org.apache.kafka.clients.producer.KafkaProducer kafkaProducer;
 private final KafkaEndpoint endpoint;
 private ExecutorService workerPool;
@@ -49,36 +55,22 @@ public class KafkaProducer extends DefaultAsyncProducer {
 this.endpoint = endpoint;
 }
 
-
-Class loadClass(Object o, ClassLoader loader) {
+ Class loadClass(Object o, ClassResolver resolver, Class type) {
 if (o == null || o instanceof Class) {
-return (Class)o;
+return CastUtils.cast((Class)o);
 }
 String name = o.toString();
-Class c;
-try {
-c = Class.forName(name, true, loader);
-} catch (ClassNotFoundException e) {
-c = null;
-}
+Class c = resolver.resolveClass(name, type);
 if (c == null) {
-try {
-c = 

camel git commit: [CAMEL-10065] Update camel-kafka to support Iterable and Iterator

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x c3d4ad71b -> d83f2d67b


[CAMEL-10065] Update camel-kafka to support Iterable and Iterator


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

Branch: refs/heads/camel-2.16.x
Commit: d83f2d67b98dce7a793052e3984ea96bdd18b2f8
Parents: c3d4ad7
Author: Daniel Kulp 
Authored: Wed Jun 22 15:17:00 2016 -0400
Committer: Daniel Kulp 
Committed: Wed Jun 22 15:17:31 2016 -0400

--
 .../camel/component/kafka/KafkaConsumer.java|  6 +--
 .../camel/component/kafka/KafkaProducer.java| 50 +++-
 .../component/kafka/KafkaProducerFullTest.java  |  4 +-
 3 files changed, 42 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d83f2d67/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 94893fb..5ad4d82 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -131,7 +131,7 @@ public class KafkaConsumer extends DefaultConsumer {
 private KafkaStream stream;
 private CyclicBarrier barrier;
 
-public BatchingConsumerTask(KafkaStream stream, 
CyclicBarrier barrier) {
+BatchingConsumerTask(KafkaStream stream, CyclicBarrier 
barrier) {
 this.stream = stream;
 this.barrier = barrier;
 }
@@ -185,7 +185,7 @@ public class KafkaConsumer extends DefaultConsumer {
 
 private final ConsumerConnector consumer;
 
-public CommitOffsetTask(ConsumerConnector consumer) {
+CommitOffsetTask(ConsumerConnector consumer) {
 this.consumer = consumer;
 }
 
@@ -201,7 +201,7 @@ public class KafkaConsumer extends DefaultConsumer {
 private final ConsumerConnector consumer;
 private KafkaStream stream;
 
-public AutoCommitConsumerTask(ConsumerConnector consumer, 
KafkaStream stream) {
+AutoCommitConsumerTask(ConsumerConnector consumer, KafkaStream stream) {
 this.consumer = consumer;
 this.stream = stream;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/d83f2d67/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 06a0317..09de594 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -16,6 +16,9 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
 
 import kafka.javaapi.producer.Producer;
@@ -25,6 +28,7 @@ import org.apache.camel.CamelException;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.CastUtils;
 
 /**
  *
@@ -77,20 +81,42 @@ public class KafkaProducer extends DefaultProducer {
 K messageKey = (K) exchange.getIn().getHeader(KafkaConstants.KEY);
 boolean hasMessageKey = messageKey != null;
 
-V msg = (V) exchange.getIn().getBody();
-KeyedMessage data;
-
-if (hasPartitionKey && hasMessageKey) {
-data = new KeyedMessage(topic, messageKey, partitionKey, 
msg);
-} else if (hasPartitionKey) {
-data = new KeyedMessage(topic, partitionKey, msg);
-} else if (hasMessageKey) {
-data = new KeyedMessage(topic, messageKey, msg);
+Object msg = exchange.getIn().getBody();
+
+if (msg instanceof Iterable) {
+msg = ((Iterable)msg).iterator();
+}
+if (msg instanceof java.util.Iterator) {
+List> data = new LinkedList>();
+Iterator it = 

[2/2] camel git commit: [CAMEL-10065] Add a test case

[dkulp]

[CAMEL-10065] Add a test case


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

Branch: refs/heads/camel-2.17.x
Commit: c4236142c8c4e8778343a73db9331e34569a69a5
Parents: b7eed97
Author: Daniel Kulp 
Authored: Thu Jun 16 13:23:37 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Jun 16 15:19:38 2016 -0400

--
 .../component/kafka/KafkaProducerFullTest.java  | 29 
 1 file changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c4236142/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
--
diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
index 0bb4740..d5b65fa 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
@@ -17,8 +17,10 @@
 package org.apache.camel.component.kafka;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
@@ -125,6 +127,33 @@ public class KafkaProducerFullTest extends 
BaseEmbeddedKafkaTest {
 assertTrue("Not all messages were published to the kafka topics. Not 
received: " + messagesLatch.getCount(), allMessagesReceived);
 }
 
+
+@Test
+public void producedStringCollectionMessageIsReceivedByKafka() throws 
InterruptedException, IOException {
+int messageInTopic = 10;
+int messageInOtherTopic = 5;
+
+CountDownLatch messagesLatch = new CountDownLatch(messageInTopic + 
messageInOtherTopic);
+
+List msgs = new ArrayList();
+for (int x = 0; x < messageInTopic; x++) {
+msgs.add("Message " + x);
+}
+
+sendMessagesInRoute(1, stringsTemplate, msgs, 
KafkaConstants.PARTITION_KEY, "1");
+msgs = new ArrayList();
+for (int x = 0; x < messageInOtherTopic; x++) {
+msgs.add("Other Message " + x);
+}
+sendMessagesInRoute(1, stringsTemplate, msgs, 
KafkaConstants.PARTITION_KEY, "1", KafkaConstants.TOPIC, 
TOPIC_STRINGS_IN_HEADER);
+
+createKafkaMessageConsumer(stringsConsumerConn, TOPIC_STRINGS, 
TOPIC_STRINGS_IN_HEADER, messagesLatch);
+
+boolean allMessagesReceived = messagesLatch.await(200, 
TimeUnit.MILLISECONDS);
+
+assertTrue("Not all messages were published to the kafka topics. Not 
received: " + messagesLatch.getCount(), allMessagesReceived);
+}
+
 @Test
 public void producedBytesMessageIsReceivedByKafka() throws 
InterruptedException, IOException {
 int messageInTopic = 10;

[1/2] camel git commit: [CAMEL-10065] Update camel-kafka to support Iterable and Iterator

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 86cfd9df9 -> c4236142c


[CAMEL-10065] Update camel-kafka to support Iterable and Iterator


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

Branch: refs/heads/camel-2.17.x
Commit: b7eed97f16842e4ef4816bd921793c070061e058
Parents: 86cfd9d
Author: Daniel Kulp 
Authored: Thu Jun 16 13:09:04 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Jun 16 15:19:31 2016 -0400

--
 .../camel/component/kafka/KafkaProducer.java| 96 
 1 file changed, 76 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b7eed97f/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 1254e97..e2f25fb 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -16,8 +16,14 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelException;
@@ -96,7 +102,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
 }
 
 @SuppressWarnings("unchecked")
-protected ProducerRecord createRecorder(Exchange exchange) throws 
CamelException {
+protected Iterator createRecorder(Exchange exchange) 
throws CamelException {
 String topic = endpoint.getTopic();
 if (!endpoint.isBridgeEndpoint()) {
 topic = exchange.getIn().getHeader(KafkaConstants.TOPIC, topic, 
String.class);
@@ -104,14 +110,39 @@ public class KafkaProducer extends DefaultAsyncProducer {
 if (topic == null) {
 throw new CamelExchangeException("No topic key set", exchange);
 }
-Object partitionKey = 
exchange.getIn().getHeader(KafkaConstants.PARTITION_KEY);
-boolean hasPartitionKey = partitionKey != null;
+final Object partitionKey = 
exchange.getIn().getHeader(KafkaConstants.PARTITION_KEY);
+final boolean hasPartitionKey = partitionKey != null;
 
-Object messageKey = exchange.getIn().getHeader(KafkaConstants.KEY);
-boolean hasMessageKey = messageKey != null;
+final Object messageKey = 
exchange.getIn().getHeader(KafkaConstants.KEY);
+final boolean hasMessageKey = messageKey != null;
 
 Object msg = exchange.getIn().getBody();
+Iterator iterator = null;
+if (msg instanceof Iterable) {
+iterator = ((Iterable)msg).iterator();
+} else if (msg instanceof Iterator) {
+iterator = (Iterator)msg;
+}
+if (iterator != null) {
+final Iterator msgList = iterator;
+final String msgTopic = topic;
+return new Iterator() {
+@Override
+public boolean hasNext() {
+return msgList.hasNext();
+}
 
+@Override
+public ProducerRecord next() {
+if (hasPartitionKey && hasMessageKey) {
+return new ProducerRecord(msgTopic, new 
Integer(partitionKey.toString()), messageKey, msgList.next());
+} else if (hasMessageKey) {
+return new ProducerRecord(msgTopic, messageKey, 
msgList.next());
+}
+return new ProducerRecord(msgTopic, msgList.next());
+}
+};
+}
 ProducerRecord record;
 if (hasPartitionKey && hasMessageKey) {
 record = new ProducerRecord(topic, new 
Integer(partitionKey.toString()), messageKey, msg);
@@ -121,25 +152,35 @@ public class KafkaProducer extends DefaultAsyncProducer {
 log.warn("No message key or partition key set");
 record = new ProducerRecord(topic, msg);
 }
-return record;
+return Collections.singletonList(record).iterator();
 }
 
 @Override
 @SuppressWarnings("unchecked")
 // Camel calls this method if the endpoint isSynchronous(), 

camel git commit: [CAMEL-10065] Add a test case

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master bbe7f4c4b -> 6cb7b85f8


[CAMEL-10065] Add a test case


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

Branch: refs/heads/master
Commit: 6cb7b85f8d8151477f9fde06d67fec161b0dc084
Parents: bbe7f4c
Author: Daniel Kulp 
Authored: Thu Jun 16 13:23:37 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Jun 16 13:23:37 2016 -0400

--
 .../component/kafka/KafkaProducerFullTest.java  | 29 
 1 file changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6cb7b85f/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
--
diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
index 0bb4740..d5b65fa 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
@@ -17,8 +17,10 @@
 package org.apache.camel.component.kafka;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
@@ -125,6 +127,33 @@ public class KafkaProducerFullTest extends 
BaseEmbeddedKafkaTest {
 assertTrue("Not all messages were published to the kafka topics. Not 
received: " + messagesLatch.getCount(), allMessagesReceived);
 }
 
+
+@Test
+public void producedStringCollectionMessageIsReceivedByKafka() throws 
InterruptedException, IOException {
+int messageInTopic = 10;
+int messageInOtherTopic = 5;
+
+CountDownLatch messagesLatch = new CountDownLatch(messageInTopic + 
messageInOtherTopic);
+
+List msgs = new ArrayList();
+for (int x = 0; x < messageInTopic; x++) {
+msgs.add("Message " + x);
+}
+
+sendMessagesInRoute(1, stringsTemplate, msgs, 
KafkaConstants.PARTITION_KEY, "1");
+msgs = new ArrayList();
+for (int x = 0; x < messageInOtherTopic; x++) {
+msgs.add("Other Message " + x);
+}
+sendMessagesInRoute(1, stringsTemplate, msgs, 
KafkaConstants.PARTITION_KEY, "1", KafkaConstants.TOPIC, 
TOPIC_STRINGS_IN_HEADER);
+
+createKafkaMessageConsumer(stringsConsumerConn, TOPIC_STRINGS, 
TOPIC_STRINGS_IN_HEADER, messagesLatch);
+
+boolean allMessagesReceived = messagesLatch.await(200, 
TimeUnit.MILLISECONDS);
+
+assertTrue("Not all messages were published to the kafka topics. Not 
received: " + messagesLatch.getCount(), allMessagesReceived);
+}
+
 @Test
 public void producedBytesMessageIsReceivedByKafka() throws 
InterruptedException, IOException {
 int messageInTopic = 10;

camel git commit: [CAMEL-10065] Update camel-kafka to support Iterable and Iterator

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 3ce49256f -> bbe7f4c4b


[CAMEL-10065] Update camel-kafka to support Iterable and Iterator


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

Branch: refs/heads/master
Commit: bbe7f4c4b90d97dd39f2f0c2916160bea8d397dd
Parents: 3ce4925
Author: Daniel Kulp 
Authored: Thu Jun 16 13:09:04 2016 -0400
Committer: Daniel Kulp 
Committed: Thu Jun 16 13:14:35 2016 -0400

--
 .../camel/component/kafka/KafkaProducer.java| 96 
 1 file changed, 76 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bbe7f4c4/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 1254e97..e2f25fb 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -16,8 +16,14 @@
  */
 package org.apache.camel.component.kafka;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelException;
@@ -96,7 +102,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
 }
 
 @SuppressWarnings("unchecked")
-protected ProducerRecord createRecorder(Exchange exchange) throws 
CamelException {
+protected Iterator createRecorder(Exchange exchange) 
throws CamelException {
 String topic = endpoint.getTopic();
 if (!endpoint.isBridgeEndpoint()) {
 topic = exchange.getIn().getHeader(KafkaConstants.TOPIC, topic, 
String.class);
@@ -104,14 +110,39 @@ public class KafkaProducer extends DefaultAsyncProducer {
 if (topic == null) {
 throw new CamelExchangeException("No topic key set", exchange);
 }
-Object partitionKey = 
exchange.getIn().getHeader(KafkaConstants.PARTITION_KEY);
-boolean hasPartitionKey = partitionKey != null;
+final Object partitionKey = 
exchange.getIn().getHeader(KafkaConstants.PARTITION_KEY);
+final boolean hasPartitionKey = partitionKey != null;
 
-Object messageKey = exchange.getIn().getHeader(KafkaConstants.KEY);
-boolean hasMessageKey = messageKey != null;
+final Object messageKey = 
exchange.getIn().getHeader(KafkaConstants.KEY);
+final boolean hasMessageKey = messageKey != null;
 
 Object msg = exchange.getIn().getBody();
+Iterator iterator = null;
+if (msg instanceof Iterable) {
+iterator = ((Iterable)msg).iterator();
+} else if (msg instanceof Iterator) {
+iterator = (Iterator)msg;
+}
+if (iterator != null) {
+final Iterator msgList = iterator;
+final String msgTopic = topic;
+return new Iterator() {
+@Override
+public boolean hasNext() {
+return msgList.hasNext();
+}
 
+@Override
+public ProducerRecord next() {
+if (hasPartitionKey && hasMessageKey) {
+return new ProducerRecord(msgTopic, new 
Integer(partitionKey.toString()), messageKey, msgList.next());
+} else if (hasMessageKey) {
+return new ProducerRecord(msgTopic, messageKey, 
msgList.next());
+}
+return new ProducerRecord(msgTopic, msgList.next());
+}
+};
+}
 ProducerRecord record;
 if (hasPartitionKey && hasMessageKey) {
 record = new ProducerRecord(topic, new 
Integer(partitionKey.toString()), messageKey, msg);
@@ -121,25 +152,35 @@ public class KafkaProducer extends DefaultAsyncProducer {
 log.warn("No message key or partition key set");
 record = new ProducerRecord(topic, msg);
 }
-return record;
+return Collections.singletonList(record).iterator();
 }
 
 @Override
 @SuppressWarnings("unchecked")
 // Camel calls this method if the endpoint isSynchronous(), as the 

camel git commit: FIx a bunch of checkstyle and eclipse errors

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 8144bad5e -> dea7ef0e0


FIx a bunch of checkstyle and eclipse errors


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

Branch: refs/heads/master
Commit: dea7ef0e0aae5ba4aef9d104cd10af986be9fc53
Parents: 8144bad
Author: Daniel Kulp 
Authored: Mon Mar 14 12:22:03 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 14 12:22:59 2016 -0400

--
 .../component/http/HttpProducerSelectMethodTest.java|  2 +-
 .../camel/converter/jaxb/NonXmlFilterReaderTest.java|  2 +-
 .../camel/component/jetty/CamelMultipartFilter.java |  2 +-
 .../camel/component/jetty/DefaultJettyHttpBinding.java  |  2 +-
 .../camel/component/jetty/JettyHttpComponent.java   |  2 +-
 .../apache/camel/component/jetty/CustomFiltersTest.java |  2 +-
 .../component/jetty/HttpBridgeMultipartRouteTest.java   |  2 +-
 .../org/apache/camel/component/jetty/HttpRouteTest.java | 12 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dea7ef0e/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
--
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
index 886e9c8..0551ead 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
@@ -169,7 +169,7 @@ public class HttpProducerSelectMethodTest extends 
CamelTestSupport {
 private String name;
 private String queryString;
 
-public MyHttpProducer(HttpEndpoint endpoint, String name, String 
queryString) {
+MyHttpProducer(HttpEndpoint endpoint, String name, String queryString) 
{
 super(endpoint);
 this.name = name;
 this.queryString = queryString;

http://git-wip-us.apache.org/repos/asf/camel/blob/dea7ef0e/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
--
diff --git 
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
 
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
index 44d8e90..e1f5ed0 100644
--- 
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
+++ 
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
@@ -89,7 +89,7 @@ public class NonXmlFilterReaderTest {
 static class ConstantReader extends Reader {
 private char[] constant;
 
-public ConstantReader(char[] constant) {
+ConstantReader(char[] constant) {
 this.constant = constant;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/dea7ef0e/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
index 9a0c6ea..8f0ba6b 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
@@ -22,7 +22,7 @@ import javax.servlet.Filter;
  * Please use the CamelFilterWrapper instead of using this classs
  */
 @Deprecated 
-class CamelMultipartFilter extends CamelFilterWrapper {
+public class CamelMultipartFilter extends CamelFilterWrapper {
 
 public CamelMultipartFilter(Filter wrapped) {
 super(wrapped);

http://git-wip-us.apache.org/repos/asf/camel/blob/dea7ef0e/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
index 

camel git commit: Remove redundant modifier

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 8e5dbe513 -> c65bd26ea


Remove redundant modifier


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

Branch: refs/heads/master
Commit: c65bd26ea4f1e4b6649359361e5836294bc8eb45
Parents: 8e5dbe5
Author: Daniel Kulp 
Authored: Mon Mar 14 12:04:48 2016 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 14 12:04:48 2016 -0400

--
 .../src/main/java/org/apache/camel/processor/FinallyProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c65bd26e/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java 
b/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
index 4fe21a6..bf543dd 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
@@ -91,7 +91,7 @@ public class FinallyProcessor extends DelegateAsyncProcessor 
implements Traceabl
 private final Exception exception;
 private final boolean fault;
 
-public FinallyAsyncCallback(Exchange exchange, AsyncCallback callback, 
Exception exception, boolean fault) {
+FinallyAsyncCallback(Exchange exchange, AsyncCallback callback, 
Exception exception, boolean fault) {
 this.exchange = exchange;
 this.callback = callback;
 this.exception = exception;

[2/3] camel git commit: Rename camel-gridfs to camel-mongodb-gridfs

[dkulp]

Rename camel-gridfs to camel-mongodb-gridfs


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

Branch: refs/heads/master
Commit: b4845575fcf22e64aa35da0a971b55c35a4ebf14
Parents: 2d5000e
Author: Daniel Kulp 
Authored: Fri Mar 4 11:55:35 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Mar 4 11:55:35 2016 -0500

--
 components/camel-gridfs/.gitignore  |   3 -
 components/camel-gridfs/pom.xml |  69 
 .../camel/component/gridfs/GridFsComponent.java |  64 
 .../camel/component/gridfs/GridFsConsumer.java  | 178 -
 .../camel/component/gridfs/GridFsEndpoint.java  | 360 ---
 .../camel/component/gridfs/GridFsProducer.java  | 145 
 .../src/main/resources/META-INF/LICENSE.txt | 203 ---
 .../src/main/resources/META-INF/NOTICE.txt  |  11 -
 .../services/org/apache/camel/component/gridfs  |  18 -
 .../component/gridfs/AbstractMongoDbTest.java   |  62 
 .../gridfs/EmbedMongoConfiguration.java |  58 ---
 .../component/gridfs/GridFsConsumerTest.java|  99 -
 .../gridfs/GridFsProducerOperationsTest.java|  74 
 .../src/test/resources/log4j.properties |  37 --
 .../src/test/resources/mongodb.test.properties  |  21 --
 components/camel-mongodb-gridfs/.gitignore  |   3 +
 components/camel-mongodb-gridfs/pom.xml |  69 
 .../camel/component/gridfs/GridFsComponent.java |  64 
 .../camel/component/gridfs/GridFsConsumer.java  | 178 +
 .../camel/component/gridfs/GridFsEndpoint.java  | 360 +++
 .../camel/component/gridfs/GridFsProducer.java  | 145 
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/gridfs  |  18 +
 .../component/gridfs/AbstractMongoDbTest.java   |  62 
 .../gridfs/EmbedMongoConfiguration.java |  58 +++
 .../component/gridfs/GridFsConsumerTest.java|  99 +
 .../gridfs/GridFsProducerOperationsTest.java|  74 
 .../src/test/resources/log4j.properties |  37 ++
 .../src/test/resources/mongodb.test.properties  |  21 ++
 components/pom.xml  |   2 +-
 .../features/src/main/resources/features.xml|   4 +-
 32 files changed, 1405 insertions(+), 1405 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-gridfs/.gitignore
--
diff --git a/components/camel-gridfs/.gitignore 
b/components/camel-gridfs/.gitignore
deleted file mode 100644
index fe30fe5..000
--- a/components/camel-gridfs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-target
-*.i??
-.idea

http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-gridfs/pom.xml
--
diff --git a/components/camel-gridfs/pom.xml b/components/camel-gridfs/pom.xml
deleted file mode 100644
index ec8e6bd..000
--- a/components/camel-gridfs/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-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/xsd/maven-4.0.0.xsd;>
-
-4.0.0
-
-
-org.apache.camel
-components
-2.17-SNAPSHOT
-
-
-camel-gridfs
-bundle
-Camel :: MongoDB GridFS
-Camel MongoDB GridFS component
-
-
-
org.apache.camel.component.gridfs.*
-
org.apache.camel.spi.ComponentResolver;component=gridfs
-
-
-
-
-
-org.apache.camel
-camel-core
-
-
-
-org.apache.camel
-camel-jackson
-
-
-
-org.mongodb
-mongo-java-driver
-3.2.2
-
-
-de.flapdoodle.embed
-de.flapdoodle.embed.mongo
-test
-
-   
-  org.apache.camel
-  camel-test-spring
-  test
-
-
-
-

http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
--
diff --git 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
deleted file mode 100644
index 62701a0..000
--- 

[3/3] camel git commit: Remove unnneeded .gitignore

[dkulp]

Remove unnneeded .gitignore


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

Branch: refs/heads/master
Commit: 39b79b97bf5690e2e3417ed2e75ae3cff330249e
Parents: b484557
Author: Daniel Kulp 
Authored: Fri Mar 4 11:56:13 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Mar 4 11:56:13 2016 -0500

--
 components/camel-mongodb-gridfs/.gitignore | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/39b79b97/components/camel-mongodb-gridfs/.gitignore
--
diff --git a/components/camel-mongodb-gridfs/.gitignore 
b/components/camel-mongodb-gridfs/.gitignore
deleted file mode 100644
index fe30fe5..000
--- a/components/camel-mongodb-gridfs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-target
-*.i??
-.idea

[1/3] camel git commit: Rename camel-gridfs to camel-mongodb-gridfs

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 2d5000ea0 -> 39b79b97b


http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
--
diff --git 
a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
 
b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
new file mode 100644
index 000..4856a7f
--- /dev/null
+++ 
b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
@@ -0,0 +1,360 @@
+/**
+ * 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.gridfs;
+
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.Mongo;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.gridfs.GridFS;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@UriEndpoint(scheme = "gridfs", title = "MongoDBGridFS", syntax = 
"gridfs:connectionBean", 
+label = "database,nosql")
+public class GridFsEndpoint extends DefaultEndpoint {
+
+public enum QueryStrategy {
+TimeStamp,
+PersistentTimestamp,
+FileAttribute,
+TimeStampAndFileAttribute,
+PersistentTimestampAndFileAttribute
+};
+public static final String GRIDFS_OPERATION = "gridfs.operation";
+public static final String GRIDFS_METADATA = "gridfs.metadata";
+public static final String GRIDFS_CHUNKSIZE = "gridfs.chunksize";
+
+private static final Logger LOG = 
LoggerFactory.getLogger(GridFsEndpoint.class);
+
+@UriPath @Metadata(required = "true")
+private String connectionBean;
+@UriParam @Metadata(required = "true")
+private String database;
+@UriParam(defaultValue = GridFS.DEFAULT_BUCKET)
+private String bucket;
+@UriParam(enums = 
"ACKNOWLEDGED,W1,W2,W3,UNACKNOWLEDGED,JOURNALED,MAJORITY,SAFE")
+private WriteConcern writeConcern;
+@UriParam
+private WriteConcern writeConcernRef;
+@UriParam
+private ReadPreference readPreference;
+
+@UriParam(label = "producer")
+private String operation;
+
+@UriParam(label = "consumer")
+private String query;
+@UriParam(label = "consumer", defaultValue = "1000")
+private long initialDelay = 1000;
+@UriParam(label = "consumer", defaultValue = "500")
+private long delay = 500;
+
+@UriParam(label = "consumer", defaultValue = "TimeStamp")
+private QueryStrategy queryStrategy = QueryStrategy.TimeStamp;
+@UriParam(label = "consumer", defaultValue = "camel-timestamps")
+private String persistentTSCollection = "camel-timestamps";
+@UriParam(label = "consumer", defaultValue = "camel-timestamp")
+private String persistentTSObject = "camel-timestamp";
+@UriParam(label = "consumer", defaultValue = "camel-processed")
+private String fileAttributeName = "camel-processed";
+
+
+private Mongo mongoConnection;
+private DB db;
+private GridFS gridFs;
+private DBCollection filesCollection;
+
+public GridFsEndpoint(String uri, GridFsComponent component) {
+super(uri, component);
+}
+
+@Override
+public Producer createProducer() throws Exception {
+initializeConnection();
+return new GridFsProducer(this);
+}
+
+@Override
+public Consumer createConsumer(Processor processor) throws Exception {
+initializeConnection();
+return new GridFsConsumer(this, processor);
+}
+
+public boolean isSingleton() {
+return true;
+}
+
+@SuppressWarnings("deprecation")
+public void initializeConnection() throws Exception {
+LOG.info("Initialize GridFS endpoint: {}", this.toString());
+if 

camel git commit: Add the oid to the output so if there are multiple files with the same name, they can be distinguished

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 2f80b8e31 -> 3e1178afa


Add the oid to the output so if there are multiple files with the same name, 
they can be distinguished


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

Branch: refs/heads/master
Commit: 3e1178afa05f91ac897db51ea56e83d204d98989
Parents: 2f80b8e
Author: Daniel Kulp 
Authored: Thu Mar 3 13:37:03 2016 -0500
Committer: Daniel Kulp 
Committed: Thu Mar 3 13:37:03 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/3e1178af/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
--
diff --git 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
index 58416b1..dccb499 100644
--- 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
+++ 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
@@ -118,7 +118,7 @@ public class GridFsProducer extends DefaultProducer {
 }
 while (cursor.hasNext() && current.length() < 4000) {
 DBObject o = cursor.next();
-current.append(o.get("filename")).append("\n");
+
current.append(o.get("filename")).append("\t").append(o.get("_id")).append("\n");
 }
 }
 @Override

camel git commit: [CAMEL-9659] Add gridfs to features.xml

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master e589faa82 -> a98328ba0


[CAMEL-9659] Add gridfs to features.xml


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

Branch: refs/heads/master
Commit: a98328ba06d743659c2b495c38dfb5dd0ed0a4c8
Parents: e589faa
Author: Daniel Kulp 
Authored: Tue Mar 1 15:02:44 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 15:02:44 2016 -0500

--
 platforms/karaf/features/src/main/resources/features.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a98328ba/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 6474c88..573faa3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1090,6 +1090,12 @@
 camel-core
 camel-jackson
   
+  
+  mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}
+  mvn:org.apache.camel/camel-gridfs/${project.version}
+  camel-core
+  camel-jackson
+  
   
 mvn:org.fusesource.mqtt-client/mqtt-client/${mqtt-client-version}
 mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version}

[7/9] camel git commit: Add 'components/camel-gridfs/' from commit '9ec105a3e251a59d982146aea5c4f2df0505866f'

[dkulp]

Add 'components/camel-gridfs/' from commit 
'9ec105a3e251a59d982146aea5c4f2df0505866f'

git-subtree-dir: components/camel-gridfs
git-subtree-mainline: 837f355c2784f09c3369e5930190b22b02045980
git-subtree-split: 9ec105a3e251a59d982146aea5c4f2df0505866f


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

Branch: refs/heads/master
Commit: f1e21c5370188ef7018962f11e8ef2af1974f4f7
Parents: 837f355 9ec105a
Author: Daniel Kulp 
Authored: Tue Mar 1 14:39:22 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:39:22 2016 -0500

--
 components/camel-gridfs/.gitignore  |   3 +
 components/camel-gridfs/pom.xml |  69 
 .../camel/component/gridfs/GridFsComponent.java |  62 
 .../camel/component/gridfs/GridFsConsumer.java  | 180 ++
 .../camel/component/gridfs/GridFsEndpoint.java  | 360 +++
 .../camel/component/gridfs/GridFsProducer.java  | 145 
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/gridfs  |  18 +
 .../component/gridfs/AbstractMongoDbTest.java   |  62 
 .../gridfs/EmbedMongoConfiguration.java |  58 +++
 .../component/gridfs/GridFsConsumerTest.java| 101 ++
 .../gridfs/GridFsProducerOperationsTest.java|  74 
 .../src/test/resources/log4j.properties |  37 ++
 .../src/test/resources/mongodb.test.properties  |  21 ++
 15 files changed, 1404 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f1e21c53/components/camel-gridfs/.gitignore
--
diff --cc components/camel-gridfs/.gitignore
index 000,000..fe30fe5
new file mode 100644
--- /dev/null
+++ b/components/camel-gridfs/.gitignore
@@@ -1,0 -1,0 +1,3 @@@
++target
++*.i??
++.idea

http://git-wip-us.apache.org/repos/asf/camel/blob/f1e21c53/components/camel-gridfs/pom.xml
--
diff --cc components/camel-gridfs/pom.xml
index 000,000..ade40e7
new file mode 100644
--- /dev/null
+++ b/components/camel-gridfs/pom.xml
@@@ -1,0 -1,0 +1,69 @@@
++
++
++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/xsd/maven-4.0.0.xsd;>
++
++4.0.0
++
++
++org.apache.camel
++components
++2.16.2
++
++
++camel-gridfs
++bundle
++Camel :: MongoDB GridFS
++Camel MongoDB GridFS component
++
++
++
org.apache.camel.component.gridfs.*
++
org.apache.camel.spi.ComponentResolver;component=gridfs
++
++
++
++
++
++org.apache.camel
++camel-core
++
++
++
++org.apache.camel
++camel-jackson
++
++
++
++org.mongodb
++mongo-java-driver
++3.2.2
++
++
++de.flapdoodle.embed
++de.flapdoodle.embed.mongo
++test
++
++  
++  org.apache.camel
++  camel-test-spring
++  test
++
++
++
++

http://git-wip-us.apache.org/repos/asf/camel/blob/f1e21c53/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
--
diff --cc 
components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
index 000,000..26da915
new file mode 100644
--- /dev/null
+++ 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
@@@ -1,0 -1,0 +1,62 @@@
++/**
++ * 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 

[3/9] camel git commit: [CAMEL-9659] Add more headers to resulting exchange

[dkulp]

[CAMEL-9659] Add more headers to resulting exchange


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

Branch: refs/heads/master
Commit: f80654f493481535ca297e240ee03468ab0cd2f7
Parents: bfaec78
Author: Daniel Kulp 
Authored: Mon Feb 29 13:14:31 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:23:00 2016 -0500

--
 .../camel/component/gridfs/GridFsConsumer.java  |  2 +-
 .../camel/component/gridfs/GridFsProducer.java  | 16 
 2 files changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f80654f4/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
index dce195a..4f2ce66 100644
--- a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
@@ -26,7 +26,7 @@ import org.apache.camel.impl.DefaultConsumer;
  * 
  */
 public class GridFsConsumer extends DefaultConsumer {
-GridFsEndpoint ep;
+final GridFsEndpoint ep;
 
 /**
  * @param endpoint

http://git-wip-us.apache.org/repos/asf/camel/blob/f80654f4/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
index 5178220..7954644 100644
--- a/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
@@ -32,6 +32,10 @@ import org.apache.camel.impl.DefaultProducer;
 
 
 public class GridFsProducer extends DefaultProducer {
+public static final String GRIDFS_OPERATION = "gridfs.operation";
+public static final String GRIDFS_METADATA = "gridfs.metadata";
+public static final String GRIDFS_CHUNKSIZE = "gridfs.chunksize";
+
 private GridFsEndpoint endpoint;
 
 public GridFsProducer(GridFsEndpoint endpoint) {
@@ -42,11 +46,11 @@ public class GridFsProducer extends DefaultProducer {
 public void process(Exchange exchange) throws Exception {
 String operation = endpoint.getOperation();
 if (operation == null) {
-operation = exchange.getIn().getHeader("gridfs.operation", 
String.class);
+operation = exchange.getIn().getHeader(GRIDFS_OPERATION, 
String.class);
 }
 if (operation == null || "create".equals(operation)) {
 final String filename = 
exchange.getIn().getHeader(Exchange.FILE_NAME, String.class);
-Long chunkSize = exchange.getIn().getHeader("gridfs.chunksize", 
Long.class);
+Long chunkSize = exchange.getIn().getHeader(GRIDFS_CHUNKSIZE, 
Long.class);
 
 InputStream ins = 
exchange.getIn().getMandatoryBody(InputStream.class);
 GridFSInputFile gfsFile = endpoint.getGridFs().createFile(ins, 
filename, true);
@@ -57,7 +61,7 @@ public class GridFsProducer extends DefaultProducer {
 if (ct != null) {
 gfsFile.setContentType(ct);
 }
-String metaData = exchange.getIn().getHeader("gridfs.metadata", 
String.class);
+String metaData = exchange.getIn().getHeader(GRIDFS_METADATA, 
String.class);
 DBObject dbObject = (DBObject) JSON.parse(metaData);
 gfsFile.setMetaData(dbObject);
 gfsFile.save();
@@ -69,7 +73,11 @@ public class GridFsProducer extends DefaultProducer {
 final String filename = 
exchange.getIn().getHeader(Exchange.FILE_NAME, String.class);
 GridFSDBFile file = endpoint.getGridFs().findOne(filename);
 if (file != null) {
-exchange.getIn().setBody(file.getInputStream(), 
InputStream.class);
+exchange.getIn().setHeader(GRIDFS_METADATA, 
JSON.serialize(file.getMetaData()));
+exchange.getIn().setHeader(Exchange.FILE_CONTENT_TYPE, 
file.getContentType());
+exchange.getIn().setHeader(Exchange.FILE_LENGTH, 
file.getLength());
+exchange.getIn().setHeader(Exchange.FILE_LAST_MODIFIED, 
file.getUploadDate());
+exchange.getIn().setBody(file.getInputStream(), 
InputStream.class);
 } else {
 throw new FileNotFoundException("No GridFS file for " + 
filename);
 

[5/9] camel git commit: [CAMEL-9659] Add different strategies for handling the detection of new files

[dkulp]

[CAMEL-9659] Add different strategies for handling the detection of new files


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

Branch: refs/heads/master
Commit: 452041047e770c24e8802f2cac7cc76080554303
Parents: ce54b04
Author: Daniel Kulp 
Authored: Tue Mar 1 11:48:43 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:23:07 2016 -0500

--
 .../camel/component/gridfs/GridFsConsumer.java  | 98 
 .../camel/component/gridfs/GridFsEndpoint.java  | 48 +-
 .../component/gridfs/GridFsConsumerTest.java| 36 ++-
 3 files changed, 157 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/45204104/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
index 240dd47..35d77ee 100644
--- a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
@@ -23,13 +23,17 @@ import java.io.InputStream;
 import java.util.concurrent.ExecutorService;
 
 import com.mongodb.BasicDBObject;
+import com.mongodb.BasicDBObjectBuilder;
+import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
+import com.mongodb.MongoException;
 import com.mongodb.gridfs.GridFSDBFile;
 import com.mongodb.util.JSON;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.gridfs.GridFsEndpoint.QueryStrategy;
 import org.apache.camel.impl.DefaultConsumer;
 
 /**
@@ -48,8 +52,6 @@ public class GridFsConsumer extends DefaultConsumer 
implements Runnable {
 this.endpoint = endpoint;
 }
 
-
-
 @Override
 protected void doStop() throws Exception {
 super.doStop();
@@ -69,7 +71,38 @@ public class GridFsConsumer extends DefaultConsumer 
implements Runnable {
 @Override
 public void run() {
 DBCursor c = null;
-java.util.Date fromDate = new java.util.Date();
+java.util.Date fromDate = null;
+
+QueryStrategy s = endpoint.getQueryStrategy();
+boolean usesTimestamp = (s != QueryStrategy.FileAttribute);
+boolean persistsTimestamp = (s == QueryStrategy.PersistentTimestamp || 
s == QueryStrategy.PersistentTimestampAndFileAttribute);
+boolean usesAttribute = (s == QueryStrategy.FileAttribute 
+|| s == QueryStrategy.TimeStampAndFileAttribute 
+|| s == QueryStrategy.PersistentTimestampAndFileAttribute);
+
+DBCollection ptsCollection = null;
+DBObject persistentTimestamp = null;
+if (persistsTimestamp) {
+ptsCollection = 
endpoint.getDB().getCollection(endpoint.getPersistentTSCollection());
+ // ensure standard indexes as long as collections are small
+try {
+if (ptsCollection.count() < 1000) {
+ptsCollection.createIndex(new BasicDBObject("id", 1));
+}
+} catch (MongoException e) {
+//TODO: Logging
+}
+persistentTimestamp = ptsCollection.findOne(new 
BasicDBObject("id", endpoint.getPersistentTSObject()));
+if (persistentTimestamp == null) {
+persistentTimestamp = new BasicDBObject("id", 
endpoint.getPersistentTSObject());
+fromDate = new java.util.Date();
+persistentTimestamp.put("timestamp", fromDate);
+ptsCollection.save(persistentTimestamp);
+}
+fromDate = (java.util.Date)persistentTimestamp.get("timestamp");
+} else if (usesTimestamp) {
+fromDate = new java.util.Date();
+}
 try {
 Thread.sleep(endpoint.getInitialDelay());
 while (isStarted()) {
@@ -84,27 +117,54 @@ public class GridFsConsumer extends DefaultConsumer 
implements Runnable {
 } else {
 query = (DBObject) JSON.parse(queryString);
 }
-
-query.put("uploadDate", new BasicDBObject("$gte", 
fromDate));
+if (usesTimestamp) {
+query.put("uploadDate", new BasicDBObject("$gt", 
fromDate));
+}
+if (usesAttribute) {
+query.put(endpoint.getFileAttributeName(), null);
+}
   

[9/9] camel git commit: [CAMEL-9659] Fix checkstyle issues

[dkulp]

[CAMEL-9659] Fix checkstyle issues


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

Branch: refs/heads/master
Commit: e589faa820c62a03831d799d721d61dcf11cbdc7
Parents: b3eaf81
Author: Daniel Kulp 
Authored: Tue Mar 1 15:01:37 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 15:01:37 2016 -0500

--
 .../camel/component/gridfs/GridFsComponent.java |  6 ++--
 .../camel/component/gridfs/GridFsConsumer.java  | 34 +---
 .../component/gridfs/GridFsConsumerTest.java| 26 +++
 3 files changed, 32 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e589faa8/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
--
diff --git 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
index 26da915..62701a0 100644
--- 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
+++ 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
@@ -16,18 +16,20 @@
  */
 package org.apache.camel.component.gridfs;
 
+import java.util.Map;
+
 import com.mongodb.Mongo;
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
 import org.apache.camel.util.CamelContextHelper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Map;
 
 public class GridFsComponent extends UriEndpointComponent {
 
-private final static Logger LOG = 
LoggerFactory.getLogger(GridFsComponent.class);
+private static final Logger LOG = 
LoggerFactory.getLogger(GridFsComponent.class);
 
 private volatile Mongo db;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e589faa8/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
--
diff --git 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
index 35d77ee..bfce711 100644
--- 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
+++ 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
@@ -1,20 +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
+ * 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
+ *  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.
+ * 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.gridfs;
@@ -74,11 +72,11 @@ public class GridFsConsumer extends DefaultConsumer 
implements Runnable {
 java.util.Date fromDate = null;
 
 QueryStrategy s = endpoint.getQueryStrategy();
-boolean usesTimestamp = (s != QueryStrategy.FileAttribute);
-boolean persistsTimestamp = (s == QueryStrategy.PersistentTimestamp || 
s == QueryStrategy.PersistentTimestampAndFileAttribute);
-boolean 

[1/9] camel git commit: Initial revision

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 837f355c2 -> e589faa82


Initial revision


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

Branch: refs/heads/master
Commit: 4c78e449c8acbe854a9409321e9ea5625778ed72
Parents: 
Author: Jean-Baptiste Onofré 
Authored: Wed Oct 15 18:10:00 2014 +0200
Committer: Jean-Baptiste Onofré 
Committed: Wed Oct 15 18:10:00 2014 +0200

--
 .gitignore  |   3 +
 pom.xml |  60 ++
 .../camel/component/gridfs/GridFsComponent.java |  56 +
 .../camel/component/gridfs/GridFsEndpoint.java  | 143 +
 .../camel/component/gridfs/GridFsProducer.java  |  90 
 src/main/resources/META-INF/LICENSE.txt | 203 +++
 src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/gridfs  |  18 ++
 8 files changed, 584 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4c78e449/.gitignore
--
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..fe30fe5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+target
+*.i??
+.idea

http://git-wip-us.apache.org/repos/asf/camel/blob/4c78e449/pom.xml
--
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000..5b1e1a1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,60 @@
+
+
+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/xsd/maven-4.0.0.xsd;>
+
+4.0.0
+
+
+org.apache.camel
+components
+2.13.2
+
+
+camel-gridfs
+bundle
+Camel :: MongoDB GridFS
+Camel MongoDB GridFS component
+
+
+
org.apache.camel.component.gridfs.*
+
org.apache.camel.spi.ComponentResolver;component=gridfs
+
+
+
+
+
+org.apache.camel
+camel-core
+
+
+
+org.apache.camel
+camel-jackson
+
+
+
+org.mongodb
+mongo-java-driver
+${mongo-java-driver-version}
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/camel/blob/4c78e449/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
new file mode 100644
index 000..87d5394
--- /dev/null
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
@@ -0,0 +1,56 @@
+/**
+ * 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.gridfs;
+
+import com.mongodb.Mongo;
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.CamelContextHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+public class GridFsComponent extends DefaultComponent {
+
+private final static Logger LOG = 
LoggerFactory.getLogger(GridFsComponent.class);
+
+private volatile Mongo db;
+
+protected Endpoint createEndpoint(String uri, String remaining, 
Map parameters) throws Exception {
+if (db == null) {
+db = CamelContextHelper.mandatoryLookup(getCamelContext(), 
remaining, Mongo.class);
+LOG.debug("Resolved the connection with the name {} as {}", 
remaining, db);
+}
+
+Endpoint endpoint = new GridFsEndpoint(uri, this);
+parameters.put("mongoConnection", db);
+setProperties(endpoint, parameters);
+
+return 

[6/9] camel git commit: [CAMEL-9659] Add component docs

[dkulp]

[CAMEL-9659] Add component docs


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

Branch: refs/heads/master
Commit: 9ec105a3e251a59d982146aea5c4f2df0505866f
Parents: 4520410
Author: Daniel Kulp 
Authored: Tue Mar 1 13:01:36 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:23:11 2016 -0500

--
 .../camel/component/gridfs/GridFsEndpoint.java  | 73 
 1 file changed, 61 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9ec105a3/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
index 554c4cd..4856a7f 100644
--- a/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
@@ -52,9 +52,9 @@ public class GridFsEndpoint extends DefaultEndpoint {
 
 @UriPath @Metadata(required = "true")
 private String connectionBean;
-@UriParam
+@UriParam @Metadata(required = "true")
 private String database;
-@UriParam
+@UriParam(defaultValue = GridFS.DEFAULT_BUCKET)
 private String bucket;
 @UriParam(enums = 
"ACKNOWLEDGED,W1,W2,W3,UNACKNOWLEDGED,JOURNALED,MAJORITY,SAFE")
 private WriteConcern writeConcern;
@@ -62,23 +62,24 @@ public class GridFsEndpoint extends DefaultEndpoint {
 private WriteConcern writeConcernRef;
 @UriParam
 private ReadPreference readPreference;
-@UriParam
+
+@UriParam(label = "producer")
 private String operation;
 
-@UriParam
+@UriParam(label = "consumer")
 private String query;
-@UriParam
+@UriParam(label = "consumer", defaultValue = "1000")
 private long initialDelay = 1000;
-@UriParam
+@UriParam(label = "consumer", defaultValue = "500")
 private long delay = 500;
 
-@UriParam 
+@UriParam(label = "consumer", defaultValue = "TimeStamp")
 private QueryStrategy queryStrategy = QueryStrategy.TimeStamp;
-@UriParam
+@UriParam(label = "consumer", defaultValue = "camel-timestamps")
 private String persistentTSCollection = "camel-timestamps";
-@UriParam
+@UriParam(label = "consumer", defaultValue = "camel-timestamp")
 private String persistentTSObject = "camel-timestamp";
-@UriParam
+@UriParam(label = "consumer", defaultValue = "camel-processed")
 private String fileAttributeName = "camel-processed";
 
 
@@ -167,6 +168,11 @@ public class GridFsEndpoint extends DefaultEndpoint {
 public Mongo getMongoConnection() {
 return mongoConnection;
 }
+/**
+ * Sets the Mongo instance that represents the backing connection
+ * 
+ * @param mongoConnection the connection to the database
+ */
 public void setMongoConnection(Mongo mongoConnection) {
 this.mongoConnection = mongoConnection;
 }
@@ -178,9 +184,19 @@ public class GridFsEndpoint extends DefaultEndpoint {
 public String getDatabase() {
 return database;
 }
+/**
+ * Sets the name of the MongoDB database to target
+ * 
+ * @param database name of the MongoDB database
+ */
 public void setDatabase(String database) {
 this.database = database;
 }
+/**
+ * Sets the name of the GridFS bucket within the database.   Default is 
"fs".
+ * 
+ * @param database name of the MongoDB database
+ */
 public String getBucket() {
 return bucket;
 }
@@ -191,40 +207,73 @@ public class GridFsEndpoint extends DefaultEndpoint {
 public String getQuery() {
 return query;
 }
+/**
+ * Additional query parameters (in JSON) that are used to configure the 
query used for finding
+ * files in the GridFsConsumer
+ * @param query
+ */
 public void setQuery(String query) {
 this.query = query;
 }
 public long getDelay() {
 return delay;
 }
+/**
+ * Sets the delay between polls within the Consumer.  Default is 500ms
+ * @param delay
+ */
 public void setDelay(long delay) {
 this.delay = delay;
 }
 public long getInitialDelay() {
 return initialDelay;
 }
+/**
+ * Sets the initialDelay before the consumer will start polling.  Default 
is 1000ms
+ * @param initialDelay
+ */
 public void setInitialDelay(long initialDelay) {
 this.initialDelay = delay;
 }
 
+/**
+ * Sets the QueryStrategy that is 

[2/9] camel git commit: [CAMEL-9659] GridFs producer working with junit test

[dkulp]

[CAMEL-9659] GridFs producer working with junit test


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

Branch: refs/heads/master
Commit: bfaec78409732532b68aff932fcbe0441fbd6559
Parents: 4c78e44
Author: Daniel Kulp 
Authored: Fri Feb 26 15:14:02 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:22:48 2016 -0500

--
 pom.xml |  15 +-
 .../camel/component/gridfs/GridFsComponent.java |  14 +-
 .../camel/component/gridfs/GridFsConsumer.java  |  40 
 .../camel/component/gridfs/GridFsEndpoint.java  | 185 ++-
 .../camel/component/gridfs/GridFsProducer.java  | 153 ++-
 .../component/gridfs/AbstractMongoDbTest.java   |  53 ++
 .../gridfs/EmbedMongoConfiguration.java |  58 ++
 .../gridfs/GridFsConsumerOperationsTest.java|  74 
 src/test/resources/log4j.properties |  37 
 src/test/resources/mongodb.test.properties  |  21 +++
 10 files changed, 542 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bfaec784/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5b1e1a1..ade40e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.13.2
+2.16.2
 
 
 camel-gridfs
@@ -52,9 +52,18 @@
 
 org.mongodb
 mongo-java-driver
-${mongo-java-driver-version}
+3.2.2
+
+
+de.flapdoodle.embed
+de.flapdoodle.embed.mongo
+test
+
+   
+  org.apache.camel
+  camel-test-spring
+  test
 
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bfaec784/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
index 87d5394..26da915 100644
--- a/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
@@ -18,29 +18,35 @@ package org.apache.camel.component.gridfs;
 
 import com.mongodb.Mongo;
 import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
 import org.apache.camel.util.CamelContextHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
-public class GridFsComponent extends DefaultComponent {
+public class GridFsComponent extends UriEndpointComponent {
 
 private final static Logger LOG = 
LoggerFactory.getLogger(GridFsComponent.class);
 
 private volatile Mongo db;
 
+public GridFsComponent() {
+super(GridFsEndpoint.class);
+}
+
 protected Endpoint createEndpoint(String uri, String remaining, 
Map parameters) throws Exception {
 if (db == null) {
 db = CamelContextHelper.mandatoryLookup(getCamelContext(), 
remaining, Mongo.class);
 LOG.debug("Resolved the connection with the name {} as {}", 
remaining, db);
 }
 
-Endpoint endpoint = new GridFsEndpoint(uri, this);
+GridFsEndpoint endpoint = new GridFsEndpoint(uri, this);
 parameters.put("mongoConnection", db);
+endpoint.setConnectionBean(remaining);
+endpoint.setMongoConnection(db);
 setProperties(endpoint, parameters);
-
+
 return endpoint;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bfaec784/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
new file mode 100644
index 000..dce195a
--- /dev/null
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
@@ -0,0 +1,40 @@
+/**
+ * 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
+ *
+ * 

[4/9] camel git commit: [CAMEL-9659] Add simple polling consumer

[dkulp]

[CAMEL-9659] Add simple polling consumer


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

Branch: refs/heads/master
Commit: ce54b04e1f0b5f7178dd0ee606d1ec644f24658d
Parents: f80654f
Author: Daniel Kulp 
Authored: Mon Feb 29 15:40:22 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:23:04 2016 -0500

--
 .../camel/component/gridfs/GridFsConsumer.java  | 88 +++-
 .../camel/component/gridfs/GridFsEndpoint.java  | 43 +-
 .../camel/component/gridfs/GridFsProducer.java  | 14 ++--
 .../component/gridfs/AbstractMongoDbTest.java   | 15 +++-
 .../gridfs/GridFsConsumerOperationsTest.java| 74 
 .../component/gridfs/GridFsConsumerTest.java| 75 +
 .../gridfs/GridFsProducerOperationsTest.java| 74 
 7 files changed, 290 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ce54b04e/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
--
diff --git 
a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java 
b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
index 4f2ce66..240dd47 100644
--- a/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
+++ b/src/main/java/org/apache/camel/component/gridfs/GridFsConsumer.java
@@ -19,22 +19,102 @@
 
 package org.apache.camel.component.gridfs;
 
+import java.io.InputStream;
+import java.util.concurrent.ExecutorService;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+import com.mongodb.gridfs.GridFSDBFile;
+import com.mongodb.util.JSON;
+
+import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultConsumer;
 
 /**
  * 
  */
-public class GridFsConsumer extends DefaultConsumer {
-final GridFsEndpoint ep;
-
+public class GridFsConsumer extends DefaultConsumer implements Runnable {
+final GridFsEndpoint endpoint;
+private ExecutorService executor;
+
 /**
  * @param endpoint
  * @param processor
  */
 public GridFsConsumer(GridFsEndpoint endpoint, Processor processor) {
 super(endpoint, processor);
-ep = endpoint;
+this.endpoint = endpoint;
+}
+
+
+
+@Override
+protected void doStop() throws Exception {
+super.doStop();
+if (executor != null) {
+executor.shutdown();
+executor = null;
+}
+}
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+executor = 
endpoint.getCamelContext().getExecutorServiceManager().newFixedThreadPool(this, 
endpoint.getEndpointUri(), 1);
+executor.execute(this);
 }
 
+@Override
+public void run() {
+DBCursor c = null;
+java.util.Date fromDate = new java.util.Date();
+try {
+Thread.sleep(endpoint.getInitialDelay());
+while (isStarted()) {
+if (c == null || c.getCursorId() == 0) {
+if (c != null) {
+c.close();
+}
+String queryString = endpoint.getQuery();
+DBObject query;
+if (queryString == null) {
+query = new BasicDBObject();
+} else {
+query = (DBObject) JSON.parse(queryString);
+}
+
+query.put("uploadDate", new BasicDBObject("$gte", 
fromDate));
+c = endpoint.getFilesCollection().find(query);
+fromDate = new java.util.Date();
+}
+while (c.hasNext() && isStarted()) {
+GridFSDBFile file = (GridFSDBFile)c.next();
+file = endpoint.getGridFs().findOne(new 
BasicDBObject("_id", file.getId()));
+
+Exchange exchange = endpoint.createExchange();
+exchange.getIn().setHeader(GridFsEndpoint.GRIDFS_METADATA, 
JSON.serialize(file.getMetaData()));
+exchange.getIn().setHeader(Exchange.FILE_CONTENT_TYPE, 
file.getContentType());
+exchange.getIn().setHeader(Exchange.FILE_LENGTH, 
file.getLength());
+exchange.getIn().setHeader(Exchange.FILE_LAST_MODIFIED, 
file.getUploadDate());
+exchange.getIn().setBody(file.getInputStream(), 
InputStream.class);
+try {
+ 

[8/9] camel git commit: [CAMEL-9659] Add gridfs component to build

[dkulp]

[CAMEL-9659] Add gridfs component to build


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

Branch: refs/heads/master
Commit: b3eaf817dfaf2499d58ecea473752a57a6764356
Parents: f1e21c5
Author: Daniel Kulp 
Authored: Tue Mar 1 14:41:08 2016 -0500
Committer: Daniel Kulp 
Committed: Tue Mar 1 14:41:08 2016 -0500

--
 components/camel-gridfs/pom.xml | 2 +-
 components/pom.xml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b3eaf817/components/camel-gridfs/pom.xml
--
diff --git a/components/camel-gridfs/pom.xml b/components/camel-gridfs/pom.xml
index ade40e7..ec8e6bd 100644
--- a/components/camel-gridfs/pom.xml
+++ b/components/camel-gridfs/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.2
+2.17-SNAPSHOT
 
 
 camel-gridfs

http://git-wip-us.apache.org/repos/asf/camel/blob/b3eaf817/components/pom.xml
--
diff --git a/components/pom.xml b/components/pom.xml
index 7da5a56..e14d134 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -114,6 +114,7 @@
 camel-google-mail
 camel-gora
 camel-grape
+camel-gridfs
 camel-gson
 camel-guava-eventbus
 camel-guice

[2/5] camel git commit: CAMEL-9534: optimize attribute handling in StAX2SAXSource adapter

[dkulp]

CAMEL-9534: optimize attribute handling in StAX2SAXSource adapter

Creating a copy of all attribute data for each START_ELEMENT event is not
necessary and wastes time and memory.

Use a custom SAX Attributes implementation that just forwards all calls to
the respective StAX XMLStreamReader.getAttribute* methods.

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: 7d90d5d14012b688af4038f9e38df218185a810a
Parents: 3ac8d9f
Author: Karsten Blees 
Authored: Sat Jan 30 14:04:51 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../camel/converter/jaxp/StAX2SAXSource.java| 154 ++-
 1 file changed, 112 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7d90d5d1/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
index e4a68b6..957637b 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
@@ -33,7 +33,6 @@ import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.AttributesImpl;
 
 /**
  * Adapter to turn a StAX {@link XMLStreamReader} into a {@link SAXSource}.
@@ -60,6 +59,7 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 }
 
 protected void parse() throws SAXException {
+final StAX2SAXAttributes attributes = new StAX2SAXAttributes();
 try {
 while (true) {
 switch (streamReader.getEventType()) {
@@ -110,19 +110,14 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 contentHandler.endDocument();
 return;
 case XMLStreamConstants.END_ELEMENT: {
-String uri = streamReader.getNamespaceURI();
+String uri = nullToEmpty(streamReader.getNamespaceURI());
 String localName = streamReader.getLocalName();
-String prefix = streamReader.getPrefix();
-String qname = prefix != null && prefix.length() > 0
-? prefix + ":" + localName : localName;
+String qname = getPrefixedName(streamReader.getPrefix(), 
localName);
 contentHandler.endElement(uri, localName, qname);
+
 // namespaces
 for (int i = 0; i < streamReader.getNamespaceCount(); i++) 
{
 String nsPrefix = streamReader.getNamespacePrefix(i);
-String nsUri = streamReader.getNamespaceURI(i);
-if (nsUri == null) {
-nsUri = "";
-}
 contentHandler.endPrefixMapping(nsPrefix);
 }
 break;
@@ -138,21 +133,19 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 contentHandler.startDocument();
 break;
 case XMLStreamConstants.START_ELEMENT: {
-String uri = streamReader.getNamespaceURI();
-String localName = streamReader.getLocalName();
-String prefix = streamReader.getPrefix();
-String qname = prefix != null && prefix.length() > 0
-? prefix + ":" + localName : localName;
 // namespaces
 for (int i = 0; i < streamReader.getNamespaceCount(); i++) 
{
 String nsPrefix = streamReader.getNamespacePrefix(i);
-String nsUri = streamReader.getNamespaceURI(i);
-if (nsUri == null) {
-nsUri = "";
-}
+String nsUri = 
nullToEmpty(streamReader.getNamespaceURI(i));
 contentHandler.startPrefixMapping(nsPrefix, nsUri);
 }
-contentHandler.startElement(uri == null ? "" : uri, 
localName, qname, getAttributes());
+
+String uri = nullToEmpty(streamReader.getNamespaceURI());
+  

[1/5] camel git commit: CAMEL-9534: XmlConverter: use a pool of SAXParser / XMLReader instances

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 7d781cce7 -> 070ed43e1


CAMEL-9534: XmlConverter: use a pool of SAXParser / XMLReader instances

Creating and configuring a new SAXParserFactory and SAXParser / XMLReader
for every SAXSource is very expensive.

A SAXParser / XMLReader instance can be used to parse many XML documents.

Add an XMLReaderPool helper to manage existing XMLReader instances (i.e.
hand out existing instances from the pool, reset properties / features and
return the instance to the pool after use).

Use pooled XMLReaders in XmlConverter.toSAXSource* (except if a specific
SAXParserFactory is configured on the Exchange).

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: 3c8560f003e0a4534cef428664fd4811621aa03c
Parents: 7d90d5d
Author: Karsten Blees 
Authored: Wed Jan 27 19:10:22 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../camel/converter/jaxp/XMLReaderPool.java | 234 +++
 .../camel/converter/jaxp/XmlConverter.java  |  50 ++--
 2 files changed, 265 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c8560f0/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
new file mode 100644
index 000..ec50920
--- /dev/null
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
@@ -0,0 +1,234 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.converter.jaxp;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
+
+/**
+ * Manages a pool of XMLReader (and associated SAXParser) instances for reuse.
+ */
+public class XMLReaderPool {
+private final Queue pool = new 
ConcurrentLinkedQueue();
+private final SAXParserFactory saxParserFactory;
+
+/**
+ * Creates a new instance.
+ *
+ * @param saxParserFactory
+ *the SAXParserFactory used to create new SAXParser instances
+ */
+public XMLReaderPool(SAXParserFactory saxParserFactory) {
+this.saxParserFactory = saxParserFactory;
+}
+
+/**
+ * Returns an XMLReader that can be used exactly once. Calling one of the
+ * {@code parse} methods returns the reader to the pool. This is useful
+ * for e.g. SAXSource which bundles an XMLReader with an InputSource that
+ * can also be consumed just once.
+ *
+ * @return the XMLReader
+ * @throws SAXException
+ * see {@link SAXParserFactory#newSAXParser()}
+ * @throws ParserConfigurationException
+ * see {@link SAXParserFactory#newSAXParser()}
+ */
+public XMLReader createXMLReader() throws SAXException, 
ParserConfigurationException {
+XMLReader xmlReader = null;
+WeakReference ref;
+while ((ref = pool.poll()) != null) {
+if ((xmlReader = ref.get()) != null)
+break;
+}
+
+if (xmlReader == 

[3/5] camel git commit: CAMEL-9534: XsltBuilder: always convert StAXSource to SAXSource

[dkulp]

CAMEL-9534: XsltBuilder: always convert StAXSource to SAXSource

Some older TrAX implementations such as Xalan and Saxon-B do not support
StAXSource.

Using the Woodstox StAX parser with the default TrAX implementation (XSLTC)
doesn't handle CDATA sections correctly (Woodstox reports these as CDATA
events, which are ignored by XSLTC's StAXStream2SAX adapter).

Using StAXSource instead of SAXSource with the default TrAX implementation
(XSLTC) or Saxon results in a significant performance penalty.

Rename Camel's StaxSource adapter to StAX2SAXSource to better reflect what
it does. Use the adapter for all TrAX implementations (not just Xalan).

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: fe0e85a92200662f441d71baafc5bfe40108894f
Parents: 7d781cc
Author: Karsten Blees 
Authored: Thu Jan 28 21:27:54 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../apache/camel/builder/xml/XsltBuilder.java   |  33 +--
 .../camel/converter/jaxp/StAX2SAXSource.java| 275 +++
 .../apache/camel/converter/jaxp/StaxSource.java | 275 ---
 .../builder/xml/XsltTestErrorListenerTest.java  |   2 +-
 .../converter/jaxp/StAX2SAXSourceTest.java  |  63 +
 .../camel/converter/jaxp/StaxSourceTest.java|  63 -
 6 files changed, 354 insertions(+), 357 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fe0e85a9/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 7a5a610..d9d65f4 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -51,7 +50,7 @@ import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeTransformException;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.jaxp.StaxSource;
+import org.apache.camel.converter.jaxp.StAX2SAXSource;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.support.SynchronizationAdapter;
@@ -120,7 +119,6 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 
 ResultHandler resultHandler = 
resultHandlerFactory.createResult(exchange);
 Result result = resultHandler.getResult();
-exchange.setProperty("isXalanTransformer", 
isXalanTransformer(transformer));
 // let's copy the headers before we invoke the transform in case they 
modify them
 Message out = exchange.getOut();
 out.copyFrom(exchange.getIn());
@@ -137,6 +135,17 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 Object body = exchange.getIn().getBody();
 source = getSource(exchange, body);
 }
+
+if (source instanceof StAXSource) {
+// Always convert StAXSource to SAXSource.
+// * Xalan and Saxon-B don't support StAXSource.
+// * The JDK default implementation (XSLTC) doesn't handle 
CDATA events
+//   (see 
com.sun.org.apache.xalan.internal.xsltc.trax.StAXStream2SAX).
+// * Saxon-HE/PE/EE seem to support StAXSource, but don't 
advertise this
+//   officially (via 
TransformerFactory.getFeature(StAXSource.FEATURE))
+source = new StAX2SAXSource(((StAXSource) 
source).getXMLStreamReader());
+}
+
 LOG.trace("Using {} as source", source);
 transformer.transform(source, result);
 LOG.trace("Transform complete with result {}", result);
@@ -148,10 +157,6 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 }
 }
 
-boolean isXalanTransformer(Transformer transformer) {
-return 
transformer.getClass().getName().startsWith("org.apache.xalan.transformer");
-}
-
 boolean 

[4/5] camel git commit: CAMEL-9534: XsltComponent: fix support for Saxon-B and Saxon >= 9.6

[dkulp]

CAMEL-9534: XsltComponent: fix support for Saxon-B and Saxon >= 9.6

Using reflection and Saxon-specific APIs to configure Saxon's MessageWarner
class is flaky - the current implementation introduced with CAMEL-7753 only
works for Saxon-HE 9.3 - 9.5. Using XsltComponent with other Saxon versions
fails with IllegalStateException "Error pre-loading Saxon classes...".

Use TransformerFactory.setAttribute(FeatureKeys.MESSAGE_EMITTER_CLASS) to
install the MessageWarner class. Only log a warning on failure.

Make lazy-initialized factory variables volatile so that they only become
visible to other threads after the factory is fully initialized.

Note: The MessageWarner class in Saxon 9.6+ redirects  output
to the ErrorListener of the TransformerFactory rather than the Transformer
instance (see https://saxonica.plan.io/issues/2581). This cannot be easily
fixed on the Camel side, as setting a Transformer-specific ErrorListener on
the TransformerFactory would break multithreaded routes.

Signed-off-by: Karsten Blees 


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

Branch: refs/heads/master
Commit: 3ac8d9fd74ec00fa5a969eb790e1df496073d92b
Parents: fe0e85a
Author: Karsten Blees 
Authored: Mon Jan 25 22:27:16 2016 +0100
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:24 2016 -0500

--
 .../apache/camel/builder/xml/XsltBuilder.java   | 62 +---
 .../camel/component/xslt/XsltEndpoint.java  |  5 --
 .../camel/converter/jaxp/XmlConverter.java  | 46 ++-
 .../util/toolbox/XsltAggregationStrategy.java   |  1 -
 .../camel/builder/xml/XsltBuilderTest.java  | 38 
 5 files changed, 47 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3ac8d9fd/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index d9d65f4..d5e73da 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -19,13 +19,13 @@ package org.apache.camel.builder.xml;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
@@ -42,8 +42,6 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.w3c.dom.Node;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExpectedBodyTypeException;
 import org.apache.camel.Message;
@@ -52,12 +50,10 @@ import org.apache.camel.RuntimeTransformException;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.converter.jaxp.StAX2SAXSource;
 import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,9 +72,8 @@ import static org.apache.camel.util.ObjectHelper.notNull;
  *
  * @version 
  */
-public class XsltBuilder extends ServiceSupport implements Processor, 
CamelContextAware {
+public class XsltBuilder implements Processor {
 private static final Logger LOG = 
LoggerFactory.getLogger(XsltBuilder.class);
-private CamelContext camelContext;
 private Map parameters = new HashMap();
 private XmlConverter converter = new XmlConverter();
 private Templates template;
@@ -89,9 +84,6 @@ public class XsltBuilder extends ServiceSupport implements 
Processor, CamelConte
 private boolean deleteOutputFile;
 private ErrorListener errorListener;
 private boolean allowStAX = true;
-private volatile Method setMessageEmitterMethod;
-private volatile Class saxonReceiverClass;
-private volatile Class saxonWarnerClass;
 
 public XsltBuilder() {
 }
@@ -157,10 +149,6 @@ public class XsltBuilder extends ServiceSupport 

[5/5] camel git commit: Fix checkstyle issues with patch

[dkulp]

Fix checkstyle issues with patch


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

Branch: refs/heads/master
Commit: 070ed43e1808ab2db381eaddd9abf520b88ce7cf
Parents: 3c8560f
Author: Daniel Kulp 
Authored: Mon Feb 1 15:46:20 2016 -0500
Committer: Daniel Kulp 
Committed: Mon Feb 1 16:06:25 2016 -0500

--
 .../apache/camel/converter/jaxp/StAX2SAXSource.java  | 15 ++-
 .../apache/camel/converter/jaxp/XMLReaderPool.java   | 14 +-
 .../apache/camel/converter/jaxp/XmlConverter.java|  3 ++-
 3 files changed, 21 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
index 957637b..89a17b0 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java
@@ -204,22 +204,25 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 
 @Override
 public String getURI(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return nullToEmpty(streamReader.getAttributeNamespace(index));
 }
 
 @Override
 public String getLocalName(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return streamReader.getAttributeLocalName(index);
 }
 
 @Override
 public String getQName(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 String localName = streamReader.getAttributeLocalName(index);
 String prefix = streamReader.getAttributePrefix(index);
 return getPrefixedName(prefix, localName);
@@ -227,15 +230,17 @@ public class StAX2SAXSource extends SAXSource implements 
XMLReader {
 
 @Override
 public String getType(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return streamReader.getAttributeType(index);
 }
 
 @Override
 public String getValue(int index) {
-if (!checkIndex(index))
+if (!checkIndex(index)) {
 return null;
+}
 return nullToEmpty(streamReader.getAttributeType(index));
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/070ed43e/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
index ec50920..658268c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
@@ -69,8 +69,9 @@ public class XMLReaderPool {
 XMLReader xmlReader = null;
 WeakReference ref;
 while ((ref = pool.poll()) != null) {
-if ((xmlReader = ref.get()) != null)
+if ((xmlReader = ref.get()) != null) {
 break;
+}
 }
 
 if (xmlReader == null) {
@@ -83,7 +84,7 @@ public class XMLReaderPool {
 /**
  * Wraps another XMLReader for single use only.
  */
-private class OneTimeXMLReader implements XMLReader {
+private final class OneTimeXMLReader implements XMLReader {
 private XMLReader xmlReader;
 private final Map initFeatures = new HashMap();
 private final Map initProperties = new HashMap();
@@ -127,8 +128,9 @@ public class XMLReaderPool {
 }
 
 private void checkValid() {
-if (xmlReader == null)
+if (xmlReader == null) {
 throw new IllegalStateException("OneTimeXMLReader.parse() can 
only be used once!");
+}
 }
 
 @Override
@@ -142,8 +144,9 @@ public class XMLReaderPool {
 public void setFeature(String name, boolean value)
 

camel git commit: On my OSX machine, camel-core is taking 10's of minutes to compile due to memory constraints and amount of time being spend in GC. Increase the amount of memory.

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 173ec6aee -> 275f1d82b


On my OSX machine, camel-core is taking 10's of minutes to compile due to 
memory constraints and amount of time being spend in GC.  Increase the amount 
of memory.


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

Branch: refs/heads/master
Commit: 275f1d82be2b493b8852ec351142468f2ef6b4ea
Parents: 173ec6a
Author: Daniel Kulp 
Authored: Wed Jan 27 10:47:52 2016 -0500
Committer: Daniel Kulp 
Committed: Wed Jan 27 10:49:09 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/275f1d82/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d797280..4288391 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2750,7 +2750,7 @@
   
   ${jdk.version}
   ${jdk.version}
-  256M
+  512M
   ${compiler.fork}
   
 
@@ -3170,7 +3170,7 @@
 
   ${jdk.version}
   ${jdk.version}
-  256M
+  512M
   ${compiler.fork}
   javac-with-errorprone
   true

svn commit: r968317 - /websites/production/camel/content/manual/camel-manual-2.16.0.html

[dkulp]

Author: dkulp
Date: Fri Oct  9 14:26:55 2015
New Revision: 968317

Log:
Uploading released manuals for camel-2.16.0

Added:
websites/production/camel/content/manual/camel-manual-2.16.0.html

Added: websites/production/camel/content/manual/camel-manual-2.16.0.html
==
--- websites/production/camel/content/manual/camel-manual-2.16.0.html (added)
+++ websites/production/camel/content/manual/camel-manual-2.16.0.html Fri Oct  
9 14:26:55 2015
@@ -0,0 +1,27150 @@
+
+
+http://camel.apache.org/styles/camel-manual.css; rel="stylesheet" 
type="text/css" />
+
+@page :left {
+@top-left {
+content: "Apache Camel 2.16.0 Developer's 
Manual";
+}
+}
+
+
+
+
+
+
+
+
+
+
+
+SyntaxHighlighter.defaults['toolbar'] = false;
+SyntaxHighlighter.all();
+
+
+Apache CamelUser GuideVersion 2.16.0
+ Copyright 2007-2015, Apache Software Foundation
+
+Table of Contents
+
+
+Table 
of ContentsIntroductionQuickstartGetting 
StartedArchitectureEnterprise 
Integration PatternsCook BookTutorialsLanguage AppendixDataFormat 
AppendixPattern AppendixComponent AppendixIndex
+
+
+Introduction
+
+Apache Camel  is a versatile open-source integration framework based on 
known Enterprise 
Integration Patterns.
+
+Camel empowers you to define routing and mediation rules in a variety of 
domain-specific languages, including a Java-based Fluent API, Spring 
or Blueprint XML Configuration files, and a 
Scala DSL. This means you get smart 
completion of routing rules in your IDE, whether in a Java, Scala or XML 
editor.
+
+Apache Camel uses URIs to work 
directly with any kind of Transport 
or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA or CXF, as well as pluggable Components and Data Format options. Apache Camel is a small 
library with minimal dependencies for easy embedding in 
any Java application. Apache Camel lets you work with the same API regardless which kind of Transport is used - so learn the API once and you can 
interact with all the Components provided out-of-box.
+
+Apache Camel provides support for Bean Binding and seamless integration with popular 
frameworks such as Spring, Blueprint and Guice.  Camel also has extensive support for 
unit testing your routes. 
+
+The following projects can leverage Apache Camel as a routing and mediation 
engine:
+
+http://servicemix.apache.org/;>Apache ServiceMix - a popular 
distributed open source ESB and JBI containerhttp://activemq.apache.org/;>Apache ActiveMQ - 
a mature, widely used open source message brokerhttp://cxf.apache.org/;>Apache CXF - a smart web services suite 
(JAX-WS and JAX-RS)http://karaf.apache.org/;>Apache Karaf - a small OSGi based runtime 
in which applications can be deployedhttp://mina.apache.org/;>Apache MINA - a 
high-performance http://en.wikipedia.org/wiki/New_I/O; rel="nofollow">NIO-driven 
networking framework
+
+
+So don't get the hump - try Camel today! https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png;
 data-emoticon-name="smile" alt="(smile)">
+
+Too many buzzwords - what exactly is Camel?
+Okay, so the description above is technology focused.  
+There's a great discussion about Camel at http://stackoverflow.com/questions/8845186/what-exactly-is-apache-camel; 
rel="nofollow">Stack Overflow. We suggest you view the post, read the 
comments, and browse the suggested links for more details.
+
+Quickstart
+
+To start using Apache Camel quickly, you can read through some simple 
examples in this chapter. For readers who would like a more thorough 
introduction, please skip ahead to Chapter 3.
+
+Walk through an Example 
CodeThis mini-guide takes you through the source code of a https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java;>simple
 example.Camel can be configured either by using Spring or directly in Java - which https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java;>this
 example does.This example is available in the 
examples\camel-example-jms-file directory of the Camel distribution.We start with creating a CamelContext - which

svn commit: r968316 [3/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[dkulp]

Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.16.0-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.16.0-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.16.0-blueprint.xsd 
Fri Oct  9 14:25:51 2015
@@ -0,0 +1,178 @@
+
+
+http://camel.apache.org/schema/blueprint/cxf;
+xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0;
+xmlns:cxf-beans="http://cxf.apache.org/configuration/beans;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+targetNamespace="http://camel.apache.org/schema/blueprint/cxf;
+elementFormDefault="qualified"
+attributeFormDefault="unqualified"
+xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;>
+
+  http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
+  http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+
+
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
\ No newline at end of file

Added: websites/production/camel/content/schema/cxf/camel-cxf-2.16.0-spring.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.16.0-spring.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.16.0-spring.xsd 
Fri Oct  9 14:25:51 2015
@@ -0,0 +1,179 @@
+
+
+http://camel.apache.org/schema/cxf;
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+  xmlns:beans="http://www.springframework.org/schema/beans;
+  xmlns:cxf-beans="http://cxf.apache.org/configuration/beans;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  targetNamespace="http://camel.apache.org/schema/cxf; 
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  http://www.springframework.org/schema/beans; 
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  http://cxf.apache.org/configuration/beans; 
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+  
+
+  
+
+  
+
+ 
   
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+ 
 
+  
+  
+
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+
+
+ 

svn commit: r968316 [1/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[dkulp]

Author: dkulp
Date: Fri Oct  9 14:25:51 2015
New Revision: 968316

Log:
Uploading released schemas for camel-2.16.0

Added:

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

websites/production/camel/content/schema/spring-security/camel-spring-security-2.16.0.xsd
websites/production/camel/content/schema/spring/camel-spring-2.16.0.xsd

websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.16.0.xsd

svn commit: r968316 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[dkulp]

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.16.0.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.16.0.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.16.0.xsd 
Fri Oct  9 14:25:51 2015
@@ -0,0 +1,8537 @@
+http://www.w3.org/2001/XMLSchema; 
xmlns:tns="http://camel.apache.org/schema/blueprint; 
elementFormDefault="qualified" 
targetNamespace="http://camel.apache.org/schema/blueprint; version="1.0">
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+

svn commit: r968316 [5/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[dkulp]

Added: 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.16.0.xsd
==
--- 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.16.0.xsd
 (added)
+++ 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.16.0.xsd
 Fri Oct  9 14:25:51 2015
@@ -0,0 +1,65 @@
+
+
+http://camel.apache.org/schema/spring/integration;
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema;
+  xmlns:beans="http://www.springframework.org/schema/beans;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xmlns:camel-spring="http://camel.apache.org/schema/spring;
+  targetNamespace="http://camel.apache.org/schema/spring/integration;
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  http://www.springframework.org/schema/beans; 
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  http://camel.apache.org/schema/spring; 
schemaLocation="http://camel.apache.org/schema/spring/camel-spring.xsd"/>
+
+  
+   
+   
+   
+   
+   
+   
+   
+   
+  
+
+  
+ 
+
+   
+ Defines a camel-source for handling the Camel context message 
in Spring Integration message bus.
+   
+   
+
+  
+  
+ 
+   
+ 
+  
+
+  
+
+   
+ Defines a camel-target to feed Spring Integration message to 
the Camel context.
+   
+   
+  
+

svn commit: r968316 [4/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

[dkulp]

Added: websites/production/camel/content/schema/spring/camel-spring-2.16.0.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.16.0.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.16.0.xsd Fri 
Oct  9 14:25:51 2015
@@ -0,0 +1,8535 @@
+http://www.w3.org/2001/XMLSchema; 
xmlns:tns="http://camel.apache.org/schema/spring; 
elementFormDefault="qualified" 
targetNamespace="http://camel.apache.org/schema/spring; version="1.0">
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  

svn commit: r10750 - /release/camel/apache-camel/2.16.0/

[dkulp]

Author: dkulp
Date: Thu Oct  8 20:42:47 2015
New Revision: 10750

Log:
add 2.16

Added:
release/camel/apache-camel/2.16.0/
release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip   (with props)
release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.asc
release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.md5
release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.sha1
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz   (with props)
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.asc
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.md5
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.sha1
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip   (with props)
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip.asc
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip.md5
release/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip.sha1

Added: release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.asc
==
--- release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.asc (added)
+++ release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.asc Thu Oct  
8 20:42:47 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJWErQMAAoJEIWPxMT0OFajtC8P/3phJgpoVKHvSRIvamoO9Kbq
+AC5fPXjTlxvY7zMfc4wqrtGwGkJvFdme7p2I90IVWzmG6vcToi5rKmN+K4MkYBMq
+sjXS+GMLZK7u1BqcOrq0Jmb+TPqGN1tJTLx8HoxRpyCUhtLYbCJ+0VlzbiBkH6sF
+y1LDn4fgeER02pGtOdJ/0F4YY/xucmM1uRZAQ+hNgZM+Clydpm7v4ZHqwxOtOD25
+lKROImutBa6HMUKgWDzsj5hSMUgxQYxLEVH8IP+1vn5/BJkRk24bV86/aESfvf8J
+GCLysJLiCwF6NasAZcJvCdb1bGqtEuqtHIziM0SK7Qxgy+h3etxio7tPo4zTtY7H
+1jCSTXRsDjhQYxL8CqyJv6gGlW5OMVZZ8q3Ftb4ts/5sUwHxoeCVwDgKApd0ZOUA
+ejDzc4Vbzt3vyFZxE8FC9IpAl+LY4fN0JE4uw9jseHWDzfnDdLn3H9NFBg9SwKgU
+dfwIgjT6OkZdGKMfGgBmFDgtAFjmxsumVGdD71n2OAR4lbqHfkFb5pkPbPy4yBtD
+onEvaMMYtNkmvEKCXc8YVyVHvoQQNhC8eUHoqBEkIeJllEFOHCng0emq4gw4qc10
+jqdn+ShRVOdTGXvxdxUm9ey6894xDglgZB09kOmqpWvhBjspRsRj5NW0Uugq6iXO
+wFC9YzyP32uAQgqYYLKl
+=MotE
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.md5
==
--- release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.md5 (added)
+++ release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.md5 Thu Oct  
8 20:42:47 2015
@@ -0,0 +1 @@
+a81bc8fc5df16187951e89b3f356638e
\ No newline at end of file

Added: release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.sha1
==
--- release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.16.0/apache-camel-2.16.0-src.zip.sha1 Thu Oct  
8 20:42:47 2015
@@ -0,0 +1 @@
+06bb5650bfb990c2b2c6d70388934de9b5f3f8c1
\ No newline at end of file

Added: release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.asc
==
--- release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.asc (added)
+++ release/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.asc Thu Oct  8 
20:42:47 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJWErQMAAoJEIWPxMT0OFajGw8P/RP22lknka2iZKtpTCM3pdh+
+aTLisqbZVU4cIEiQuNUOCdJNnH7b5diDvNvUYEEvLW3cLxlkm5wUylOfoG+/rQIB
+nWsue3P5eWE3qY4ccjBiLAlo/geEUQodqVLNBvQvnAikpCn4c/1qwPH7qpxVLUNL
+etXuov3DHEwfzcm60WnFNMFHCqvBuxW9gbqGA9pmrQsdh6oCzdkG0QvCB7Z6MkDY
+x08AEiZlov8vJhwS2zODzD+k/gXr9ge+blulOAgpBZ4HWJQQ+Dw4mUPoCCTQ5o8C
+z4TMsZxD+VpQOjQ0+n4uTkIrp3kkwh2wFlfPNcpx1kBHmZX6BO7rfrXZbESkeLsD
+TzaAqTycn3g7FO/HoSu84jJULtODlCDv/7M8JX+3F0h3FGYgQDS2qn9X4T1ujXmV
+d2RsRmUvUvNTPVTRmu8mwDh6Y3l0F0hQD1tjEYeqo/E4FBw1oDF2P/n5NpnfE3hI
+8FRl8C2v1Pj13KicGuZaPhE+cqHfsTnlgXAwp5Oj+HI2fFIGe4vtfv1evfMhe00n
+ntrFirdPzh2/zRpElyLEv5MBzRchQ+mPBJlnqJwFdlHG0ceEcFBdM/YdVzjpSr9i
+wgn2rSJ6qGSZcx7GPAQ3R2AnJUw0nqhRRYLhdXdAVNh7Jtz77r6agly3n98oq7mD
+X+JEuq49Ebine5cy/9z9
+=pXoX
+-END PGP SIGNATURE-

Added: release/camel/apache-camel

Git Push Summary

[dkulp]

Repository: camel
Updated Tags:  refs/tags/camel-2.16.0 [deleted] a9ddbc948

camel git commit: Add camel-elsql so build doesn't fail

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 4072a78d4 -> 54c982a9c


Add camel-elsql so build doesn't fail


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

Branch: refs/heads/master
Commit: 54c982a9c79baf3b917d74c8810bcd5dbd533999
Parents: 4072a78
Author: Daniel Kulp 
Authored: Mon Oct 5 11:04:27 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 5 11:04:27 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/54c982a9/components/pom.xml
--
diff --git a/components/pom.xml b/components/pom.xml
index fae282a..46e62d7 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -94,6 +94,7 @@
 camel-eclipse
 camel-ejb
 camel-elasticsearch
+camel-elsql
 camel-eventadmin
 camel-exec
 camel-facebook

[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 5a32be649 -> ff51e64d1


http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index be935dd..d15fba3 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index eefdb57..3a8f859 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index 2ff..f757ed5 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index 5b324ba..d054768 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index d43c49a..c4460fd 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index 43a9d5b..998e55e 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 6d58512..7ad3249 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.0
+2.16.1-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index 0d545dc..e902f8f 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git 

Git Push Summary

[dkulp]

Repository: camel
Updated Tags:  refs/tags/camel-2.16.0 [created] cad9dc2be

[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index cbf10a2..9321bbc 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index ec6464a..532a608a 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 1ffd9bb..efff95b 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index 78aac64..b0519d7 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 7982165..da3dcb7 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 7b58d3f..a71e936 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 38e36e4..8489188 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.0
+2.16.1-SNAPSHOT
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 0c313ab..64c58bd 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.0
+2.16.1-SNAPSHOT
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 3657c4b..05f2e59 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.0
+2.16.1-SNAPSHOT
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/ff51e64d/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index d2d4519..20e3328 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.0
+2.16.1-SNAPSHOT
   
 
   

[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.0

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 54c982a9c -> 5a32be649


http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index d15fba3..be935dd 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index 3a8f859..eefdb57 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index f757ed5..2ff 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index d054768..5b324ba 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index c4460fd..d43c49a 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index 998e55e..43a9d5b 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 7ad3249..6d58512 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.1-SNAPSHOT
+2.16.0
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index e902f8f..0d545dc 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.0
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/5a32be64/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git 

[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.0

[dkulp]

[maven-release-plugin] prepare release camel-2.16.0


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

Branch: refs/heads/master
Commit: 5a32be6497ee64782ab2b9f507033e5e6e5840b3
Parents: 54c982a
Author: Daniel Kulp 
Authored: Mon Oct 5 11:39:03 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 5 11:39:03 2015 -0400

--
 apache-camel/pom.xml| 2 +-
 buildingtools/pom.xml   | 2 +-
 camel-core/pom.xml  | 2 +-
 components/camel-ahc-ws/pom.xml | 2 +-
 components/camel-ahc/pom.xml| 2 +-
 components/camel-amqp/pom.xml   | 2 +-
 components/camel-apns/pom.xml   | 2 +-
 components/camel-atmos/pom.xml  | 2 +-
 components/camel-atmosphere-websocket/pom.xml   | 2 +-
 components/camel-atom/pom.xml   | 2 +-
 components/camel-avro/pom.xml   | 2 +-
 components/camel-aws/pom.xml| 2 +-
 components/camel-bam/pom.xml| 2 +-
 components/camel-barcode/pom.xml| 2 +-
 components/camel-base64/pom.xml | 2 +-
 components/camel-bean-validator/pom.xml | 2 +-
 components/camel-beanio/pom.xml | 2 +-
 components/camel-beanstalk/pom.xml  | 2 +-
 components/camel-bindy/pom.xml  | 2 +-
 components/camel-blueprint/pom.xml  | 2 +-
 components/camel-boon/pom.xml   | 2 +-
 components/camel-box/pom.xml| 2 +-
 components/camel-cache/pom.xml  | 2 +-
 components/camel-cassandraql/pom.xml| 2 +-
 components/camel-castor/pom.xml | 2 +-
 components/camel-cdi/pom.xml| 2 +-
 components/camel-chunk/pom.xml  | 2 +-
 components/camel-cmis/pom.xml   | 2 +-
 components/camel-coap/pom.xml   | 2 +-
 components/camel-cometd/pom.xml | 2 +-
 components/camel-context/pom.xml| 2 +-
 components/camel-core-osgi/pom.xml  | 2 +-
 components/camel-core-xml/pom.xml   | 2 +-
 components/camel-couchdb/pom.xml| 2 +-
 components/camel-crypto/pom.xml | 2 +-
 components/camel-csv/pom.xml| 2 +-
 components/camel-cxf-transport/pom.xml  | 2 +-
 components/camel-cxf/pom.xml| 2 +-
 components/camel-disruptor/pom.xml  | 2 +-
 components/camel-dns/pom.xml| 2 +-
 components/camel-docker/pom.xml | 2 +-
 components/camel-dozer/pom.xml  | 2 +-
 components/camel-dropbox/pom.xml| 2 +-
 components/camel-eclipse/pom.xml| 2 +-
 components/camel-ejb/pom.xml| 2 +-
 components/camel-elasticsearch/pom.xml  | 2 +-
 components/camel-elsql/pom.xml  | 2 +-
 components/camel-eventadmin/pom.xml | 2 +-
 components/camel-exec/pom.xml   | 2 +-
 components/camel-facebook/pom.xml   | 2 +-
 components/camel-flatpack/pom.xml   | 2 +-
 components/camel-fop/pom.xml| 2 +-
 components/camel-freemarker/pom.xml | 2 +-
 components/camel-ftp/pom.xml| 2 +-
 components/camel-gae/pom.xml| 2 +-
 components/camel-ganglia/pom.xml| 2 +-
 components/camel-geocoder/pom.xml   | 2 +-
 components/camel-git/pom.xml| 2 +-
 components/camel-github/pom.xml | 2 +-
 components/camel-google-calendar/pom.xml| 2 +-
 components/camel-google-drive/pom.xml  

[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[dkulp]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: ff51e64d1fcba28f80b927cec65da7660cc90c71
Parents: 5a32be6
Author: Daniel Kulp 
Authored: Mon Oct 5 11:39:22 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 5 11:39:22 2015 -0400

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml | 2 +-
 components/camel-github/pom.xml  | 2 +-
 components/camel-google-calendar/pom.xml