svn commit: r1008862 - in /websites/production/camel/content: cache/main.pageCache camel-2180-release.html

2017-03-23 Thread buildbot 
Author: buildbot
Date: Thu Mar 23 17:51:32 2017
New Revision: 1008862

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2180-release.html

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

Modified: websites/production/camel/content/camel-2180-release.html
==
--- websites/production/camel/content/camel-2180-release.html (original)
+++ websites/production/camel/content/camel-2180-release.html Thu Mar 23 
17:51:32 2017
@@ -91,7 +91,7 @@
 
 
 
-New and NoteworthyWelcome 
to the 2.18.0 release which resolved over 500 issues.This is first release thatrequires Java 8 and comes with a much-improved Spring Boot 
support, andships with 
numerous new features, improvements and bug fixes.Java DSL 
with experimental Java8 functional/lambda support. Check out the https://github.com/apache/camel/tree/master/examples/camel-example-java8; 
rel="nofollow">camel-example-java8. We love feedback on this DSL and expect 
to improved the API over the next couple of releases.The XSD schema 
for camelContext and its other configuration elements are now also 
documented (before it was only routes and rests). The XSD 
schema now also documents the default values of al
 l the 
options.IntroducedFluentProducerTemplateusing 
fluent builder style as a alternative toProducerTemplateAll CamelComponents that has options to be 
configured now supports and includeSpring Bootauto configuration for those 
options, so they can easily be configured in your application.yaml file when 
using Spring Boot with Camel.Camel Spring Boot now supports the sameadvanced 
configurationyou can do with Spring XML, if the beanshave been 
configured using@Beanstyle in a Spring Boot 
configuration class.Added Hystrix EIP as EIP pattern that uses nativ
 e Netflixx Hystrix as the Circuit Breaker implementation.This requires 
havingcamel-hystrixon the 
classpath.AddedService Call EIP as EIP pattern that allows to 
call a remote service in a distributed system, where the service is looked up 
from a service registry of some sorts, such as kubernetes, consul, etcd, 
zookeeper etc.Running Camel 
withSpring Boot now includes 
a Camel Health Indicator (actuator) if 
spring-boot-starter-actuatoris on the 
classpath.TheRest 
component allows to call REST services now (as a client), where you can pick 
one of the following Camel components for the HTTP transport: http, http4, 
netty4-http, jetty, restlet, undertow. You can also refer to a existing swagger 
api doc and include camel-swagger-ja
 va on the classpath, for automatic validation of rest endpoint is configured 
to use a valid rest operation/parameters.The Rest DSL now auto 
discovers which HTTP component to use if no explicit component name has been 
configured, by the available components on the classpath (by their default 
name) and if there only exists one, then that is used.Spring-DM for 
OSGi moved out of camel-spring into a separate camel-spring-dm module.Improved theBean component to 
better match method parameter types when usingSimple language as 
parameter values.AddedBindyConverter that 
allows to implement custom data converters forBindyThe access in theRest DSL 
has been deprecated and no longer in use - its not part of swagger 
specification anymore.Camel-NATSnow uses JNATS client instead of the 
deprecated Java_nats one.During startup ofCamelContext the services that are used as part of 
routes are now deferred being started to the end of the startup process. Some 
IoC frameworks like Spring can otherwise causes a circular dependency issue if 
services are started too early. A side effect is that if service startup 
failures happen when being started later, they are now wrapped in the 
FailedToStartupRouteException to better pin point which route thas 
the problem.Improved the startup sequence ofSpring Java Config to be similar toSpring
  Boot that helps prevent Spring initialization errors about circular 
dependencies issues.Added PATCH toRest DSLAdded "starts with" and "ends with" 
operator to the Simplelanguage.AddedBeanIOSplitter
 toBeanIO that can be used with 
theSplitter EIP to split big 
payloads in streaming mode without reading the entire content into 
memory.Some of the AWScomponents allows to specify ARN in the endpoint 
configuration.The create operation inZookeeper now creates sub paths if 
missing.Added support for async mode forSERVLET component to leverage Asynchronous Servlet from 
the Servlet 3.0 spec.
 Beancomponent and Bean Languagevalidates method name must be 
a valid according to java identifier rules, and also if parameter syntax has an 
ending parenthesis.You can now 
use@RunWith(CamelSpringBootJUnit4ClassRunner.class) to test 
CamelSpring 
Bootapplications and

camel git commit: CAMEL-10735: deprecate stuff

2017-03-23 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master d8a47d4ea -> 4f893bfee


CAMEL-10735: deprecate stuff


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

Branch: refs/heads/master
Commit: 4f893bfee8c9d0c48bebb1d130ea58107b0aa526
Parents: d8a47d4
Author: Claus Ibsen 
Authored: Thu Mar 23 13:35:45 2017 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 23 18:49:16 2017 +0100

--
 components/camel-servletlistener/pom.xml | 2 +-
 components/readme.adoc   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4f893bfe/components/camel-servletlistener/pom.xml
--
diff --git a/components/camel-servletlistener/pom.xml 
b/components/camel-servletlistener/pom.xml
index 443536f..1f286e7 100644
--- a/components/camel-servletlistener/pom.xml
+++ b/components/camel-servletlistener/pom.xml
@@ -26,7 +26,7 @@
 
   camel-servletlistener
   jar
-  Camel :: Servlet Listener
+  Camel :: Servlet Listener (deprecated)
   Bootstrapping Camel using Servet Listener
   
   

http://git-wip-us.apache.org/repos/asf/camel/blob/4f893bfe/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index ff4ef60..5333b37 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -855,7 +855,7 @@ Miscellaneous Components
 
 
 // others: START
-Number of Miscellaneous Components: 36 in 36 JAR artifacts (13 deprecated)
+Number of Miscellaneous Components: 36 in 36 JAR artifacts (14 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -897,7 +897,7 @@ Number of Miscellaneous Components: 36 in 36 JAR artifacts 
(13 deprecated)
 
 | link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | *deprecated* 
Camel with OSGi SCR (Declarative Services)
 
-| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servlet 
Listener] (camel-servletlistener) | 2.11 | Bootstrapping Camel using Servet 
Listener
+| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servlet 
Listener] (camel-servletlistener) | 2.11 | *deprecated* Bootstrapping Camel 
using Servet Listener
 
 | link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | 
Security using Shiro

camel git commit: CAMEL-11043: ServiceCall : allow to use placeholders for name, uri, etc

2017-03-23 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master d032095f7 -> d8a47d4ea


CAMEL-11043: ServiceCall : allow to use placeholders for name, uri, etc


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

Branch: refs/heads/master
Commit: d8a47d4eafdd7d404e1aeaa257ed45675d0377ef
Parents: d032095
Author: lburgazzoli 
Authored: Thu Mar 23 17:48:37 2017 +0100
Committer: lburgazzoli 
Committed: Thu Mar 23 17:48:37 2017 +0100

--
 .../impl/cloud/DefaultServiceCallProcessor.java | 22 -
 .../ServiceCallConfigurationDefinition.java |  2 +-
 .../camel/model/cloud/ServiceCallConstants.java |  1 +
 .../model/cloud/ServiceCallDefinition.java  | 26 ++
 .../org/apache/camel/util/ObjectHelper.java | 33 -
 .../cloud/ServiceCallConfigurationTest.java | 50 
 6 files changed, 123 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d8a47d4e/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
index e75c8cb..be97182 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
@@ -83,6 +83,27 @@ public class DefaultServiceCallProcessor extends 
ServiceSupport implements Async
 // Properties
 // *
 
+
+public ExchangePattern getExchangePattern() {
+return exchangePattern;
+}
+
+public String getName() {
+return name;
+}
+
+public String getScheme() {
+return scheme;
+}
+
+public String getUri() {
+return uri;
+}
+
+public String getContextPath() {
+return contextPath;
+}
+
 public LoadBalancer getLoadBalancer() {
 return loadBalancer;
 }
@@ -91,7 +112,6 @@ public class DefaultServiceCallProcessor extends 
ServiceSupport implements Async
 return expression;
 }
 
-
 // *
 // Lifecycle
 // *

http://git-wip-us.apache.org/repos/asf/camel/blob/d8a47d4e/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
 
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
index e0b3818..6a910b9 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
@@ -42,7 +42,7 @@ import org.apache.camel.spi.Metadata;
 public class ServiceCallConfigurationDefinition extends IdentifiedType {
 @XmlAttribute
 private String uri;
-@XmlAttribute @Metadata(defaultValue = "http")
+@XmlAttribute @Metadata(defaultValue = 
ServiceCallConstants.DEFAULT_COMPONENT)
 private String component;
 @XmlAttribute
 private ExchangePattern pattern;

http://git-wip-us.apache.org/repos/asf/camel/blob/d8a47d4e/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConstants.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConstants.java
 
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConstants.java
index 951d25a..4cc89f1 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConstants.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConstants.java
@@ -17,6 +17,7 @@
 package org.apache.camel.model.cloud;
 
 public final class ServiceCallConstants {
+public static final String DEFAULT_COMPONENT = "http";
 public static final String DEFAULT_SERVICE_CALL_CONFIG_ID = 
"service-call-configuration";
 public static final String DEFAULT_SERVICE_CALL_EXPRESSION_ID = 
"service-call-expression";
 public static final String DEFAULT_SERVICE_DISCOVERY_ID = 
"service-discovery";

http://git-wip-us.apache.org/repos/asf/camel/blob/d8a47d4e/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java

camel git commit: CAMEL-10877: service-call eip : add a spring-cloud example

2017-03-23 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 7ba190216 -> 64c57a8db


CAMEL-10877: service-call eip : add a spring-cloud example


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

Branch: refs/heads/master
Commit: 64c57a8db2ab4760dc580f64b5ec2f4462a81f63
Parents: 7ba1902
Author: lburgazzoli 
Authored: Thu Mar 23 15:27:06 2017 +0100
Committer: lburgazzoli 
Committed: Thu Mar 23 15:27:06 2017 +0100

--
 components/camel-spring-cloud-netflix/pom.xml   |   4 -
 ...ngCloudDiscoveryClientAutoConfiguration.java |  62 
 ...pringCloudLoadBalancerAutoConfiguration.java |   8 +-
 examples/README.adoc|   8 +-
 .../README.adoc |  53 +++
 .../consumer/pom.xml| 153 +++
 .../camel/example/ConsumerApplication.java  |  59 +++
 .../src/main/resources/application.properties   |  16 ++
 .../consumer/src/main/resources/logback.xml |  34 +
 .../pom.xml |  40 +
 .../service/pom.xml | 112 ++
 .../service/src/main/bash/consul-run.sh |  52 +++
 .../camel/example/ServiceApplication.java   |  69 +
 .../src/main/resources/application.properties   |   8 +
 .../service/src/main/resources/logback.xml  |  34 +
 examples/pom.xml|   1 +
 16 files changed, 702 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/64c57a8d/components/camel-spring-cloud-netflix/pom.xml
--
diff --git a/components/camel-spring-cloud-netflix/pom.xml 
b/components/camel-spring-cloud-netflix/pom.xml
index a111462..5d6ca11 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -63,10 +63,6 @@
   org.apache.camel
   camel-spring-boot
 
-
-  org.apache.camel
-  camel-spring-cloud
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/64c57a8d/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
--
diff --git 
a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
 
b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
new file mode 100644
index 000..cc29cc4
--- /dev/null
+++ 
b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
@@ -0,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 org.apache.camel.spring.cloud;
+
+
+import org.apache.camel.cloud.LoadBalancer;
+import org.apache.camel.spring.boot.cloud.CamelCloudAutoConfiguration;
+import org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties;
+import org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscovery;
+import 
org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscoveryAutoConfiguration;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import 
org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import

[2/2] camel git commit: Fix CS

2017-03-23 Thread lburgazzoli 
Fix CS


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

Branch: refs/heads/master
Commit: 7ba19021655a105422a9c191cc1a55258d662283
Parents: 3bc26be
Author: lburgazzoli 
Authored: Thu Mar 23 14:08:10 2017 +0100
Committer: lburgazzoli 
Committed: Thu Mar 23 14:08:10 2017 +0100

--
 .../main/java/org/apache/camel/ComponentVerifier.java   |  2 +-
 .../apache/camel/management/ManagedComponentTest.java   | 12 +++-
 .../apache/camel/management/ManagementTestSupport.java  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java 
b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
index 969b25b..53cb8c7 100644
--- a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
+++ b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
@@ -58,7 +58,7 @@ public interface ComponentVerifier {
 private static final Scope[] VALUES = values();
 
 public static Scope fromString(String scope) {
-for (int i=0; i < VALUES.length; i++) {
+for (int i = 0; i < VALUES.length; i++) {
 if (ObjectHelper.equal(scope, VALUES[i].name(), true)) {
 return VALUES[i];
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
index 00ade1f..491e766 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
@@ -31,7 +31,9 @@ import 
org.apache.camel.impl.verifier.DefaultComponentVerifier;
 import org.apache.camel.impl.verifier.ResultBuilder;
 
 public class ManagedComponentTest extends ManagementTestSupport {
-private static final String[] VERIFY_SIGNATURE = new String[]{ 
"java.lang.String", "java.util.Map" };
+private static final String[] VERIFY_SIGNATURE = new String[] {
+"java.lang.String", "java.util.Map"
+};
 
 @Override
 protected CamelContext createCamelContext() throws Exception {
@@ -76,17 +78,17 @@ public class ManagedComponentTest extends 
ManagementTestSupport {
 ComponentVerifier.Result res;
 
 // check lowercase
-res = invoke(mbeanServer, on, "verify", new Object[]{ "connectivity", 
Collections.emptyMap() }, VERIFY_SIGNATURE);
+res = invoke(mbeanServer, on, "verify", new Object[]{"connectivity", 
Collections.emptyMap()}, VERIFY_SIGNATURE);
 assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus());
 assertEquals(ComponentVerifier.Scope.CONNECTIVITY, res.getScope());
 
 // check mixed case
-res = invoke(mbeanServer, on, "verify", new Object[]{ "ConnEctivIty", 
Collections.emptyMap() }, VERIFY_SIGNATURE);
+res = invoke(mbeanServer, on, "verify", new Object[]{"ConnEctivIty", 
Collections.emptyMap()}, VERIFY_SIGNATURE);
 assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus());
 assertEquals(ComponentVerifier.Scope.CONNECTIVITY, res.getScope());
 
 // check uppercase
-res = invoke(mbeanServer, on, "verify", new Object[]{ "PARAMETERS", 
Collections.emptyMap() }, VERIFY_SIGNATURE);
+res = invoke(mbeanServer, on, "verify", new Object[]{"PARAMETERS", 
Collections.emptyMap()}, VERIFY_SIGNATURE);
 assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus());
 assertEquals(ComponentVerifier.Scope.PARAMETERS, res.getScope());
 }
@@ -115,4 +117,4 @@ public class ManagedComponentTest extends 
ManagementTestSupport {
 throw new UnsupportedOperationException();
 }
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
index 1d484ec..ed0b372

[1/2] camel git commit: CAMEL-11057: Undertow Producer : NPE if tryConvertTo fails to convert exchange body to ByteBuffer

2017-03-23 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 5586f91c4 -> 7ba190216


CAMEL-11057: Undertow Producer : NPE if tryConvertTo fails to convert exchange 
body to ByteBuffer


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

Branch: refs/heads/master
Commit: 3bc26bef77b8d91944ebc20d2e46d5c1b4587f34
Parents: 5586f91
Author: lburgazzoli 
Authored: Thu Mar 23 14:03:31 2017 +0100
Committer: lburgazzoli 
Committed: Thu Mar 23 14:03:31 2017 +0100

--
 .../org/apache/camel/component/undertow/UndertowProducer.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3bc26bef/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
index 0bca663..a4133df 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
@@ -128,7 +128,9 @@ public class UndertowProducer extends DefaultAsyncProducer {
 final TypeConverter tc = endpoint.getCamelContext().getTypeConverter();
 final ByteBuffer bodyAsByte = tc.tryConvertTo(ByteBuffer.class, body);
 
-if (body != null) {
+// As tryConvertTo is used to convert the body, we should do null check
+// or the call bodyAsByte.remaining() may throw an NPE
+if (body != null && bodyAsByte != null) {
 requestHeaders.put(Headers.CONTENT_LENGTH, bodyAsByte.remaining());
 }

[1/2] camel git commit: Add javadoc for VerifiableComponent

2017-03-23 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 7aec00f43 -> 5586f91c4


Add javadoc for VerifiableComponent


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

Branch: refs/heads/master
Commit: 5586f91c4b5b22b822eebeda8843cefa59d78569
Parents: 33854d2
Author: lburgazzoli 
Authored: Thu Mar 23 13:52:27 2017 +0100
Committer: lburgazzoli 
Committed: Thu Mar 23 13:52:45 2017 +0100

--
 .../src/main/java/org/apache/camel/VerifiableComponent.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5586f91c/camel-core/src/main/java/org/apache/camel/VerifiableComponent.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/VerifiableComponent.java 
b/camel-core/src/main/java/org/apache/camel/VerifiableComponent.java
index 26df848..2b95404 100644
--- a/camel-core/src/main/java/org/apache/camel/VerifiableComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/VerifiableComponent.java
@@ -17,13 +17,13 @@
 package org.apache.camel;
 
 /**
- * TODO: document
+ * An interface to represent an object which support validation
  */
 public interface VerifiableComponent {
 /**
- * TODO: document
+ * Get the {@link ComponentVerifier}
  *
- * @return a Component Verifier
+ * @return the Component Verifier
  */
 ComponentVerifier getVerifier();
 }

[2/2] camel git commit: CAMEL-11055: Ping Check API - Allow to use lower case scopes

2017-03-23 Thread lburgazzoli 
CAMEL-11055: Ping Check API - Allow to use lower case scopes


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

Branch: refs/heads/master
Commit: 33854d2997f416a058aaf78b0d6356fb4312c347
Parents: 7aec00f
Author: lburgazzoli 
Authored: Thu Mar 23 13:50:10 2017 +0100
Committer: lburgazzoli 
Committed: Thu Mar 23 13:52:45 2017 +0100

--
 .../org/apache/camel/ComponentVerifier.java |  16 ++-
 .../management/mbean/ManagedComponent.java  |   8 +-
 .../camel/management/ManagedComponentTest.java  | 118 +++
 .../camel/management/ManagementTestSupport.java |  15 +++
 .../camel/component/http/HttpComponent.java |   2 +-
 .../camel/component/http4/HttpComponent.java|   2 +-
 .../salesforce/SalesforceComponent.java |   2 +-
 .../servicenow/ServiceNowComponent.java |   2 +-
 .../component/twitter/TwitterComponent.java |   2 +-
 9 files changed, 156 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/33854d29/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java 
b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
index ce8cae8..969b25b 100644
--- a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
+++ b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
@@ -21,6 +21,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.camel.util.ObjectHelper;
+
 /**
  * Defines the interface used to validate component/endpoint parameters.
  */
@@ -51,7 +53,19 @@ public interface ComponentVerifier {
 enum Scope {
 NONE,
 PARAMETERS,
-CONNECTIVITY
+CONNECTIVITY;
+
+private static final Scope[] VALUES = values();
+
+public static Scope fromString(String scope) {
+for (int i=0; i < VALUES.length; i++) {
+if (ObjectHelper.equal(scope, VALUES[i].name(), true)) {
+return VALUES[i];
+}
+}
+
+throw new IllegalArgumentException("Unknown scope <" + scope + 
">");
+}
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/33854d29/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
index 90081ae..78af22a 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
@@ -37,6 +37,7 @@ import 
org.apache.camel.api.management.mbean.ManagedComponentMBean;
 import org.apache.camel.impl.verifier.ResultBuilder;
 import org.apache.camel.impl.verifier.ResultErrorBuilder;
 import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.JsonSchemaHelper;
 import org.apache.camel.util.ObjectHelper;
 
@@ -146,13 +147,10 @@ public class ManagedComponent implements ManagedInstance, 
ManagedComponentMBean
 @Override
 public ComponentVerifier.Result verify(String scope, Map 
options) {
 try {
-ComponentVerifier.Scope scopeEnum = 
ComponentVerifier.Scope.valueOf(scope);
+ComponentVerifier.Scope scopeEnum = 
ComponentVerifier.Scope.fromString(scope);
 
 if (component instanceof VerifiableComponent) {
-@SuppressWarnings("unchecked")
-final Map properties = (Map)options;
-
-return ((VerifiableComponent) 
component).getVerifier().verify(scopeEnum, properties);
+return ((VerifiableComponent) 
component).getVerifier().verify(scopeEnum, CastUtils.cast(options));
 } else {
 return ResultBuilder.unsupported().build();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/33854d29/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
new file mode 100644
index 000..00ade1f
--- /dev/null
+++

camel git commit: CAMEL-10735: deprecate stuff in OSGi

2017-03-23 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 5250afa19 -> 7aec00f43


CAMEL-10735: deprecate stuff in OSGi


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

Branch: refs/heads/master
Commit: 7aec00f43c8c793b79a17c794bb75dba29add196
Parents: 5250afa
Author: Claus Ibsen 
Authored: Thu Mar 23 10:17:53 2017 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 23 13:00:03 2017 +0100

--
 archetypes/camel-archetype-scr/pom.xml   | 2 +-
 components/camel-scr/pom.xml | 2 +-
 components/readme.adoc   | 4 ++--
 examples/camel-example-cdi-osgi/pom.xml  | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/archetypes/camel-archetype-scr/pom.xml
--
diff --git a/archetypes/camel-archetype-scr/pom.xml 
b/archetypes/camel-archetype-scr/pom.xml
index 87fb3f1..8ec0b49 100644
--- a/archetypes/camel-archetype-scr/pom.xml
+++ b/archetypes/camel-archetype-scr/pom.xml
@@ -28,7 +28,7 @@
 
   org.apache.camel.archetypes
   camel-archetype-scr
-  Camel :: Archetypes :: OSGi Service Component Runtime bundle
+  Camel :: Archetypes :: OSGi Service Component Runtime bundle 
(deprecated)
   Creates a new Camel SCR (Declarative Services) bundle project 
for OSGi
   maven-archetype
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/components/camel-scr/pom.xml
--
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 5016be2..5505faf 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -25,7 +25,7 @@
   
 
   camel-scr
-  Camel :: SCR
+  Camel :: SCR (deprecated)
   Camel with OSGi SCR (Declarative Services)
   jar
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index 3b4c15a..ff4ef60 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -855,7 +855,7 @@ Miscellaneous Components
 
 
 // others: START
-Number of Miscellaneous Components: 36 in 36 JAR artifacts (12 deprecated)
+Number of Miscellaneous Components: 36 in 36 JAR artifacts (13 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -895,7 +895,7 @@ Number of Miscellaneous Components: 36 in 36 JAR artifacts 
(12 deprecated)
 
 | link:camel-scala/src/main/docs/scala.adoc[Scala DSL] (camel-scala) | 1.4 | 
*deprecated* Camel Scala DSL
 
-| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | Camel with 
OSGi SCR (Declarative Services)
+| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | *deprecated* 
Camel with OSGi SCR (Declarative Services)
 
 | link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servlet 
Listener] (camel-servletlistener) | 2.11 | Bootstrapping Camel using Servet 
Listener
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/examples/camel-example-cdi-osgi/pom.xml
--
diff --git a/examples/camel-example-cdi-osgi/pom.xml 
b/examples/camel-example-cdi-osgi/pom.xml
index 4af73d8..80d6004 100755
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -27,7 +27,7 @@
   
 
   camel-example-cdi-osgi
-  Camel :: Example :: CDI :: OSGi
+  Camel :: Example :: CDI :: OSGi (deprecated)
   PAX CDI example
   jar
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7aec00f4/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 c4bf366..cdbe42b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -285,7 +285,7 @@
 mvn:org.apache.camel/camel-castor/${project.version}
   
   
-camel-cdi requires that either pax-cdi-weld or 
pax-cdi-openwebbeans has been installed
+camel-cdi in OSGi is deprecated. camel-cdi requires that either 
pax-cdi-weld or pax-cdi-openwebbeans has been installed
 camel-core
 pax-cdi
 eventadmin

camel git commit: CAMEL-11053 camel-undertow - Compile error

2017-03-23 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master 76659a972 -> 5250afa19


CAMEL-11053 camel-undertow - Compile error

This could be related to JDK-8051402[1], the change makes the types more
explicit.

[1] https://bugs.openjdk.java.net/browse/JDK-8051402


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

Branch: refs/heads/master
Commit: 5250afa19d0a55076c599ed7ac0f7f4c7bc25413
Parents: 76659a9
Author: Zoran Regvart 
Authored: Thu Mar 23 11:50:56 2017 +0100
Committer: Zoran Regvart 
Committed: Thu Mar 23 11:50:56 2017 +0100

--
 .../camel/component/undertow/UndertowClientCallback.java  | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5250afa1/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
index 02fcc4c..d9c6485 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
+import java.nio.channels.Channel;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -42,6 +43,7 @@ import org.apache.camel.Message;
 import org.apache.camel.util.ExchangeHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xnio.ChannelExceptionHandler;
 import org.xnio.ChannelListener;
 import org.xnio.ChannelListeners;
 import org.xnio.IoUtils;
@@ -258,8 +260,12 @@ class UndertowClientCallback implements 
ClientCallback {
 // the canonical way of flushing Xnio channels
 channel.shutdownWrites();
 if (!channel.flush()) {
-
channel.getWriteSetter().set(ChannelListeners.flushingChannelListener(IoUtils::safeClose,
-ChannelListeners.closingChannelExceptionHandler()));
+final ChannelListener safeClose = 
IoUtils::safeClose;
+final ChannelExceptionHandler 
closingChannelExceptionHandler = ChannelListeners
+.closingChannelExceptionHandler();
+final ChannelListener flushingChannelListener = 
ChannelListeners
+.flushingChannelListener(safeClose, 
closingChannelExceptionHandler);
+channel.getWriteSetter().set(flushingChannelListener);
 channel.resumeWrites();
 }
 }

[2/2] camel git commit: Revert "CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header"

2017-03-23 Thread acosentino 
Revert "CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" 
header"

This reverts commit 99e506e312aac6a235ea9fc7f7120f9832ec9a6e.


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

Branch: refs/heads/camel-2.17.x
Commit: 38a6966ad8ab89a223c71f2f0539bb3a68e34b6e
Parents: 91483f7
Author: Andrea Cosentino 
Authored: Thu Mar 23 10:47:31 2017 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:47:31 2017 +0100

--
 .../component/jetty/JettyContentExchange.java   |  2 --
 .../component/jetty/JettyHttpProducer.java  |  9 ++---
 .../jetty9/CamelInputStreamContentProvider.java | 21 
 .../component/jetty9/JettyContentExchange9.java |  5 -
 4 files changed, 2 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
index 809168c..af63606 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
@@ -44,8 +44,6 @@ public interface JettyContentExchange {
 void setRequestContent(String data, String charset) throws 
UnsupportedEncodingException;
 
 void setRequestContent(InputStream ins);
-
-void setRequestContent(InputStream ins, int contentLength);
 
 void addRequestHeader(String key, String s);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index ee6b83b..2a01b39 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -164,18 +164,13 @@ public class JettyHttpProducer extends 
DefaultAsyncProducer implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-   // then fallback to input stream
+// then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
+httpExchange.setRequestContent(is);
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
 if (ObjectHelper.isNotEmpty(length)) {
 httpExchange.addRequestHeader(Exchange.CONTENT_LENGTH, 
length);
-//send with content-length
-httpExchange.setRequestContent(is, new 
Integer(length));
-
-} else {
-   //send chunked
-httpExchange.setRequestContent(is);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
deleted file mode 100644
index 08d66c6..000
--- 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.apache.camel.component.jetty9;
-
-import java.io.InputStream;
-
-import org.eclipse.jetty.client.util.InputStreamContentProvider;
-
-public class CamelInputStreamContentProvider

[1/2] camel git commit: Revert "Corrected formatting issues"

2017-03-23 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 1f7b09fb7 -> 38a6966ad


Revert "Corrected formatting issues"

This reverts commit 1f7b09fb7205593fc6fa8d2450a701bb053b7da5.


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

Branch: refs/heads/camel-2.17.x
Commit: 91483f7c40a606e989ef6c55db42872645b8099e
Parents: 1f7b09f
Author: Andrea Cosentino 
Authored: Thu Mar 23 10:47:23 2017 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:47:23 2017 +0100

--
 .../camel/component/jetty/JettyHttpProducer.java |  4 ++--
 .../jetty9/CamelInputStreamContentProvider.java  | 19 ++-
 .../component/jetty9/JettyContentExchange9.java  |  7 ---
 3 files changed, 8 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91483f7c/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index e420b08..ee6b83b 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -164,7 +164,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-// then fallback to input stream
+   // then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
@@ -174,7 +174,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 httpExchange.setRequestContent(is, new 
Integer(length));
 
 } else {
-//send chunked
+   //send chunked
 httpExchange.setRequestContent(is);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/91483f7c/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
index 629a5a1..08d66c6 100644
--- 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -1,19 +1,3 @@
-/**
- * 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.jetty9;
 
 import java.io.InputStream;
@@ -30,7 +14,8 @@ public class CamelInputStreamContentProvider extends 
InputStreamContentProvider
 }
 
 @Override
-public long getLength() {
+public long getLength()
+{
 return length;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/91483f7c/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java

[2/2] camel git commit: CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header

2017-03-23 Thread acosentino 
CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header

Change-Id: Icc12a11b9b2886affb0f6b6d4a874de11c0338bd


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

Branch: refs/heads/camel-2.17.x
Commit: 99e506e312aac6a235ea9fc7f7120f9832ec9a6e
Parents: 87e33ad
Author: Matthew Luckam 
Authored: Fri Feb 19 14:43:19 2016 -0500
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:16:58 2017 +0100

--
 .../component/jetty/JettyContentExchange.java   |  2 ++
 .../component/jetty/JettyHttpProducer.java  |  9 +++--
 .../jetty9/CamelInputStreamContentProvider.java | 21 
 .../component/jetty9/JettyContentExchange9.java |  5 +
 4 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/99e506e3/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
index af63606..809168c 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
@@ -44,6 +44,8 @@ public interface JettyContentExchange {
 void setRequestContent(String data, String charset) throws 
UnsupportedEncodingException;
 
 void setRequestContent(InputStream ins);
+
+void setRequestContent(InputStream ins, int contentLength);
 
 void addRequestHeader(String key, String s);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/99e506e3/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index 2a01b39..ee6b83b 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -164,13 +164,18 @@ public class JettyHttpProducer extends 
DefaultAsyncProducer implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-// then fallback to input stream
+   // then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
-httpExchange.setRequestContent(is);
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
 if (ObjectHelper.isNotEmpty(length)) {
 httpExchange.addRequestHeader(Exchange.CONTENT_LENGTH, 
length);
+//send with content-length
+httpExchange.setRequestContent(is, new 
Integer(length));
+
+} else {
+   //send chunked
+httpExchange.setRequestContent(is);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/99e506e3/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
new file mode 100644
index 000..08d66c6
--- /dev/null
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -0,0 +1,21 @@
+package org.apache.camel.component.jetty9;
+
+import java.io.InputStream;
+
+import org.eclipse.jetty.client.util.InputStreamContentProvider;
+
+public class CamelInputStreamContentProvider extends

[1/2] camel git commit: Corrected formatting issues

2017-03-23 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 87e33ad01 -> 1f7b09fb7


Corrected formatting issues

Change-Id: I614a4c87a6b1295bd8a5076e7e8ea8d6cd318ad2


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

Branch: refs/heads/camel-2.17.x
Commit: 1f7b09fb7205593fc6fa8d2450a701bb053b7da5
Parents: 99e506e
Author: Matthew Luckam 
Authored: Wed Mar 22 17:24:44 2017 -0400
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:16:58 2017 +0100

--
 .../camel/component/jetty/JettyHttpProducer.java |  4 ++--
 .../jetty9/CamelInputStreamContentProvider.java  | 19 +--
 .../component/jetty9/JettyContentExchange9.java  |  7 +++
 3 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f7b09fb/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index ee6b83b..e420b08 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -164,7 +164,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-   // then fallback to input stream
+// then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
@@ -174,7 +174,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 httpExchange.setRequestContent(is, new 
Integer(length));
 
 } else {
-   //send chunked
+//send chunked
 httpExchange.setRequestContent(is);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/1f7b09fb/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
index 08d66c6..629a5a1 100644
--- 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.jetty9;
 
 import java.io.InputStream;
@@ -14,8 +30,7 @@ public class CamelInputStreamContentProvider extends 
InputStreamContentProvider
 }
 
 @Override
-public long getLength()
-{
+public long getLength() {
 return length;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/1f7b09fb/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java

[2/2] camel git commit: Corrected formatting issues

2017-03-23 Thread acosentino 
Corrected formatting issues

Change-Id: I614a4c87a6b1295bd8a5076e7e8ea8d6cd318ad2


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

Branch: refs/heads/camel-2.18.x
Commit: 59c8fb9b09fa07adf7fb23d183aa9bd7de8aae97
Parents: b90686f
Author: Matthew Luckam 
Authored: Wed Mar 22 17:24:44 2017 -0400
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:13:44 2017 +0100

--
 .../camel/component/jetty/JettyHttpProducer.java |  4 ++--
 .../jetty9/CamelInputStreamContentProvider.java  | 19 +--
 .../component/jetty9/JettyContentExchange9.java  |  7 +++
 3 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/59c8fb9b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index ee59f60..6953442 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -179,7 +179,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-   // then fallback to input stream
+// then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
@@ -189,7 +189,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 httpExchange.setRequestContent(is, new 
Integer(length));
 
 } else {
-   //send chunked
+//send chunked
 httpExchange.setRequestContent(is);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/59c8fb9b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
index 08d66c6..629a5a1 100644
--- 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.jetty9;
 
 import java.io.InputStream;
@@ -14,8 +30,7 @@ public class CamelInputStreamContentProvider extends 
InputStreamContentProvider
 }
 
 @Override
-public long getLength()
-{
+public long getLength() {
 return length;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/59c8fb9b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
--
diff --git

[1/2] camel git commit: CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header

2017-03-23 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 01658bf2a -> 59c8fb9b0


CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header

Change-Id: Icc12a11b9b2886affb0f6b6d4a874de11c0338bd


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

Branch: refs/heads/camel-2.18.x
Commit: b90686f83d8c0b0b67bbce89e8e1677696063a1b
Parents: 01658bf
Author: Matthew Luckam 
Authored: Fri Feb 19 14:43:19 2016 -0500
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:13:43 2017 +0100

--
 .../component/jetty/JettyContentExchange.java   |  2 ++
 .../component/jetty/JettyHttpProducer.java  |  9 +++--
 .../jetty9/CamelInputStreamContentProvider.java | 21 
 .../component/jetty9/JettyContentExchange9.java |  5 +
 4 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b90686f8/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
index af63606..809168c 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
@@ -44,6 +44,8 @@ public interface JettyContentExchange {
 void setRequestContent(String data, String charset) throws 
UnsupportedEncodingException;
 
 void setRequestContent(InputStream ins);
+
+void setRequestContent(InputStream ins, int contentLength);
 
 void addRequestHeader(String key, String s);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b90686f8/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index 7280b0c..ee59f60 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -179,13 +179,18 @@ public class JettyHttpProducer extends 
DefaultAsyncProducer implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-// then fallback to input stream
+   // then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
-httpExchange.setRequestContent(is);
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
 if (ObjectHelper.isNotEmpty(length)) {
 httpExchange.addRequestHeader(Exchange.CONTENT_LENGTH, 
length);
+//send with content-length
+httpExchange.setRequestContent(is, new 
Integer(length));
+
+} else {
+   //send chunked
+httpExchange.setRequestContent(is);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/b90686f8/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
new file mode 100644
index 000..08d66c6
--- /dev/null
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -0,0 +1,21 @@
+package org.apache.camel.component.jetty9;
+
+import java.io.InputStream;
+
+import

[2/2] camel git commit: Corrected formatting issues

2017-03-23 Thread acosentino 
Corrected formatting issues

Change-Id: I614a4c87a6b1295bd8a5076e7e8ea8d6cd318ad2


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

Branch: refs/heads/master
Commit: 76659a97228d01b94b1dc4e06009bc33431ff505
Parents: 950082f
Author: Matthew Luckam 
Authored: Wed Mar 22 17:24:44 2017 -0400
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:01:36 2017 +0100

--
 .../camel/component/jetty/JettyHttpProducer.java |  4 ++--
 .../jetty9/CamelInputStreamContentProvider.java  | 19 +--
 .../component/jetty9/JettyContentExchange9.java  |  7 +++
 3 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/76659a97/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index 662a221..e8e34ab 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -181,7 +181,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-   // then fallback to input stream
+// then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
@@ -191,7 +191,7 @@ public class JettyHttpProducer extends DefaultAsyncProducer 
implements AsyncProc
 httpExchange.setRequestContent(is, new 
Integer(length));
 
 } else {
-   //send chunked
+//send chunked
 httpExchange.setRequestContent(is);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/76659a97/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
index 08d66c6..629a5a1 100644
--- 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.jetty9;
 
 import java.io.InputStream;
@@ -14,8 +30,7 @@ public class CamelInputStreamContentProvider extends 
InputStreamContentProvider
 }
 
 @Override
-public long getLength()
-{
+public long getLength() {
 return length;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/76659a97/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
--
diff --git

[1/2] camel git commit: CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header

2017-03-23 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master c0f89d60f -> 76659a972


CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header

Change-Id: Icc12a11b9b2886affb0f6b6d4a874de11c0338bd


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

Branch: refs/heads/master
Commit: 950082fbf5815cf4b5f567d72ccbb5e9f825dfa4
Parents: c0f89d6
Author: Matthew Luckam 
Authored: Fri Feb 19 14:43:19 2016 -0500
Committer: Andrea Cosentino 
Committed: Thu Mar 23 10:01:35 2017 +0100

--
 .../component/jetty/JettyContentExchange.java   |  2 ++
 .../component/jetty/JettyHttpProducer.java  |  9 +++--
 .../jetty9/CamelInputStreamContentProvider.java | 21 
 .../component/jetty9/JettyContentExchange9.java |  5 +
 4 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/950082fb/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
index af63606..809168c 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
@@ -44,6 +44,8 @@ public interface JettyContentExchange {
 void setRequestContent(String data, String charset) throws 
UnsupportedEncodingException;
 
 void setRequestContent(InputStream ins);
+
+void setRequestContent(InputStream ins, int contentLength);
 
 void addRequestHeader(String key, String s);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/950082fb/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index bd92792..662a221 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -181,13 +181,18 @@ public class JettyHttpProducer extends 
DefaultAsyncProducer implements AsyncProc
 String charset = IOHelper.getCharsetName(exchange, false);
 httpExchange.setRequestContent(data, charset);
 } else {
-// then fallback to input stream
+   // then fallback to input stream
 InputStream is = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, 
exchange, exchange.getIn().getBody());
-httpExchange.setRequestContent(is);
 // setup the content length if it is possible
 String length = 
exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class);
 if (ObjectHelper.isNotEmpty(length)) {
 httpExchange.addRequestHeader(Exchange.CONTENT_LENGTH, 
length);
+//send with content-length
+httpExchange.setRequestContent(is, new 
Integer(length));
+
+} else {
+   //send chunked
+httpExchange.setRequestContent(is);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/950082fb/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
--
diff --git 
a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
new file mode 100644
index 000..08d66c6
--- /dev/null
+++ 
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -0,0 +1,21 @@
+package org.apache.camel.component.jetty9;
+
+import java.io.InputStream;
+
+import