[2/2] camel git commit: CAMEL-9407: Camel-Elasticsearch: Re-enable cluster tests

[acosentino]

CAMEL-9407: Camel-Elasticsearch: Re-enable cluster tests


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

Branch: refs/heads/master
Commit: b4b067e1f4227e64ad2773b2c85a6a986f762048
Parents: 64008de
Author: Andrea Cosentino 
Authored: Wed Dec 9 13:47:24 2015 +0100
Committer: Andrea Cosentino 
Committed: Thu Dec 10 10:01:30 2015 +0100

--
 components/camel-elasticsearch/pom.xml  |   8 ++
 .../ElasticsearchClusterBaseTest.java   | 125 +++
 .../ElasticsearchClusterIndexTest.java  | 101 +++
 .../elasticsearch/ElasticsearchIndexTest.java   |  58 -
 4 files changed, 234 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4b067e1/components/camel-elasticsearch/pom.xml
--
diff --git a/components/camel-elasticsearch/pom.xml 
b/components/camel-elasticsearch/pom.xml
index ef92eb9..5191318 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -52,6 +52,12 @@
   camel-test
   test
 
+
+  org.codelibs
+  elasticsearch-cluster-runner
+  2.0.0.0
+  test
+
 
 
 
@@ -70,6 +76,8 @@
   
 target/data
   
+  1
+  false
 
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b4b067e1/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
--
diff --git 
a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
 
b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
new file mode 100644
index 000..83de307
--- /dev/null
+++ 
b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
@@ -0,0 +1,125 @@
+/**
+ * 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.elasticsearch;
+
+import static 
org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.common.settings.Settings.Builder;
+import org.elasticsearch.node.Node;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+public class ElasticsearchClusterBaseTest extends CamelTestSupport {
+
+public static ElasticsearchClusterRunner runner;
+public static String clusterName;  
+public static Node node;
+public static Client client;
+
+@BeforeClass
+public static void cleanUpOnce() throws Exception {
+deleteDirectory("target/testcluster/");
+clusterName = "es-cl-run-" + System.currentTimeMillis();
+// create runner instance
+runner = new ElasticsearchClusterRunner();
+// create ES nodes
+runner.onBuild(new ElasticsearchClusterRunner.Builder() {
+@Override
+public void build(final int number, final Builder settingsBuilder) 
{
+settingsBuilder.put("http.cors.enabled", true);
+settingsBuilder.put("http.cors.allow-origin", "*");
+}
+}).build(
+newConfigs()
+.clusterName("testCluster")
+.numOfNode(3)
+.basePath("target/testcluster/")
+.useLogger());
+
+// wait for green status
+runner.ensureGreen();
+
+client = runner.client();
+}

camel git commit: Upgrade Google Guava to version 19.0. Specify a different version, 18.0, for Camel-Docker in features.

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master b5ef19d75 -> c8e0a52e7


Upgrade Google Guava to version 19.0. Specify a different version, 18.0, for 
Camel-Docker in features.


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

Branch: refs/heads/master
Commit: c8e0a52e7ff1f347b7f977f3cbc4bff797307061
Parents: b5ef19d
Author: Andrea Cosentino 
Authored: Thu Dec 10 10:49:17 2015 +0100
Committer: Andrea Cosentino 
Committed: Thu Dec 10 10:50:40 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/c8e0a52e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5671e20..2927d9e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -132,6 +132,7 @@
 3.3.2
 2.1.7
 2.1.7_1
+18.0
 1.4.0
 1.4.0_1
 1.6.1_5
@@ -190,7 +191,7 @@
 
1.9.28_1
 1.41.5.w1
 1.41.1_1
-18.0
+19.0
 1.19.0
 
v2-rev151-1.19.0
 
v3-rev99-1.19.0

http://git-wip-us.apache.org/repos/asf/camel/blob/c8e0a52e/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 cc266fd..b35aeef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -336,7 +336,7 @@
 mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
 mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}
 mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}
-mvn:com.google.guava/guava/${google-guava-version}
+mvn:com.google.guava/guava/${docker-guava-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.commons/commons-compress/${commons-compress-version}
 mvn:commons-io/commons-io/${commons-io-version}

camel git commit: CAMEL-9338: Remove spring-integration feature in karaf as its not osgi bundle and nobody really use it anyway.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 7d715c895 -> 64008dec5


CAMEL-9338: Remove spring-integration feature in karaf as its not osgi bundle 
and nobody really use it anyway.


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

Branch: refs/heads/master
Commit: 64008dec503f4466f03318406ae39f5d08d5323d
Parents: 7d715c8
Author: Claus Ibsen 
Authored: Thu Dec 10 09:14:04 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 09:14:04 2015 +0100

--
 .../features/src/main/resources/features.xml|  8 
 .../itest/karaf/CamelSpringIntegrationTest.java | 42 
 2 files changed, 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/64008dec/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 92f2067..cc266fd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1403,14 +1403,6 @@
 camel-spring
 mvn:org.apache.camel/camel-spring-batch/${project.version}
   
-  
   
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}
 camel-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/64008dec/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
deleted file mode 100644
index 30e8f84..000
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
+++ /dev/null
@@ -1,42 +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 License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-@Ignore("Spring Integration 4.x is not OSGi bundle")
-public class CamelSpringIntegrationTest extends AbstractFeatureTest {
-
-public static final String COMPONENT = 
extractName(CamelSpringIntegrationTest.class);
-
-@Test
-public void test() throws Exception {
-testComponent(COMPONENT);
-}
-
-@Configuration
-public static Option[] configure() {
-return configure(COMPONENT);
-}
-
-}
\ No newline at end of file

[1/2] camel git commit: CAMEL-9407: Camel-Elasticsearch: Re-enable cluster tests. Define an elasticsearch-cluster-runner version property

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 64008dec5 -> e25705f0a


CAMEL-9407: Camel-Elasticsearch: Re-enable cluster tests. Define an 
elasticsearch-cluster-runner version property


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

Branch: refs/heads/master
Commit: e25705f0ae583389857151bfcaf43db2742b6056
Parents: b4b067e
Author: Andrea Cosentino 
Authored: Thu Dec 10 09:59:11 2015 +0100
Committer: Andrea Cosentino 
Committed: Thu Dec 10 10:01:30 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/e25705f0/components/camel-elasticsearch/pom.xml
--
diff --git a/components/camel-elasticsearch/pom.xml 
b/components/camel-elasticsearch/pom.xml
index 5191318..58d0990 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -55,7 +55,7 @@
 
   org.codelibs
   elasticsearch-cluster-runner
-  2.0.0.0
+  ${elasticsearch-cluster-runner-version}
   test
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e25705f0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9c97425..5671e20 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,6 +146,7 @@
 2.1.5_1
 2.0.0_1
 2.0.0
+
2.0.0.0
 1.2
 1.0.1
 1.50.0

[1/5] camel git commit: CAMEL-9338: Upgrade Spring Integration to version 4.2.2

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 3b7abccea -> 7d715c895


CAMEL-9338: Upgrade Spring Integration to version 4.2.2


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

Branch: refs/heads/master
Commit: ccfa2dedaf54a46052aca5fb3ee32db80ef28314
Parents: 3b7abcc
Author: Pascal Schumacher 
Authored: Sun Dec 6 22:02:14 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 08:06:41 2015 +0100

--
 components/camel-spring-integration/pom.xml |  3 ++-
 .../integration/SpringIntegrationBinding.java   | 10 +-
 .../integration/SpringIntegrationConsumer.java  | 20 ++--
 .../integration/SpringIntegrationEndpoint.java  |  2 +-
 .../integration/SpringIntegrationMessage.java   |  8 
 .../integration/SpringIntegrationProducer.java  | 20 ++--
 .../integration/adapter/CamelSourceAdapter.java | 10 +-
 .../integration/adapter/CamelTargetAdapter.java | 10 +-
 .../converter/SpringIntegrationConverter.java   | 12 ++--
 .../SpringIntegrationOneWayConsumerTest.java|  4 ++--
 .../SpringIntegrationTwoWayConsumerTest.java| 10 +-
 .../adapter/CamelSourceAdapterTest.java |  4 ++--
 .../adapter/CamelTargetAdapterTest.java | 10 +-
 parent/pom.xml  |  2 +-
 14 files changed, 63 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/pom.xml
--
diff --git a/components/camel-spring-integration/pom.xml 
b/components/camel-spring-integration/pom.xml
index 45a230e..1d3e50f 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -31,7 +31,8 @@
 
 
 
org.apache.camel.component.spring.integration.*
-
org.springframework.integration.*;version="[2,3)"
+
org.springframework.integration.*;version="[4"
+
org.springframework.messaging.*;version="[4"
 
org.apache.camel.spi.ComponentResolver;component=spring-integration
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ccfa2ded/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
--
diff --git 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
index 7d2c119..4f7d049 100644
--- 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
+++ 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.spring.integration;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
-import org.springframework.integration.message.GenericMessage;
+import org.springframework.messaging.support.GenericMessage;
 
 /**
  * The helper class for Mapping between the Spring Integration message and the 
Camel Message.
@@ -32,20 +32,20 @@ public final class SpringIntegrationBinding {
 // Helper class
 }
 
-public static org.springframework.integration.Message 
createSpringIntegrationMessage(Exchange exchange) {
+public static org.springframework.messaging.Message 
createSpringIntegrationMessage(Exchange exchange) {
 return createSpringIntegrationMessage(exchange, 
exchange.getIn().getHeaders());
 }
 
-public static org.springframework.integration.Message 
createSpringIntegrationMessage(Exchange exchange, Map headers) {
+public static org.springframework.messaging.Message 
createSpringIntegrationMessage(Exchange exchange, Map headers) {
 org.apache.camel.Message message = exchange.getIn();
 return new GenericMessage(message.getBody(), headers);
 }
 
-public static org.springframework.integration.Message 
storeToSpringIntegrationMessage(org.apache.camel.Message message) {
+public static org.springframework.messaging.Message 
storeToSpringIntegrationMessage(org.apache.camel.Message message) {
 return new GenericMessage(message.getBody(), 
message.getHeaders());
 }
 
-public static void 
storeToCamelMessage(org.springframework.integration.Message siMessage, 

[3/5] camel git commit: CAMEL-9338: Upgrade Spring Integration to version 4.2.2

[davsclaus]

CAMEL-9338: Upgrade Spring Integration to version 4.2.2


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

Branch: refs/heads/master
Commit: 74b9e987d4116ee27315a2fbe4fac05fe675a0be
Parents: 07f1594
Author: Claus Ibsen 
Authored: Thu Dec 10 08:24:15 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 08:25:32 2015 +0100

--
 components/camel-spring-integration/pom.xml | 9 -
 parent/pom.xml  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74b9e987/components/camel-spring-integration/pom.xml
--
diff --git a/components/camel-spring-integration/pom.xml 
b/components/camel-spring-integration/pom.xml
index 1d3e50f..b68ab4b 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -31,12 +31,11 @@
 
 
 
org.apache.camel.component.spring.integration.*
-
org.springframework.integration.*;version="[4"
-
org.springframework.messaging.*;version="[4"
+
+org.springframework.integration.*;version="[4.2,5)",
+org.springframework.messaging.*;version="[4.2,5)"
+
 
org.apache.camel.spi.ComponentResolver;component=spring-integration
-
-
-${spring41-version}
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/74b9e987/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 028dc02..68f6a62 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -467,7 +467,7 @@
 1.2.0
 1.6.5.RELEASE
 1.6.0.RELEASE
-4.2.2.RELEASE
+4.2.3.RELEASE
 1.0.0-20090215
 2.0.4.RELEASE
 2.0.3.RELEASE_1

[2/5] camel git commit: CAMEL-9379: Camel BOM should not include tooling depdencies

[davsclaus]

CAMEL-9379: Camel BOM should not include tooling depdencies


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

Branch: refs/heads/master
Commit: 07f15940d968d407894cdd8f1cd14461b32f03a2
Parents: ccfa2de
Author: Claus Ibsen 
Authored: Thu Dec 10 08:20:39 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 08:22:08 2015 +0100

--
 .../camel-salesforce-maven-plugin/pom.xml   |  2 +-
 tooling/apt/pom.xml | 30 -
 tooling/maven/pom.xml   | 70 
 tooling/pom.xml | 70 
 4 files changed, 85 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
--
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml 
b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 99ab3b8..40997ba 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -35,7 +35,7 @@
 
   
 org.apache.camel
-tooling
+maven-plugins
 ${project.version}
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/tooling/apt/pom.xml
--
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 9b8f16c..f67abd0 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 
   4.0.0
 
@@ -61,21 +62,18 @@
 
 
   
-  
-
-  maven-compiler-plugin
-  
-${jdk.version}
-${jdk.version}
-
-  none
-  false
-
-  
-
-  
+
+  
+maven-compiler-plugin
+
+  ${jdk.version}
+  ${jdk.version}
+  
+  none
+  false
+
+  
+
   
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/tooling/maven/pom.xml
--
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index b64789c..a4a5b9e 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -29,6 +29,76 @@
   Camel Maven Plugins
   pom
 
+  
+2.2.1
+
2.2.1
+2.2.1
+2.2.1
+2.4
+0.0.7
+1.6
+3.0.22
+  
+
+  
+
+  org.apache.maven
+  maven-core
+  ${maven-version}
+
+
+  org.apache.maven
+  maven-artifact
+  ${maven-version}
+
+
+  org.apache.maven
+  maven-plugin-api
+  ${maven-version}
+
+
+  org.apache.maven
+  maven-plugin-descriptor
+  ${maven-maven-plugin-descriptor-version}
+  
+
+  log4j
+  log4j
+
+  
+
+
+  org.apache.maven
+  maven-project
+  ${maven-project-version}
+
+
+  org.apache.maven.reporting
+  maven-reporting-api
+  ${maven-reporting-api-version}
+
+
+  org.apache.maven.reporting
+  maven-reporting-impl
+  ${maven-reporting-impl-version}
+
+
+  org.codehaus.plexus
+  plexus-container-default
+  ${plexus-container-default-version}
+
+
+  org.codehaus.plexus
+  plexus-utils
+  ${plexus-utils-version}
+
+
+  org.sonatype.plexus
+  plexus-build-api
+  ${plexus-build-api-version}
+
+  
+
   
 camel-package-maven-plugin
 camel-maven-plugin

http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/tooling/pom.xml
--
diff --git a/tooling/pom.xml b/tooling/pom.xml
index ed49475..d5d2622 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -31,76 +31,6 @@
   Camel Tooling
   pom
 
-  
-2.2.1
-
2.2.1
-2.2.1
-2.2.1
-2.4
-0.0.7
-1.6
-3.0.22
-  
-
-  
-
-  org.apache.maven
-  maven-core
-  ${maven-version}
-
- 

[5/5] camel git commit: CAMEL-9338: Upgrade Spring Integration to version 4.2.2

[davsclaus]

CAMEL-9338: Upgrade Spring Integration to version 4.2.2


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

Branch: refs/heads/master
Commit: 7d715c895d6b4ff82342b55af8f125085c47f3f2
Parents: 577d8d1
Author: Claus Ibsen 
Authored: Thu Dec 10 09:10:31 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 09:10:31 2015 +0100

--
 platforms/karaf/features/src/main/resources/features.xml  | 3 ++-
 .../org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7d715c89/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 625957a..92f2067 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1403,13 +1403,14 @@
 camel-spring
 mvn:org.apache.camel/camel-spring-batch/${project.version}
   
+  
   
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}
 camel-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/7d715c89/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
index 99aba62..30e8f84 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.itest.karaf;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -23,6 +24,7 @@ import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
+@Ignore("Spring Integration 4.x is not OSGi bundle")
 public class CamelSpringIntegrationTest extends AbstractFeatureTest {
 
 public static final String COMPONENT = 
extractName(CamelSpringIntegrationTest.class);

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

[buildbot]

Author: buildbot
Date: Thu Dec 10 08:19:54 2015
New Revision: 975157

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2170-release.html
==
--- websites/production/camel/content/camel-2170-release.html (original)
+++ websites/production/camel/content/camel-2170-release.html Thu Dec 10 
08:19:54 2015
@@ -85,7 +85,7 @@

 
 
-Camel 2.17.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 x.y.z release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)highlighted issue fixedUpgraded 
camel-hbase to Hadoop 2.x and HBase 1.1.xCamel commands forSpring BootMany improvements 
toCamel
 0;KuraAdded transacted option 
toSQL Component when used 
as a consumer in a transacted route.Added support for UPDATE operation 
toElasticSearch.Allow to reuse existing 
configured Elasticsearch Client on the ElasticSearch component, instead of creating a 
client per endpoint.Theinclude 
andexclude options onFile2 andFTP 
endpoints is now case in-sensitive out of the box.Resource based 
component such asXSLT,Velocityetc can load the resource 
file from theRegistryby 
usingref: as prefix.Upgraded camel-amqp to the latest 
qpid-jms-client (also AMQP  1.0 is not supported 
anymore).Many improvements to Camel AMQP component.TheMetrics Component allows to 
captureMessage History 
performance statistics with 
theMetricsMessageHistoryFactoryReduced 
the number of mbeans enlisted in the services tree, to only include mbeans that 
has value to be managed.TheElasticsearch Componentnow supports 
MultiGet operationFixed these issuesTheSwagger Java now parses nested types 
in the POJO model that has been annotated with the swagger api annotations to 
use in the schema api modelFixedRest DSL 
 >withapiContextPath fail to start if there are 2 ore more rest's in 
 >use.Paho component name is not limited to 4 characters 
 >anymore.FixedSpring 
 >Boot not starting Camel routes if running in Spring Cloud.id="Camel2.17.0Release-New">New href="enterprise-integration-patterns.html">Enterprise Integration 
 >PatternsNew href="components.html">Componentscamel-kubernetes - 
 >Integrates Camel with Kubernetescamel-aws - AWS kineses streams 
 >component addedNew DSLid="Camel2.17.0Release-NewAnnotations">New Annotationsid="Camel2.17.0Release-NewDataFormats">New href="data-format.html">Data Formatshref="mime-multipart.html">MIME-Multipart - mime
  based data format.New LanguagesNew Examplescamel-example-spring-boot-metrics 
- showing a Camel spring-boot application that report metrics to Graphite. 
Requires Graphite running on your network.New TutorialsAPI breakingKnown IssuesDependency 
upgradesEHCache from 2.10.0 to 2.10.1Mvel from 
2.2.6.Final to 2.2.7.FinalSpring 4.1.x to 4.2.xSpring-Boot 
1.2.x to 1.3.xslf4j-api 1.6.x to 1.7.xImportant 
changes to consider when upgradingRemoved camel-hbase
  as Karaf feature as it did not really work well in 
OSGicamel-infinispan requires Java 8.Support for Spring 4.0.x 
is deprecated.Moved some Camel tooling related dependencies (such as 
maven/plexus) from the Camel Parent BOM to the tooling BOM (to have them 
separated).camel-amqp do not support 0.9 anymore.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip;>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc;>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz;>apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc;>apache-camel-x.y.x.tar.gz.ascThe above URLs use redirectionThe above URLs use the Apache 
Mirror system to redirect you to a suitable mirror for your download. Some 
users have experienced issues with some versions of browsers (e.g. some Safari 
browsers). If the download doesn't seem to work for you from the above URL then 
try using http://www.mozilla.com/en-US/firefox/; 
rel="nofollow">FireFoxSource DistributionsDescriptionDownload LinkPGP Signature file of 
downloadSource for 

camel git commit: Reduce garbage in ApiName Enums

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master e25705f0a -> b5ef19d75


Reduce garbage in ApiName Enums


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

Branch: refs/heads/master
Commit: b5ef19d75084c8b108e6f70f1164f2f37990e17d
Parents: e25705f
Author: lburgazzoli 
Authored: Wed Dec 9 13:54:50 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 10:35:06 2015 +0100

--
 .../src/main/resources/api-name-enum.vm  | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b5ef19d7/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
--
diff --git 
a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
 
b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
index b2bfe60..732a667 100644
--- 
a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
+++ 
b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
@@ -34,6 +34,8 @@ public enum $apiNameEnum implements ApiName {
 
 #end
 
+private static final ${apiNameEnum}[] VALUES = values();
+
 private final String name;
 
 private ${apiNameEnum}(String name) {
@@ -46,9 +48,9 @@ public enum $apiNameEnum implements ApiName {
 }
 
 public static $apiNameEnum fromValue(String value) throws 
IllegalArgumentException {
-for ($apiNameEnum api : ${apiNameEnum}.values()) {
-if (api.name.equals(value)) {
-return api;
+for (int i = 0; i < VALUES.length; i++) {
+if (VALUES[i].name.equals(value)) {
+return VALUES[i];
 }
 }
 throw new IllegalArgumentException("Invalid value " + value);

camel git commit: Spark+Hive tests should not be executed if JVM max memory is less than 1 GB.

[hekonsek]

Repository: camel
Updated Branches:
  refs/heads/master 8230d49b5 -> 8ef757a78


Spark+Hive tests should not be executed if JVM max memory is less than 1 GB.


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

Branch: refs/heads/master
Commit: 8ef757a784ff7796ffca712a8f307439eccdca72
Parents: 8230d49
Author: Henryk Konsek 
Authored: Thu Dec 10 22:42:11 2015 +0100
Committer: Henryk Konsek 
Committed: Thu Dec 10 22:42:11 2015 +0100

--
 .../component/spark/SparkProducerTest.java  | 27 
 1 file changed, 22 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8ef757a7/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
--
diff --git 
a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
 
b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
index 81a28e6..6c85148 100644
--- 
a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
+++ 
b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.spark;
 import java.io.File;
 import java.io.IOException;
 
+import static java.lang.Runtime.getRuntime;
 import static java.util.Arrays.asList;
 
 import com.google.common.truth.Truth;
@@ -30,12 +31,14 @@ import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.JavaSparkContext;
 import org.apache.spark.sql.DataFrame;
 import org.apache.spark.sql.hive.HiveContext;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static 
org.apache.camel.component.spark.SparkConstants.SPARK_DATAFRAME_CALLBACK_HEADER;
 import static 
org.apache.camel.component.spark.SparkConstants.SPARK_RDD_CALLBACK_HEADER;
 import static org.apache.camel.component.spark.Sparks.createLocalSparkContext;
 import static 
org.apache.camel.component.spark.annotations.AnnotatedRddCallback.annotatedRddCallback;
+import static org.junit.Assume.assumeTrue;
 
 public class SparkProducerTest extends CamelTestSupport {
 
@@ -43,7 +46,9 @@ public class SparkProducerTest extends CamelTestSupport {
 
 static JavaSparkContext sparkContext = createLocalSparkContext();
 
-static HiveContext hiveContext = new HiveContext(sparkContext.sc());
+static boolean shouldRunHive = getRuntime().maxMemory() > 1024 * 1024 * 
1024;
+
+static HiveContext hiveContext;
 
 String sparkUri = "spark:rdd?rdd=#pomRdd";
 
@@ -51,6 +56,13 @@ public class SparkProducerTest extends CamelTestSupport {
 
 String sparkHiveUri = "spark:hive";
 
+@BeforeClass
+public static void beforeClass() {
+if (shouldRunHive) {
+hiveContext = new HiveContext(sparkContext.sc());
+}
+}
+
 // Routes fixtures
 
 @Override
@@ -59,10 +71,12 @@ public class SparkProducerTest extends CamelTestSupport {
 
 registry.bind("pomRdd", sparkContext.textFile("testrdd.txt"));
 
-registry.bind("hiveContext", hiveContext);
-DataFrame jsonCars = 
hiveContext.read().json("src/test/resources/cars.json");
-jsonCars.registerTempTable("cars");
-registry.bind("jsonCars", jsonCars);
+if (shouldRunHive) {
+registry.bind("hiveContext", hiveContext);
+DataFrame jsonCars = 
hiveContext.read().json("src/test/resources/cars.json");
+jsonCars.registerTempTable("cars");
+registry.bind("jsonCars", jsonCars);
+}
 
 registry.bind("countLinesTransformation", new 
org.apache.camel.component.spark.RddCallback() {
 @Override
@@ -180,6 +194,7 @@ public class SparkProducerTest extends CamelTestSupport {
 
 @Test
 public void shouldExecuteHiveQuery() {
+assumeTrue(shouldRunHive);
 long tablesCount = template.requestBody(sparkHiveUri + 
"?collect=false", "SELECT * FROM cars", Long.class);
 Truth.assertThat(tablesCount).isEqualTo(2);
 }
@@ -188,6 +203,7 @@ public class SparkProducerTest extends CamelTestSupport {
 
 @Test
 public void shouldCountFrame() {
+assumeTrue(shouldRunHive);
 DataFrameCallback callback = new DataFrameCallback() {
 @Override
 public Long onDataFrame(DataFrame dataFrame, Object... payloads) {
@@ -200,6 +216,7 @@ public class SparkProducerTest extends CamelTestSupport {
 
 @Test
 public void shouldExecuteConditionalFrameCount() {
+assumeTrue(shouldRunHive);
 

camel git commit: Fixed CS.

[hekonsek]

Repository: camel
Updated Branches:
  refs/heads/master 1a7cce0f2 -> 8230d49b5


Fixed CS.


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

Branch: refs/heads/master
Commit: 8230d49b529d04c34ba6c3c3725e85bdd895bc5b
Parents: 1a7cce0
Author: Henryk Konsek 
Authored: Thu Dec 10 22:25:24 2015 +0100
Committer: Henryk Konsek 
Committed: Thu Dec 10 22:25:24 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8230d49b/components/camel-spark/src/main/java/org/apache/camel/component/spark/HiveSparkProducer.java
--
diff --git 
a/components/camel-spark/src/main/java/org/apache/camel/component/spark/HiveSparkProducer.java
 
b/components/camel-spark/src/main/java/org/apache/camel/component/spark/HiveSparkProducer.java
index eb64637..3145595 100644
--- 
a/components/camel-spark/src/main/java/org/apache/camel/component/spark/HiveSparkProducer.java
+++ 
b/components/camel-spark/src/main/java/org/apache/camel/component/spark/HiveSparkProducer.java
@@ -46,7 +46,7 @@ public class HiveSparkProducer extends DefaultProducer {
 
 protected HiveContext resolveHiveContext() {
 Set hiveContexts = 
getEndpoint().getComponent().getCamelContext().getRegistry().findByType(HiveContext.class);
-if(hiveContexts.size() == 1) {
+if (hiveContexts.size() == 1) {
 return hiveContexts.iterator().next();
 }
 return null;

[1/2] camel git commit: CAMEL-9409: wiretap - Allow to use endpoint injected instance

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x daff7aad8 -> 572df64ce
  refs/heads/master ac9a7940b -> 1b7c19622


CAMEL-9409: wiretap - Allow to use endpoint injected instance


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

Branch: refs/heads/master
Commit: 1b7c1962246afd6acbac0451802b8c504d740ec5
Parents: ac9a794
Author: Claus Ibsen 
Authored: Thu Dec 10 11:21:21 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 11:21:32 2015 +0100

--
 .../apache/camel/model/ProcessorDefinition.java | 16 +++
 .../camel/processor/WireTapLogEndpointTest.java | 44 
 2 files changed, 60 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1b7c1962/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 55dd19e..eacb304 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -2250,6 +2250,22 @@ public abstract class ProcessorDefinition
  * destination gets a copy of the original message to avoid the processors
  * interfering with each other using {@link ExchangePattern#InOnly}.
  *
+ * @param endpoint  the endpoint to wiretap to
+ * @return the builder
+ */
+public WireTapDefinition wireTap(Endpoint endpoint) {
+WireTapDefinition answer = new WireTapDefinition();
+answer.setUri(endpoint.getEndpointUri());
+addOutput(answer);
+return answer;
+}
+
+/**
+ * http://camel.apache.org/wiretap.html;>WireTap EIP:
+ * Sends messages to all its child outputs; so that each processor and
+ * destination gets a copy of the original message to avoid the processors
+ * interfering with each other using {@link ExchangePattern#InOnly}.
+ *
  * @param uri  the dynamic endpoint to wiretap to (resolved using simple 
language by default)
  * @return the builder
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/1b7c1962/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
new file mode 100644
index 000..5f5a75b
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
@@ -0,0 +1,44 @@
+/**
+ * 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.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.builder.RouteBuilder;
+
+public class WireTapLogEndpointTest extends ContextTestSupport {
+
+public void testWireTapLog() throws Exception {
+getMockEndpoint("mock:result").expectedMessageCount(1);
+
+template.sendBody("direct:start", "Hello World");
+
+assertMockEndpointsSatisfied();
+}
+
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+public void configure() {
+Endpoint tap = endpoint("log:com.foo.MyApp?level=WARN");
+
+from("direct:start")
+.wireTap(tap)
+.to("mock:result");
+}
+};
+}
+}
\ No newline at end of file

[2/2] camel git commit: CAMEL-9409: wiretap - Allow to use endpoint injected instance

[davsclaus]

CAMEL-9409: wiretap - Allow to use endpoint injected instance


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

Branch: refs/heads/camel-2.16.x
Commit: 572df64ce56f38da66606cbc8d9b482dc0819d84
Parents: daff7aa
Author: Claus Ibsen 
Authored: Thu Dec 10 11:21:21 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 11:22:09 2015 +0100

--
 .../apache/camel/model/ProcessorDefinition.java | 16 +++
 .../camel/processor/WireTapLogEndpointTest.java | 44 
 2 files changed, 60 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/572df64c/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 2ddb383..7bb512f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -2250,6 +2250,22 @@ public abstract class ProcessorDefinition
  * destination gets a copy of the original message to avoid the processors
  * interfering with each other using {@link ExchangePattern#InOnly}.
  *
+ * @param endpoint  the endpoint to wiretap to
+ * @return the builder
+ */
+public WireTapDefinition wireTap(Endpoint endpoint) {
+WireTapDefinition answer = new WireTapDefinition();
+answer.setUri(endpoint.getEndpointUri());
+addOutput(answer);
+return answer;
+}
+
+/**
+ * http://camel.apache.org/wiretap.html;>WireTap EIP:
+ * Sends messages to all its child outputs; so that each processor and
+ * destination gets a copy of the original message to avoid the processors
+ * interfering with each other using {@link ExchangePattern#InOnly}.
+ *
  * @param uri  the dynamic endpoint to wiretap to (resolved using simple 
language by default)
  * @return the builder
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/572df64c/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
new file mode 100644
index 000..5f5a75b
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/WireTapLogEndpointTest.java
@@ -0,0 +1,44 @@
+/**
+ * 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.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.builder.RouteBuilder;
+
+public class WireTapLogEndpointTest extends ContextTestSupport {
+
+public void testWireTapLog() throws Exception {
+getMockEndpoint("mock:result").expectedMessageCount(1);
+
+template.sendBody("direct:start", "Hello World");
+
+assertMockEndpointsSatisfied();
+}
+
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+public void configure() {
+Endpoint tap = endpoint("log:com.foo.MyApp?level=WARN");
+
+from("direct:start")
+.wireTap(tap)
+.to("mock:result");
+}
+};
+}
+}
\ No newline at end of file

camel git commit: Upgrade Atmosphere Runtime to version 2.4.1.4

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master c8e0a52e7 -> ac9a7940b


Upgrade Atmosphere Runtime to version 2.4.1.4


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

Branch: refs/heads/master
Commit: ac9a7940b144710b5ba00d7d828ad08ead82b498
Parents: c8e0a52
Author: Andrea Cosentino 
Authored: Thu Dec 10 11:17:26 2015 +0100
Committer: Andrea Cosentino 
Committed: Thu Dec 10 11:17:26 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/ac9a7940/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2927d9e..85b1754 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
 3.3.1
 1.8.7
 2.2.2
-2.4.1.3
+2.4.1.4
 [2.4,3.0)
 3.9.3
 4.3.1_1

svn commit: r975191 - in /websites/production/camel/content: cache/main.pageCache zip-file-dataformat.html

[buildbot]

Author: buildbot
Date: Thu Dec 10 12:20:05 2015
New Revision: 975191

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/zip-file-dataformat.html

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

Modified: websites/production/camel/content/zip-file-dataformat.html
==
--- websites/production/camel/content/zip-file-dataformat.html (original)
+++ websites/production/camel/content/zip-file-dataformat.html Thu Dec 10 
12:20:05 2015
@@ -111,7 +111,7 @@
 .process(new UnZippedMessageProcessor())
  .end();
 ]]>
-AggregateAvailable since Camel 2.12.3Please note that this aggregation 
strategy requires eager completion check to work 
properly.In this example we aggregate all text 
files found in the input directory into a singel Zip file that is stored in the 
output directory.
+AggregateAvailable since Camel 2.12.3Please note that this aggregation 
strategy requires eager completion check to work 
properly.In this example we aggregate all text 
files found in the input directory into a single Zip file that is stored in the 
output directory.
 

camel git commit: CAMEL-9410: camel-netty-http - should default to port 80 and 443

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 1b7c19622 -> e6cf6f110


CAMEL-9410: camel-netty-http - should default to port 80 and 443


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

Branch: refs/heads/master
Commit: e6cf6f110ca5e04b1fe4b9156c9df5ffa7b505df
Parents: 1b7c196
Author: Claus Ibsen 
Authored: Thu Dec 10 14:59:07 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 14:59:07 2015 +0100

--
 .../netty/http/NettyHttpComponent.java  | 36 ---
 .../netty4/http/NettyHttpComponent.java | 37 
 2 files changed, 46 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6cf6f11/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 59fcc91..f551b20 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -58,9 +58,6 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 private HeaderFilterStrategy headerFilterStrategy;
 private NettyHttpSecurityConfiguration securityConfiguration;
 
-// If the port is not specified Netty set it to -1, we need to set it on a 
default port in this case
-private int defaultPortIfNotProvided = 80;
-
 public NettyHttpComponent() {
 // use the http configuration and filter strategy
 super(NettyHttpEndpoint.class);
@@ -94,20 +91,36 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 NettyHttpSecurityConfiguration securityConfiguration = 
resolveAndRemoveReferenceParameter(parameters, "securityConfiguration", 
NettyHttpSecurityConfiguration.class);
 Map securityOptions = 
IntrospectionSupport.extractProperties(parameters, "securityConfiguration.");
 
-config = parseConfiguration(config, remaining, parameters);
-setProperties(config, parameters);
-
-// validate config
-config.validateConfiguration();
-
 // are we using a shared http server?
+int sharedPort = -1;
 NettySharedHttpServer shared = 
resolveAndRemoveReferenceParameter(parameters, "nettySharedHttpServer", 
NettySharedHttpServer.class);
 if (shared != null) {
 // use port number from the shared http server
 LOG.debug("Using NettySharedHttpServer: {} with port: {}", shared, 
shared.getPort());
-config.setPort(shared.getPort());
+sharedPort = shared.getPort();
+}
+
+// configure configuration
+config = parseConfiguration(config, remaining, parameters);
+// set port on configuration which is either shared or using default 
values
+if (sharedPort != -1) {
+config.setPort(sharedPort);
+} else if (config.getPort() == -1) {
+if ("http".equals(config.getProtocol())) {
+config.setPort(80);
+} else if ("https".equals(config.getProtocol())) {
+config.setPort(443);
+}
+}
+if (config.getPort() == -1) {
+throw new IllegalArgumentException("Port number must be 
configured");
 }
 
+setProperties(config, parameters);
+
+// validate config
+config.validateConfiguration();
+
 // create the address uri which includes the remainder parameters 
(which is not configuration parameters for this component)
 URI u = new URI(UnsafeUriCharactersEncoder.encodeHttpURI(remaining));
 
@@ -169,9 +182,6 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 ((NettyHttpConfiguration) configuration).setPath(uri.getPath());
 }
 
-if (configuration.getPort() == -1) {
-configuration.setPort(defaultPortIfNotProvided);
-}
 return configuration;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e6cf6f11/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
--
diff --git 

[2/2] camel git commit: CAMEL-9410: camel-netty-http - should default to port 80 and 443

[davsclaus]

CAMEL-9410: camel-netty-http - should default to port 80 and 443


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

Branch: refs/heads/camel-2.16.x
Commit: 5564ac9eda8f5c3118cd9d487140e5c5f631159c
Parents: b3f279a
Author: Claus Ibsen 
Authored: Thu Dec 10 15:15:44 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 15:16:08 2015 +0100

--
 .../netty/http/NettyHttpConfiguration.java  | 35 
 .../netty4/http/NettyHttpConfiguration.java | 35 
 .../apache/camel/catalog/CamelCatalogTest.java  |  2 ++
 3 files changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5564ac9e/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 044c33c..ed9638b 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -37,6 +37,10 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 @UriPath(enums = "http,https", defaultValue = "http") @Metadata(required = 
"true")
 private String protocol;
 @UriPath @Metadata(required = "true")
+private String host;
+@UriPath
+private int port;
+@UriPath @Metadata(required = "true")
 private String path;
 @UriParam(label = "consumer,advanced")
 private boolean urlDecodeHeaders;
@@ -100,6 +104,37 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 this.protocol = protocol;
 }
 
+@Override
+public String getHost() {
+// override to setup better documentation for netty-http
+return super.getHost();
+}
+
+/**
+ * The local hostname such as localhost, or 0.0.0.0 when being a consumer.
+ * The remote HTTP server hostname when using producer.
+ */
+@Override
+public void setHost(String host) {
+// override to setup better documentation for netty-http
+super.setHost(host);
+}
+
+@Override
+public int getPort() {
+// override to setup better documentation for netty-http
+return super.getPort();
+}
+
+/**
+ * The port number. Is default 80 for http and 443 for https.
+ */
+@Override
+public void setPort(int port) {
+// override to setup better documentation for netty-http
+super.setPort(port);
+}
+
 public boolean isCompression() {
 return compression;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/5564ac9e/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 694ba2d..74c6f28 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
@@ -36,6 +36,10 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 @UriPath(enums = "http,https", defaultValue = "http") @Metadata(required = 
"true")
 private String protocol;
 @UriPath @Metadata(required = "true")
+private String host;
+@UriPath
+private int port;
+@UriPath @Metadata(required = "true")
 private String path;
 @UriParam(label = "consumer,advanced")
 private boolean urlDecodeHeaders;
@@ -99,6 +103,37 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 this.protocol = protocol;
 }
 
+@Override
+public String getHost() {
+// override to setup better documentation for netty-http
+return super.getHost();
+}
+
+/**
+ * The local hostname such as localhost, or 0.0.0.0 when being a consumer.
+ * The remote HTTP server hostname when using producer.
+ */
+@Override
+public void setHost(String host) {
+// override to setup better 

camel git commit: CAMEL-9410: camel-netty-http - should default to port 80 and 443

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 572df64ce -> b3f279ae6


CAMEL-9410: camel-netty-http - should default to port 80 and 443


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

Branch: refs/heads/camel-2.16.x
Commit: b3f279ae6027612df0b59682001cc5cb76e26072
Parents: 572df64
Author: Claus Ibsen 
Authored: Thu Dec 10 14:59:07 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 15:00:13 2015 +0100

--
 .../netty/http/NettyHttpComponent.java  | 36 ---
 .../netty4/http/NettyHttpComponent.java | 37 
 2 files changed, 46 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b3f279ae/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 59fcc91..f551b20 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -58,9 +58,6 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 private HeaderFilterStrategy headerFilterStrategy;
 private NettyHttpSecurityConfiguration securityConfiguration;
 
-// If the port is not specified Netty set it to -1, we need to set it on a 
default port in this case
-private int defaultPortIfNotProvided = 80;
-
 public NettyHttpComponent() {
 // use the http configuration and filter strategy
 super(NettyHttpEndpoint.class);
@@ -94,20 +91,36 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 NettyHttpSecurityConfiguration securityConfiguration = 
resolveAndRemoveReferenceParameter(parameters, "securityConfiguration", 
NettyHttpSecurityConfiguration.class);
 Map securityOptions = 
IntrospectionSupport.extractProperties(parameters, "securityConfiguration.");
 
-config = parseConfiguration(config, remaining, parameters);
-setProperties(config, parameters);
-
-// validate config
-config.validateConfiguration();
-
 // are we using a shared http server?
+int sharedPort = -1;
 NettySharedHttpServer shared = 
resolveAndRemoveReferenceParameter(parameters, "nettySharedHttpServer", 
NettySharedHttpServer.class);
 if (shared != null) {
 // use port number from the shared http server
 LOG.debug("Using NettySharedHttpServer: {} with port: {}", shared, 
shared.getPort());
-config.setPort(shared.getPort());
+sharedPort = shared.getPort();
+}
+
+// configure configuration
+config = parseConfiguration(config, remaining, parameters);
+// set port on configuration which is either shared or using default 
values
+if (sharedPort != -1) {
+config.setPort(sharedPort);
+} else if (config.getPort() == -1) {
+if ("http".equals(config.getProtocol())) {
+config.setPort(80);
+} else if ("https".equals(config.getProtocol())) {
+config.setPort(443);
+}
+}
+if (config.getPort() == -1) {
+throw new IllegalArgumentException("Port number must be 
configured");
 }
 
+setProperties(config, parameters);
+
+// validate config
+config.validateConfiguration();
+
 // create the address uri which includes the remainder parameters 
(which is not configuration parameters for this component)
 URI u = new URI(UnsafeUriCharactersEncoder.encodeHttpURI(remaining));
 
@@ -169,9 +182,6 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 ((NettyHttpConfiguration) configuration).setPath(uri.getPath());
 }
 
-if (configuration.getPort() == -1) {
-configuration.setPort(defaultPortIfNotProvided);
-}
 return configuration;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f279ae/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
--
diff --git 

[1/2] camel git commit: CAMEL-9410: camel-netty-http - should default to port 80 and 443

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x b3f279ae6 -> 5564ac9ed
  refs/heads/master e6cf6f110 -> e6b06ad05


CAMEL-9410: camel-netty-http - should default to port 80 and 443


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

Branch: refs/heads/master
Commit: e6b06ad05f3b14d7df9be581f0a0108291eae3eb
Parents: e6cf6f1
Author: Claus Ibsen 
Authored: Thu Dec 10 15:15:44 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 15:15:44 2015 +0100

--
 .../netty/http/NettyHttpConfiguration.java  | 35 
 .../netty4/http/NettyHttpConfiguration.java | 35 
 .../apache/camel/catalog/CamelCatalogTest.java  |  2 ++
 3 files changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6b06ad0/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 044c33c..ed9638b 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -37,6 +37,10 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 @UriPath(enums = "http,https", defaultValue = "http") @Metadata(required = 
"true")
 private String protocol;
 @UriPath @Metadata(required = "true")
+private String host;
+@UriPath
+private int port;
+@UriPath @Metadata(required = "true")
 private String path;
 @UriParam(label = "consumer,advanced")
 private boolean urlDecodeHeaders;
@@ -100,6 +104,37 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 this.protocol = protocol;
 }
 
+@Override
+public String getHost() {
+// override to setup better documentation for netty-http
+return super.getHost();
+}
+
+/**
+ * The local hostname such as localhost, or 0.0.0.0 when being a consumer.
+ * The remote HTTP server hostname when using producer.
+ */
+@Override
+public void setHost(String host) {
+// override to setup better documentation for netty-http
+super.setHost(host);
+}
+
+@Override
+public int getPort() {
+// override to setup better documentation for netty-http
+return super.getPort();
+}
+
+/**
+ * The port number. Is default 80 for http and 443 for https.
+ */
+@Override
+public void setPort(int port) {
+// override to setup better documentation for netty-http
+super.setPort(port);
+}
+
 public boolean isCompression() {
 return compression;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e6b06ad0/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 694ba2d..74c6f28 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
@@ -36,6 +36,10 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 @UriPath(enums = "http,https", defaultValue = "http") @Metadata(required = 
"true")
 private String protocol;
 @UriPath @Metadata(required = "true")
+private String host;
+@UriPath
+private int port;
+@UriPath @Metadata(required = "true")
 private String path;
 @UriParam(label = "consumer,advanced")
 private boolean urlDecodeHeaders;
@@ -99,6 +103,37 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 this.protocol = protocol;
 }
 
+@Override
+public String getHost() {
+// override to setup better documentation for netty-http
+return super.getHost();
+}
+
+/**
+ * The local hostname such as localhost, or 0.0.0.0 when being a consumer.
+ * The remote HTTP server hostname when 

camel git commit: Spark+Hive tests should not be executed if JVM max memory is less than 2 GB.

[hekonsek]

Repository: camel
Updated Branches:
  refs/heads/master 8ef757a78 -> 19c9651bd


Spark+Hive tests should not be executed if JVM max memory is less than 2 GB.


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

Branch: refs/heads/master
Commit: 19c9651bd3565846ed343014ebe75d2bad447dda
Parents: 8ef757a
Author: Henryk Konsek 
Authored: Fri Dec 11 07:51:41 2015 +0100
Committer: Henryk Konsek 
Committed: Fri Dec 11 07:51:41 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/19c9651b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
--
diff --git 
a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
 
b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
index 6c85148..1533f8e 100644
--- 
a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
+++ 
b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
@@ -46,7 +46,7 @@ public class SparkProducerTest extends CamelTestSupport {
 
 static JavaSparkContext sparkContext = createLocalSparkContext();
 
-static boolean shouldRunHive = getRuntime().maxMemory() > 1024 * 1024 * 
1024;
+static boolean shouldRunHive = getRuntime().maxMemory() > 2 * 1024 * 1024 
* 1024;
 
 static HiveContext hiveContext;
 

[1/3] camel git commit: CAMEL-9411 Remove old stuff

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 19c9651bd -> 6dd1856a5


CAMEL-9411 Remove old stuff


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

Branch: refs/heads/master
Commit: 841dab8b5f2d79d5f89b819dc9752538e6877321
Parents: e19417f
Author: gautric 
Authored: Thu Dec 10 16:55:03 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 11 08:00:21 2015 +0100

--
 README.txt  | 123 ---
 examples/README.md  |   9 +-
 .../camel-example-servlet-rest-tomcat/README.md |   1 -
 3 files changed, 4 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/841dab8b/README.txt
--
diff --git a/README.txt b/README.txt
deleted file mode 100755
index 8f43d0b..000
--- a/README.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-Welcome to Apache Camel
-===
 
-
-Apache Camel is a powerful open source integration framework based on known
-Enterprise Integration Patterns with powerful Bean Integration.
-
-Camel lets you create the Enterprise Integration Patterns to implement routing
-and mediation rules in either a Java based Domain Specific Language (or Fluent 
API),
-via Spring or Blueprint based Xml Configuration files, or via the Scala DSL.
-This means you get smart completion of routing rules in your IDE whether
-in your Java, Scala or XML editor.
-
-Apache Camel uses URIs so that it can easily work directly with any kind of
-transport or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA
-or CXF together with working with pluggable Data Format options.
-Apache Camel is a small library which has minimal dependencies for easy 
embedding
-in any Java application. Apache Camel lets you work with the same API 
regardless
-which kind of transport used, so learn the API once and you will be able to
-interact with all the Components that is provided out-of-the-box.
-
-Apache Camel has powerful Bean Binding and integrated seamless with
-popular frameworks such as Spring, Blueprint and Guice.
-
-Apache Camel has extensive testing support allowing you to easily
-unit test your routes.
-
-Apache Camel can be used as a routing and mediation engine for the
-following projects:
-
-  * Apache ServiceMix which is the most popular and powerful distributed
-open source ESB, JBI and OSGi container
-  * Apache ActiveMQ which is the most popular and powerful open
-source message broker
-  * Apache CXF which is a smart web services suite (JAX-WS and JAX-RS)
-  * Apache Karaf which is a small OSGi based runtime which applications
-can be deployed
-  * Apache MINA a networking framework
-
-
-Getting Started
-===
 
-
-To help you get started, try the following links:
-
-Getting Started
-  http://camel.apache.org/getting-started.html
-
-Building
-  http://camel.apache.org/building.html
-
-We welcome contributions of all kinds, for details of how you can help
-  http://camel.apache.org/contributing.html
-
-Please refer to the website for details of finding the issue tracker, 
-email lists, wiki or IRC channel
-
-Wiki: 
-  http://camel.apache.org/
-
-IRC: 
-  http://camel.apache.org/irc-room.html
-
-Mailing list:
-  http://camel.apache.org/mailing-lists.html
-
-Support
-If you need support or help then read this page first
-  http://camel.apache.org/support.html
-
-Forum
-If you hit any problems please talk to us on the Camel Forums
-  http://camel.apache.org/discussion-forums.html
-
-Please help us make Apache Camel better - we appreciate any feedback 
-you may have.
-
-Enjoy!
-
--
-The Camel riders!
-
-Licensing
-===
 
-
-This software is licensed under the terms you may find in the file
-named "LICENSE.txt" in this directory.
-   
-This distribution includes cryptographic software.  The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software.  BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted.  See  for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export 

[2/3] camel git commit: CAMEL-9412 Correct camel-example-swagger-cdi documentation

[davsclaus]

CAMEL-9412 Correct camel-example-swagger-cdi documentation


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

Branch: refs/heads/master
Commit: e19417f0add7268ea50567cd1287a592d6940fdd
Parents: 19c9651
Author: gautric 
Authored: Thu Dec 10 21:42:12 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 11 08:00:21 2015 +0100

--
 examples/camel-example-swagger-cdi/README.md | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e19417f0/examples/camel-example-swagger-cdi/README.md
--
diff --git a/examples/camel-example-swagger-cdi/README.md 
b/examples/camel-example-swagger-cdi/README.md
index d9d3f19..6da3833 100644
--- a/examples/camel-example-swagger-cdi/README.md
+++ b/examples/camel-example-swagger-cdi/README.md
@@ -7,30 +7,33 @@ This is an example that uses the rest-dsl to define a rest 
services which provid
 - PUT user  - Updates or create a user
 - GET user/findAll  - Find all users
 
-
-
 ### Build
 You will need to compile this example first:
-  mvn compile
+
+   mvn compile
 
 ### Run
 To run the example type
-  mvn camel:run
+  
+   mvn camel:run
 
 The rest service can be accessed from the following url
 
curl http://localhost:8080/user
+   
 
 
 For example to get a user with id 123
 
-   curl http://localhost:8080/user/123
+   curl http://localhost:8080/user/123
+   
 
 
 The rest services provides Swagger API which can be accessed from the 
following url
 
-http://localhost:8080/api-docs
-
+curl http://localhost:8080/api-doc
+
+
 
 To stop the example hit `ctrl + c`
 

[3/3] camel git commit: CAMEL-9411 Remove old stuff

[davsclaus]

CAMEL-9411 Remove old stuff


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

Branch: refs/heads/master
Commit: 6dd1856a5181b94af48e24190bdff111954fbded
Parents: 841dab8
Author: Claus Ibsen 
Authored: Fri Dec 11 08:10:21 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Dec 11 08:10:21 2015 +0100

--
 apache-camel/src/main/descriptors/unix-bin.xml  | 38 
 .../src/main/descriptors/windows-bin.xml| 37 ---
 apache-camel/src/main/release/README.txt| 23 +++-
 3 files changed, 15 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6dd1856a/apache-camel/src/main/descriptors/unix-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/unix-bin.xml 
b/apache-camel/src/main/descriptors/unix-bin.xml
index ce0850e..67eb8a8 100644
--- a/apache-camel/src/main/descriptors/unix-bin.xml
+++ b/apache-camel/src/main/descriptors/unix-bin.xml
@@ -46,11 +46,6 @@
 **/target/*
 **/*.ser
 **/*.log
-
-
**/camel-example-reportincident-wssecurity/README.txt
-**/camel-example-osgi/README.txt
-**/camel-example-cxf-osgi/README.txt
-**/camel-example-cxf-blueprint/README.txt
   
   unix
 
@@ -74,39 +69,6 @@
 
   
 
-  
-
-
-  
../examples/camel-example-reportincident-wssecurity/README.txt
-  
/examples/camel-example-reportincident-wssecurity
-  true
-  0644
-  unix
-
-
-  ../examples/camel-example-osgi/README.txt
-  /examples/camel-example-osgi
-  true
-  0644
-  unix
-
-
-  ../examples/camel-example-cxf-osgi/README.txt
-  /examples/camel-example-cxf-osgi
-  true
-  0644
-  unix
-
-
-  ../examples/camel-example-cxf-blueprint/README.txt
-  /examples/camel-example-cxf-blueprint
-  true
-  0644
-  unix
-
-  
-
-
   
 
src/main/descriptors/common-bin.xml
   

http://git-wip-us.apache.org/repos/asf/camel/blob/6dd1856a/apache-camel/src/main/descriptors/windows-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/windows-bin.xml 
b/apache-camel/src/main/descriptors/windows-bin.xml
index d088456..27627cc 100644
--- a/apache-camel/src/main/descriptors/windows-bin.xml
+++ b/apache-camel/src/main/descriptors/windows-bin.xml
@@ -46,11 +46,6 @@
 **/target/*
 **/*.ser
 **/*.log
-
-
**/camel-example-reportincident-wssecurity/README.txt
-**/camel-example-osgi/README.txt
-**/camel-example-cxf-osgi/README.txt
-**/camel-example-cxf-blueprint/README.txt
   
   dos
 
@@ -74,38 +69,6 @@

   
 
-  
-
-
-  
../examples/camel-example-reportincident-wssecurity/README.txt
-  
/examples/camel-example-reportincident-wssecurity
-  true
-  0644
-  dos
-
-
-  ../examples/camel-example-osgi/README.txt
-  /examples/camel-example-osgi
-  true
-  0644
-  dos
-
-
-  ../examples/camel-example-cxf-osgi/README.txt
-  /examples/camel-example-cxf-osgi
-  true
-  0644
-  dos
-
-
-  ../examples/camel-example-cxf-blueprint/README.txt
-  /examples/camel-example-cxf-blueprint
-  true
-  0644
-  dos
-
-  
-
   
 
src/main/descriptors/common-bin.xml
 

http://git-wip-us.apache.org/repos/asf/camel/blob/6dd1856a/apache-camel/src/main/release/README.txt
--
diff --git a/apache-camel/src/main/release/README.txt 
b/apache-camel/src/main/release/README.txt
index 5167302..04d3015 100755
--- a/apache-camel/src/main/release/README.txt
+++ b/apache-camel/src/main/release/README.txt
@@ -92,11 +92,18 @@ code and source code.
 
 The following provides more details on the included cryptographic
 software:
-   * camel-ftp can be configured for secure file transfers
-   * camel-mail can be configured for secure email communications
-   * camel-cxf can be configured for secure web service communications
-   * camel-jetty can be configured to use https
-   * camel-http can be configured to use https
-   * camel-gae can be configured for secure communications
-   * camel-xmlsecurity can be configured for secure communications
-
+  * camel-ahc can be configured to use https
+  * camel-crypto can be used for secure communications
+  * camel-cxf can be configured for secure communications
+  * camel-ftp can be configured for 

camel git commit: Added test based on user forum issue

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master b925b0174 -> 1a7cce0f2


Added test based on user forum issue


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

Branch: refs/heads/master
Commit: 1a7cce0f26fba19ef9e870f66efc8b7c0f85f4f5
Parents: b925b01
Author: Claus Ibsen 
Authored: Thu Dec 10 16:59:42 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 16:59:42 2015 +0100

--
 .../component/sql/SpringSqlMultilineTest.java   | 45 
 .../component/sql/SpringSqlMultilineTest.xml| 43 +++
 2 files changed, 88 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a7cce0f/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
--
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
new file mode 100755
index 000..536ba0f
--- /dev/null
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
@@ -0,0 +1,45 @@
+/**
+ * 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.sql;
+
+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;
+
+/**
+ * @version 
+ */
+public class SpringSqlMultilineTest extends CamelSpringTestSupport {
+
+@Override
+protected AbstractApplicationContext createApplicationContext() {
+return new 
ClassPathXmlApplicationContext("org/apache/camel/component/sql/SpringSqlMultilineTest.xml");
+}
+
+@Test
+public void testSQLEndpoint() throws Exception {
+MockEndpoint mock = getMockEndpoint("mock:result");
+mock.expectedMessageCount(2);
+
+template.sendBody("direct:start", "");
+
+assertMockEndpointsSatisfied();
+}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/1a7cce0f/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
--
diff --git 
a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
 
b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
new file mode 100644
index 000..bef92b9
--- /dev/null
+++ 
b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
@@ -0,0 +1,43 @@
+
+
+http://www.springframework.org/schema/beans;
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+   xmlns:jdbc="http://www.springframework.org/schema/jdbc;
+   xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+   http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+   http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd;>
+
+  
+  
+
+  
+
+  http://camel.apache.org/schema/spring;>
+
+  
+  
+  
+  
+body
+
+  
+
+  
+
+

[2/2] camel git commit: CAMEL-9337 Add readme.txt to all examples

[davsclaus]

CAMEL-9337 Add readme.txt to all examples


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

Branch: refs/heads/master
Commit: 149648b204c18d6ef96abe57115772c9db4107c6
Parents: 4e43476
Author: gautric 
Authored: Thu Dec 10 15:47:25 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 15:53:02 2015 +0100

--
 examples/camel-example-bam/README.md|  21 ++-
 examples/camel-example-etl/README.md|  13 +-
 examples/camel-example-pojo-messaging/README.md |  33 +
 .../camel-example-pojo-messaging/README.txt |  23 
 .../README.md   | 131 +++
 .../README.txt  | 119 -
 examples/camel-example-reportincident/README.md |  43 ++
 .../camel-example-reportincident/README.txt |  31 -
 examples/camel-example-restlet-jdbc/README.md   |  58 
 examples/camel-example-restlet-jdbc/README.txt  |  38 --
 .../camel-example-route-throttling/README.md|  48 +++
 .../camel-example-route-throttling/README.txt   |  42 --
 .../README.md   |  66 ++
 .../README.txt  |  63 -
 .../camel-example-servlet-rest-tomcat/README.md |   1 +
 .../README.txt  |   1 -
 .../README.md   |  39 ++
 .../README.txt  |  30 -
 examples/camel-example-servlet-tomcat/README.md |  39 ++
 .../camel-example-servlet-tomcat/README.txt |  29 
 examples/camel-example-simplejirabot/README.md  |  47 +++
 examples/camel-example-simplejirabot/README.txt |  38 --
 .../camel-example-spark-rest-tomcat/README.md   |  42 ++
 .../camel-example-spark-rest-tomcat/README.txt  |  32 -
 examples/camel-example-splunk/README.md |  63 +
 examples/camel-example-splunk/README.txt|  45 ---
 .../camel-example-spring-boot-metrics/README.md |  33 -
 examples/camel-example-spring-boot/README.md|  49 +++
 examples/camel-example-spring-boot/README.txt   |  41 --
 .../camel-example-spring-javaconfig/README.md   |  41 ++
 .../camel-example-spring-javaconfig/README.txt  |  32 -
 examples/camel-example-spring-jms/README.md |  48 +++
 examples/camel-example-spring-jms/README.txt|  41 --
 .../camel-example-spring-security/README.md |  41 ++
 .../camel-example-spring-security/README.txt|  35 -
 examples/camel-example-spring-ws/README.md  |  40 ++
 examples/camel-example-spring-ws/README.txt |  35 -
 examples/camel-example-spring-xquery/README.md  |  41 ++
 examples/camel-example-spring-xquery/README.txt |  34 -
 examples/camel-example-spring/README.md |  40 ++
 examples/camel-example-spring/README.txt|  32 -
 examples/camel-example-sql-blueprint/README.md  |  72 ++
 examples/camel-example-sql-blueprint/README.txt |  68 --
 examples/camel-example-sql/README.md|  71 ++
 examples/camel-example-sql/README.txt   |  68 --
 examples/camel-example-ssh-security/README.md   |  99 ++
 examples/camel-example-ssh-security/README.txt  |  96 --
 examples/camel-example-ssh/README.md|  39 ++
 examples/camel-example-ssh/README.txt   |  42 --
 examples/camel-example-swagger-cdi/README.md|  46 +++
 examples/camel-example-swagger-cdi/README.txt   |  38 --
 examples/camel-example-swagger-java/README.md   |  44 +++
 examples/camel-example-swagger-java/README.txt  |  36 -
 examples/camel-example-tracer/README.md |  45 +++
 examples/camel-example-tracer/README.txt|  36 -
 .../README.md   |  63 +
 .../README.txt  |  58 
 .../camel-example-twitter-websocket/README.md   |  45 +++
 .../camel-example-twitter-websocket/README.txt  |  37 --
 59 files changed, 1477 insertions(+), 1244 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/149648b2/examples/camel-example-bam/README.md
--
diff --git a/examples/camel-example-bam/README.md 
b/examples/camel-example-bam/README.md
index ccf5c5d..710992f 100644
--- a/examples/camel-example-bam/README.md
+++ b/examples/camel-example-bam/README.md
@@ -1,9 +1,9 @@
 # Camel BAM Example
 
-### Introduction 
+### Introduction
 
 This example shows how to perform Business Activity Monitoring (BAM)
-with 

[1/2] camel git commit: CAMEL-9337 Add readme.txt to all examples

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 4e43476ae -> 149648b20


http://git-wip-us.apache.org/repos/asf/camel/blob/149648b2/examples/camel-example-sql/README.md
--
diff --git a/examples/camel-example-sql/README.md 
b/examples/camel-example-sql/README.md
new file mode 100644
index 000..b7c1f04
--- /dev/null
+++ b/examples/camel-example-sql/README.md
@@ -0,0 +1,71 @@
+# Camel SQL Example
+
+### Introduction
+This example shows how to exchange data using a shared database table.
+
+The example has two Camel routes. The first route insert new data into the 
table,
+triggered by a timer to run every 5th second.
+
+The second route pickup the newly inserted rows from the table,
+process the row(s), and mark the row(s) as processed when done;
+to avoid picking up the same rows again.
+
+### Build 
+
+You will need to compile this example first:
+
+   mvn install
+   
+### Run with maven
+
+To run the example type
+
+   mvn camel:run
+
+To stop the example hit `ctrl + c`
+
+This example uses Spring to setup and configure the database,
+as well the CamelContext. You can see this in the following file:
+In the src/main/resources/META-INF/spring/camel-context.xml
+
+### Run with Karaf
+
+To install Apache Camel in Karaf you type in the shell (we use version 
${project.version}):
+
+   features:chooseurl camel ${project.version}
+   features:install camel
+
+First you need to install the following features in Karaf/ServiceMix with:
+
+   features:install camel-spring
+   features:install camel-sql
+
+Then you need to install JDBC connection pool and the Derby Database:
+
+   osgi:install -s mvn:commons-pool/commons-pool/1.6
+   osgi:install -s mvn:commons-dbcp/commons-dbcp/1.4
+   osgi:install -s mvn:org.apache.derby/derby/10.10.1.1
+
+Then you can install the Camel example:
+
+   osgi:install -s 
mvn:org.apache.camel/camel-example-sql/${project.version}
+
+And you can see the application running by tailing the logs
+
+   log:tail
+
+And you can use `ctrl + c` to stop tailing the log.
+
+### Documentation
+This example is documented at 
+
+### Forum, Help, etc 
+
+If you hit an problems please let us know on the Camel Forums 

+
+Please help us make Apache Camel better - we appreciate any feedback you may
+have.  Enjoy!
+
+
+
+The Camel riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/149648b2/examples/camel-example-sql/README.txt
--
diff --git a/examples/camel-example-sql/README.txt 
b/examples/camel-example-sql/README.txt
deleted file mode 100644
index 83087e1..000
--- a/examples/camel-example-sql/README.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-Camel SQL Example
-=
-
-This example shows how to exchange data using a shared database table.
-
-The example has two Camel routes. The first route insert new data into the 
table,
-triggered by a timer to run every 5th second.
-
-The second route pickup the newly inserted rows from the table,
-process the row(s), and mark the row(s) as processed when done;
-to avoid picking up the same rows again.
-
-Standalone
---
-You will need to compile this example first:
-  mvn compile
-
-To run the example type
-  mvn camel:run
-
-To stop the example hit ctrl + c
-
-This example uses Spring to setup and configure the database,
-as well the CamelContext. You can see this in the following file:
-In the src/main/resources/META-INF/spring/camel-context.xml
-
-Apache Karaf / ServiceMix
--
-You will need to compile this example first:
-  mvn compile
-
-To install Apache Camel in Karaf you type in the shell (we use version 
${project.version}):
-
-  features:chooseurl camel ${project.version}
-  features:install camel
-
-First you need to install the following features in Karaf/ServiceMix with:
-
-  features:install camel-spring
-  features:install camel-sql
-
-Then you need to install JDBC connection pool and the Derby Database:
-
-  osgi:install -s mvn:commons-pool/commons-pool/1.6
-  osgi:install -s mvn:commons-dbcp/commons-dbcp/1.4
-  osgi:install -s mvn:org.apache.derby/derby/10.10.1.1
-
-Then you can install the Camel example:
-
-  osgi:install -s mvn:org.apache.camel/camel-example-sql/${project.version}
-
-And you can see the application running by tailing the logs
-
-  log:tail
-
-And you can use ctrl + c to stop tailing the log.
-
-This example is documented at
-  http://camel.apache.org/sql-example.html
-
-If you hit any problems please talk to us on the Camel Forums
-  http://camel.apache.org/discussion-forums.html
-
-Please help us make Apache Camel better - we appreciate any feedback you
-may have.  Enjoy!
-
-
-The Camel riders!

camel git commit: Allow component developers to set a timeout for default scheduled poll consumer

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 9013fe82e -> 4e43476ae


Allow component developers to set a timeout for default scheduled poll consumer


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

Branch: refs/heads/master
Commit: 4e43476ae014ea303405e6ae66120e60c8827331
Parents: 9013fe8
Author: Claus Ibsen 
Authored: Thu Dec 10 15:43:19 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 15:46:01 2015 +0100

--
 .../impl/DefaultScheduledPollConsumer.java  | 29 +++-
 1 file changed, 28 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4e43476a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
index e827fdc..847574d 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
@@ -32,6 +32,7 @@ import org.apache.camel.util.ServiceHelper;
  */
 public class DefaultScheduledPollConsumer extends ScheduledPollConsumer {
 private PollingConsumer pollingConsumer;
+private int timeout;
 
 public DefaultScheduledPollConsumer(DefaultEndpoint defaultEndpoint, 
Processor processor) {
 super(defaultEndpoint, processor);
@@ -45,7 +46,15 @@ public class DefaultScheduledPollConsumer extends 
ScheduledPollConsumer {
 int messagesPolled = 0;
 
 while (isPollAllowed()) {
-Exchange exchange = pollingConsumer.receiveNoWait();
+Exchange exchange;
+if (timeout == 0) {
+exchange = pollingConsumer.receiveNoWait();
+} else if (timeout < 0) {
+exchange = pollingConsumer.receive();
+} else {
+exchange = pollingConsumer.receive(timeout);
+}
+
 if (exchange == null) {
 break;
 }
@@ -67,6 +76,24 @@ public class DefaultScheduledPollConsumer extends 
ScheduledPollConsumer {
 return messagesPolled;
 }
 
+public int getTimeout() {
+return timeout;
+}
+
+/**
+ * Sets a timeout to use with {@link PollingConsumer}.
+ * 
+ * Use timeout < 0 for {@link PollingConsumer#receive()}.
+ * Use timeout == 0 for {@link 
PollingConsumer#receiveNoWait()}.
+ * Use timeout > 0 for {@link 
PollingConsumer#receive(long)}}.
+ *  The default timeout value is 0
+ *
+ * @param timeout the timeout value
+ */
+public void setTimeout(int timeout) {
+this.timeout = timeout;
+}
+
 @Override
 protected void doStart() throws Exception {
 pollingConsumer = getEndpoint().createPollingConsumer();

camel git commit: Upgrade Weld to version 2.3.2.Final

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master e6b06ad05 -> 9013fe82e


Upgrade Weld to version 2.3.2.Final


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

Branch: refs/heads/master
Commit: 9013fe82e349859e63ab2a968026f651e6cb4a42
Parents: e6b06ad
Author: Andrea Cosentino 
Authored: Thu Dec 10 15:33:01 2015 +0100
Committer: Andrea Cosentino 
Committed: Thu Dec 10 15:33:01 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9013fe82/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 85b1754..65bec18 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -521,7 +521,7 @@
 1.7
 3.1.0
 0.7
-2.3.1.Final
+2.3.2.Final
 0.9.4_5
 4.4.1
 1.0.2_2

camel git commit: CAMEL-9337 Update README.md -p1

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 72626b572 -> b925b0174


CAMEL-9337 Update README.md -p1


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

Branch: refs/heads/master
Commit: b925b017423d171fd1f8b3c8324ad44944e9b2aa
Parents: 72626b5
Author: Greg. A 
Authored: Thu Dec 10 16:12:22 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 16:25:14 2015 +0100

--
 examples/README.md | 95 +
 1 file changed, 95 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b925b017/examples/README.md
--
diff --git a/examples/README.md b/examples/README.md
index d8d65a3..b042487 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -8,6 +8,101 @@ command, Maven will attempt to download the required 
dependencies from a
 central repository to your local repository.
 View the individual example READMEs for details.
 
+### List of all examples
+
+All examples have been sort by type/category
+
+
+# Big data
+
+* [camel-example-spark-rest-tomcat](camel-example-spark-rest-tomcat/README.md)
+* [camel-example-splunk](camel-example-splunk/README.md)
+
+# EIP
+
+* [camel-example-tracer](camel-example-tracer/README.md)
+* [camel-example-route-throttling](camel-example-route-throttling/README.md)
+* [camel-example-aggregate](camel-example-aggregate/README.md)
+* [camel-example-etl](camel-example-etl/README.md)
+* [camel-example-loadbalancing](camel-example-loadbalancing/README.md)
+
+# Easy 
+
+* [camel-example-cdi](camel-example-cdi/README.md)
+* [camel-example-console](camel-example-console/README.md)
+* [camel-example-jmx](camel-example-jmx/README.md)
+* [camel-example-ftp](camel-example-ftp/README.md)
+* [camel-example-ssh](camel-example-ssh/README.md)
+* [camel-example-ssh-security](camel-example-ssh-security/README.md)
+
+# "Real" use case
+
+* [camel-example-loan-broker](camel-example-loan-broker/README.md)
+* [camel-example-reportincident](camel-example-reportincident/README.md)
+* 
[camel-example-reportincident-wssecurity](camel-example-reportincident-wssecurity/README.md)
+* [camel-example-cafe](camel-example-cafe/README.md)
+* [camel-example-bam](camel-example-bam/README.md)
+
+# OSGi
+
+* [camel-example-osgi](camel-example-osgi/README.md)
+* [camel-example-osgi-rmi](camel-example-osgi-rmi/README.md)
+* [camel-example-sql-blueprint](camel-example-sql-blueprint/README.md)
+* 
[camel-example-servlet-rest-blueprint](camel-example-servlet-rest-blueprint/README.md)
+
+# DB
+
+* [camel-example-restlet-jdbc](camel-example-restlet-jdbc/README.md)
+* [camel-example-mybatis](camel-example-mybatis/README.md)
+* [camel-example-jdbc](camel-example-jdbc/README.md)
+* [camel-example-restlet-jdbc](camel-example-restlet-jdbc/README.md)
+* [camel-example-sql](camel-example-sql/README.md)
+
+# MoM  
+
+* [camel-example-activemq-tomcat](camel-example-activemq-tomcat/README.md)
+* [camel-example-jms-file](camel-example-jms-file/README.md)
+* [camel-example-guice-jms](camel-example-guice-jms/README.md)
+* [camel-example-pojo-messaging](camel-example-pojo-messaging/README.md)
+
+# Social
+
+* [camel-example-box-osgi](camel-example-box-osgi/README.md)
+* [camel-example-gae](camel-example-gae/README.md)
+* [camel-example-gauth](camel-example-gauth/README.md)
+* [camel-example-simplejirabot](camel-example-simplejirabot/README.md)
+* [camel-example-twitter-websocket](camel-example-twitter-websocket/README.md)
+* 
[camel-example-twitter-websocket-blueprint](camel-example-twitter-websocket-blueprint/README.md)
+
+# Spring 
+
+* [camel-example-spring](camel-example-spring/README.md)
+* [camel-example-spring-boot](camel-example-spring-boot/README.md)
+* 
[camel-example-spring-boot-metrics](camel-example-spring-boot-metrics/README.md)
+* [camel-example-spring-javaconfig](camel-example-spring-javaconfig/README.md)
+* [camel-example-spring-jms](camel-example-spring-jms/README.md)
+* [camel-example-spring-security](camel-example-spring-security/README.md)
+* [camel-example-spring-ws](camel-example-spring-ws/README.md)
+* [camel-example-spring-xquery](camel-example-spring-xquery/README.md)
+
+# Miscellaneous
+
+* 
[camel-example-servlet-rest-tomcat](camel-example-servlet-rest-tomcat/README.md)
+* [camel-example-servlet-tomcat](camel-example-servlet-tomcat/README.md)
+* 
[camel-example-servlet-tomcat-no-spring](camel-example-servlet-tomcat-no-spring/README.md)
+* [camel-example-swagger-cdi](camel-example-swagger-cdi/README.md)
+* 

[2/2] camel git commit: CAMEL-9382: netty http should be more friendly in the hostname and support default http as protocol. And whether people include double slashes or not.

[davsclaus]

CAMEL-9382: netty http should be more friendly in the hostname and support 
default http as protocol. And whether people include double slashes or not.


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

Branch: refs/heads/camel-2.16.x
Commit: 2a66cb22088979fc401d96dcc857a892c8ca0f58
Parents: 5564ac9
Author: Claus Ibsen 
Authored: Thu Dec 10 16:22:49 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 16:24:03 2015 +0100

--
 .../netty/http/NettyHttpComponent.java  | 26 --
 .../netty/http/NettyDefaultProtocolTest.java| 54 
 .../http/NettyHttpProtocolNoSlashTest.java  | 54 
 .../netty4/http/NettyHttpComponent.java | 30 ---
 .../netty4/http/NettyDefaultProtocolTest.java   | 53 +++
 .../http/NettyHttpProtocolNoSlashTest.java  | 54 
 6 files changed, 261 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2a66cb22/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index f551b20..8bc0aea 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -100,15 +100,31 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 sharedPort = shared.getPort();
 }
 
-// configure configuration
-config = parseConfiguration(config, remaining, parameters);
+// we must include the protocol in the remaining
+boolean hasProtocol = remaining.startsWith("http://;) || 
remaining.startsWith("http:")
+|| remaining.startsWith("https://;) || 
remaining.startsWith("https:");
+if (!hasProtocol) {
+// http is the default protocol
+remaining = "http://; + remaining;
+}
+boolean hasSlash = remaining.startsWith("http://;) || 
remaining.startsWith("https://;);
+if (!hasSlash) {
+// must have double slash after protocol
+if (remaining.startsWith("http:")) {
+remaining = "http://; + remaining.substring(5);
+} else {
+remaining = "https://; + remaining.substring(6);
+}
+}
+LOG.debug("Netty http url: {}", remaining);
+
 // set port on configuration which is either shared or using default 
values
 if (sharedPort != -1) {
 config.setPort(sharedPort);
 } else if (config.getPort() == -1) {
-if ("http".equals(config.getProtocol())) {
+if (remaining.startsWith("http:")) {
 config.setPort(80);
-} else if ("https".equals(config.getProtocol())) {
+} else if (remaining.startsWith("https:")) {
 config.setPort(443);
 }
 }
@@ -116,6 +132,8 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 throw new IllegalArgumentException("Port number must be 
configured");
 }
 
+// configure configuration
+config = parseConfiguration(config, remaining, parameters);
 setProperties(config, parameters);
 
 // validate config

http://git-wip-us.apache.org/repos/asf/camel/blob/2a66cb22/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
--
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
new file mode 100644
index 000..4160538
--- /dev/null
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, 

[1/2] camel git commit: CAMEL-9382: netty http should be more friendly in the hostname and support default http as protocol. And whether people include double slashes or not.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 5564ac9ed -> 2a66cb220
  refs/heads/master 149648b20 -> 72626b572


CAMEL-9382: netty http should be more friendly in the hostname and support 
default http as protocol. And whether people include double slashes or not.


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

Branch: refs/heads/master
Commit: 72626b57258ed224486fe4af6caa18f7313f
Parents: 149648b
Author: Claus Ibsen 
Authored: Thu Dec 10 16:22:49 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 10 16:22:49 2015 +0100

--
 .../netty/http/NettyHttpComponent.java  | 26 --
 .../netty/http/NettyDefaultProtocolTest.java| 54 
 .../http/NettyHttpProtocolNoSlashTest.java  | 54 
 .../netty4/http/NettyHttpComponent.java | 30 ---
 .../netty4/http/NettyDefaultProtocolTest.java   | 53 +++
 .../http/NettyHttpProtocolNoSlashTest.java  | 54 
 6 files changed, 261 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/72626b57/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index f551b20..8bc0aea 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -100,15 +100,31 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 sharedPort = shared.getPort();
 }
 
-// configure configuration
-config = parseConfiguration(config, remaining, parameters);
+// we must include the protocol in the remaining
+boolean hasProtocol = remaining.startsWith("http://;) || 
remaining.startsWith("http:")
+|| remaining.startsWith("https://;) || 
remaining.startsWith("https:");
+if (!hasProtocol) {
+// http is the default protocol
+remaining = "http://; + remaining;
+}
+boolean hasSlash = remaining.startsWith("http://;) || 
remaining.startsWith("https://;);
+if (!hasSlash) {
+// must have double slash after protocol
+if (remaining.startsWith("http:")) {
+remaining = "http://; + remaining.substring(5);
+} else {
+remaining = "https://; + remaining.substring(6);
+}
+}
+LOG.debug("Netty http url: {}", remaining);
+
 // set port on configuration which is either shared or using default 
values
 if (sharedPort != -1) {
 config.setPort(sharedPort);
 } else if (config.getPort() == -1) {
-if ("http".equals(config.getProtocol())) {
+if (remaining.startsWith("http:")) {
 config.setPort(80);
-} else if ("https".equals(config.getProtocol())) {
+} else if (remaining.startsWith("https:")) {
 config.setPort(443);
 }
 }
@@ -116,6 +132,8 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 throw new IllegalArgumentException("Port number must be 
configured");
 }
 
+// configure configuration
+config = parseConfiguration(config, remaining, parameters);
 setProperties(config, parameters);
 
 // validate config

http://git-wip-us.apache.org/repos/asf/camel/blob/72626b57/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
--
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
new file mode 100644
index 000..4160538
--- /dev/null
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyDefaultProtocolTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this