camel git commit: CAMEL-9201 - Minor fixes to the project structure.

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master db3448582 -> f97ac2787


CAMEL-9201 - Minor fixes to the project structure.

The changes introduced no longer depend on DeltaSpike Core, so removed that 
dependency and upgraded to the latest patch version (v1.5.4)
Updated some docs, they were referring to RoutesBuilder and extending it, 
however its an interface so that doesn't work well.


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

Branch: refs/heads/master
Commit: f97ac2787b12e6469af9efee9f46f3100873abe5
Parents: db34485
Author: John D. Ament 
Authored: Sun Feb 21 19:49:22 2016 -0500
Committer: Claus Ibsen 
Committed: Mon Feb 22 08:55:03 2016 +0100

--
 components/camel-cdi/pom.xml|  7 ---
 components/camel-cdi/src/main/docs/cdi.adoc | 12 ++--
 parent/pom.xml  |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f97ac278/components/camel-cdi/pom.xml
--
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index f2c5f47..6c10e00 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -79,13 +79,6 @@
 
 
 
-  org.apache.deltaspike.core
-  deltaspike-core-api
-  ${deltaspike-version}
-  true
-
-
-
   org.apache.deltaspike.cdictrl
   deltaspike-cdictrl-api
   ${deltaspike-version}

http://git-wip-us.apache.org/repos/asf/camel/blob/f97ac278/components/camel-cdi/src/main/docs/cdi.adoc
--
diff --git a/components/camel-cdi/src/main/docs/cdi.adoc 
b/components/camel-cdi/src/main/docs/cdi.adoc
index 3fc1071..f6ff6f0 100644
--- a/components/camel-cdi/src/main/docs/cdi.adoc
+++ b/components/camel-cdi/src/main/docs/cdi.adoc
@@ -55,7 +55,7 @@ route is as simple as declaring a class, e.g.:
 
 [source,java]
 
-class MyRouteBean extends RoutesBuilder {
+class MyRouteBean extends RouteBuilder {
  
 @Override
 public void configure() {
@@ -103,7 +103,7 @@ you can used the `@ContextName` qualifier provided by 
Camel CDI, e.g.:
 [source,java]
 
 @ContextName("camel-context")
-class MyRouteBean extends RoutesBuilder {
+class MyRouteBean extends RouteBuilder {
  
 @Override
 public void configure() {
@@ -215,7 +215,7 @@ class BarCamelContext extends DefaultCamelContext {
 }
  
 @ContextName("foo")
-class RouteAddedToFooCamelContext extends RoutesBuilder {
+class RouteAddedToFooCamelContext extends RouteBuilder {
 
 @Override
 public void configure() {
@@ -224,7 +224,7 @@ class RouteAddedToFooCamelContext extends RoutesBuilder {
 }
  
 @BarContextQualifier
-class RouteAddedToBarCamelContext extends RoutesBuilder {
+class RouteAddedToBarCamelContext extends RouteBuilder {
 
 @Override
 public void configure() {
@@ -233,7 +233,7 @@ class RouteAddedToBarCamelContext extends RoutesBuilder {
 }
  
 @ContextName("baz")
-class RouteAddedToBazCamelContext extends RoutesBuilder {
+class RouteAddedToBazCamelContext extends RouteBuilder {
 
 @Override
 public void configure() {
@@ -242,7 +242,7 @@ class RouteAddedToBazCamelContext extends RoutesBuilder {
 }
  
 @MyOtherQualifier
-class RouteNotAddedToAnyCamelContext extends RoutesBuilder {
+class RouteNotAddedToAnyCamelContext extends RouteBuilder {
 
 @Override
 public void configure() {

http://git-wip-us.apache.org/repos/asf/camel/blob/f97ac278/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fc91bcc..003079b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -133,7 +133,7 @@
 [3.0,4.0)
 3.0.5
 3.0.5
-1.5.3
+1.5.4
 10.11.1.1
 3.3.4
 2.1.7

camel git commit: Upgrade Google app engine and related bundle to version 1.9.32

2016-02-21 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 9ede6a24b -> db3448582


Upgrade Google app engine and related bundle to version 1.9.32


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

Branch: refs/heads/master
Commit: db34485822e698c7cdcb3f235f7a46208edb4f8e
Parents: 9ede6a2
Author: Andrea Cosentino 
Authored: Mon Feb 22 08:14:36 2016 +0100
Committer: Andrea Cosentino 
Committed: Mon Feb 22 08:14:36 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/db344858/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ef7835..fc91bcc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -197,8 +197,8 @@
 
1.1.3
 1.4
 1.0.10
-1.9.31
-
1.9.31_1
+1.9.32
+
1.9.32_1
 1.41.5.w1
 1.41.1_1
 19.0

camel git commit: CAMEL-9458 Add details in camel-ignite Karaf feature (displayed with feature:info).

2016-02-21 Thread raulk 
Repository: camel
Updated Branches:
  refs/heads/master 4aa1d392b -> 9ede6a24b


CAMEL-9458 Add details in camel-ignite Karaf feature (displayed with 
feature:info).


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

Branch: refs/heads/master
Commit: 9ede6a24be919c8ea437e500ac87754c43c04ac9
Parents: 4aa1d39
Author: Raul Kripalani 
Authored: Sun Feb 21 20:20:18 2016 +
Committer: Raul Kripalani 
Committed: Sun Feb 21 20:20:18 2016 +

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9ede6a24/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 f1b6a8e..160fc3c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -714,7 +714,15 @@
 mvn:org.apache.camel/camel-ibatis/${project.version}
   
   
-The camel-ignite feature can only run on a SUN JVM. You need to 
add the package sun.nio.ch to the java platform packages in the 
etc/jre.properties file.
+
+
+
 camel-core
 ignite-core
 mvn:org.apache.camel/camel-ignite/${project.version}

svn commit: r980901 - in /websites/production/camel/content: cache/main.pageCache ignite.html

2016-02-21 Thread buildbot 
Author: buildbot
Date: Sun Feb 21 20:18:42 2016
New Revision: 980901

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/ignite.html

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

Modified: websites/production/camel/content/ignite.html
==
--- websites/production/camel/content/ignite.html (original)
+++ websites/production/camel/content/ignite.html Sun Feb 21 20:18:42 2016
@@ -85,13 +85,13 @@

 
 
-Camel Ignite 
componentAvailable as of Camel 2.17https://ignite.apache.org/;>Apache 
Ignite In-Memory Data Fabric is a high-performance, integrated and 
distributed in-memory platform for computing and transacting on large-scale 
data sets in real-time, orders of magnitude faster than possible with 
traditional disk-based or flash technologies. Itis designed to deliver 
uncompromised performance for a wide set of in-memory computing use cases from 
high performance computing, to the industry most advanced data grid, highly 
available service grid, and streaming. See all https://ignite.apache.org/features.html;>features.https://cwiki.apache.org/confluence; 
data-linked-resource-content-type="image/png" 
data-linked-resource-container-id="61333868" 
data-linked-resource-container-version="16">This component offers 
seven endpoints to cover much of Ignite's functionality:Ignite 
Cache.Ignite Compute.Ignite Messaging.Ignite 
Events.Ignite Sets.Ignite Queues.Ignite ID 
Generator.To use this component,add the 
following dependency to yourpom.xml:
+Camel Ignite 
componentAvailable as of Camel 2.17https://ignite.apache.org/;>Apache 
Ignite In-Memory Data Fabric is a high-performance, integrated and 
distributed in-memory platform for computing and transacting on large-scale 
data sets in real-time, orders of magnitude faster than possible with 
traditional disk-based or flash technologies. Itis designed to deliver 
uncompromised performance for a wide set of in-memory computing use cases from 
high performance computing, to the industry most advanced data grid, highly 
available service grid, and streaming. See all https://ignite.apache.org/features.html;>features.https://ignite.apache.org/images/apache-ignite.png; 
data-image-src="https://ignite.apache.org/images/apache-ignite.png;>This
 component offers seven endpoints to cover much of Ignite's 
functionality:Ignite Cache.Ignite Compute.Ignite 
Messaging.Ignite Events.Ignite Sets.Ignite 
Queues.Ignite ID Generator.To use this 
component,add the following dependency to 
yourpom.xml:
 
-Table of contentsCACHE: Ignite 
Cache endpointThis endpoint allows you to interact with an https://apacheignite.readme.io/docs/data-grid; style="line-height: 
1.42857;" rel="nofollow">Ignite Cache:
+Running in OSGiIf running in an OSGi container, 
please don't miss the OSGi 
Support section below.Table 
of contentsCACHE: Ignite Cache endpointThis 
endpoint allows you to interact with an https://apacheignite.readme.io/docs/data-grid; style="line-height: 
1.42857;" rel="nofollow">Ignite Cache:
 
 Offers both a Producer (to invoke cache operations on an Ignite 
cache) and a Consumer (to consume changes from a continuous query).The 
cache value is always the body of the message, whereas the cache key is always 
stored in theIgniteConstants.IGNITE_CACHE_KEY message 
header. Even if you configure a fixed operation in the 
endpoint URI, you can vary it per-exchange by setting the 
IgniteConstants.IGNITE_CACHE_OPERATION message 
header.OptionsOptionTypeDefault valueDescriptionCompulsoryConsum
 er/produceroperationIgniteCacheOperation enum---Cache operation to perform.Possible values: GET, 
PUT, REMOVE, SIZE, REBALANCE, QUERY, CLEAR.NProducerfailIfInexistentCachebooleanfalseWhether to fail the initialization if the cache doesn't 
exist.NProducercachePeekModeCachePeekMode (Ignite) enumALLThe cache peek mode used for SIZE 
operations.NProducerqueryQuery---The query used for QUERY operations (as a producer) or 
to launch the continuous query (as a consumer). You can use a reference to a reg
 istry bean with a syntax like: ?query=#myQuery.Y for the consumer / N for the 
producerProducer (for QUERY operation) and 
ConsumerremoteFilterCacheEntryEventSerializableFilter---An optional remote filter for 
the continuous query consumer. You can use a reference to a registry bean with 
a syntax like:

camel git commit: CAMEL-9458 Added note about installing camel-ignite

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 418c2e366 -> 4aa1d392b


CAMEL-9458 Added note about installing camel-ignite


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

Branch: refs/heads/master
Commit: 4aa1d392b2d91204a483ea355005d493fd7a9e2c
Parents: 418c2e3
Author: John D. Ament 
Authored: Sun Feb 21 10:03:52 2016 -0500
Committer: John D. Ament 
Committed: Sun Feb 21 10:03:52 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/camel/blob/4aa1d392/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 e28cfd9..f1b6a8e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -714,6 +714,7 @@
 mvn:org.apache.camel/camel-ibatis/${project.version}
   
   
+The camel-ignite feature can only run on a SUN JVM. You need to 
add the package sun.nio.ch to the java platform packages in the 
etc/jre.properties file.
 camel-core
 ignite-core
 mvn:org.apache.camel/camel-ignite/${project.version}

[1/2] camel git commit: Allow to configure thread pool of spark

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 2834779e5 -> 418c2e366


Allow to configure thread pool of spark


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

Branch: refs/heads/master
Commit: e413ac78b3622f74f012d6a10b5b5ed142ae948d
Parents: 2834779
Author: Claus Ibsen 
Authored: Sun Feb 21 14:12:35 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 14:12:35 2016 +0100

--
 .../camel/component/sparkrest/CamelSpark.java   | 11 ++
 .../component/sparkrest/SparkComponent.java | 36 
 2 files changed, 47 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e413ac78/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
index 65b20a7..8cdfd41 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
@@ -46,6 +46,17 @@ public final class CamelSpark {
 }
 
 /**
+ * Configures the thread pool
+ */
+public static void threadPool(int minThreads, int maxThreads, int 
timeOutMillis) {
+int min = minThreads > 0 ? minThreads : -1;
+int max = maxThreads > 0 ? maxThreads : -1;
+int idle = timeOutMillis > 0 ? timeOutMillis : -1;
+
+Spark.threadPool(max, min, idle);
+}
+
+/**
  * Adds a Spark REST verb that routes to the given spark route
  *
  * @param verb   the HTTP verb

http://git-wip-us.apache.org/repos/asf/camel/blob/e413ac78/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
index 19cabcd..30f3db8 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
@@ -38,6 +38,9 @@ public class SparkComponent extends UriEndpointComponent 
implements RestConsumer
 
 private int port = 4567;
 private String ipAddress;
+private int minThreads;
+private int maxThreads;
+private int timeOutMillis;
 private SparkConfiguration sparkConfiguration = new SparkConfiguration();
 private SparkBinding sparkBinding = new DefaultSparkBinding();
 
@@ -69,6 +72,39 @@ public class SparkComponent extends UriEndpointComponent 
implements RestConsumer
 this.ipAddress = ipAddress;
 }
 
+public int getMinThreads() {
+return minThreads;
+}
+
+/**
+ * Minimum number of threads in Spark thread-pool (shared globally)
+ */
+public void setMinThreads(int minThreads) {
+this.minThreads = minThreads;
+}
+
+public int getMaxThreads() {
+return maxThreads;
+}
+
+/**
+ * Maximum number of threads in Spark thread-pool (shared globally)
+ */
+public void setMaxThreads(int maxThreads) {
+this.maxThreads = maxThreads;
+}
+
+public int getTimeOutMillis() {
+return timeOutMillis;
+}
+
+/**
+ * Thread idle timeout in millis where threads that has been idle for a 
longer period will be terminated from the thread pool
+ */
+public void setTimeOutMillis(int timeOutMillis) {
+this.timeOutMillis = timeOutMillis;
+}
+
 public SparkConfiguration getSparkConfiguration() {
 return sparkConfiguration;
 }

[2/2] camel git commit: camel-spark-rest allow to configure it some more

2016-02-21 Thread davsclaus 
camel-spark-rest allow to configure it some more


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

Branch: refs/heads/master
Commit: 418c2e366e112c9582864e03146d19b3286822a2
Parents: e413ac7
Author: Claus Ibsen 
Authored: Sun Feb 21 14:19:20 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 14:19:20 2016 +0100

--
 .../camel/component/sparkrest/CamelSpark.java   |  7 +++
 .../component/sparkrest/SparkComponent.java | 55 
 2 files changed, 62 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/418c2e36/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
index 8cdfd41..c5e317d 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
@@ -57,6 +57,13 @@ public final class CamelSpark {
 }
 
 /**
+ * Configures connection to be secure
+ */
+public static void security(String keystoreFile, String keystorePassword, 
String truststoreFile, String truststorePassword) {
+Spark.secure(keystoreFile, keystorePassword, truststoreFile, 
truststorePassword);
+}
+
+/**
  * Adds a Spark REST verb that routes to the given spark route
  *
  * @param verb   the HTTP verb

http://git-wip-us.apache.org/repos/asf/camel/blob/418c2e36/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
index 30f3db8..51c553f 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
@@ -38,9 +38,16 @@ public class SparkComponent extends UriEndpointComponent 
implements RestConsumer
 
 private int port = 4567;
 private String ipAddress;
+
 private int minThreads;
 private int maxThreads;
 private int timeOutMillis;
+
+private String keystoreFile;
+private String keystorePassword;
+private String truststoreFile;
+private String truststorePassword;
+
 private SparkConfiguration sparkConfiguration = new SparkConfiguration();
 private SparkBinding sparkBinding = new DefaultSparkBinding();
 
@@ -105,6 +112,50 @@ public class SparkComponent extends UriEndpointComponent 
implements RestConsumer
 this.timeOutMillis = timeOutMillis;
 }
 
+public String getKeystoreFile() {
+return keystoreFile;
+}
+
+/**
+ * Configures connection to be secure to use the keystore file
+ */
+public void setKeystoreFile(String keystoreFile) {
+this.keystoreFile = keystoreFile;
+}
+
+public String getKeystorePassword() {
+return keystorePassword;
+}
+
+/**
+ * Configures connection to be secure to use the keystore password
+ */
+public void setKeystorePassword(String keystorePassword) {
+this.keystorePassword = keystorePassword;
+}
+
+public String getTruststoreFile() {
+return truststoreFile;
+}
+
+/**
+ * Configures connection to be secure to use the truststore file
+ */
+public void setTruststoreFile(String truststoreFile) {
+this.truststoreFile = truststoreFile;
+}
+
+public String getTruststorePassword() {
+return truststorePassword;
+}
+
+/**
+ * Configures connection to be secure to use the truststore password
+ */
+public void setTruststorePassword(String truststorePassword) {
+this.truststorePassword = truststorePassword;
+}
+
 public SparkConfiguration getSparkConfiguration() {
 return sparkConfiguration;
 }
@@ -165,6 +216,10 @@ public class SparkComponent extends UriEndpointComponent 
implements RestConsumer
 CamelSpark.ipAddress(getIpAddress());
 }
 
+if (keystoreFile != null || truststoreFile != null) {
+CamelSpark.security(keystoreFile, keystorePassword,

camel git commit: Upgrade camel-spark-rest component

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 68c697313 -> 2834779e5


Upgrade camel-spark-rest component


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

Branch: refs/heads/master
Commit: 2834779e56fa73c57202ab262a24922d6ca11467
Parents: 68c6973
Author: Claus Ibsen 
Authored: Sun Feb 21 14:06:51 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 14:06:51 2016 +0100

--
 .../java/org/apache/camel/component/sparkrest/CamelSpark.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2834779e/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
index 79e05d9..65b20a7 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

camel git commit: Upgrade camel-spark-rest component

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master ac3b44099 -> 68c697313


Upgrade camel-spark-rest component


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

Branch: refs/heads/master
Commit: 68c69731325d820252bbace04c37d6cfe5eb5083
Parents: ac3b440
Author: Claus Ibsen 
Authored: Sun Feb 21 14:05:32 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 14:05:32 2016 +0100

--
 .../java/org/apache/camel/component/sparkrest/CamelSpark.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/68c69731/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
index b67dcab..79e05d9 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
@@ -46,12 +46,12 @@ public final class CamelSpark {
 }
 
 /**
- * Adds a Spark REST verb that routes to the given Camel route
+ * Adds a Spark REST verb that routes to the given spark route
  *
  * @param verb   the HTTP verb
  * @param path   the context path
  * @param accept the accept header
- * @param route  the Camel route
+ * @param route  the spark route (we call a Camel route from here)
  */
 public static void spark(String verb, String path, String accept, Route 
route) {
 if ("get".equals(verb)) {

camel git commit: Upgrade camel-spark-rest component

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 2ded240dd -> ac3b44099


Upgrade camel-spark-rest component


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

Branch: refs/heads/master
Commit: ac3b44099b7b82ac728d6f79b6c5a3ae10973c5f
Parents: 2ded240
Author: Claus Ibsen 
Authored: Sun Feb 21 13:57:50 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 13:58:04 2016 +0100

--
 .../camel/component/sparkrest/CamelSpark.java   | 35 +--
 .../sparkrest/ServletSparkApplication.java  | 37 
 .../component/sparkrest/SparkComponent.java | 13 +++---
 .../sparkrest/SparkServletContextListener.java  | 46 
 parent/pom.xml  |  4 +-
 5 files changed, 40 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac3b4409/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
index 533ce3c..b67dcab 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSpark.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +24,35 @@ public final class CamelSpark {
 private CamelSpark() {
 }
 
+/**
+ * Stops the Spark Server
+ */
+public static void stop() {
+Spark.stop();
+}
+
+/**
+ * Configures the port number to use
+ */
+public static void port(int port) {
+Spark.port(port);
+}
+
+/**
+ * Configures the IP address to use
+ */
+public static void ipAddress(String ip) {
+Spark.ipAddress(ip);
+}
+
+/**
+ * Adds a Spark REST verb that routes to the given Camel route
+ *
+ * @param verb   the HTTP verb
+ * @param path   the context path
+ * @param accept the accept header
+ * @param route  the Camel route
+ */
 public static void spark(String verb, String path, String accept, Route 
route) {
 if ("get".equals(verb)) {
 if (accept != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/ac3b4409/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/ServletSparkApplication.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/ServletSparkApplication.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/ServletSparkApplication.java
deleted file mode 100644
index 5df4cd0..000
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/ServletSparkApplication.java
+++ /dev/null
@@ -1,37 +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.component.sparkrest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import spark.Access;
-import spark.servlet.SparkApplication;
-
-/**
- * A {@link spark.servlet.SparkApplication} to

svn commit: r980884 [3/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache jetty.html

2016-02-21 Thread buildbot 
Modified: websites/production/camel/content/jetty.html
==
--- websites/production/camel/content/jetty.html (original)
+++ websites/production/camel/content/jetty.html Sun Feb 21 11:19:37 2016
@@ -97,7 +97,7 @@
 URI format
 http://hostname[:port][/resourceUri][?options]
 ]]>
-You can append query options to the URI in the following 
format, ?option=valueoption=value...OptionsNameDefault ValueDescriptionsessionSupportfalseSpecifies whether to enable the 
session manager on the server side of Jetty.httpClient.XXXnullConfiguration of Jetty's http://wiki.eclipse.org/Jetty/Tutorial/HttpClient; 
rel="nofollow">HttpClient. For example, setting 
httpClient.idleTimeout=3 sets the idle timeout to 30 seconds. 
And httpClient.timeout=3 sets the request timeout to 30 
seconds, in case you want to timeout sooner if you have long running 
request/response calls.httpClientnullTo use a shared 
org.eclipse.jetty.client.HttpClient for all producers created by 
this endpoint. This option should only be used in special 
circumstances.httpClientMinThreadsnullCamel 2.11: Producer 
only: To set a value for minimum number of threads in 
HttpClient thread pool. This setting override any setting 
configured on component level. Notice that both a min and max size must be 
configured. If not set it default to min 8 threads used in Jettys thread 
pool.httpClientMaxThreadsnullCamel 2.11: 
Producer only: To set a value for maximum number of threads in 
HttpClient thread pool. This setting override any setting 
configured on component level. Notice that both a min and max size must be 
configured. If not set it default to max 16 threads used in Jettys thread 
pool.<
 /td>httpBindingRefnullReference to an 
org.apache.camel.component.http.HttpBinding in the Registry. HttpBinding can be used to 
customize how a response should be written for the 
consumer.jettyHttpBindingRefnullCamel 2.6.0+: 
Reference to an org.apache.camel.component.jetty.JettyHttpBinding 
in the Registry. 
JettyHttpBinding can be used to customize how a response should be 
written for the producer.matchOnUriPrefixfalseWhether or not the 
CamelServlet should try to find a target consumer by matching the 
URI prefix if no exact match is found. See here How do I let Jetty match 
wildcards.handlersnullSpecifies a comma-delimited set of 
org.mortbay.jetty.Handler instances in your Registry (such as your Spring 
ApplicationContext). These handlers are added to the Jetty servlet 
context (for example, to add security). Important:
  You can not use different handlers with different Jetty endpoints 
using the same port number. The handlers is associated to the port number. If 
you need different handlers, then use different port 
numbers.chunkedtrueCamel 2.2: If this option 
is false Jetty servlet will disable the HTTP streaming and set the 
content-length header on the responseenableJmxfalseCamel 2.3: If 
this option is true, Jetty JMX support will be enabled for this endpoint. See 
Jetty JMX support for more details.disableStreamCachefalseCamel 2.3: Determines 
whether or not the raw input stream from Jetty is cached or not (Camel will 
read the stream into a in memory/overflow to file, Stream caching) cache. By default Camel will 
cache the Jetty input stream to support reading it multiple times to ensure it 
Camel can retrieve all data from the stream. However you can set this option to 
true when you for example need to access the raw stream, such as 
streaming it directly to a file or other persistent store. DefaultHttpBinding 
will copy the request input stream into a stream cache and put it into message 
body if this option is false to support reading the stream 
multiple tim
 es. If you use Jetty to bridge/proxy an 
endpoint then consider enabling this option to improve performance, in case you 
do not need to read the message payload multiple times.throwExceptionOnFailuretrueOption to disable throwing the 
HttpOperationFailedException in case of failed responses from the 
remote server. This allows you to get all responses regardles of the HTTP 
status code.transferExceptionfalseCamel 2.6: If enabled and 
an Exchange failed 
 processing on the consumer side, and if the caused Exception was send back 
serialized in the response as a 
application/x-java-serialized-object content type. On the producer 
side the exception will be deserialized and thrown as is, instead of the 
HttpOperationFailedException. The caused exception is required to 
be serialized.bridgeEndpointfalseCamel 2.1: If the option 
is true , HttpProducer will ignore the Exchange.HTTP_URI header, and use the 
endpoint's URI for request. You may also set the 
throwExceptionOnFailure to be false to let the HttpProducer 
send all the fault response back.  
Camel 2.3: If the option is true, HttpProducer and 
CamelServlet wi
 ll skip the

svn commit: r980884 [2/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache jetty.html

2016-02-21 Thread buildbot 
Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Sun Feb 21 11:19:37 
2016
@@ -3733,11 +3733,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMSThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -5852,11 +5852,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example
@@ -17311,11 +17311,11 @@ template.send(direct:alias-verify&
 ]]>
 See Also
 Configuring 
CamelComponentEndpointGetting StartedCrypto Crypto is also available as a Data Format CXF ComponentWhen using CXF as a consumer, the 
CXF Bean Component allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to consume web 
 services. The bean component's configuration is also simpler and provides the 
fastest method to implement web services using Camel and 
CXF.When using CXF in streaming modes 
(see DataFormat option), then also read about Stream caching.The 
cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services 
hosted in CXF./**/
+/*]]>*/
 CXF Component
 URI formatOptions
 The descriptions of the 
dataformats
@@ -21425,7 +21425,7 @@ from(direct:hello)
 URI format
 http://hostname[:port][/resourceUri][?options]
 ]]>
-You can append query options to the URI in the following 
format, ?option=valueoption=value...OptionsNameDefault ValueDescriptionsessionSupportfalseSpecifies whether to enable the 
session manager on the server side of Jetty.httpClient.XXXnullConfiguration of Jetty's http://wiki.eclipse.org/Jetty/Tutorial/HttpClient; 
rel="nofollow">HttpClient. For example, setting 
httpClient.idleTimeout=3 sets the idle timeout to 30 seconds. 
And httpClient.timeout=3 sets the request timeout to 30 
seconds, in case you want to timeout sooner if you have long running 
request/response calls.httpClientnullTo use a shared 
org.eclipse.jetty.client.HttpClient for all producers created by 
this endpoint. This option should only be used in special 
circumstances.httpClientMinThreadsnullCamel 2.11: Producer 
only: To set a value for minimum number of threads in 
HttpClient thread pool. This setting override any setting 
configured on component level. Notice that both a min and max size must be 
configured. If not set it default to min 8 threads used in Jettys thread 
pool.httpClientMaxThreadsnullCamel 2.11: 
Producer only: To set a value for maximum number of threads in 
HttpClient thread pool. This setting override any setting 
configured on component level. Notice that both a min and max size must be 
configured. If not set it default to max 16 threads used

svn commit: r980884 [1/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache jetty.html

2016-02-21 Thread buildbot 
Author: buildbot
Date: Sun Feb 21 11:19:37 2016
New Revision: 980884

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/jetty.html

Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Sun Feb 21 
11:19:37 2016
@@ -1016,11 +1016,11 @@ template.send(direct:alias-verify&
 ]]>
 See Also
 Configuring 
CamelComponentEndpointGetting StartedCrypto Crypto is also available as a Data Format CXF ComponentWhen using CXF as a consumer, the 
CXF Bean Component allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to cons
 ume web services. The bean component's configuration is also simpler and 
provides the fastest method to implement web services using Camel and 
CXF.When using CXF in streaming modes 
(see DataFormat option), then also read about Stream caching.The 
cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services 
hosted in CXF./**/
+/*]]>*/
 CXF Component
 URI formatOptions
 The descriptions 
of the dataformats
@@ -5130,7 +5130,7 @@ from(direct:hello)
 URI format
 http://hostname[:port][/resourceUri][?options]
 ]]>
-You can append query options to the URI in the following 
format, ?option=valueoption=value...OptionsNameDefault ValueDescriptionsessionSupportfalseSpecifies whether to enable the 
session manager on the server side of Jetty.httpClient.XXXnullConfiguration of Jetty's http://wiki.eclipse.org/Jetty/Tutorial/HttpClient; 
rel="nofollow">HttpClient. For example, setting 
httpClient.idleTimeout=3 sets the idle timeout to 30 seconds. 
And httpClient.timeout=3 sets the request timeout to 30 
seconds, in case you want to timeout sooner if you have long running 
request/response calls.httpClientnullTo use a shared 
org.eclipse.jetty.client.HttpClient for all producers created by 
this endpoint. This option should only be used in special 
circumstances.httpClientMinThreadsnullCamel 2.11: Producer 
only: To set a value for minimum number of threads in 
HttpClient thread pool. This setting override any setting 
configured on component level. Notice that both a min and max size must be 
configured. If not set it default to min 8 threads used in Jettys thread 
pool.httpClientMaxThreadsnullCamel 2.11: 
Producer only: To set a value for maximum number of threads in 
HttpClient thread pool. This setting override any setting 
configured on component level. Notice that both a min and max size must be 
configured. If not set it default to max 16 threads used in Jetty
 s thread pool.httpBindingRefnullReference to an 
org.apache.camel.component.http.HttpBinding in the Registry. HttpBinding can be used to 
customize how a response should be written for the 
consumer.jettyHttpBindingRefnullCamel 2.6.0+: 
Reference to an org.apache.camel.component.jetty.JettyHttpBinding 
in the Registry. 
JettyHttpBinding can be used to customize how a response should be 
written for the producer.matchOnUriPrefixfalseWhether or not the 
CamelServlet should try to find a target consumer by matching the 
URI prefix if no exact match is found. See here How do I let Jetty match 
wildcards.handlersnullSpecifies a comma-delimited set of 
org.mortbay.jetty.Handler instances in your Registry (such as your Spring 
ApplicationContext). These handlers are added to the Jetty servlet 
context (for example, to add security).
  Important: You can not use different handlers with different 
Jetty endpoints using the same port number. The handlers is associated to the 
port number. If you need different handlers, then use different port 
numbers.chunkedtrueCamel 2.2: If this option 
is false Jetty servlet will disable the HTTP streaming and set the 
content-length header on the responseenableJmxfalseCamel 2.3: If 
this option is true, Jetty JMX support will be enabled for this endpoint. See 
Jetty JMX support for more details.disableStreamCachefalseCamel 2.3: Determines 
whether or not the raw input stream from Jetty is cached or not (Camel will 
read the stream into a in

camel git commit: CAMEL-9501 Support to setup the filter InitParameters from Jetty URI

2016-02-21 Thread ningjiang 
Repository: camel
Updated Branches:
  refs/heads/master 48020041f -> 2ded240dd


CAMEL-9501 Support to setup the filter InitParameters from Jetty URI


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

Branch: refs/heads/master
Commit: 2ded240ddcb5fc92f6dd56e606e0906e63a21a4e
Parents: 4802004
Author: Willem Jiang 
Authored: Sun Feb 21 18:56:31 2016 +0800
Committer: Willem Jiang 
Committed: Sun Feb 21 19:09:24 2016 +0800

--
 .../org/apache/camel/util/IntrospectionSupport.java  | 15 +++
 .../camel/component/jetty/JettyHttpComponent.java| 10 +-
 .../camel/component/jetty/JettyHttpEndpoint.java | 15 +++
 .../camel/component/jetty/CustomFiltersTest.java |  9 +++--
 4 files changed, 46 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2ded240d/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java 
b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index e4a98df..46fd82e 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -448,6 +448,21 @@ public final class IntrospectionSupport {
 return rc;
 }
 
+public static Map extractStringProperties(Map properties) {
+ObjectHelper.notNull(properties, "properties");
+
+Map rc = new LinkedHashMap(properties.size());
+
+for (Iterator> it = 
properties.entrySet().iterator(); it.hasNext();) {
+Map.Entry entry = it.next();
+String name = entry.getKey();
+String value = entry.getValue().toString();
+rc.put(name, value);
+}
+
+return rc;
+}
+
 public static boolean setProperties(CamelContext context, TypeConverter 
typeConverter, Object target, Map properties) throws Exception {
 ObjectHelper.notNull(target, "target");
 ObjectHelper.notNull(properties, "properties");

http://git-wip-us.apache.org/repos/asf/camel/blob/2ded240d/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index ca6afc0..5e39a14 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -185,6 +185,9 @@ public abstract class JettyHttpComponent extends 
HttpCommonComponent implements
 // extract httpClient. parameters
 Map httpClientParameters = 
IntrospectionSupport.extractProperties(parameters, "httpClient.");
 
+// extract filterInit. parameters
+Map filterInitParameters =  
IntrospectionSupport.extractStringProperties(IntrospectionSupport.extractProperties(parameters,
 "filterInit."));
+
 String address = remaining;
 URI addressUri = new 
URI(UnsafeUriCharactersEncoder.encodeHttpURI(address));
 URI endpointUri = URISupport.createRemainingURI(addressUri, 
parameters);
@@ -217,10 +220,12 @@ public abstract class JettyHttpComponent extends 
HttpCommonComponent implements
 }
 // setup the proxy host and proxy port
 
-
 if (httpClientParameters != null && !httpClientParameters.isEmpty()) {
 endpoint.setHttpClientParameters(httpClientParameters);
 }
+if (filterInitParameters != null && !filterInitParameters.isEmpty()) {
+endpoint.setFilterInitParameters(filterInitParameters);
+}
 if (handlerList.size() > 0) {
 endpoint.setHandlers(handlerList);
 }
@@ -369,6 +374,9 @@ public abstract class JettyHttpComponent extends 
HttpCommonComponent implements
 List filters = endpoint.getFilters();
 for (Filter filter : filters) {
 FilterHolder filterHolder = new FilterHolder();
+if (endpoint.getFilterInitParameters() != null) {
+

camel git commit: CAMEL-9131: Component docs

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master ae2012ee7 -> 48020041f


CAMEL-9131: Component docs


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

Branch: refs/heads/master
Commit: 48020041ff873e399c3eff8093658e48197ff2ed
Parents: ae2012e
Author: Claus Ibsen 
Authored: Sun Feb 21 11:30:37 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 11:30:37 2016 +0100

--
 .../apache/camel/component/cxf/CxfEndpoint.java | 56 ++--
 1 file changed, 28 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/48020041/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 84c83ee..8dd5442 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -115,8 +115,8 @@ import org.slf4j.LoggerFactory;
 public class CxfEndpoint extends DefaultEndpoint implements 
HeaderFilterStrategyAware, Service, Cloneable {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CxfEndpoint.class);
-
-@UriPath
+
+@UriParam(label = "advanced")
 protected Bus bus;
 
 private AtomicBoolean getBusHasBeenCalled = new AtomicBoolean(false);
@@ -136,59 +136,59 @@ public class CxfEndpoint extends DefaultEndpoint 
implements HeaderFilterStrategy
 
 @UriPath(description = "To lookup an existing configured CxfEndpoint. Must 
used bean: as prefix.")
 private String beanId;
-@UriPath
+@UriParam(defaultValue = "POJO")
+private DataFormat dataFormat = DataFormat.POJO;
+@UriPath(label = "service")
 private String address;
-@UriParam
+@UriParam(label = "service")
 private String wsdlURL;
-@UriParam
+@UriParam(label = "service")
 private Class serviceClass;
-@UriParam(name = "portName")
+@UriParam(label = "service", name = "portName")
 private String portNameString;
 private QName portName;
-@UriParam(name = "serviceName")
+@UriParam(label = "service", name = "serviceName")
 private String serviceNameString;
 private QName serviceName;
+@UriParam(label = "service")
+private String bindingId;
+@UriParam(label = "service")
+private String publishedEndpointUrl;
 @UriParam(label = "producer")
 private String defaultOperationName;
 @UriParam(label = "producer")
 private String defaultOperationNamespace;
-@UriParam
+@UriParam(label = "producer")
 private boolean wrapped;
 @UriParam
 private Boolean wrappedStyle;
-@UriParam
+@UriParam(label = "advanced")
 private Boolean allowStreaming;
-@UriParam(defaultValue = "POJO")
-private DataFormat dataFormat = DataFormat.POJO;
-@UriParam
-private String publishedEndpointUrl;
-@UriParam
+@UriParam(label = "advanced")
 private CxfBinding cxfBinding;
-@UriParam
+@UriParam(label = "advanced")
 private HeaderFilterStrategy headerFilterStrategy;
-@UriParam
+@UriParam(label = "advanced")
 private boolean defaultBus;
-@UriParam
+@UriParam(label = "logging")
 private boolean loggingFeatureEnabled;
-@UriParam(defaultValue = "" + AbstractLoggingInterceptor.DEFAULT_LIMIT)
+@UriParam(label = "logging", defaultValue = "" + 
AbstractLoggingInterceptor.DEFAULT_LIMIT)
 private int loggingSizeLimit;
-@UriParam
+@UriParam(label = "advanced")
 private boolean mtomEnabled;
-@UriParam
+@UriParam(label = "advanced")
 private boolean skipPayloadMessagePartCheck;
-@UriParam
+@UriParam(label = "logging")
 private boolean skipFaultLogging;
-@UriParam
+@UriParam(label = "advanced")
 private boolean mergeProtocolHeaders;
-@UriParam
-private String bindingId;
-@UriParam
+@UriParam(label = "advanced")
 private CxfEndpointConfigurer cxfEndpointConfigurer;
-@UriParam(defaultValue = "3")
+@UriParam(label = "advanced", defaultValue = "3")
 private long continuationTimeout = 3;
-@UriParam
+@UriParam(label = "security")
 private String username;
-@UriParam
+@UriParam(label = "security")
 private String password;
 @UriParam(label = "advanced", prefix = "properties.", multiValue = true)
 private Map properties;

camel git commit: CAMEL-8879: BatchMessage is only for InOnly and its deperecated.

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 9bfad3cb8 -> ae2012ee7


CAMEL-8879: BatchMessage is only for InOnly and its deperecated.


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

Branch: refs/heads/master
Commit: ae2012ee7faf12fadcbb3760e4e56990563fdf1a
Parents: 9bfad3c
Author: Claus Ibsen 
Authored: Sun Feb 21 11:17:19 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 11:18:23 2016 +0100

--
 .../java/org/apache/camel/component/sjms/BatchMessage.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ae2012ee/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
index fd9b79e..6a8eec4 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
@@ -22,7 +22,13 @@ import java.util.Map;
 /**
  * A {@link List} of these objects can be used to batch a collection of bodies 
and
  * header pairs in one exchange.
+ * 
+ * Important: This BatchMessage is only supported by InOnly 
messaging style
+ * (eg you cannot do request/reply with this BatchMessage)
+ *
+ * @deprecated do not use, its being removed in a future Camel release
  */
+@Deprecated
 public class BatchMessage {
 private T payload;
 private Map headers;

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

2016-02-21 Thread buildbot 
Author: buildbot
Date: Sun Feb 21 10:19:11 2016
New Revision: 980881

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2170-release.html
websites/production/camel/content/sjms-batch.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 Sun Feb 21 
10:19:11 2016
@@ -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...)The component documentation generated from 
the source code has been double checked to be up to date and include all the 
options the endpoints supports.Camel 
commands forSpring BootMany improvements toCamelKuraAdded 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 operationTheThrottler has been improved to be more performant and 
use a rolling window for time periods which gives a better flow.
 ThesetHeader 
andsetExchangeProperty allows to use a dynamic header key 
using theSimplelanguage if 
the name of the key is aSimplelanguage expression.Add collate 
function toSimple language to make 
it easier to split a message body into sub lists of a specified size. The 
function is similar to the collate function from Groovy.TheCamel Run Maven Goal is able 
to auto detect if its a OSGi Blueprint or CDI project so end users no longer 
have to explicit configure this on the plugin.Camel-Elasticsearch now supports Multiget, 
Multisearch and exists operationCamel-Git now supports Cherry-pick 
operationStopping the
 Main class from JMX will now trigger shutdown of the Main 
class/JVM also, as it does when hitting ctrl + c.Added option to 
skipFirst to theTokenizer 
language to make it easy to skip the very first element, when for example 
splitting a CSV file using theSplitter EIP.TheRest DSL now supports default values for query 
parametersTheRest DSL 
now only binds from POJO to JSon/XML if the content-type is for json or xml. 
This allows you to specify a custom content-type and omit the binding, such as 
when having binary payloads.Exchange and Message only output id in 
their toString method to avoid outputting any message details such as sensitive 
details from message bodies.CamelError Handler no longer 
 log message body/header details when logging the Message History. This avoids logging 
anysensitive details from message bodies.CamelException Clause andError Handler now supports using a 
customProcessor to be invoked right after an exception was 
thrown using the newonExceptionOccurred 
option.RabbitMQ consumer more 
resilient to auto re-connect in case of connection failuresTheJSON camel-jacksoncan be 
used as a type converter to convert json to/from POJO and String/byte[] types, 
if enabled.TheSQL 
Component now supports loading the SQL queries from external files on the 
classpath or file system, whe
 re you can format the queries using newlines and 
indenting.TheMail consumer 
allows to use an idempotent repositorywhich allows to cluster consuming 
from the same mailbox, and let the repository coordinate whether a mail message 
is valid for the consumer to process.TheHTTP andHTTP4 
producers now support thedisableStreamCache option to allow 
to use the raw response stream as the message body instead of wrapping 
usingStream 
cachingThe Camel CDI component 
has been improved to better fit into the CDI programming model, cover a larger 
set of containers, and provide these new features:The Camel events from 
the

[1/2] camel git commit: CAMEL-9239: camel-sjms - Add completionInterval to batch consumer. Polished the code and fixed some mistakes.

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master e58534afb -> 9bfad3cb8


CAMEL-9239: camel-sjms - Add completionInterval to batch consumer. Polished the 
code and fixed some mistakes.


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

Branch: refs/heads/master
Commit: 9bfad3cb84679a4bebb5861833a8bc752c3139e8
Parents: cf288b6
Author: Claus Ibsen 
Authored: Sun Feb 21 10:57:33 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 11:02:47 2016 +0100

--
 .../component/sjms/batch/SjmsBatchConsumer.java | 90 +++-
 .../sjms/batch/SjmsBatchConsumerTest.java   | 55 
 2 files changed, 123 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9bfad3cb/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
index 5316664..b5d72a2 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
@@ -88,6 +88,10 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 if (completionInterval > 0 && completionTimeout != 
SjmsBatchEndpoint.DEFAULT_COMPLETION_TIMEOUT) {
 throw new IllegalArgumentException("Only one of completionInterval 
or completionTimeout can be used, not both.");
 }
+if (sjmsBatchEndpoint.isSendEmptyMessageWhenIdle() && 
completionTimeout <= 0 && completionInterval <= 0) {
+throw new IllegalArgumentException("SendEmptyMessageWhenIdle can 
only be enabled if either completionInterval or completionTimeout is also set");
+}
+
 pollDuration = sjmsBatchEndpoint.getPollDuration();
 if (pollDuration < 0) {
 throw new IllegalArgumentException("pollDuration must be 0 or 
greater");
@@ -205,6 +209,9 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 }
 
 private class BatchConsumptionLoop implements Runnable {
+
+private final BatchConsumptionTask task = new 
BatchConsumptionTask(completionTimeoutTrigger);
+
 @Override
 public void run() {
 try {
@@ -217,7 +224,7 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 MessageConsumer consumer = session.createConsumer(queue);
 
 try {
-consumeBatchesOnLoop(session, consumer, 
completionTimeoutTrigger);
+task.consumeBatchesOnLoop(session, consumer);
 } finally {
 try {
 consumer.close();
@@ -250,22 +257,44 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 }
 }
 
-private void consumeBatchesOnLoop(final Session session, final 
MessageConsumer consumer, final AtomicBoolean timeoutInterval) throws 
JMSException {
-final boolean usingTimeout = completionTimeout > 0;
+private final class BatchConsumptionTask {
+
+// state
+private final AtomicBoolean timeoutInterval;
+private final AtomicBoolean timeout = new AtomicBoolean();
+private int messageCount;
+private long timeElapsed;
+private long startTime;
+private Exchange aggregatedExchange;
+
+public BatchConsumptionTask(AtomicBoolean timeoutInterval) {
+this.timeoutInterval = timeoutInterval;
+}
+
+private void consumeBatchesOnLoop(final Session session, final 
MessageConsumer consumer) throws JMSException {
+final boolean usingTimeout = completionTimeout > 0;
+
+LOG.trace("BatchConsumptionTask +++ start +++");
 
-batchConsumption:
-while (running.get()) {
-// reset the state
-boolean timeout = false;
-int messageCount = 0;
-long timeElapsed = 0;
-long startTime = 0;
-Exchange aggregatedExchange = null;
+while (running.get()) {
 
-batch:
-// loop while no timeout or interval triggered and while we 
have room still for messages in the batch
-while (!timeout && !timeoutInterval.compareAndSet(true,

[2/2] camel git commit: CAMEL-9239: camel-sjms - Add completionInterval to batch consumer. Polished the code and fixed some mistakes.

2016-02-21 Thread davsclaus 
CAMEL-9239: camel-sjms - Add completionInterval to batch consumer. Polished the 
code and fixed some mistakes.


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

Branch: refs/heads/master
Commit: cf288b6a1ce8828ea500077f55161c67c4d95a33
Parents: e58534a
Author: Claus Ibsen 
Authored: Sun Feb 21 10:24:31 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 11:02:47 2016 +0100

--
 .../component/sjms/batch/SessionCompletion.java |   6 +-
 .../component/sjms/batch/SjmsBatchConsumer.java | 149 ++-
 .../component/sjms/batch/SjmsBatchEndpoint.java |  69 +++--
 3 files changed, 176 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cf288b6a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
index cae90cb..f2a7e69 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SessionCompletion.java
@@ -41,8 +41,7 @@ class SessionCompletion implements Synchronization {
 LOG.debug("Committing");
 session.commit();
 } catch (JMSException ex) {
-LOG.error("Exception caught while committing: {}", 
ex.getMessage());
-exchange.setException(ex);
+LOG.warn("Exception caught while committing JMS session", ex);
 }
 }
 
@@ -52,8 +51,7 @@ class SessionCompletion implements Synchronization {
 LOG.debug("Rolling back");
 session.rollback();
 } catch (JMSException ex) {
-LOG.error("Exception caught while rolling back: {}", 
ex.getMessage());
-exchange.setException(ex);
+LOG.warn("Exception caught while rolling back JMS session", ex);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cf288b6a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
index 505aa07..5316664 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.sjms.batch;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Date;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -45,6 +44,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SjmsBatchConsumer extends DefaultConsumer {
+
+public static final String SJMS_BATCH_TIMEOUT_CHECKER = 
"SJmsBatchTimeoutChecker";
+
 private static final boolean TRANSACTED = true;
 private static final Logger LOG = 
LoggerFactory.getLogger(SjmsBatchConsumer.class);
 
@@ -53,9 +55,14 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 private static final AtomicLong MESSAGE_RECEIVED = new AtomicLong();
 private static final AtomicLong MESSAGE_PROCESSED = new AtomicLong();
 
+private ScheduledExecutorService timeoutCheckerExecutorService;
+private boolean shutdownTimeoutCheckerExecutorService;
+private final AtomicBoolean completionTimeoutTrigger = new AtomicBoolean();
+
 private final SjmsBatchEndpoint sjmsBatchEndpoint;
 private final AggregationStrategy aggregationStrategy;
 private final int completionSize;
+private final int completionInterval;
 private final int completionTimeout;
 private final int consumerCount;
 private final int pollDuration;
@@ -76,7 +83,11 @@ public class SjmsBatchConsumer extends DefaultConsumer {
 destinationName = 
ObjectHelper.notEmpty(sjmsBatchEndpoint.getDestinationName(), 
"destinationName");
 
 completionSize =

camel git commit: Upgrade Openshift-client to the same version of Kubernetes-client

2016-02-21 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 471937e27 -> e58534afb


Upgrade Openshift-client to the same version of Kubernetes-client


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

Branch: refs/heads/master
Commit: e58534afb8e40c24192138c432de8a930a2d333b
Parents: 471937e
Author: Andrea Cosentino 
Authored: Sun Feb 21 09:17:17 2016 +0100
Committer: Andrea Cosentino 
Committed: Sun Feb 21 09:17:17 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/e58534af/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f8b666e..0efbb35 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -422,7 +422,7 @@
 4.7.3
 2.4.0
 2.7.0.Final
-1.3.68
+1.3.70
 6.3.0.Final
 2.0.8_6
 2.4_5

camel git commit: CAMEL-9413: Polished

2016-02-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 89533e240 -> 471937e27


CAMEL-9413: Polished


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

Branch: refs/heads/master
Commit: 471937e2790373c5cfc5510554c6c33341738f43
Parents: 89533e2
Author: Claus Ibsen 
Authored: Sun Feb 21 09:01:42 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Feb 21 09:01:42 2016 +0100

--
 examples/camel-example-box-osgi/README.md  |  4 ++--
 examples/camel-example-cxf-blueprint/README.md |  2 +-
 examples/camel-example-cxf-osgi/README.md  | 16 +++-
 3 files changed, 6 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/471937e2/examples/camel-example-box-osgi/README.md
--
diff --git a/examples/camel-example-box-osgi/README.md 
b/examples/camel-example-box-osgi/README.md
index fe68c4e..d161cca 100644
--- a/examples/camel-example-box-osgi/README.md
+++ b/examples/camel-example-box-osgi/README.md
@@ -18,7 +18,7 @@ First you will need to compile the example:
 
 ### Run
 
-To run the example on Apache Karaf 2.3.x
+To run the example on Apache Karaf 2.4.x
 
  Step 1
 
@@ -28,7 +28,7 @@ Launch karaf
 
 Add features required into Karak
 
-   features:addUrl 
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+   features:chooseurl camel ${version}
features:install camel-spring
features:install camel-box
 

http://git-wip-us.apache.org/repos/asf/camel/blob/471937e2/examples/camel-example-cxf-blueprint/README.md
--
diff --git a/examples/camel-example-cxf-blueprint/README.md 
b/examples/camel-example-cxf-blueprint/README.md
index bad7fed..1a387c7 100644
--- a/examples/camel-example-cxf-blueprint/README.md
+++ b/examples/camel-example-cxf-blueprint/README.md
@@ -18,7 +18,7 @@ You will need to compile this example first:
 
 ### Run
 
-To run the example on Apache Karaf 2.3.1 or better
+To run the example on Apache Karaf 2.4.x
 
  Step 1: Laraf
 

http://git-wip-us.apache.org/repos/asf/camel/blob/471937e2/examples/camel-example-cxf-osgi/README.md
--
diff --git a/examples/camel-example-cxf-osgi/README.md 
b/examples/camel-example-cxf-osgi/README.md
index 21247f5..27f2cff 100644
--- a/examples/camel-example-cxf-osgi/README.md
+++ b/examples/camel-example-cxf-osgi/README.md
@@ -25,26 +25,15 @@ Remarks:
 
 ### Run
 
-To run the example on Apache ServiceMix 4.x or Apache Karaf 2.2.x
+To run the example on Apache Karaf 2.4.x
 
  Step 1: launch the server
 
karaf / karaf.bat
 
-Note for Karaf 2.2.x:
-  a) edit the etc/jre.properties file to add the following packages to be 
exported
-  jre-1.6=, \
-  com.sun.org.apache.xerces.internal.dom, \
-  com.sun.org.apache.xerces.internal.jaxp, \
-
-  b) from the same file comment out the following exports already provided by 
the bundles
-  that will be imported next: javax.xml.bind*, javax.jws*, javax.xml.soap*, 
javax.xml.ws*,
-  javax.activation, javax.annotation, javax.xml.stream*.
-
-
  Step 2: Add features required
 
-   features:addUrl 
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+   features:chooseurl camel ${version}
features:install war
features:install cxf
features:install camel-spring
@@ -53,6 +42,7 @@ Note for Karaf 2.2.x:
 
 
  Step 3: Deploy the example
+
osgi:install -s mvn:org.apache.camel/camel-example-cxf-osgi/${version}
 
  Step 4: Verify that your service is available using the following url in 
the browser.