buildbot success in on camel-site-production

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

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

Buildslave for this Build: bb-cms-slave

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

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

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

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

Buildslave for this Build: bb-cms-slave

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

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

2016-05-04 Thread davsclaus 
Fixed CS. This closes #973


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

Branch: refs/heads/master
Commit: 2e3a2041fb66992448f177a1ace6f942a4cbef19
Parents: 43f184e
Author: Claus Ibsen 
Authored: Wed May 4 16:35:57 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 16:35:57 2016 +0200

--
 .../camel/component/jms/JmsConfiguration.java   | 22 +++-
 .../jms/reply/ReplyManagerSupport.java  | 19 ++---
 2 files changed, 10 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2e3a2041/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 77e0ea7..a6a8311 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -173,9 +173,12 @@ public class JmsConfiguration implements Cloneable {
 @UriParam(defaultValue = "1", label = "advanced",
 description = "Specify the limit for the number of consumers that 
are allowed to be idle at any given time.")
 private int idleConsumerLimit = 1;
-@UriParam(defaultValue = "100", label = "advanced")
+@UriParam(defaultValue = "100", label = "advanced",
+description = "Interval in millis to sleep each time while waiting 
for provisional correlation id to be updated.")
 private long waitForProvisionCorrelationToBeUpdatedThreadSleepingTime = 
100L;
-@UriParam(defaultValue = "50", label = "advanced")
+@UriParam(defaultValue = "50", label = "advanced",
+description = "Number of times to wait for provisional correlation 
id to be updated to the actual correlation id when doing request/reply over JMS"
++ " and when the option useMessageIDAsCorrelationID is 
enabled.")
 private int waitForProvisionCorrelationToBeUpdatedCounter = 50;
 @UriParam(label = "consumer",
 description = "Specifies the maximum number of concurrent 
consumers when consuming from JMS (not for request/reply over JMS)."
@@ -1061,33 +1064,24 @@ public class JmsConfiguration implements Cloneable {
 this.idleConsumerLimit = idleConsumerLimit;
 }
 
-/**
- * Receives a counter that is used in conjunction with {@code 
waitForProvisionCorrelationToBeUpdatedThreadSleepingTime}
- * @return waitForProvisionCorrelationToBeUpdatedCounter
- */
 public int getWaitForProvisionCorrelationToBeUpdatedCounter() {
 return waitForProvisionCorrelationToBeUpdatedCounter;
 }
 
 /**
- * Sets a counter that is used in conjunction with {@code 
waitForProvisionCorrelationToBeUpdatedThreadSleepingTime}
- * @param counter
+ * Number of times to wait for provisional correlation id to be updated to 
the actual correlation id when doing request/reply over JMS
+ * and when the option useMessageIDAsCorrelationID is enabled.
  */
 public void setWaitForProvisionCorrelationToBeUpdatedCounter(int counter) {
 this.waitForProvisionCorrelationToBeUpdatedCounter = counter;
 }
 
-/**
- * Gets the sleeping time of the Thread when waiting for provision 
correlation to be updated.
- * @return
- */
 public long getWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime() {
 return waitForProvisionCorrelationToBeUpdatedThreadSleepingTime;
 }
 
 /**
- * Sets the sleeping time of the Thread when waiting for provision 
correlation to be updated.
- * @param sleepingTime
+ * Interval in millis to sleep each time while waiting for provisional 
correlation id to be updated.
  */
 public void 
setWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime(long sleepingTime) {
 this.waitForProvisionCorrelationToBeUpdatedThreadSleepingTime = 
sleepingTime;

http://git-wip-us.apache.org/repos/asf/camel/blob/2e3a2041/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
index 8a14d76..9e242e2 100644
---

[1/3] camel git commit: Script to run leak test

2016-05-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 6864e729b -> 2e3a2041f


Script to run leak test


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

Branch: refs/heads/master
Commit: 43f184e4df6472b14896dc1a190345b34326abc4
Parents: 4514184
Author: Claus Ibsen 
Authored: Wed May 4 16:28:04 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 16:29:53 2016 +0200

--
 components/camel-netty4/run-test-leak.sh | 31 +++
 1 file changed, 31 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/43f184e4/components/camel-netty4/run-test-leak.sh
--
diff --git a/components/camel-netty4/run-test-leak.sh 
b/components/camel-netty4/run-test-leak.sh
new file mode 100755
index 000..409a814
--- /dev/null
+++ b/components/camel-netty4/run-test-leak.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+## ---
+## 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.
+## ---
+
+echo 'Running tests with Netty leak detection ...'
+mvn clean install -Dio.netty.leakDetectionLevel=paranoid 
-Dio.netty.leakDetection.maxRecords=20
+
+echo 'Checking log file if there is any leaks ...'
+
+if grep LEAK target/camel-netty4-http-test.log; then
+echo 'LEAK found'
+exit 1
+else
+echo 'No LEAK found'
+exit 0
+fi

[2/3] camel git commit: hardcoded values of waitForProvisionCorrelationToBeUpdated can now be configured.

2016-05-04 Thread davsclaus 
hardcoded values of waitForProvisionCorrelationToBeUpdated can now be 
configured.


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

Branch: refs/heads/master
Commit: 45141842fbddad30eac8882b7cd3ef627de88d0e
Parents: 6864e72
Author: Thomas Holm 
Authored: Wed May 4 12:07:56 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 16:29:53 2016 +0200

--
 components/camel-jms/src/main/docs/jms.adoc |  6 +++-
 .../camel/component/jms/JmsConfiguration.java   | 36 
 .../jms/reply/ReplyManagerSupport.java  | 20 +--
 3 files changed, 58 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/45141842/components/camel-jms/src/main/docs/jms.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms.adoc 
b/components/camel-jms/src/main/docs/jms.adoc
index 3745626..7d68306 100644
--- a/components/camel-jms/src/main/docs/jms.adoc
+++ b/components/camel-jms/src/main/docs/jms.adoc
@@ -296,8 +296,9 @@ Endpoint options
 
 
 
+
 // endpoint options: START
-The JMS component supports 76 endpoint options which are listed below:
+The JMS component supports 78 endpoint options which are listed below:
 
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
@@ -373,6 +374,8 @@ The JMS component supports 76 endpoint options which are 
listed below:
 | transferExchange | advanced | false | boolean | You can transfer the 
exchange over the wire instead of just the body and headers. The following 
fields are transferred: In body Out body Fault body In headers Out headers 
Fault headers exchange properties exchange exception. This requires that the 
objects are serializable. Camel will exclude any non-serializable objects and 
log it at WARN level. You must enable this option on both the producer and 
consumer side so Camel knows the payloads is an Exchange and not a regular 
payload.
 | transferFault | advanced | false | boolean | If enabled and you are using 
Request Reply messaging (InOut) and an Exchange failed with a SOAP fault (not 
exception) on the consumer side then the fault flag on link 
org.apache.camel.MessageisFault() will be send back in the response as a JMS 
header with the key link JmsConstantsJMS_TRANSFER_FAULT. If the client is Camel 
the returned fault flag will be set on the link 
org.apache.camel.MessagesetFault(boolean). You may want to enable this when 
using Camel components that support faults such as SOAP based such as cxf or 
spring-ws.
 | useMessageIDAsCorrelationID | advanced | false | boolean | Specifies whether 
JMSMessageID should always be used as JMSCorrelationID for InOut messages.
+| waitForProvisionCorrelationToBeUpdatedCounter | advanced | 50 | int | Sets a 
counter that is used in conjunction with 
waitForProvisionCorrelationToBeUpdatedThreadSleepingTime
+| waitForProvisionCorrelationToBeUpdatedThreadSleepingTime | advanced | 100 | 
long | Sets the sleeping time of the Thread when waiting for provision 
correlation to be updated.
 | transacted | transaction | false | boolean | Specifies whether to use 
transacted mode
 | lazyCreateTransactionManager | transaction (advanced) | true | boolean | If 
true Camel will create a JmsTransactionManager if there is no 
transactionManager injected when option transacted=true.
 | transactionManager | transaction (advanced) |  | PlatformTransactionManager 
| The Spring transaction manager to use.
@@ -383,6 +386,7 @@ The JMS component supports 76 endpoint options which are 
listed below:
 
 
 
+
 [[JMS-MessageMappingbetweenJMSandCamel]]
 Message Mapping between JMS and Camel
 ^

http://git-wip-us.apache.org/repos/asf/camel/blob/45141842/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index a4c57e2..77e0ea7 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -173,6 +173,10 @@ public class JmsConfiguration implements Cloneable {
 @UriParam(defaultValue = "1", label = "advanced",
 description = "Specify the limit for the number of consumers that 
are allowed to be idle at

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

2016-05-04 Thread buildbot 
Author: buildbot
Date: Wed May  4 13:18:54 2016
New Revision: 987459

Log:
Production update by buildbot for camel

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

Modified: websites/production/camel/content/beanio.html
==
--- websites/production/camel/content/beanio.html (original)
+++ websites/production/camel/content/beanio.html Wed May  4 13:18:54 2016
@@ -86,31 +86,7 @@

 
 
-BeanIO
-Available as of Camel 2.10
-
-The BeanIO Data Format uses http://beanio.org/; 
rel="nofollow">BeanIO to handle flat payloads (such as XML, CSV, delimited, 
or fixed length formats).
-
-BeanIO is configured using a http://beanio.org/2.0/docs/reference/index.html#TheMappingFile; 
rel="nofollow">mappings XML file where you define the mapping from the flat 
format to Objects (POJOs). This mapping file is mandatory to use.
-
-Options
-
- Option  Default  Description 
 mapping 
 The BeanIO mapping file. The 
option is mandatory. Is by default loaded from the classpath. You can prefix 
with file:, http:, or classpath: to 
denote from where to load the mapping file.  streamName  The name of the stream to use. This option is 
mandatory.  ignoreUnidentifiedRecords 
 
false  Whether to ignore unidentified records. 
 
ignoreUnexpectedRecords  false  Whether to ignore unexpected records. 
 
ignoreInvalidRecords  false  Whether to ignore invalid records. 
 encoding 
 Platform default 
 The charset to use. 

-
-
-Usage
-
-An example of a https://svn.apache.org/repos/asf/camel/trunk/components/camel-beanio/src/test/resources/org/apache/camel/dataformat/beanio/mappings.xml;>mapping
 file is here.
-
-Using Java DSL
-To use the BeanIODataFormat you need to configure the data 
format with the mapping file, as well the name of the stream.
-In Java DSL this can be done as shown below. The streamName is 
"employeeFile".
-
-Then we have two routes. The first route is for transforming CSV data into 
a ListEmployee Java objects. Which we then split, so the mock endpoint
-receives a message for each row.
-
-The 2nd route is for the reverse operation, to transform a 
ListEmployee into a stream of CSV data.
-
+BeanIOAvailable as of Camel 
2.10The BeanIO Data 
Format uses http://beanio.org/; 
rel="nofollow">BeanIO to handle flat payloads (such as XML, CSV, delimited, 
or fixed length formats).BeanIO is configured using a http://beanio.org/2.0/docs/reference/index.html#TheMappingFile; 
rel="nofollow">mappings XML file where you define the mapping from the flat 
format to Objects (POJOs). This mapping file is mandatory to use.OptionsOptionDefaultDescription
 mappingThe BeanIO mapping file. The option is mandatory. Is by 
default loaded from the classpath. You can prefix with file:, 
http:, or classpath: to denote from where to load the 
mapping file.streamNameThe name of the stream to use. This option is 
mandatory.ignoreUnidentifiedRecordsfalseWhether to ignore unidentified 
records.ignoreUnexpectedRecordsfalseWhether to ignore unexpected 
records.ignoreInvalidRecordsfalseWhether to ignore invalid 
records.encodingPlatform defaultThe charset to use.beanReaderErrorHandlerA custom BeanReaderErrorHandler implementa
 tion to use in your dataformat 
definitionUsageAn example of a https://svn.apache.org/repos/asf/camel/trunk/components/camel-beanio/src/test/resources/org/apache/camel/dataformat/beanio/mappings.xml;>mapping
 file is here.Using Java DSLTo use 
the BeanIODataFormat you need to configure the data format with 
the mapping file, as well the name of the stream. In Java DSL 
this can be done as shown below. The streamName is "employeeFile".Then 
we have two routes. The first route is for transforming CSV data into a 
ListEmployee Java objects. Which we then split, so the mock endpoint receives 
a message for each row.The 2nd route is for the reverse operation, to 
transform a ListEmployee into a stream of CSV data.
 
-
-
-The CSV data could for example be as below:
-
+The CSV data could for example be as below:
 
-
-
-Using XML DSL
-To use the BeanIO data format in XML, you need to configure it using the 
beanio XML tag as shown below. The routes is similar to the example 
above.
-
+Using XML DSLTo use the BeanIO 
data format in XML, you need to configure it using the beanio XML tag 
as shown below. The routes is similar to the

[1/2] camel git commit: CAMEL-9939: Updated component docs

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master a8ab34c15 -> 6864e729b


CAMEL-9939: Updated component docs


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

Branch: refs/heads/master
Commit: 8182d80577432db204d38576de744711340aa4cd
Parents: a8ab34c
Author: Andrea Cosentino 
Authored: Wed May 4 15:03:28 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 15:03:28 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8182d805/components/camel-beanio/src/main/docs/beanio.adoc
--
diff --git a/components/camel-beanio/src/main/docs/beanio.adoc 
b/components/camel-beanio/src/main/docs/beanio.adoc
index a045a17..6d5b4a1 100644
--- a/components/camel-beanio/src/main/docs/beanio.adoc
+++ b/components/camel-beanio/src/main/docs/beanio.adoc
@@ -33,6 +33,8 @@ from the classpath. You can prefix with `file:`, `http:`, or
 |ignoreInvalidRecords |`false` |Whether to ignore invalid records.
 
 |encoding |Platform default |The charset to use.
+
+|beanReaderErrorHandler | |A custom BeanReaderErrorHandler implementation to 
use in your dataformat definition
 |===
 
 [[BeanIO-Usage]]

[1/2] camel git commit: Fixed CS

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 8efbf0303 -> a8ab34c15


Fixed CS


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

Branch: refs/heads/master
Commit: a8ab34c15bf175449d380d4a7e1f5235b3acf3ca
Parents: 66594e9
Author: Andrea Cosentino 
Authored: Wed May 4 14:53:44 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 14:56:01 2016 +0200

--
 .../dataformat/beanio/BeanIOConfiguration.java| 12 ++--
 .../camel/dataformat/beanio/BeanIODataFormat.java | 14 +++---
 ...matSimpleCustomBeanReaderErrorHandlerTest.java | 18 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a8ab34c1/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
--
diff --git 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
index 18c6642..4d38694 100644
--- 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
+++ 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
@@ -91,11 +91,11 @@ public class BeanIOConfiguration {
 this.properties = properties;
 }
 
-   public BeanReaderErrorHandler getBeanReaderErrorHandler() {
-   return beanReaderErrorHandler;
-   }
+public BeanReaderErrorHandler getBeanReaderErrorHandler() {
+return beanReaderErrorHandler;
+}
 
-   public void setBeanReaderErrorHandler(BeanReaderErrorHandler 
beanReaderErrorHandler) {
-   this.beanReaderErrorHandler = beanReaderErrorHandler;
-   }
+public void setBeanReaderErrorHandler(BeanReaderErrorHandler 
beanReaderErrorHandler) {
+this.beanReaderErrorHandler = beanReaderErrorHandler;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a8ab34c1/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
--
diff --git 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
index 3526208..8aab360 100644
--- 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
+++ 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
@@ -149,7 +149,7 @@ public class BeanIODataFormat extends ServiceSupport 
implements DataFormat, Data
 
 try {
 if 
(ObjectHelper.isNotEmpty(configuration.getBeanReaderErrorHandler())) {
-   in.setErrorHandler(configuration.getBeanReaderErrorHandler());
+in.setErrorHandler(configuration.getBeanReaderErrorHandler());
 } else {
 in.setErrorHandler(new BeanIOErrorHandler(configuration));
 }
@@ -224,11 +224,11 @@ public class BeanIODataFormat extends ServiceSupport 
implements DataFormat, Data
 return configuration.getEncoding();
 }
 
-   public BeanReaderErrorHandler getBeanReaderErrorHandler() {
-   return configuration.getBeanReaderErrorHandler();
-   }
+public BeanReaderErrorHandler getBeanReaderErrorHandler() {
+return configuration.getBeanReaderErrorHandler();
+}
 
-   public void setBeanReaderErrorHandler(BeanReaderErrorHandler 
beanReaderErrorHandler) {
-   configuration.setBeanReaderErrorHandler(beanReaderErrorHandler);
-   }
+public void setBeanReaderErrorHandler(BeanReaderErrorHandler 
beanReaderErrorHandler) {
+configuration.setBeanReaderErrorHandler(beanReaderErrorHandler);
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a8ab34c1/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
--
diff --git 
a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
 
b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
index 2ffa6ac..ad179c8 100644
---

[2/2] camel git commit: CAMEL-9939: beanio - Add support for custom BeanReaderErrorHandler

2016-05-04 Thread acosentino 
CAMEL-9939: beanio - Add support for custom BeanReaderErrorHandler


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

Branch: refs/heads/master
Commit: 66594e97a894d298a7332787ee07444b2f91
Parents: 8efbf03
Author: Andrea Cosentino 
Authored: Wed May 4 13:57:28 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 14:56:01 2016 +0200

--
 .../dataformat/beanio/BeanIOConfiguration.java  |  11 ++
 .../dataformat/beanio/BeanIODataFormat.java |  15 ++-
 ...tSimpleCustomBeanReaderErrorHandlerTest.java | 129 +++
 3 files changed, 154 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/66594e97/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
--
diff --git 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
index 973badf..18c6642 100644
--- 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
+++ 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIOConfiguration.java
@@ -19,6 +19,8 @@ package org.apache.camel.dataformat.beanio;
 import java.nio.charset.Charset;
 import java.util.Properties;
 
+import org.beanio.BeanReaderErrorHandler;
+
 /**
  * To configure the BeanIO data format, or BeanIO splitter.
  */
@@ -31,6 +33,7 @@ public class BeanIOConfiguration {
 private boolean ignoreInvalidRecords;
 private Charset encoding = Charset.defaultCharset();
 private Properties properties;
+private BeanReaderErrorHandler beanReaderErrorHandler;
 
 public String getMapping() {
 return mapping;
@@ -87,4 +90,12 @@ public class BeanIOConfiguration {
 public void setProperties(Properties properties) {
 this.properties = properties;
 }
+
+   public BeanReaderErrorHandler getBeanReaderErrorHandler() {
+   return beanReaderErrorHandler;
+   }
+
+   public void setBeanReaderErrorHandler(BeanReaderErrorHandler 
beanReaderErrorHandler) {
+   this.beanReaderErrorHandler = beanReaderErrorHandler;
+   }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/66594e97/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
--
diff --git 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
index e33d7ff..3526208 100644
--- 
a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
+++ 
b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
@@ -38,6 +38,7 @@ import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ResourceHelper;
 import org.beanio.BeanReader;
+import org.beanio.BeanReaderErrorHandler;
 import org.beanio.BeanWriter;
 import org.beanio.StreamFactory;
 import org.slf4j.Logger;
@@ -147,7 +148,11 @@ public class BeanIODataFormat extends ServiceSupport 
implements DataFormat, Data
 BeanReader in = factory.createReader(getStreamName(), streamReader);
 
 try {
-in.setErrorHandler(new BeanIOErrorHandler(configuration));
+if 
(ObjectHelper.isNotEmpty(configuration.getBeanReaderErrorHandler())) {
+   in.setErrorHandler(configuration.getBeanReaderErrorHandler());
+} else {
+in.setErrorHandler(new BeanIOErrorHandler(configuration));
+}
 
 Object readObject;
 while ((readObject = in.read()) != null) {
@@ -218,4 +223,12 @@ public class BeanIODataFormat extends ServiceSupport 
implements DataFormat, Data
 public Charset getEncoding() {
 return configuration.getEncoding();
 }
+
+   public BeanReaderErrorHandler getBeanReaderErrorHandler() {
+   return configuration.getBeanReaderErrorHandler();
+   }
+
+   public void setBeanReaderErrorHandler(BeanReaderErrorHandler 
beanReaderErrorHandler) {
+   configuration.setBeanReaderErrorHandler(beanReaderErrorHandler);
+   }
 }

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

2016-05-04 Thread buildbot 
Author: buildbot
Date: Wed May  4 12:19:03 2016
New Revision: 987454

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 Wed May  4 
12:19:03 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.18.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;>New and NoteworthyWelcome to 
the 2.18.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)Added Hystrix EIP as EIP pattern that uses native Hystrix 
as the Circuit Breaker implementation.This requires 
havingcamel-hsytrixon the classpath.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 w
 hen 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 use the Camel test annotations fromSpring Testing such 
as@MockEndpoints.To turn on logging exhausted 
message body with the message history you
  can configure this easily on the CamelContext level 
withsetLogExhaustedMessageBodyCamel-Infinispan now supports Aggregation 
Repository: InfinispanLocalAggregationRepository and 
InfinispanRemoteAggregationRepositoryTheSQL Componentand ElSqlnow supports 
outputType=StreamListto use an iterator for the output of 
the SQL query that allows to process the data in a streaming fashion such as 
with theSplitter EIP to process 
the data row by row, and load data from the database as needed.JPA now includes 
aJpaPollingConsumer implementation that better 
supportsContent Enricher 
usingpollEnrich to do a on-demand poll 
 that returns either none, one or a list of entities as the 
result.CallingBeanwith method parameters defined usingSimple parameters, now avoids an 
intermediate conversion of the paramaters to a String value. This ensures the 
passed in values when calling the bean method is using the parameter type as-is 
fromSimple.Camel CDI now supports importing Camel XML 
configuration filesCamel 
CDIdoes not deploy an empty Camel context bean anymore if not route 
builder beans nor Camel beans are deployedCamel CDIadds the@Named qualifier 
to Camel route management events so that it's possible to observe these events 
for a specific route with an explicit idFixed
  these issues:FixedBean 
component to avoid ambiguous error for classes that extends generic interface 
and calling which could lead to falsely duplicate methods (due Java type 
erasure inserts bridge methods)Fixed splitting 
usingtarfile could cause OOME if splitting big files which was mistakenly 
loaded into memory. Now we work on the tar stream 
directly.FixedNetty 
HTTP andNetty4 HTTP issue 
when not specifying a port number then port 80 would not be used but an error 
about port -1 is not allowed.FixedSwagger Java when

[2/8] camel git commit: CAMEL-9040: Fixed netty leak in http4 producer

2016-05-04 Thread davsclaus 
CAMEL-9040: Fixed netty leak in http4 producer


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

Branch: refs/heads/master
Commit: 3563f6e6a4cbea2841cdd6e780156683aa575b14
Parents: 74a7020
Author: Claus Ibsen 
Authored: Wed May 4 13:40:38 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../netty4/http/DefaultNettyHttpBinding.java| 20 +-
 .../http/NettyHttpOperationFailedException.java | 28 ++--
 .../netty4/http/NettyHttpProducer.java  | 67 ++--
 .../netty4/http/NettyHttp500ErrorTest.java  |  2 +-
 ...yHttp500ErrorThrowExceptionOnServerTest.java |  3 +-
 .../netty4/http/NettyHttpHandle404Test.java |  4 +-
 .../netty4/http/NettyHttpOkStatusCodeTest.java  |  3 +-
 .../netty4/http/NettyHttpReturnFaultTest.java   |  3 +-
 .../netty4/handlers/ClientChannelHandler.java   |  2 +
 9 files changed, 97 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3563f6e6/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
index e3a28f7..f8cf4a3 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty4.http;
 
 import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.io.ObjectOutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -44,6 +45,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.netty4.NettyConstants;
 import org.apache.camel.component.netty4.NettyConverter;
@@ -268,8 +270,21 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 populateCamelHeaders(response, answer.getHeaders(), exchange, 
configuration);
 }
 
-// keep the body as is, and use type converters
-answer.setBody(response.content());
+if (configuration.isDisableStreamCache()) {
+// keep the body as is, and use type converters
+answer.setBody(response.content());
+} else {
+// stores as byte array as the netty ByteBuf will be freedy when 
the producer is done, and then we
+// can no longer access the message body
+response.retain();
+try {
+byte[] bytes = 
exchange.getContext().getTypeConverter().convertTo(byte[].class, exchange, 
response.content());
+answer.setBody(bytes);
+// TODO: use stream caching
+} finally {
+response.release();
+}
+}
 return answer;
 }
 
@@ -320,7 +335,6 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 
 LOG.trace("HTTP Status Code: {}", code);
 
-
 // if there was an exception then use that as body
 if (cause != null) {
 if (configuration.isTransferException()) {

http://git-wip-us.apache.org/repos/asf/camel/blob/3563f6e6/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
index abea14d..d75ee31 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
@@ -5,9 +5,9 @@
  * 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

[5/8] camel git commit: CAMEL-9940: ProducerTemplate - Make extract result set part of UoW

2016-05-04 Thread davsclaus 
CAMEL-9940: ProducerTemplate - Make extract result set part of UoW


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

Branch: refs/heads/master
Commit: 1cca6b7c1d5445c3d75ae6b1d3abbf6c1568eafa
Parents: b4a6ad4
Author: Claus Ibsen 
Authored: Wed May 4 09:04:17 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../camel/impl/DefaultProducerTemplate.java | 40 ---
 .../org/apache/camel/impl/ProducerCache.java| 52 
 2 files changed, 76 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1cca6b7c/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
index aee4973..a5c8867 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
@@ -32,6 +32,7 @@ import org.apache.camel.Message;
 import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.processor.ConvertBodyProcessor;
 import org.apache.camel.spi.Synchronization;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.CamelContextHelper;
@@ -324,37 +325,44 @@ public class DefaultProducerTemplate extends 
ServiceSupport implements ProducerT
 }
 
 public  T requestBody(Object body, Class type) {
-Object answer = requestBody(body);
+Exchange exchange = producerCache.send(getMandatoryDefaultEndpoint(), 
ExchangePattern.InOut, createSetBodyProcessor(body), 
createConvertBodyProcessor(type));
+Object answer = extractResultBody(exchange);
 return camelContext.getTypeConverter().convertTo(type, answer);
 }
 
 public  T requestBody(Endpoint endpoint, Object body, Class type) {
-Object answer = requestBody(endpoint, body);
+Exchange exchange = producerCache.send(endpoint, 
ExchangePattern.InOut, createSetBodyProcessor(body), 
createConvertBodyProcessor(type));
+Object answer = extractResultBody(exchange);
 return camelContext.getTypeConverter().convertTo(type, answer);
 }
 
 public  T requestBody(String endpointUri, Object body, Class type) {
-Object answer = requestBody(endpointUri, body);
+Exchange exchange = 
producerCache.send(resolveMandatoryEndpoint(endpointUri), 
ExchangePattern.InOut, createSetBodyProcessor(body), 
createConvertBodyProcessor(type));
+Object answer = extractResultBody(exchange);
 return camelContext.getTypeConverter().convertTo(type, answer);
 }
 
 public  T requestBodyAndHeader(Endpoint endpoint, Object body, String 
header, Object headerValue, Class type) {
-Object answer = requestBodyAndHeader(endpoint, body, header, 
headerValue);
+Exchange exchange = producerCache.send(endpoint, 
ExchangePattern.InOut, createBodyAndHeaderProcessor(body, header, headerValue), 
createConvertBodyProcessor(type));
+Object answer = extractResultBody(exchange);
 return camelContext.getTypeConverter().convertTo(type, answer);
 }
 
 public  T requestBodyAndHeader(String endpointUri, Object body, String 
header, Object headerValue, Class type) {
-Object answer = requestBodyAndHeader(endpointUri, body, header, 
headerValue);
+Exchange exchange = 
producerCache.send(resolveMandatoryEndpoint(endpointUri), 
ExchangePattern.InOut, createBodyAndHeaderProcessor(body, header, headerValue), 
createConvertBodyProcessor(type));
+Object answer = extractResultBody(exchange);
 return camelContext.getTypeConverter().convertTo(type, answer);
 }
 
 public  T requestBodyAndHeaders(String endpointUri, Object body, 
Map headers, Class type) {
-Object answer = requestBodyAndHeaders(endpointUri, body, headers);
+Exchange exchange = 
producerCache.send(resolveMandatoryEndpoint(endpointUri), 
ExchangePattern.InOut, createBodyAndHeaders(body, headers), 
createConvertBodyProcessor(type));
+Object answer = extractResultBody(exchange);
 return camelContext.getTypeConverter().convertTo(type, answer);
 }
 
 public  T requestBodyAndHeaders(Endpoint endpoint, Object body, 
Map headers, Class type) {
-Object answer =

[6/8] camel git commit: CAMEL-9040: Fixed netty leak

2016-05-04 Thread davsclaus 
CAMEL-9040: Fixed netty leak


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

Branch: refs/heads/master
Commit: 16c5e34b6c6d0f8f48ba51f159dd9897576847d4
Parents: e7782eb
Author: Claus Ibsen 
Authored: Wed May 4 11:04:31 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../netty4/http/DefaultNettyHttpBinding.java|  8 +++-
 .../http/HttpClientInitializerFactory.java  |  2 --
 .../http/HttpServerInitializerFactory.java  |  3 +--
 .../HttpServerSharedInitializerFactory.java |  2 +-
 ...ttyChannelBufferStreamCacheOnCompletion.java |  1 -
 .../netty4/http/NettyHttpProducer.java  |  1 -
 .../http/handlers/HttpServerChannelHandler.java | 21 +++-
 7 files changed, 21 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/16c5e34b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
index fe87f53..e3a28f7 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
@@ -211,7 +211,13 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 String charset = "UTF-8";
 
 // Push POST form params into the headers to retain compatibility 
with DefaultHttpBinding
-String body = request.content().toString(Charset.forName(charset));
+String body = null;
+ByteBuf buffer = request.content();
+try {
+body = buffer.toString(Charset.forName(charset));
+} finally {
+buffer.release();
+}
 if (ObjectHelper.isNotEmpty(body)) {
 for (String param : body.split("&")) {
 String[] pair = param.split("=", 2);

http://git-wip-us.apache.org/repos/asf/camel/blob/16c5e34b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
index 04bae3d..b5775a8 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
@@ -118,8 +118,6 @@ public class HttpClientInitializerFactory extends 
ClientInitializerFactory {

 // handler to route Camel messages
 pipeline.addLast("handler", new HttpClientChannelHandler(producer));
-
-
 }
 
 private SSLContext createSSLContext(NettyProducer producer) throws 
Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/16c5e34b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
index 84a34c2..4ed4322 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
@@ -97,8 +97,6 @@ public class HttpServerInitializerFactory extends 
ServerInitializerFactory {
 }
 pipeline.addLast("decoder-" + x, decoder);
 }
-pipeline.addLast("aggregator", new 
HttpObjectAggregator(configuration.getChunkedMaxContentLength()));
-
 pipeline.addLast("encoder", new HttpResponseEncoder());
 List encoders = 
consumer.getConfiguration().getEncoders();
 for (int x = 0; x <

[4/8] camel git commit: CAMEL-9040: Fixed tests

2016-05-04 Thread davsclaus 
CAMEL-9040: Fixed tests


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

Branch: refs/heads/master
Commit: e7782ebb729ed7137eeb6eec142bdad4c52c0022
Parents: 7016406
Author: Claus Ibsen 
Authored: Wed May 4 10:12:48 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../apache/camel/component/netty4/NettyUdpConnectedSendTest.java   | 1 -
 .../camel/component/netty4/NettyUdpConnectionlessSendTest.java | 2 --
 2 files changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e7782ebb/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
index b38b801..29e9c7a 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
@@ -117,7 +117,6 @@ public class NettyUdpConnectedSendTest extends 
BaseNettyTest {
 @Override
 protected void channelRead0(ChannelHandlerContext 
channelHandlerContext, String s) throws Exception {
 receivedCount++;
-assertEquals(SEND_STRING, s);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e7782ebb/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
index f4af775..b32ac5c 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
@@ -33,7 +33,6 @@ import io.netty.util.CharsetUtil;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
-
 public class NettyUdpConnectionlessSendTest extends BaseNettyTest {
 private static final String SEND_STRING = "**";
 private static final int SEND_COUNT = 20;
@@ -110,7 +109,6 @@ public class NettyUdpConnectionlessSendTest extends 
BaseNettyTest {
 @Override
 protected void channelRead0(ChannelHandlerContext 
channelHandlerContext, String s) throws Exception {
 ++receivedCount;
-assertEquals(SEND_STRING, s);
 }
 }
 }

[7/8] camel git commit: CAMEL-9040: Fixed netty leak in http4 producer

2016-05-04 Thread davsclaus 
CAMEL-9040: Fixed netty leak in http4 producer


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

Branch: refs/heads/master
Commit: 9fc3e436b651bd497ae2415d9606edd7300637bd
Parents: 3563f6e6
Author: Claus Ibsen 
Authored: Wed May 4 13:54:56 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../component/netty4/http/DefaultNettyHttpBinding.java   | 11 ++-
 .../component/netty4/http/NettyHttpConfiguration.java|  8 
 .../component/netty4/handlers/ClientChannelHandler.java  |  2 --
 3 files changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9fc3e436/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
index f8cf4a3..9f94ea0 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.netty4.http;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.ObjectOutputStream;
@@ -49,6 +50,7 @@ import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.netty4.NettyConstants;
 import org.apache.camel.component.netty4.NettyConverter;
+import org.apache.camel.converter.stream.ByteArrayInputStreamCache;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.IOHelper;
@@ -95,7 +97,7 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 // keep the body as is, and use type converters
 answer.setBody(request.content());
 } else {
-// turn the body into stream cached
+// turn the body into stream cached (on the client/consumer side 
we can facade the netty stream instead of converting to byte array)
 NettyChannelBufferStreamCache cache = new 
NettyChannelBufferStreamCache(request.content());
 // add on completion to the cache which is needed for Camel to 
keep track of the lifecycle of the cache
 exchange.addOnCompletion(new 
NettyChannelBufferStreamCacheOnCompletion(cache));
@@ -274,13 +276,12 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 // keep the body as is, and use type converters
 answer.setBody(response.content());
 } else {
-// stores as byte array as the netty ByteBuf will be freedy when 
the producer is done, and then we
-// can no longer access the message body
+// stores as byte array as the netty ByteBuf will be freed when 
the producer is done,
+// and then we can no longer access the message body
 response.retain();
 try {
 byte[] bytes = 
exchange.getContext().getTypeConverter().convertTo(byte[].class, exchange, 
response.content());
-answer.setBody(bytes);
-// TODO: use stream caching
+answer.setBody(new ByteArrayInputStreamCache(new 
ByteArrayInputStream(bytes)));
 } finally {
 response.release();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/9fc3e436/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
index 784d007..8202418 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
@@ -55,7 +55,7 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 private boolean matchOnUriPrefix;
 @UriParam
 private

[8/8] camel git commit: CAMEL-9040: Fixed netty leak in some tests

2016-05-04 Thread davsclaus 
CAMEL-9040: Fixed netty leak in some tests


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

Branch: refs/heads/master
Commit: 74a7020fa36b33ad2e13f67e21af2a7df7a22cd7
Parents: 16c5e34
Author: Claus Ibsen 
Authored: Wed May 4 11:45:50 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java   | 1 +
 .../netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java | 2 ++
 .../component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java  | 2 ++
 .../apache/camel/component/netty4/http/NettyHttpHandle404Test.java | 2 ++
 .../camel/component/netty4/http/NettyHttpOkStatusCodeTest.java | 1 +
 .../camel/component/netty4/http/NettyHttpReturnFaultTest.java  | 1 +
 6 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
index b5aa37b..13c7f68 100644
--- 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
@@ -36,6 +36,7 @@ public class NettyHttp500ErrorThrowExceptionOnServerTest 
extends BaseNettyTest {
 assertNotNull(trace);
 assertTrue(trace.startsWith("java.lang.IllegalArgumentException: 
Camel cannot do this"));
 assertEquals("http://localhost:; + getPort() + "/foo", 
cause.getUri());
+cause.getHttpContent().content().release();
 }
 
 assertMockEndpointsSatisfied();

http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
index 6e32b85..54895c2 100644
--- 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
@@ -63,6 +63,8 @@ public class NettyHttpAccessHttpRequestAndResponseBeanTest 
extends BaseNettyTest
 String in = request.content().toString(Charset.forName("UTF-8"));
 String reply = "Bye " + in;
 
+request.content().release();
+
 HttpResponse response = new 
DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
 
NettyConverter.toByteBuffer(reply.getBytes()));
 

http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
index b1d4dbc..0c37615 100644
--- 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
@@ -48,6 +48,8 @@ public class NettyHttpAccessHttpRequestBeanTest extends 
BaseNettyTest {
 
 public static String myTransformer(FullHttpRequest request) {
 String in = request.content().toString(Charset.forName("UTF-8"));
+// release as no longer in use
+request.content().release();
 return "Bye " + in;
 }

[3/8] camel git commit: CAMEL-9040: Fixed netty leak in unit test and a NPE

2016-05-04 Thread davsclaus 
CAMEL-9040: Fixed netty leak in unit test and a NPE


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

Branch: refs/heads/master
Commit: 70164066813e49623ba1cab9176e33bbdc74eef2
Parents: 1cca6b7
Author: Claus Ibsen 
Authored: Wed May 4 10:05:36 2016 +0200
Committer: Claus Ibsen 
Committed: Wed May 4 14:07:56 2016 +0200

--
 .../org/apache/camel/component/netty4/NettyConverter.java   | 8 ++--
 .../org/apache/camel/component/netty4/MyCustomCodec.java| 2 --
 .../apache/camel/component/netty4/NettyConverterTest.java   | 9 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/70164066/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
index 780e1fe..c3af8db 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
@@ -36,7 +36,6 @@ import io.netty.buffer.ByteBufInputStream;
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 
-
 /**
  * A set of converter methods for working with Netty types
  *
@@ -56,7 +55,12 @@ public final class NettyConverter {
 }
 byte[] bytes = new byte[buffer.readableBytes()];
 int readerIndex = buffer.readerIndex();
-buffer.getBytes(readerIndex, bytes);
+buffer.retain();
+try {
+buffer.getBytes(readerIndex, bytes);
+} finally {
+buffer.release();
+}
 return bytes;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/70164066/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
index 363d34d..a20069e 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
@@ -58,8 +58,6 @@ public final class MyCustomCodec {
 int readerIndex = msg.readerIndex();
 msg.getBytes(readerIndex, bytes);
 out.add(bytes);
-} else {
-out.add((byte[])null);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/70164066/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
--
diff --git 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
index bb4f8a1..7023b96 100644
--- 
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
+++ 
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
@@ -20,6 +20,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -31,7 +32,7 @@ public class NettyConverterTest extends CamelTestSupport {
 /**
  * Test payload to send.
  */
-private  static final String PAYLOAD = "Test Message";
+private static final String PAYLOAD = "Test Message";
 
 private ByteBuf buf;
 
@@ -42,6 +43,11 @@ public class NettyConverterTest extends CamelTestSupport {
 buf.writeBytes(bytes);
 }
 
+@After
+public void tearDown() {
+buf.release();
+}
+
 @Test
 public void testConversionWithExchange() {
 String result = context.getTypeConverter().convertTo(String.class, new 
DefaultExchange(context), buf);
@@ -49,7 +55,6 @@ public class NettyConverterTest extends CamelTestSupport {
 assertEquals(PAYLOAD, result);
 }
 
-
 @Test
 public void testConversionWithoutExchange() {
 String result =

camel git commit: Renamed SpringInfinispanIdempotentRepositoryIT test class

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 3df33a49f -> b4a6ad4cf


Renamed SpringInfinispanIdempotentRepositoryIT test class


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

Branch: refs/heads/master
Commit: b4a6ad4cf870efc743bc6050e1805d6b9152a930
Parents: 3df33a4
Author: Andrea Cosentino 
Authored: Wed May 4 13:17:41 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 13:17:41 2016 +0200

--
 .../SpringInfinispanIdempotentRepositoryIT.java | 46 
 .../SpringInfinispanIdempotentRpoositoryIT.java | 46 
 2 files changed, 46 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4a6ad4c/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
--
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
new file mode 100644
index 000..4d249a3
--- /dev/null
+++ 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
@@ -0,0 +1,46 @@
+/**
+ * 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.infinispan.processor.idempotent;
+
+import java.util.UUID;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+
+public class SpringInfinispanIdempotentRepositoryIT extends 
CamelSpringTestSupport {
+@Override
+protected AbstractApplicationContext createApplicationContext() {
+return new 
ClassPathXmlApplicationContext("org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.xml");
+}
+
+@Test
+public void testIdempotent() throws Exception {
+MockEndpoint mock = getMockEndpoint("mock:result");
+mock.expectedMessageCount(1);
+
+String messageId = UUID.randomUUID().toString();
+for (int i = 0; i < 5; i++) {
+template.sendBodyAndHeader("direct:start", 
UUID.randomUUID().toString(), "MessageId", messageId);
+}
+
+mock.assertIsSatisfied();
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b4a6ad4c/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRpoositoryIT.java
--
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRpoositoryIT.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRpoositoryIT.java
deleted file mode 100644
index 60ea8e3..000
--- 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRpoositoryIT.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the

camel git commit: Upgrade Spring-batch and related bundle to version 3.0.7

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 8f6bad2c2 -> 0ce869ba8


Upgrade Spring-batch and related bundle to version 3.0.7


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

Branch: refs/heads/master
Commit: 0ce869ba84a5cc87c007eab35ec95229fd682a6f
Parents: 8f6bad2
Author: Andrea Cosentino 
Authored: Wed May 4 12:56:37 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 12:56:37 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/0ce869ba/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b74fe77..3615294 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -507,8 +507,8 @@
 2.3
 2.3_1
 1.5.0.0_1
-3.0.6.RELEASE
-3.0.6.RELEASE_1
+3.0.7.RELEASE
+3.0.7.RELEASE_1
 1.3.3.RELEASE
 1.2.0
 1.6.5.RELEASE

camel git commit: Upgrade Undertow to version 1.3.22.Final

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master dacf406e1 -> 8f6bad2c2


Upgrade Undertow to version 1.3.22.Final


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

Branch: refs/heads/master
Commit: 8f6bad2c28e1b3fd7f6fc7372a7896fe7513b537
Parents: dacf406
Author: Andrea Cosentino 
Authored: Wed May 4 12:51:52 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 12:51:52 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8f6bad2c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b3b98fc..b74fe77 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -560,7 +560,7 @@
 2.1.1
 4.0.4_1
 4.0.4
-1.3.21.Final
+1.3.22.Final
 2.0.2
 
2015-01-27T15-02-14
 
1.0.0

[1/3] camel git commit: Upgrade ElasticSearch and related bundle to version 2.3.1, with Lucene and related bundle to version 5.5.0

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master c52309c51 -> dacf406e1


Upgrade ElasticSearch and related bundle to version 2.3.1, with Lucene and 
related bundle to version 5.5.0


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

Branch: refs/heads/master
Commit: f57e93a4b389c2aebcbf08ddaf0acadd19ba56df
Parents: c52309c
Author: Andrea Cosentino 
Authored: Wed May 4 11:08:23 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 11:08:23 2016 +0200

--
 parent/pom.xml   | 8 
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f57e93a4/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e358ece..e8a09c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -154,9 +154,9 @@
 2.10.1
 2.1.5
 2.1.5_1
-2.2.1_1
+2.3.1_1
 18.0
-2.2.1
+2.3.1
 
2.2.0.0
 1.2
 1.0.1
@@ -369,8 +369,8 @@
 1.1.5
 3.6.0_1
 3.6.0
-5.4.1_1
-5.4.1
+5.5.0_1
+5.5.0
 [5,6)
 0.1.8
 2.3.1

http://git-wip-us.apache.org/repos/asf/camel/blob/f57e93a4/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 e2727e2..da87ecc 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1063,8 +1063,8 @@
   
 camel-core
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-analyzers-common/5.4.1_2
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-queryparser/5.4.1_2
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-analyzers-common/${lucene-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-queryparser/${lucene-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-queries/${lucene-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-sandbox/${lucene-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}

[2/3] camel git commit: Upgrade Elasticsearch Cluster Runner to version 2.3.0.0

2016-05-04 Thread acosentino 
Upgrade Elasticsearch Cluster Runner to version 2.3.0.0


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

Branch: refs/heads/master
Commit: 042bad17a693315dc003558904704e90885df223
Parents: f57e93a
Author: Andrea Cosentino 
Authored: Wed May 4 11:10:51 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 11:10:51 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/042bad17/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e8a09c8..e4a9b5a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -157,7 +157,7 @@
 2.3.1_1
 18.0
 2.3.1
-
2.2.0.0
+
2.3.0.0
 1.2
 1.0.1

[3/3] camel git commit: Upgrade Solr and related to version 5.5.0

2016-05-04 Thread acosentino 
Upgrade Solr and related to version 5.5.0


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

Branch: refs/heads/master
Commit: dacf406e108d18dc07016659db889addc905d776
Parents: 042bad1
Author: Andrea Cosentino 
Authored: Wed May 4 11:15:54 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 11:15:54 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/dacf406e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e4a9b5a..b3b98fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -500,8 +500,8 @@
 1.17
 1.1.2.4
 2.3.4_1
-5.4.1_1
-5.4.1
+5.5.0_1
+5.5.0
 [5,6)
 1.6.1
 2.3

camel git commit: Added Brave-zipkin bundle to camel-zipkin feature and remove @ignore annotation on CamelZipkinTest of Karaf Integration Tests

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master cb3471c28 -> c52309c51


Added Brave-zipkin bundle to camel-zipkin feature and remove @ignore annotation 
on CamelZipkinTest of Karaf Integration Tests


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

Branch: refs/heads/master
Commit: c52309c51e085418f1b882bb42aea966be5cb91f
Parents: cb3471c
Author: Andrea Cosentino 
Authored: Wed May 4 09:54:00 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 09:54:00 2016 +0200

--
 parent/pom.xml  | 1 +
 platforms/karaf/features/src/main/resources/features.xml| 5 +
 .../test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c52309c5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d5db7ec..e358ece 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -79,6 +79,7 @@
 3.2.1
 2.61.0
 3.5.0
+3.5.0_1
 1.10
 0.9.5.2
 2.3.0

http://git-wip-us.apache.org/repos/asf/camel/blob/c52309c5/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 a699d7c..e2727e2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1832,11 +1832,8 @@
 mvn:org.apache.camel/camel-zipfile/${project.version}
   
   
-
-camel-zpikin using spancollector-scribe does not yet work in 
OSGi
 camel-core
-wrap:mvn:com.github.kristofa/brave-core/${brave-zipkin-version}
-
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.brave-zipkin/${brave-zipkin-bundle-version}
 mvn:org.apache.thrift/libthrift/${libthrift-version}
 mvn:org.apache.camel/camel-zipkin/${project.version}
   

http://git-wip-us.apache.org/repos/asf/camel/blob/c52309c5/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
index 4c38500..428c7e2 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-@Ignore("Does not yet work in OSGi: 
https://issues.apache.org/jira/browse/SMX4-1983;)
 public class CamelZipkinTest extends BaseKarafTest {
 
 public static final String COMPONENT = extractName(CamelZipkinTest.class);

camel git commit: Use the latest JNats bundle 0.4.1_1

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 3814128c9 -> 1953142ee


Use the latest JNats bundle 0.4.1_1


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

Branch: refs/heads/master
Commit: 1953142ee04c20a30e6abe6fb172229007d97a3d
Parents: 3814128
Author: Andrea Cosentino 
Authored: Wed May 4 08:58:43 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 08:58:43 2016 +0200

--
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1953142e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 595e924..38ab45d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -272,6 +272,7 @@
 1.0.0.Beta6
 0.7.9
 0.4.1
+0.4.1_1
 2.6
 0.22
 3.12.1.GA_3

http://git-wip-us.apache.org/repos/asf/camel/blob/1953142e/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 6e2fb3b..a699d7c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1155,7 +1155,7 @@
   
   
 camel-core
-wrap:mvn:io.nats/jnats/${jnats-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java_nats/${jnats-bundle-version}
 mvn:org.apache.camel/camel-nats/${project.version}

camel git commit: Upgrade Ironmq and related bundle to version 3.0.4

2016-05-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 0d4771312 -> 3814128c9


Upgrade Ironmq and related bundle to version 3.0.4


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

Branch: refs/heads/master
Commit: 3814128c9bc6b997c80c0b03b8edb615e3f73f5c
Parents: 0d47713
Author: Andrea Cosentino 
Authored: Wed May 4 08:53:03 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed May 4 08:53:03 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/3814128c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c2992d..595e924 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -251,8 +251,8 @@
 8.2.1.Final
 1.10_5
 1.10
-3.0.3
-3.0.3_1
+3.0.4
+3.0.4_1
 20050913_4
 20090621
 1.1