[1/3] camel git commit: Polished

2016-07-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 3706bf1cc -> d50dcd4d7


Polished


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

Branch: refs/heads/master
Commit: 34f9af90c5a753cc71e60ae7f3d2254fe41b1415
Parents: f80365c
Author: Claus Ibsen 
Authored: Mon Jul 25 15:20:28 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 17:11:57 2016 +0200

--
 .../src/main/java/org/apache/camel/builder/xml/XsltBuilder.java  | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/34f9af90/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 2770d10..4179107 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
@@ -67,10 +67,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
  * 
  * Will by default output the result as a String. You can chose which kind of 
output
  * you want using the outputXXX methods.
- * 
- * If using the static xslt methods to create a {@link 
org.apache.camel.builder.xml.XsltBuilder} its recommended
- * to inject the {@link org.apache.camel.CamelContext} using the {@link 
#setCamelContext(org.apache.camel.CamelContext)}
- * and call {@link #start()} to properly initialize the builder before using.
  *
  * @version 
  */

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

2016-07-25 Thread davsclaus 
Fixed CS. This closes #1080


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

Branch: refs/heads/master
Commit: d50dcd4d7ed89503ed47516a675288a0d98eddfb
Parents: 34f9af9
Author: Claus Ibsen 
Authored: Mon Jul 25 17:15:42 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 17:15:42 2016 +0200

--
 .../component/restlet/DefaultRestletBinding.java | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d50dcd4d/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index 31eb55e..be75a8e 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -195,23 +195,22 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 }
 }
 
-//Get outgoing custom http headers from the exchange if they exists
-Series restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS,Series.class);
+// get outgoing custom http headers from the exchange if they exists
+Series restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS, Series.class);
 if (restletHeaders == null) {
-restletHeaders = new Series<>(Header.class);
+restletHeaders = new Series(Header.class);
 request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, 
restletHeaders);
 } else {
-
-//If the restlet headers already exists on the exchange, we need 
to filter them
-for(String name : restletHeaders.getNames()){
-if(headerFilterStrategy.applyFilterToCamelHeaders(name, 
restletHeaders.getValues(name), exchange)) {
+// if the restlet headers already exists on the exchange, we need 
to filter them
+for (String name : restletHeaders.getNames()) {
+if (headerFilterStrategy.applyFilterToCamelHeaders(name, 
restletHeaders.getValues(name), exchange)) {
 restletHeaders.removeAll(name);
 }
 }
 request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, 
restletHeaders);
-
-//Since the restlet headers already exists remove them from the 
exchange so they don't get added again below
-//We will get a new set of restlet headers on the response
+
+// since the restlet headers already exists remove them from the 
exchange so they don't get added again below
+// we will get a new set of restlet headers on the response
 exchange.getIn().removeHeader(HeaderConstants.ATTRIBUTE_HEADERS);
 }

[2/3] camel git commit: Filter existing restlet headers when building restlet request

2016-07-25 Thread davsclaus 
Filter existing restlet headers when building restlet request


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

Branch: refs/heads/master
Commit: f80365cde8f8ab2595095817e8146f8942c64b97
Parents: 3706bf1
Author: John Moon 
Authored: Mon Jul 18 10:00:03 2016 -0400
Committer: Claus Ibsen 
Committed: Mon Jul 25 17:11:57 2016 +0200

--
 .../component/restlet/DefaultRestletBinding.java   | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f80365cd/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index 482a97a..31eb55e 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -195,11 +195,24 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 }
 }
 
-//Get outgoing custom http headers
-Series restletHeaders = 
(Series)request.getAttributes().get(HeaderConstants.ATTRIBUTE_HEADERS);
+//Get outgoing custom http headers from the exchange if they exists
+Series restletHeaders = 
exchange.getIn().getHeader(HeaderConstants.ATTRIBUTE_HEADERS,Series.class);
 if (restletHeaders == null) {
 restletHeaders = new Series<>(Header.class);
 request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, 
restletHeaders);
+} else {
+
+//If the restlet headers already exists on the exchange, we need 
to filter them
+for(String name : restletHeaders.getNames()){
+if(headerFilterStrategy.applyFilterToCamelHeaders(name, 
restletHeaders.getValues(name), exchange)) {
+restletHeaders.removeAll(name);
+}
+}
+request.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, 
restletHeaders);
+
+//Since the restlet headers already exists remove them from the 
exchange so they don't get added again below
+//We will get a new set of restlet headers on the response
+exchange.getIn().removeHeader(HeaderConstants.ATTRIBUTE_HEADERS);
 }
 
 // login and password are filtered by header filter strategy

camel git commit: Upgrade Rxjava to version 1.1.8

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 2d3c36a21 -> 3706bf1cc


Upgrade Rxjava to version 1.1.8


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

Branch: refs/heads/master
Commit: 3706bf1ccd21e6c8cc2245b1dd6fd1e19978
Parents: 2d3c36a
Author: Andrea Cosentino 
Authored: Mon Jul 25 16:32:18 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 16:32:18 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/3706bf1c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2854dc3..9fb20ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -496,7 +496,7 @@
 2.19.0.Final
 1.0_3
 1.0
-1.1.7
+1.1.8
 1.3.2_2
 9.5.1-5_1
 9.5.1-5

[1/2] camel git commit: Fixed CS

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 91a7a02db -> 2d3c36a21


Fixed CS


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

Branch: refs/heads/master
Commit: 2d3c36a21391f79371db4392718da25b333f4da0
Parents: e075822
Author: Andrea Cosentino 
Authored: Mon Jul 25 14:15:11 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 14:33:33 2016 +0200

--
 .../org/apache/camel/component/undertow/UndertowComponent.java   | 2 +-
 .../org/apache/camel/component/undertow/UndertowEndpoint.java| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2d3c36a2/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index a7fac90..912856f 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -81,7 +81,7 @@ public class UndertowComponent extends UriEndpointComponent 
implements RestConsu
 // Prefer endpoint configured over component configured
 if (undertowHttpBinding == null) {
 // fallback to component configured
-   undertowHttpBinding = getUndertowHttpBinding();
+undertowHttpBinding = getUndertowHttpBinding();
 }
 if (undertowHttpBinding != null) {
 endpoint.setUndertowHttpBinding(undertowHttpBinding);

http://git-wip-us.apache.org/repos/asf/camel/blob/2d3c36a2/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index b4dfcaf..b808b67 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -219,8 +219,8 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements AsyncEndpoint,
 public UndertowHttpBinding getUndertowHttpBinding() {
 if (undertowHttpBinding == null) {
 // create a new binding and use the options from this endpoint
-   undertowHttpBinding = new DefaultUndertowHttpBinding();
-   
undertowHttpBinding.setHeaderFilterStrategy(getHeaderFilterStrategy());
+undertowHttpBinding = new DefaultUndertowHttpBinding();
+
undertowHttpBinding.setHeaderFilterStrategy(getHeaderFilterStrategy());
 }
 return undertowHttpBinding;
 }

[2/2] camel git commit: CAMEL-10181: Camel-undertow: UndertowHttpBinding should be initialized in the endpoint and not at component level

2016-07-25 Thread acosentino 
CAMEL-10181: Camel-undertow: UndertowHttpBinding should be initialized in the 
endpoint and not at component level


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

Branch: refs/heads/master
Commit: e07582215f682f56c85114819606014af08bf7b6
Parents: 91a7a02
Author: Andrea Cosentino 
Authored: Mon Jul 25 14:10:35 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 14:33:33 2016 +0200

--
 components/camel-undertow/src/main/docs/undertow.adoc|  4 
 .../camel/component/undertow/UndertowComponent.java  | 11 +--
 .../camel/component/undertow/UndertowEndpoint.java   |  8 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e0758221/components/camel-undertow/src/main/docs/undertow.adoc
--
diff --git a/components/camel-undertow/src/main/docs/undertow.adoc 
b/components/camel-undertow/src/main/docs/undertow.adoc
index 275b5ad..b82a5c4 100644
--- a/components/camel-undertow/src/main/docs/undertow.adoc
+++ b/components/camel-undertow/src/main/docs/undertow.adoc
@@ -40,6 +40,8 @@ Options
 ^^^
 
 
+
+
 // component options: START
 The Undertow component supports 2 options which are listed below.
 
@@ -57,6 +59,8 @@ The Undertow component supports 2 options which are listed 
below.
 
 
 
+
+
 // endpoint options: START
 The Undertow component supports 17 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e0758221/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index f9677f6..a7fac90 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
 public class UndertowComponent extends UriEndpointComponent implements 
RestConsumerFactory, RestApiConsumerFactory {
 private static final Logger LOG = 
LoggerFactory.getLogger(UndertowEndpoint.class);
 
-private UndertowHttpBinding undertowHttpBinding = new 
DefaultUndertowHttpBinding();
+private UndertowHttpBinding undertowHttpBinding;
 private final Map serversRegistry = new 
HashMap();
 private SSLContextParameters sslContextParameters;
 
@@ -78,7 +78,14 @@ public class UndertowComponent extends UriEndpointComponent 
implements RestConsu
 UndertowEndpoint endpoint = createEndpointInstance(endpointUri, this);
 // set options from component
 endpoint.setSslContextParameters(sslContextParameters);
-endpoint.setUndertowHttpBinding(undertowHttpBinding);
+// Prefer endpoint configured over component configured
+if (undertowHttpBinding == null) {
+// fallback to component configured
+   undertowHttpBinding = getUndertowHttpBinding();
+}
+if (undertowHttpBinding != null) {
+endpoint.setUndertowHttpBinding(undertowHttpBinding);
+}
 // set options from parameters
 setProperties(endpoint, parameters);
 if (options != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e0758221/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index ce71dea..b4dfcaf 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -61,7 +61,7 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements AsyncEndpoint,
 @UriParam(label = "advanced")
 private UndertowHttpBinding undertowHttpBinding;
 @UriParam(label = "advanced")
-private HeaderFilterStrategy headerFilterStrategy;
+private HeaderFilterStrategy headerFilterStrategy = new 
UndertowHeaderFilterStrategy();

[1/2] camel git commit: CAMEL-10181: Camel-undertow: UndertowHttpBinding should be initialized in the endpoint and not at component level

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 6aa84254f -> 052807ad2


CAMEL-10181: Camel-undertow: UndertowHttpBinding should be initialized in the 
endpoint and not at component level


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

Branch: refs/heads/camel-2.17.x
Commit: 6df702ce6074dcbe3d5452201241477b53e31169
Parents: 6aa8425
Author: Andrea Cosentino 
Authored: Mon Jul 25 14:10:35 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 14:35:18 2016 +0200

--
 .../camel/component/undertow/UndertowComponent.java  | 11 +--
 .../camel/component/undertow/UndertowEndpoint.java   |  8 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6df702ce/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 65771f2..a43979b 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
 public class UndertowComponent extends UriEndpointComponent implements 
RestConsumerFactory, RestApiConsumerFactory {
 private static final Logger LOG = 
LoggerFactory.getLogger(UndertowEndpoint.class);
 
-private UndertowHttpBinding undertowHttpBinding = new 
DefaultUndertowHttpBinding();
+private UndertowHttpBinding undertowHttpBinding;
 private final Map serversRegistry = new 
HashMap();
 private SSLContextParameters sslContextParameters;
 
@@ -78,7 +78,14 @@ public class UndertowComponent extends UriEndpointComponent 
implements RestConsu
 UndertowEndpoint endpoint = createEndpointInstance(endpointUri, this);
 // set options from component
 endpoint.setSslContextParameters(sslContextParameters);
-endpoint.setUndertowHttpBinding(undertowHttpBinding);
+// Prefer endpoint configured over component configured
+if (undertowHttpBinding == null) {
+// fallback to component configured
+   undertowHttpBinding = getUndertowHttpBinding();
+}
+if (undertowHttpBinding != null) {
+endpoint.setUndertowHttpBinding(undertowHttpBinding);
+}
 // set options from parameters
 setProperties(endpoint, parameters);
 if (options != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/6df702ce/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index 9111ecd..f71da15 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -60,7 +60,7 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements HeaderFilterStr
 @UriParam(label = "advanced")
 private UndertowHttpBinding undertowHttpBinding;
 @UriParam(label = "advanced")
-private HeaderFilterStrategy headerFilterStrategy;
+private HeaderFilterStrategy headerFilterStrategy = new 
UndertowHeaderFilterStrategy();
 @UriParam(label = "security")
 private SSLContextParameters sslContextParameters;
 @UriParam(label = "consumer")
@@ -178,7 +178,6 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements HeaderFilterStr
  */
 public void setHeaderFilterStrategy(HeaderFilterStrategy 
headerFilterStrategy) {
 this.headerFilterStrategy = headerFilterStrategy;
-undertowHttpBinding.setHeaderFilterStrategy(headerFilterStrategy);
 }
 
 public SSLContextParameters getSslContextParameters() {
@@ -217,6 +216,11 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements HeaderFilterStr
 }
 
 public UndertowHttpBinding getUndertowHttpBinding() {
+if (undertowHttpBinding == null) {
+// create a new binding

[2/2] camel git commit: Fixed CS

2016-07-25 Thread acosentino 
Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: 052807ad26da72c4c5fb7fd6fbfa68aebcc5ae7e
Parents: 6df702c
Author: Andrea Cosentino 
Authored: Mon Jul 25 14:15:11 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 14:36:48 2016 +0200

--
 .../org/apache/camel/component/undertow/UndertowComponent.java   | 2 +-
 .../org/apache/camel/component/undertow/UndertowEndpoint.java| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/052807ad/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index a43979b..2541fd0 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -81,7 +81,7 @@ public class UndertowComponent extends UriEndpointComponent 
implements RestConsu
 // Prefer endpoint configured over component configured
 if (undertowHttpBinding == null) {
 // fallback to component configured
-   undertowHttpBinding = getUndertowHttpBinding();
+undertowHttpBinding = getUndertowHttpBinding();
 }
 if (undertowHttpBinding != null) {
 endpoint.setUndertowHttpBinding(undertowHttpBinding);

http://git-wip-us.apache.org/repos/asf/camel/blob/052807ad/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index f71da15..5db8abf 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -218,8 +218,8 @@ public class UndertowEndpoint extends DefaultEndpoint 
implements HeaderFilterStr
 public UndertowHttpBinding getUndertowHttpBinding() {
 if (undertowHttpBinding == null) {
 // create a new binding and use the options from this endpoint
-   undertowHttpBinding = new DefaultUndertowHttpBinding();
-   
undertowHttpBinding.setHeaderFilterStrategy(getHeaderFilterStrategy());
+undertowHttpBinding = new DefaultUndertowHttpBinding();
+
undertowHttpBinding.setHeaderFilterStrategy(getHeaderFilterStrategy());
 }
 return undertowHttpBinding;
 }

[3/4] camel git commit: CAMEL-10174: Fixed advice with using weaveBy to work with CBR to work on when/ohterwise outputs.

2016-07-25 Thread davsclaus 
CAMEL-10174: Fixed advice with using weaveBy to work with CBR to work on 
when/ohterwise outputs.


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

Branch: refs/heads/camel-2.17.x
Commit: 12ddce8e8be5e5321294c78d30a1663a0973d72d
Parents: 9c529be
Author: Claus Ibsen 
Authored: Mon Jul 25 11:59:42 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 13:58:07 2016 +0200

--
 .../apache/camel/builder/AdviceWithTasks.java   | 26 ++---
 .../apache/camel/model/ChoiceDefinition.java|  3 +-
 .../AdviceWithWeaveByToStringCBRTest.java   | 60 
 3 files changed, 80 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/12ddce8e/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java 
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
index 23690a1..bc1d066 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.camel.Endpoint;
+import org.apache.camel.model.ChoiceDefinition;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.ProcessorDefinitionHelper;
@@ -143,7 +144,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -192,7 +193,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -240,7 +241,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -289,7 +290,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -310,17 +311,26 @@ public final class AdviceWithTasks {
 }
 
 /**
- * Gets the outputs from the given parent.
+ * Gets the outputs to use with advice with from the given child/parent
  * 
  * This implementation deals with that outputs can be abstract and 
retrieves the correct parent output.
  *
- * @param parent the parent
- * @return null if no parent
+ * @param node the node
+ * @return null if not outputs to be used
  */
-private static List 
getParentOutputs(ProcessorDefinition parent) {
+private static List 
getOutputs(ProcessorDefinition node) {
+if (node == null) {
+return null;
+}
+ProcessorDefinition parent = node.getParent();
 if (parent == null) {
 return null;
 }
+// for CBR then use the outputs from the node itself

[1/4] camel git commit: CAMEL-10180: weaveByToUri - To make it easier to match sending to uris

2016-07-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 9c529bed3 -> 6aa84254f
  refs/heads/master 548d7a0df -> 91a7a02db


CAMEL-10180: weaveByToUri - To make it easier to match sending to uris


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

Branch: refs/heads/master
Commit: 91a7a02dbe35fec7d8b3adcafe5a313fbe37c150
Parents: 285a9e4
Author: Claus Ibsen 
Authored: Mon Jul 25 12:29:33 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 13:57:38 2016 +0200

--
 .../apache/camel/builder/AdviceWithBuilder.java | 16 +-
 .../camel/builder/AdviceWithRouteBuilder.java   | 26 +++--
 .../apache/camel/builder/AdviceWithTasks.java   | 54 ++
 .../apache/camel/model/ChoiceDefinition.java|  3 +-
 .../AdviceWithWeaveByToStringCBRTest.java   | 60 
 .../issues/AdviceWithWeaveByToUriCBRTest.java   | 57 +++
 6 files changed, 146 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91a7a02d/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
index 75d643d..a9eff2f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -28,6 +28,7 @@ public class AdviceWithBuilder> {
 private final AdviceWithRouteBuilder builder;
 private final String id;
 private final String toString;
+private final String toUri;
 private final Class type;
 private boolean selectFirst;
 private boolean selectLast;
@@ -35,14 +36,15 @@ public class AdviceWithBuilder> {
 private int selectTo = -1;
 private int maxDeep = -1;
 
-public AdviceWithBuilder(AdviceWithRouteBuilder builder, String id, String 
toString, Class type) {
+public AdviceWithBuilder(AdviceWithRouteBuilder builder, String id, String 
toString, String toUri, Class type) {
 this.builder = builder;
 this.id = id;
 this.toString = toString;
+this.toUri = toUri;
 this.type = type;
 
-if (id == null && toString == null && type == null) {
-throw new IllegalArgumentException("Either id, toString or type 
must be specified");
+if (id == null && toString == null && toUri == null && type == null) {
+throw new IllegalArgumentException("Either id, toString, toUri or 
type must be specified");
 }
 }
 
@@ -133,6 +135,8 @@ public class AdviceWithBuilder> {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceById(route, id, answer, 
selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (toString != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByToString(route, 
toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
+} else if (toUri != null) {
+
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByToUri(route, toUri, 
answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (type != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByType(route, type, 
answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 }
@@ -148,6 +152,8 @@ public class AdviceWithBuilder> {
 builder.getAdviceWithTasks().add(AdviceWithTasks.removeById(route, 
id, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (toString != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, 
toString, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
+} else if (toUri != null) {
+
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToUri(route, toUri, 
selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (type != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, 
selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 }
@@ -165,6 +171,8 @@ public class AdviceWithBuilder> {
 builder.getAdviceWithTasks().add(AdviceWithTasks.beforeById(route, 
id, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (toString != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(route, 
toString, answer, selectFirst,

[2/4] camel git commit: CAMEL-10174: Fixed advice with using weaveBy to work with CBR to work on when/ohterwise outputs.

2016-07-25 Thread davsclaus 
CAMEL-10174: Fixed advice with using weaveBy to work with CBR to work on 
when/ohterwise outputs.


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

Branch: refs/heads/master
Commit: 285a9e4427852091f2f82230443e14d4849db9ad
Parents: 548d7a0
Author: Claus Ibsen 
Authored: Mon Jul 25 11:59:42 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 13:57:38 2016 +0200

--
 .../apache/camel/builder/AdviceWithTasks.java   | 26 ++---
 .../apache/camel/model/ChoiceDefinition.java|  3 +-
 .../AdviceWithWeaveByToStringCBRTest.java   | 60 
 3 files changed, 80 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/285a9e44/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java 
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
index 23690a1..bc1d066 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.camel.Endpoint;
+import org.apache.camel.model.ChoiceDefinition;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.ProcessorDefinitionHelper;
@@ -143,7 +144,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -192,7 +193,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -240,7 +241,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -289,7 +290,7 @@ public final class AdviceWithTasks {
 while (it.hasNext()) {
 ProcessorDefinition output = it.next();
 if (matchBy.match(output)) {
-List outputs = 
getParentOutputs(output.getParent());
+List outputs = 
getOutputs(output);
 if (outputs != null) {
 int index = outputs.indexOf(output);
 if (index != -1) {
@@ -310,17 +311,26 @@ public final class AdviceWithTasks {
 }
 
 /**
- * Gets the outputs from the given parent.
+ * Gets the outputs to use with advice with from the given child/parent
  * 
  * This implementation deals with that outputs can be abstract and 
retrieves the correct parent output.
  *
- * @param parent the parent
- * @return null if no parent
+ * @param node the node
+ * @return null if not outputs to be used
  */
-private static List 
getParentOutputs(ProcessorDefinition parent) {
+private static List 
getOutputs(ProcessorDefinition node) {
+if (node == null) {
+return null;
+}
+ProcessorDefinition parent = node.getParent();
 if (parent == null) {
 return null;
 }
+// for CBR then use the outputs from the node itself
+

[4/4] camel git commit: CAMEL-10180: weaveByToUri - To make it easier to match sending to uris

2016-07-25 Thread davsclaus 
CAMEL-10180: weaveByToUri - To make it easier to match sending to uris


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

Branch: refs/heads/camel-2.17.x
Commit: 6aa84254fcbdf1da304bfec59d1179740c596074
Parents: 12ddce8
Author: Claus Ibsen 
Authored: Mon Jul 25 12:29:33 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 25 13:58:15 2016 +0200

--
 .../apache/camel/builder/AdviceWithBuilder.java | 16 +-
 .../camel/builder/AdviceWithRouteBuilder.java   | 26 +++--
 .../apache/camel/builder/AdviceWithTasks.java   | 54 ++
 .../apache/camel/model/ChoiceDefinition.java|  3 +-
 .../AdviceWithWeaveByToStringCBRTest.java   | 60 
 .../issues/AdviceWithWeaveByToUriCBRTest.java   | 57 +++
 6 files changed, 146 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6aa84254/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
index 75d643d..a9eff2f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -28,6 +28,7 @@ public class AdviceWithBuilder> {
 private final AdviceWithRouteBuilder builder;
 private final String id;
 private final String toString;
+private final String toUri;
 private final Class type;
 private boolean selectFirst;
 private boolean selectLast;
@@ -35,14 +36,15 @@ public class AdviceWithBuilder> {
 private int selectTo = -1;
 private int maxDeep = -1;
 
-public AdviceWithBuilder(AdviceWithRouteBuilder builder, String id, String 
toString, Class type) {
+public AdviceWithBuilder(AdviceWithRouteBuilder builder, String id, String 
toString, String toUri, Class type) {
 this.builder = builder;
 this.id = id;
 this.toString = toString;
+this.toUri = toUri;
 this.type = type;
 
-if (id == null && toString == null && type == null) {
-throw new IllegalArgumentException("Either id, toString or type 
must be specified");
+if (id == null && toString == null && toUri == null && type == null) {
+throw new IllegalArgumentException("Either id, toString, toUri or 
type must be specified");
 }
 }
 
@@ -133,6 +135,8 @@ public class AdviceWithBuilder> {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceById(route, id, answer, 
selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (toString != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByToString(route, 
toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
+} else if (toUri != null) {
+
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByToUri(route, toUri, 
answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (type != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.replaceByType(route, type, 
answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 }
@@ -148,6 +152,8 @@ public class AdviceWithBuilder> {
 builder.getAdviceWithTasks().add(AdviceWithTasks.removeById(route, 
id, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (toString != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, 
toString, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
+} else if (toUri != null) {
+
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToUri(route, toUri, 
selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (type != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, 
selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 }
@@ -165,6 +171,8 @@ public class AdviceWithBuilder> {
 builder.getAdviceWithTasks().add(AdviceWithTasks.beforeById(route, 
id, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
 } else if (toString != null) {
 
builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(route, 
toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
+} else if (toUri != null) {
+

camel git commit: Updating Apache DS

2016-07-25 Thread coheigea 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x d9ecc823a -> 9c529bed3


Updating Apache DS


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

Branch: refs/heads/camel-2.17.x
Commit: 9c529bed3f0dc47224b3cd68abd6ac9137d2d953
Parents: d9ecc82
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 10:48:23 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 10:48:57 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9c529bed/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 212d830..b62a4b9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
 3.5.2_1
 3.5.2_1
 1.0_6
-2.0.0-M22
+2.0.0-M23
 0.6.1
 0.7.2
 1.0.1

camel git commit: Updating Apache DS

2016-07-25 Thread coheigea 
Repository: camel
Updated Branches:
  refs/heads/master 951f58b11 -> 548d7a0df


Updating Apache DS


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

Branch: refs/heads/master
Commit: 548d7a0df8f2751c9ce9db87299bf7515c448d64
Parents: 951f58b
Author: Colm O hEigeartaigh 
Authored: Mon Jul 25 10:48:23 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 25 10:48:23 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/548d7a0d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2120b14..2854dc3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
 3.5.2_1
 3.5.2_1
 1.0_6
-2.0.0-M22
+2.0.0-M23
 0.6.1
 0.7.2
 1.0.1

camel git commit: CAMEL-10177: Camel-catalog: wireTap is missing from all oneOf lists

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x ecab52ae7 -> d9ecc823a


CAMEL-10177: Camel-catalog: wireTap is missing from all oneOf lists


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

Branch: refs/heads/camel-2.17.x
Commit: d9ecc823adbac85335b85dd85f80a09452521196
Parents: ecab52a
Author: Andrea Cosentino 
Authored: Mon Jul 25 09:28:30 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 09:29:25 2016 +0200

--
 .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d9ecc823/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 85d340e..106f0ed 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -80,6 +80,7 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
 "org.apache.camel.model.SendDefinition",
 "org.apache.camel.model.InterceptDefinition",
 "org.apache.camel.model.WhenDefinition",
+"org.apache.camel.model.ToDynamicDefinition"
 };
 // special for verbs (these classes have sub classes, so we use this to 
find all classes)
 private static final String[] ONE_OF_VERBS = new String[]{

camel git commit: CAMEL-10177: Camel-catalog: wireTap is missing from all oneOf lists

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 90535ba80 -> 951f58b11


CAMEL-10177: Camel-catalog: wireTap is missing from all oneOf lists


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

Branch: refs/heads/master
Commit: 951f58b112a349679d801d7dec83aafc57fe6317
Parents: 90535ba
Author: Andrea Cosentino 
Authored: Mon Jul 25 09:28:30 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 09:28:58 2016 +0200

--
 .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/951f58b1/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index c5000a5..253e37f 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -80,6 +80,7 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
 "org.apache.camel.model.SendDefinition",
 "org.apache.camel.model.InterceptDefinition",
 "org.apache.camel.model.WhenDefinition",
+"org.apache.camel.model.ToDynamicDefinition"
 };
 // special for verbs (these classes have sub classes, so we use this to 
find all classes)
 private static final String[] ONE_OF_VERBS = new String[]{

camel git commit: CAMEL-10177: Camel-catalog: wireTap is missing from all oneOf lists

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 6a379fc3e -> a392df37a


CAMEL-10177: Camel-catalog: wireTap is missing from all oneOf lists


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

Branch: refs/heads/camel-2.16.x
Commit: a392df37a855e10be0e9cc07c9b1937f6ca9b446
Parents: 6a379fc
Author: Andrea Cosentino 
Authored: Mon Jul 25 09:28:30 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 09:29:51 2016 +0200

--
 .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a392df37/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 2097916..75a46d0 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -80,6 +80,7 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
 "org.apache.camel.model.SendDefinition",
 "org.apache.camel.model.InterceptDefinition",
 "org.apache.camel.model.WhenDefinition",
+"org.apache.camel.model.ToDynamicDefinition"
 };
 // special for verbs (these classes have sub classes, so we use this to 
find all classes)
 private static final String[] ONE_OF_VERBS = new String[]{

camel git commit: CAMEL-10094: Use meaningful LinkedIn error message for oauth2 auth error

2016-07-25 Thread dhirajsb 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x ae6993976 -> ecab52ae7


CAMEL-10094: Use meaningful LinkedIn error message for oauth2 auth error


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

Branch: refs/heads/camel-2.17.x
Commit: ecab52ae72f1b100474a152f831586f8555d9437
Parents: ae69939
Author: Dhiraj Bokde 
Authored: Mon Jul 25 00:00:46 2016 -0700
Committer: Dhiraj Bokde 
Committed: Mon Jul 25 00:02:01 2016 -0700

--
 .../camel/component/linkedin/api/LinkedInOAuthRequestFilter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ecab52ae/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index a54c21a..d78f095 100644
--- 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -205,7 +205,7 @@ public final class LinkedInOAuthRequestFilter implements 
ClientRequestFilter {
 redirectQuery = new URL(location).getQuery();
 }
 if (redirectQuery == null) {
-throw new IllegalArgumentException("Redirect Query is null 
cannot use it as input");
+throw new IllegalArgumentException("Redirect response query is 
null, check username, password and permissions");
 }
 final Map params = new HashMap();
 final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);

camel git commit: CAMEL-10094: Use meaningful LinkedIn error message for oauth2 auth error

2016-07-25 Thread dhirajsb 
Repository: camel
Updated Branches:
  refs/heads/master fd7852b1c -> 90535ba80


CAMEL-10094: Use meaningful LinkedIn error message for oauth2 auth error


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

Branch: refs/heads/master
Commit: 90535ba809dde19da37d061ceb9e7035cb1fc932
Parents: fd7852b
Author: Dhiraj Bokde 
Authored: Mon Jul 25 00:00:46 2016 -0700
Committer: Dhiraj Bokde 
Committed: Mon Jul 25 00:01:18 2016 -0700

--
 .../camel/component/linkedin/api/LinkedInOAuthRequestFilter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/90535ba8/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index a54c21a..d78f095 100644
--- 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -205,7 +205,7 @@ public final class LinkedInOAuthRequestFilter implements 
ClientRequestFilter {
 redirectQuery = new URL(location).getQuery();
 }
 if (redirectQuery == null) {
-throw new IllegalArgumentException("Redirect Query is null 
cannot use it as input");
+throw new IllegalArgumentException("Redirect response query is 
null, check username, password and permissions");
 }
 final Map params = new HashMap();
 final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);

camel git commit: Added a little CDI example for Camel-cassandraql using an Apache Cassandra cluster based on Docker

2016-07-25 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 37644948f -> fd7852b1c


Added a little CDI example for Camel-cassandraql using an Apache Cassandra 
cluster based on Docker


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

Branch: refs/heads/master
Commit: fd7852b1c1e208000f05d0b5940173c1bcf4dc9d
Parents: 3764494
Author: Andrea Cosentino 
Authored: Mon Jul 25 08:24:47 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 25 08:44:04 2016 +0200

--
 .../camel-example-cdi-cassandraql/README.md | 152 ++
 examples/camel-example-cdi-cassandraql/pom.xml  | 105 ++
 .../example/cdi/cassandraql/Application.java|  72 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../META-INF/apache-deltaspike.properties   |  21 ++
 .../src/main/resources/META-INF/beans.xml   |  18 ++
 .../src/main/resources/log4j.properties |  27 +++
 examples/pom.xml|   1 +
 9 files changed, 610 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fd7852b1/examples/camel-example-cdi-cassandraql/README.md
--
diff --git a/examples/camel-example-cdi-cassandraql/README.md 
b/examples/camel-example-cdi-cassandraql/README.md
new file mode 100644
index 000..5d9cb12
--- /dev/null
+++ b/examples/camel-example-cdi-cassandraql/README.md
@@ -0,0 +1,152 @@
+# Cassandraql Example - CDI
+
+### Introduction
+
+This example illustrates the integration between Camel, CDI and Cassandra.
+
+The example get the list of pods from a Kubernetes cluster and print name and 
status of each one of the pods returned.
+
+The `camel-cdi`, `camel-core` and `camel-cassandraql` components are used in 
this example.
+The example assumes you have a running Cassandra Cluster in your environment. 
We will use Docker to spin up this cluster.
+As first step we will need to run a single node cluster:
+
+```
+docker run --name master_node -dt oscerd/cassandra
+docker run --name node1 -d -e SEED="$(docker inspect --format='{{ 
.NetworkSettings.IPAddress }}' master_node)" oscerd/cassandra
+docker run --name node2 -d -e SEED="$(docker inspect --format='{{ 
.NetworkSettings.IPAddress }}' master_node)" oscerd/cassandra
+```
+
+We now have three nodes in our cluster.
+
+```
+docker exec -ti master_node /opt/cassandra/bin/nodetool status
+Datacenter: datacenter1
+===
+Status=Up/Down
+|/ State=Normal/Leaving/Joining/Moving
+--  Address Load   Tokens   Owns (effective)  Host ID  
 Rack
+UN  172.17.0.3  102.67 KiB  256  65.9% 
1a985c48-33a1-44aa-b7e9-f1a3620a6482  rack1
+UN  172.17.0.2  107.64 KiB  256  68.2% 
da54ce5e-6433-4ea0-b2c3-fbc6c63ea955  rack1
+UN  172.17.0.4  15.42 KiB  256  65.8% 
0f2ba25a-37b0-4f27-a10a-d9a44655396a  rack1
+```
+
+From your local [Apache Cassandra](http://cassandra.apache.org/) directory run 
the `cqlsh` command:
+
+```
+/bin/cqlsh $(docker inspect --format='{{ 
.NetworkSettings.IPAddress }}' master_node)
+```
+
+You should see the Cqlsh prompt
+
+```
+Connected to Test Cluster at 172.17.0.2:9042.
+[cqlsh 5.0.1 | Cassandra 3.6 | CQL spec 3.4.2 | Native protocol v4]
+Use HELP for help.
+cqlsh>
+```
+
+Let's create a namespace `test` with a table `users`
+
+```
+create keyspace test with replication = {'class':'SimpleStrategy', 
'replication_factor':3};
+use test;
+create table users ( id int primary key, name text );
+insert into users (id,name) values (1, 'oscerd');
+quit;
+```
+
+run a simple query to check everything works:
+
+```
+cqlsh> use test;
+cqlsh:test> select * from users;
+
+ id | name
++
+  1 | oscerd
+
+(1 rows)
+cqlsh:test> 
+```
+
+Remember to edit the apache-deltaspike.properties file to add the correct 
addresses of the different nodes running in Docker.
+
+### Build
+
+You will need to build this example first:
+
+```sh
+$ mvn install
+```
+
+### Run
+
+You can run this example using:
+
+```sh
+$ mvn compile camel:run
+```
+
+When the Camel application runs, you should see the following result:
+```
+2016-07-24 15:33:50,812 [cdi.Main.main()] INFO  Version
- WELD-000900: 2.3.5 (Final)
+Jul 24, 2016 3:33:50 PM 
org.apache.deltaspike.core.impl.config.EnvironmentPropertyConfigSourceProvider 

+INFO: Custom config found by DeltaSpike. Name: 
'META-INF/apache-deltaspike.properties', URL:

camel git commit: [CAMEL-10176]camel-cxf RawMessageContentRedirectInterceptor should be able to handle the case that OutputStream is null for an outgoing message

2016-07-25 Thread ffang 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 4203ed6a0 -> 6a379fc3e


[CAMEL-10176]camel-cxf RawMessageContentRedirectInterceptor should be able to 
handle the case that OutputStream is null for an outgoing message

(cherry picked from commit 37644948fb546604b8f1e3f1ce5b308c77ca9926)
(cherry picked from commit ae69939761ab2c592608235e5789272aae3a606a)


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

Branch: refs/heads/camel-2.16.x
Commit: 6a379fc3ed7f384712de7ea03a3c781e993f585e
Parents: 4203ed6
Author: Freeman Fang 
Authored: Mon Jul 25 14:35:04 2016 +0800
Committer: Freeman Fang 
Committed: Mon Jul 25 14:39:41 2016 +0800

--
 .../RawMessageContentRedirectInterceptor.java  | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6a379fc3/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
index 86a6dc4..bd49955 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
@@ -17,13 +17,16 @@
 package org.apache.camel.component.cxf.interceptors;
 
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.Writer;
 import java.util.List;
 
 import org.apache.camel.StreamCache;
 import org.apache.camel.util.IOHelper;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
@@ -49,16 +52,20 @@ public class RawMessageContentRedirectInterceptor extends 
AbstractPhaseIntercept
 if (null != params) {
 InputStream is = (InputStream)params.get(0);
 OutputStream os = message.getContent(OutputStream.class);
-if (os == null) {
+Writer writer = message.getContent(Writer.class);
+if (os == null && writer == null) {
 //InOny
 return;
 }
-
 try {
-if (is instanceof StreamCache) {
-((StreamCache)is).writeTo(os);
+if (os == null && writer != null) {
+IOUtils.copyAndCloseInput(new InputStreamReader(is), 
writer);
 } else {
-IOUtils.copy(is, os);
+if (is instanceof StreamCache) {
+((StreamCache)is).writeTo(os);
+} else {
+IOUtils.copy(is, os);
+}
 }
 } catch (Exception e) {
 throw new Fault(e);

camel git commit: [CAMEL-10176]camel-cxf RawMessageContentRedirectInterceptor should be able to handle the case that OutputStream is null for an outgoing message

2016-07-25 Thread ffang 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x e13c890fa -> ae6993976


[CAMEL-10176]camel-cxf RawMessageContentRedirectInterceptor should be able to 
handle the case that OutputStream is null for an outgoing message

(cherry picked from commit 37644948fb546604b8f1e3f1ce5b308c77ca9926)


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

Branch: refs/heads/camel-2.17.x
Commit: ae69939761ab2c592608235e5789272aae3a606a
Parents: e13c890
Author: Freeman Fang 
Authored: Mon Jul 25 14:35:04 2016 +0800
Committer: Freeman Fang 
Committed: Mon Jul 25 14:38:53 2016 +0800

--
 .../RawMessageContentRedirectInterceptor.java  | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ae699397/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
index 86a6dc4..bd49955 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
@@ -17,13 +17,16 @@
 package org.apache.camel.component.cxf.interceptors;
 
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.Writer;
 import java.util.List;
 
 import org.apache.camel.StreamCache;
 import org.apache.camel.util.IOHelper;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
@@ -49,16 +52,20 @@ public class RawMessageContentRedirectInterceptor extends 
AbstractPhaseIntercept
 if (null != params) {
 InputStream is = (InputStream)params.get(0);
 OutputStream os = message.getContent(OutputStream.class);
-if (os == null) {
+Writer writer = message.getContent(Writer.class);
+if (os == null && writer == null) {
 //InOny
 return;
 }
-
 try {
-if (is instanceof StreamCache) {
-((StreamCache)is).writeTo(os);
+if (os == null && writer != null) {
+IOUtils.copyAndCloseInput(new InputStreamReader(is), 
writer);
 } else {
-IOUtils.copy(is, os);
+if (is instanceof StreamCache) {
+((StreamCache)is).writeTo(os);
+} else {
+IOUtils.copy(is, os);
+}
 }
 } catch (Exception e) {
 throw new Fault(e);

camel git commit: [CAMEL-10176]camel-cxf RawMessageContentRedirectInterceptor should be able to handle the case that OutputStream is null for an outgoing message

2016-07-25 Thread ffang 
Repository: camel
Updated Branches:
  refs/heads/master c8a458a79 -> 37644948f


[CAMEL-10176]camel-cxf RawMessageContentRedirectInterceptor should be able to 
handle the case that OutputStream is null for an outgoing message


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

Branch: refs/heads/master
Commit: 37644948fb546604b8f1e3f1ce5b308c77ca9926
Parents: c8a458a
Author: Freeman Fang 
Authored: Mon Jul 25 14:35:04 2016 +0800
Committer: Freeman Fang 
Committed: Mon Jul 25 14:35:04 2016 +0800

--
 .../RawMessageContentRedirectInterceptor.java  | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37644948/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
index 86a6dc4..bd49955 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
@@ -17,13 +17,16 @@
 package org.apache.camel.component.cxf.interceptors;
 
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.Writer;
 import java.util.List;
 
 import org.apache.camel.StreamCache;
 import org.apache.camel.util.IOHelper;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
@@ -49,16 +52,20 @@ public class RawMessageContentRedirectInterceptor extends 
AbstractPhaseIntercept
 if (null != params) {
 InputStream is = (InputStream)params.get(0);
 OutputStream os = message.getContent(OutputStream.class);
-if (os == null) {
+Writer writer = message.getContent(Writer.class);
+if (os == null && writer == null) {
 //InOny
 return;
 }
-
 try {
-if (is instanceof StreamCache) {
-((StreamCache)is).writeTo(os);
+if (os == null && writer != null) {
+IOUtils.copyAndCloseInput(new InputStreamReader(is), 
writer);
 } else {
-IOUtils.copy(is, os);
+if (is instanceof StreamCache) {
+((StreamCache)is).writeTo(os);
+} else {
+IOUtils.copy(is, os);
+}
 }
 } catch (Exception e) {
 throw new Fault(e);