camel git commit: Upgrade Rabbitmq AMQP client to version 3.6.6

2016-11-23 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/master f907d0365 -> 6d1f54234


Upgrade Rabbitmq AMQP client to version 3.6.6


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

Branch: refs/heads/master
Commit: 6d1f542342d944deaf0bf1a690c4b2ee37d64698
Parents: f907d03
Author: Andrea Cosentino 
Authored: Thu Nov 24 08:56:20 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Nov 24 08:56:50 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/6d1f5423/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a9ecc1..5f77766 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -494,7 +494,7 @@
 [1.8,2)
 2.2.3
 1.6.2
-3.6.5
+3.6.6
 0.9.10_3
 1.4_1
 3.0.1



[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration

2016-11-23 Thread gzurowski
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x dcd8a7ac6 -> 9e38f7b5a


http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index 1cce268..e6994bc 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index d1903fb..199392a 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-example-cxf

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-etl/pom.xml
--
diff --git a/examples/camel-example-etl/pom.xml 
b/examples/camel-example-etl/pom.xml
index 1b55271..813424a 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-example-etl

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-ftp/pom.xml
--
diff --git a/examples/camel-example-ftp/pom.xml 
b/examples/camel-example-ftp/pom.xml
index a96a81c..2230019 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-example-ftp

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-gae/pom.xml
--
diff --git a/examples/camel-example-gae/pom.xml 
b/examples/camel-example-gae/pom.xml
index fde8296..75ea5e6 100644
--- a/examples/camel-example-gae/pom.xml
+++ b/examples/camel-example-gae/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-example-gae

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-gauth/pom.xml
--
diff --git a/examples/camel-example-gauth/pom.xml 
b/examples/camel-example-gauth/pom.xml
index 02fbc39..a1e17e1 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-example-gauth

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml 
b/examples/camel-example-guice-jms/pom.xml
index 257d40f..9fa7da6 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-example-guice-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index 4829460..440fd40 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-example-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-jms-file/pom.xml
--
diff --git a/examples/camel-example-jms-file/pom.xml 
b/examples/camel-example-jms-file/pom.xml
index 6644ace..15498aa 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -21,7 +21,7 @@

org.apache.camel
examples
-   2.17.4
+   2.17.5-SNAPSHOT

 
camel-example-jms-file

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/examples/camel-example-jmx/pom.xml
--
diff --git a/examples/camel-example-jmx/pom.xml 
b/examples/camel-example-jmx/pom.xml
index 

[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration

2016-11-23 Thread gzurowski
http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jms/pom.xml
--
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 78482cd..fedcbdd 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jmx/pom.xml
--
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index f1642ce..878bdf8 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
 
 
 camel-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jolt/pom.xml
--
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 23c784a..3f14ea0 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-jolt

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-josql/pom.xml
--
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 4caceab..0ccc149 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-josql

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jpa/pom.xml
--
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index dcc8cd5..2ade424 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-jpa

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jsch/pom.xml
--
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index a5b02e0..f95345d 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-jsch

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index 32ab58c..2676e2a 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-jsonpath

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jt400/pom.xml
--
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index 70384e6..10c0608 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-jt400

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-juel/pom.xml
--
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index 02fbe9a..3c44084 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-juel

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index df55a4f..3743c28 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.4
+2.17.5-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/9e38f7b5/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 91a44f3..e934942 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.4

[3/3] camel git commit: [maven-release-plugin] prepare for next development iteration

2016-11-23 Thread gzurowski
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/camel-2.17.x
Commit: 9e38f7b5a840c37442c5d0a73ed356b6b76ba5d5
Parents: dcd8a7a
Author: Gregor Zurowski 
Authored: Wed Nov 23 19:23:40 2016 +
Committer: Gregor Zurowski 
Committed: Wed Nov 23 19:23:40 2016 +

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-braintree/pom.xml   | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-etcd/pom.xml| 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 

[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.17.4

2016-11-23 Thread gzurowski
[maven-release-plugin] prepare release camel-2.17.4


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

Branch: refs/heads/camel-2.17.x
Commit: dcd8a7ac69889d4067b772b09938261946808926
Parents: 763e195
Author: Gregor Zurowski 
Authored: Wed Nov 23 19:23:10 2016 +
Committer: Gregor Zurowski 
Committed: Wed Nov 23 19:23:10 2016 +

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-braintree/pom.xml   | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-etcd/pom.xml| 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml  

[camel] Git Push Summary

2016-11-23 Thread gzurowski
Repository: camel
Updated Tags:  refs/tags/camel-2.17.4 [created] a4ab2f6d7


[1/2] camel git commit: CAMEL-10520 fix the acknowledgment mechanism for lumberjack protocol v1

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 466bcab19 -> 6145dcd25
  refs/heads/master 02b9f4d92 -> f907d0365


CAMEL-10520 fix the acknowledgment mechanism for lumberjack protocol v1


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

Branch: refs/heads/master
Commit: f907d03658ddc0080e48e05bb90085adf6bc587c
Parents: 02b9f4d
Author: xfournet 
Authored: Wed Nov 23 19:53:12 2016 +0100
Committer: xfournet 
Committed: Wed Nov 23 19:53:12 2016 +0100

--
 .../component/lumberjack/io/LumberjackSessionHandler.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f907d036/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackSessionHandler.java
--
diff --git 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackSessionHandler.java
 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackSessionHandler.java
index 6c16656..3f184ca 100644
--- 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackSessionHandler.java
+++ 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackSessionHandler.java
@@ -31,9 +31,11 @@ import static 
org.apache.camel.component.lumberjack.io.LumberjackConstants.VERSI
  */
 final class LumberjackSessionHandler {
 private static final Logger LOG = 
LoggerFactory.getLogger(LumberjackSessionHandler.class);
+private static final int ACK_UNSET = -1;
 
 private volatile int version = -1;
 private volatile int windowSize = 1;
+private volatile int nextAck = ACK_UNSET;
 
 void versionRead(int version) {
 if (this.version == -1) {
@@ -50,10 +52,15 @@ final class LumberjackSessionHandler {
 void windowSizeRead(int windowSize) {
 LOG.debug("Lumberjack window size is {}", windowSize);
 this.windowSize = windowSize;
+nextAck = ACK_UNSET;
 }
 
 void notifyMessageProcessed(ChannelHandlerContext ctx, int sequenceNumber) 
{
-if (sequenceNumber == windowSize) {
+if (nextAck == ACK_UNSET) {
+nextAck = sequenceNumber + windowSize - 1;
+}
+
+if (sequenceNumber == nextAck) {
 LOG.debug("Sequence number is {}. Sending ACK", sequenceNumber);
 ByteBuf response = 
ctx.alloc().heapBuffer(FRAME_ACKNOWLEDGE_LENGTH, FRAME_ACKNOWLEDGE_LENGTH);
 response.writeByte(version);



[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.17.4

2016-11-23 Thread gzurowski
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 763e19528 -> dcd8a7ac6


http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index f82ec2a..1cce268 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
 
 
 camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index 6097ff4..d1903fb 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
 
 
 camel-example-cxf

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-etl/pom.xml
--
diff --git a/examples/camel-example-etl/pom.xml 
b/examples/camel-example-etl/pom.xml
index 44501ea..1b55271 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
   
 
   camel-example-etl

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-ftp/pom.xml
--
diff --git a/examples/camel-example-ftp/pom.xml 
b/examples/camel-example-ftp/pom.xml
index adfab34..a96a81c 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
 
 
 camel-example-ftp

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-gae/pom.xml
--
diff --git a/examples/camel-example-gae/pom.xml 
b/examples/camel-example-gae/pom.xml
index 559aaa3..fde8296 100644
--- a/examples/camel-example-gae/pom.xml
+++ b/examples/camel-example-gae/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
 
 
 camel-example-gae

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-gauth/pom.xml
--
diff --git a/examples/camel-example-gauth/pom.xml 
b/examples/camel-example-gauth/pom.xml
index 6eb26fd..02fbc39 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
 
 
 camel-example-gauth

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml 
b/examples/camel-example-guice-jms/pom.xml
index cd17c12..257d40f 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
 
 
 camel-example-guice-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index d4378b1..4829460 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.17.4-SNAPSHOT
+2.17.4
   
 
   camel-example-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-jms-file/pom.xml
--
diff --git a/examples/camel-example-jms-file/pom.xml 
b/examples/camel-example-jms-file/pom.xml
index d5e9efd..6644ace 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -21,7 +21,7 @@

org.apache.camel
examples
-   2.17.4-SNAPSHOT
+   2.17.4

 
camel-example-jms-file

http://git-wip-us.apache.org/repos/asf/camel/blob/dcd8a7ac/examples/camel-example-jmx/pom.xml
--
diff --git a/examples/camel-example-jmx/pom.xml 
b/examples/camel-example-jmx/pom.xml
index 

camel git commit: Fix Checkstyle issue: Make constant static final

2016-11-23 Thread gzurowski
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x b2b62d06b -> 763e19528


Fix Checkstyle issue: Make constant static final

Signed-off-by: Gregor Zurowski 

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

Branch: refs/heads/camel-2.17.x
Commit: 763e19528526e882aee235cba17961c2845a986b
Parents: b2b62d0
Author: Gregor Zurowski 
Authored: Wed Nov 23 18:31:16 2016 +0100
Committer: Gregor Zurowski 
Committed: Wed Nov 23 18:31:16 2016 +0100

--
 .../java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/763e1952/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 43f9674..cd65e18 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -32,7 +32,7 @@ public final class UnsafeUriCharactersEncoder {
 private static BitSet unsafeCharactersHttp;
 private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', 
'6', '7', '8', '9', 'A', 'B', 'C',
 'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
-private static Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
+private static final Pattern RAW_PATTERN = 
Pattern.compile("RAW\\([^\\)]+\\)");
 
 static {
 unsafeCharactersRfc1738 = new BitSet(256);



camel git commit: CAMEL-10518 - Fix typo "uncheked"

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 39a9f5223 -> 02b9f4d92


CAMEL-10518 - Fix typo "uncheked"

- fix typo
- remove unused suppress warning

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

Branch: refs/heads/master
Commit: 02b9f4d9275acaa32865ef81b740f8d0f3624732
Parents: 39a9f52
Author: Aurelien Pupier 
Authored: Wed Nov 23 15:50:16 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 16:52:06 2016 +0100

--
 .../apache/camel/impl/remote/RandomServiceCallLoadBalancer.java| 1 -
 .../camel/impl/remote/RoundRobinServiceCallLoadBalancer.java   | 1 -
 .../main/java/org/apache/camel/component/jcache/JCacheHelper.java  | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/02b9f4d9/camel-core/src/main/java/org/apache/camel/impl/remote/RandomServiceCallLoadBalancer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/remote/RandomServiceCallLoadBalancer.java
 
b/camel-core/src/main/java/org/apache/camel/impl/remote/RandomServiceCallLoadBalancer.java
index 53997f4..a9d7af2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/remote/RandomServiceCallLoadBalancer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/remote/RandomServiceCallLoadBalancer.java
@@ -29,7 +29,6 @@ public class RandomServiceCallLoadBalancer implements 
ServiceCallLoadBalancer servers) {
 int size = servers.size();

http://git-wip-us.apache.org/repos/asf/camel/blob/02b9f4d9/camel-core/src/main/java/org/apache/camel/impl/remote/RoundRobinServiceCallLoadBalancer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/remote/RoundRobinServiceCallLoadBalancer.java
 
b/camel-core/src/main/java/org/apache/camel/impl/remote/RoundRobinServiceCallLoadBalancer.java
index b4b50a9..966a6ae 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/remote/RoundRobinServiceCallLoadBalancer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/remote/RoundRobinServiceCallLoadBalancer.java
@@ -25,7 +25,6 @@ import org.apache.camel.spi.ServiceCallServer;
 public class RoundRobinServiceCallLoadBalancer 
implements ServiceCallLoadBalancer {
 private int counter = -1;
 
-@SuppressWarnings("uncheked")
 @Override
 public S chooseServer(List servers) {
 int size = servers.size();

http://git-wip-us.apache.org/repos/asf/camel/blob/02b9f4d9/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheHelper.java
--
diff --git 
a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheHelper.java
 
b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheHelper.java
index 48b3e7e..84e15ec 100644
--- 
a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheHelper.java
+++ 
b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheHelper.java
@@ -42,7 +42,7 @@ public final class JCacheHelper {
 return new JCacheManager<>(configuration);
 }
 
-@SuppressWarnings("uncheked")
+@SuppressWarnings("unchecked")
 public static  T tcclProxy(final T instance, Class type, final 
ClassLoader classLoader) {
 return (T) Proxy.newProxyInstance(
 JCacheHelper.class.getClassLoader(),



camel git commit: CAMEL-10517 - Remove Unnecessary suppress warnings

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master d2a2fffa7 -> 39a9f5223


CAMEL-10517 - Remove Unnecessary suppress warnings

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

Branch: refs/heads/master
Commit: 39a9f52232fcaa1d82b290622d24aa45523094d0
Parents: d2a2fff
Author: Aurelien Pupier 
Authored: Wed Nov 23 15:43:45 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 16:51:26 2016 +0100

--
 .../java/org/apache/camel/builder/AdviceWithRouteBuilder.java | 1 -
 .../java/org/apache/camel/component/bean/ProxyHelper.java | 1 -
 .../src/main/java/org/apache/camel/impl/DefaultExchange.java  | 1 -
 .../java/org/apache/camel/impl/EventDrivenConsumerRoute.java  | 1 -
 .../camel/impl/remote/DefaultServiceCallProcessorFactory.java | 1 -
 .../main/java/org/apache/camel/model/ProcessorDefinition.java | 7 ---
 .../org/apache/camel/model/language/ExpressionDefinition.java | 2 --
 .../org/apache/camel/processor/ThrowExceptionProcessor.java   | 1 -
 .../component/bean/BeanParameterBindingStreamCachingTest.java | 1 -
 .../org/apache/camel/processor/WireTapCustomPoolTest.java | 1 -
 .../camel/dataformat/bindy/BindyKeyValuePairFactory.java  | 1 -
 .../apache/camel/blueprint/handler/CamelNamespaceHandler.java | 3 +--
 .../apache/camel/converter/crypto/PGPKeyAccessDataFormat.java | 1 -
 .../transport/blueprint/CamelTransportNameSpaceHandler.java   | 2 +-
 .../java/org/apache/camel/component/drill/DrillEndpoint.java  | 1 -
 .../org/apache/camel/component/ehcache/EhcacheConsumer.java   | 1 -
 .../org/apache/camel/component/ehcache/EhcacheProducer.java   | 1 -
 .../camel/component/google/pubsub/GooglePubsubConsumer.java   | 1 -
 .../org/apache/camel/guice/testing/junit4/GuiceyJUnit4.java   | 2 --
 .../camel/component/hazelcast/HazelcastMapConsumerTest.java   | 2 --
 .../java/org/apache/camel/component/hdfs2/HdfsFileType.java   | 1 -
 .../org/apache/camel/component/ignite/IgniteCacheTest.java| 1 -
 .../org/apache/camel/component/infinispan/InfinispanUtil.java | 1 -
 .../java/org/apache/camel/component/jcache/JCacheManager.java | 1 -
 .../jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java | 1 -
 .../jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java  | 1 -
 .../component/jdbc/JdbcProducerOutputTypeSelectOneTest.java   | 1 -
 .../jms/issues/JmsBlockedAsyncRoutingEngineTest.java  | 1 -
 .../component/lumberjack/LumberjackComponentSSLTest.java  | 1 -
 .../component/lumberjack/LumberjackDisconnectionTest.java | 1 -
 .../lumberjack/io/LumberjackChannelInitializerTest.java   | 1 -
 .../apache/camel/component/olingo2/Olingo2ComponentTest.java  | 1 -
 .../component/ribbon/processor/RibbonProcessorFactory.java| 1 -
 .../camel/component/routebox/strategy/RouteboxDispatcher.java | 1 -
 .../component/salesforce/internal/SalesforceSession.java  | 1 -
 .../spring/management/SpringManagedCamelContextTest.java  | 1 -
 .../java/org/apache/camel/component/sql/SqlRouteTest.java | 3 ---
 .../main/java/org/apache/camel/testng/CamelTestSupport.java   | 1 -
 .../apache/camel/commands/AbstractLocalCamelController.java   | 2 --
 .../apache/camel/maven/packaging/SpringBootStarterMojo.java   | 1 -
 40 files changed, 2 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/39a9f522/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
index 7872128..f233297 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
@@ -160,7 +160,6 @@ public abstract class AdviceWithRouteBuilder extends 
RouteBuilder {
  * @return the builder
  * @see org.apache.camel.util.EndpointHelper#matchPattern(String, String)
  */
-@SuppressWarnings("unchecked")
 public > AdviceWithBuilder 
weaveByToUri(String pattern) {
 ObjectHelper.notNull(originalRoute, "originalRoute", this);
 return new AdviceWithBuilder(this, null, null, pattern, null);

http://git-wip-us.apache.org/repos/asf/camel/blob/39a9f522/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java 

[3/3] camel git commit: CAMEL-10516 - Remove unused import

2016-11-23 Thread davsclaus
CAMEL-10516 - Remove unused import

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

Branch: refs/heads/master
Commit: d2a2fffa761c6e9acae16a0fc5a85aaed184d4ba
Parents: 9a44a1a
Author: Aurelien Pupier 
Authored: Wed Nov 23 15:17:52 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 16:50:34 2016 +0100

--
 .../camel/builder/AdviceWithRouteBuilder.java   |  1 -
 .../org/apache/camel/builder/AdviceWithTasks.java   |  1 -
 .../apache/camel/component/dataset/FileDataSet.java |  1 -
 .../apache/camel/component/dataset/ListDataSet.java |  4 
 .../camel/component/direct/DirectConsumer.java  |  1 -
 .../apache/camel/component/seda/SedaProducer.java   |  5 -
 .../apache/camel/component/test/TestComponent.java  |  4 
 .../apache/camel/converter/DurationConverter.java   |  3 ---
 .../apache/camel/impl/DefaultConsumerTemplate.java  |  2 --
 .../apache/camel/impl/DefaultShutdownStrategy.java  |  1 -
 .../apache/camel/impl/ScheduledPollConsumer.java|  1 -
 .../org/apache/camel/model/MulticastDefinition.java |  1 -
 .../org/apache/camel/model/SplitDefinition.java |  1 -
 .../camel/processor/RedeliveryErrorHandler.java |  1 -
 .../apache/camel/processor/ThreadsProcessor.java|  1 -
 .../org/apache/camel/spi/RestProducerFactory.java   |  1 -
 .../camel/util/jsse/BaseSSLContextParameters.java   |  1 -
 .../bean/BeanInfoWithBridgedMethodTest.java |  1 -
 .../component/bean/MethodCallStaticMethodTest.java  |  3 ---
 .../TwoSchedulerConcurrentTasksOneRouteTest.java|  2 --
 .../validator/ValidatorIllegalImportTest.java   |  1 -
 .../camel/component/xslt/InvalidXsltFileTest.java   |  1 -
 .../camel/component/xslt/XsltFileNotFoundTest.java  |  1 -
 .../apache/camel/component/xslt/XsltSaxonTest.java  |  1 -
 .../DefaultCamelContextEndpointCacheLimitTest.java  |  3 ---
 .../impl/DefaultCamelContextEndpointCacheTest.java  |  3 ---
 .../tokenizer/XMLTokenizeLanguageStreamingTest.java |  1 -
 .../ManagedRouteDumpRouteAsXmlPlaceholderTest.java  |  3 ---
 .../camel/processor/SplitSubUnitOfWorkTest.java |  1 -
 .../interceptor/DefaultTraceFormatterTest.java  |  1 -
 .../springboot/BindyCsvDataFormatConfiguration.java |  1 -
 .../BindyFixedLengthDataFormatConfiguration.java|  1 -
 .../BindyKeyValuePairDataFormatConfiguration.java   |  1 -
 .../springboot/GangliaComponentConfiguration.java   |  1 -
 .../springboot/GsonDataFormatConfiguration.java |  1 -
 .../springboot/JacksonDataFormatConfiguration.java  |  1 -
 .../jms/springboot/JmsComponentConfiguration.java   |  1 -
 .../springboot/JohnzonDataFormatConfiguration.java  |  1 -
 .../springboot/Mina2ComponentConfiguration.java |  1 -
 .../springboot/NettyComponentConfiguration.java |  1 -
 .../springboot/NettyComponentConfiguration.java |  1 -
 .../ServiceNowComponentConfiguration.java   |  1 -
 .../smpp/springboot/SmppComponentConfiguration.java |  1 -
 .../SnakeYAMLDataFormatConfiguration.java   |  1 -
 .../springboot/JsonDataFormatConfiguration.java |  1 -
 .../apache/camel/component/ahc/ws/TestServlet.java  |  1 -
 .../org/apache/camel/component/ahc/BaseAhcTest.java |  1 -
 .../camel/component/atmos/AtmosConsumerTest.java|  2 --
 .../apache/camel/component/aws/s3/S3Producer.java   |  1 -
 .../camel/component/aws/sdb/AbstractSdbCommand.java |  1 -
 .../apache/camel/component/aws/sns/SnsEndpoint.java |  1 -
 .../aws/ddbstream/ShardIteratorHandlerTest.java |  1 -
 .../component/aws/kinesis/KinesisEndpointTest.java  |  1 -
 .../component/aws/s3/S3ComponentCopyObjectTest.java |  2 --
 .../component/aws/sdb/AbstractSdbCommandTest.java   |  1 -
 .../dataformat/bindy/csv/BindyCsvDataFormat.java|  2 --
 .../csv/BindyCarQuoteAndCommaDelimiterTest.java |  1 -
 .../fix/BindyComplexKeyValuePairStandaloneTest.java |  1 -
 .../date/BindyDatePatternCsvUnmarshallTest.java |  2 --
 .../camel/component/cache/CacheComponent.java   |  2 --
 .../camel/cdi/test/CamelRouteEventNotifierTest.java |  1 -
 .../org/apache/camel/component/cm/CMEndpoint.java   |  1 -
 .../java/org/apache/camel/coap/CoAPPingTest.java|  3 ---
 .../apache/camel/component/cxf/CxfComponent.java|  1 -
 .../org/apache/camel/component/cxf/CxfEndpoint.java |  1 -
 .../RawMessageContentRedirectInterceptor.java   |  1 -
 .../org/apache/camel/component/cxf/ssl/SslTest.java |  4 
 .../remote/DnsServiceCallServerListStrategy.java|  2 --
 .../docker/producer/AsyncDockerProducer.java|  1 -
 .../docker/consumer/DockerEventsConsumerTest.java   |  2 --
 .../component/docker/headers/AuthCmdHeaderTest.java |  1 -
 .../apache/camel/component/dozer/DozerEndpoint.java |  3 ---
 

[1/3] camel git commit: CAMEL-10516 - Remove unused import

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 9a44a1ac0 -> d2a2fffa7


http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
--
diff --git 
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
 
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
index 1b0683e..6d1145e 100644
--- 
a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
+++ 
b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.weather;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.camel.component.weather.geolocation.GeoLocation;
 import org.apache.camel.component.weather.geolocation.GeoLocationProvider;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
index 422a2a1..8cf91a1 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
@@ -17,10 +17,8 @@
 package org.apache.camel.component.websocket;
 
 import java.io.Serializable;
-import java.lang.annotation.Annotation;
 import java.util.UUID;
 
-import org.eclipse.jetty.websocket.api.BatchMode;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
index d37f288..f022ac6 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.websocket;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
index 3e5e641..faea552 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.websocket;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
index fdd4d7b..b49ba62 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.websocket;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

[2/3] camel git commit: CAMEL-10516 - Remove unused import

2016-11-23 Thread davsclaus
http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
index 1692156..350c519 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
@@ -21,7 +21,6 @@ import java.io.File;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
index 785c224..105dbd3 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.core.IsInstanceOf.instanceOf;

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
--
diff --git 
a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
 
b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
index e1495bd..63afa93 100644
--- 
a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
+++ 
b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.gora;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.ExecutorService;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
index 99b801b..2f003de 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.hazelcast.seda;
 
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
 
 /**
  * Hazelcast SEDA Component configuration.

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
--
diff --git 
a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
 
b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
index cd0c73f..b68866a 100644
--- 
a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
+++ 
b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.io.WritableComparable;
 
 public class HdfsWritableFactories {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/d2a2fffa/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsWritableFactories.java
--
diff --git 

svn commit: r1001534 - in /websites/production/camel/content: aws-ddb.html cache/main.pageCache

2016-11-23 Thread buildbot
Author: buildbot
Date: Wed Nov 23 15:18:55 2016
New Revision: 1001534

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/aws-ddb.html
websites/production/camel/content/cache/main.pageCache

Modified: websites/production/camel/content/aws-ddb.html
==
--- websites/production/camel/content/aws-ddb.html (original)
+++ websites/production/camel/content/aws-ddb.html Wed Nov 23 15:18:55 2016
@@ -86,7 +86,7 @@
 
 
 DDB 
ComponentAvailable as of Camel 2.10The DynamoDB 
component supports storing and retrieving data from/to http://aws.amazon.com/dynamodb; 
rel="nofollow">Amazon's DynamoDB service.PrerequisitesYou must have a valid Amazon Web 
Services developer account, and be signed up to use Amazon DynamoDB. More 
information are available at http://aws.amazon.com/dynamodb; rel="nofollow">Amazon 
DynamoDB.URI Format
-
 You can append query options to the URI in the following 
format:?options=valueoption2=value...URI OptionsNameDefault ValueContextDescriptionamazonDDBClientnullProducerReference to a 
com.amazonaws.services.dynamodb.AmazonDynamoDB in 
the Registry.class="confluenceTd">accessKeyrowspan="1" class="confluenceTd">nullrowspan="1" class="confluenceTd">Producerrowspan="1" class="confluenceTd">Amazon AWS Access 
 >Key.class="confluenceTd">secretKeyrowspan="1" class="confluenceTd">nullrowspan="1" class="confluenceTd">Producerrowspan="1" class="confluenceTd">Amazon AWS Secret 
 >Key.class="confluenceTd">amazonDdbEndpointcolspan="1" rowspan="1" class="confluenceTd">nullcolspan="1" rowspan="1" class="confluenceTd">Producercolspan="1" rowspan="1" class="confluenceTd">The region with which the 
 >AWS-DDB client wants t
 o work with.tableNamenullProducerThe name of the table currently worked 
with.readCapacity0ProducerThe provisioned throughput to reserve for 
reading resources from your tablewriteCapacity0ProducerThe provisioned throughput to reserved for 
writing resources to your tableconsistentReadfalseProducerDetermines whether or not strong 
consistency should be enforced when data is read.operationPutAttributesProducerValid values 
are:BatchGetItemsDeleteItemDeleteTableDescribeTableGetItemPutItemQueryScanUpdateItemUpdateTableproxyHostnullProducerCamel 2.16: Specify a 
proxy host to be used inside the client definition.proxyPortnullProducerCamel 2.16: Specify a 
proxy port to be used inside the client 
definition.Required DDB 
component optionsYou have to provide 
theamazonDDBClient in the Registry or 
youraccessKey 
andsecretKey to access the http://aws.amazon.com/dynamodb; 
rel="nofollow">Amazon's DynamoDB.UsageMessage headers evaluated 
by the DDB producer
  HeaderTypeDescriptionCamelAwsDdbBatchItemsMapString, 
KeysAndAttributesA map of the table name and corresponding items to get 
by primary key.CamelAwsDdbTableNameStringTable Name for this 
operation.CamelAwsDdbKeyKeyThe primary key that uniquely identifies each item in a 
table.From Camel 2.16.0: the type of this header is 
MapString, AttributeValue and 
notKey.CamelAwsDdbReturnValuesStringUse this parameter if you want 
to get the attribute name-value pairs before or after they are modified 
(NONE, ALL_OLD, UPDATED_OLD, 
ALL_NEW, UPDATED_NEW).CamelAwsDdbUpdateConditionMap&
 lt;String, ExpectedAttributeValueDesignates an attribute for a conditional 
modification.CamelAwsDdbAttributeNamesCollectionStringIf attribute names are not 
specified then all attributes will be returned.CamelAwsDdbConsistentReadBooleanIf set to true, then a consistent read is 
issued, otherwise eventually consistent is used.CamelAwsDdbItem
 MapString, AttributeValueA map of the attributes for the item, and 
must include the primary key values that define the item.CamelAwsDdbExactCountBooleanIf set to true, Amazon DynamoDB returns a 
total number of items that match the query parameters, instead of a list of the 
matching items and their attributes.From Camel 2.16.0 this 
header doesn't exist anymore.CamelAwsDdbKeyConditionsMapString, 
ConditionFrom Camel 2.16.0. Th
 is header specify the selection criteria for the query, and merge together the 
two old headers CamelAwsDdbHashKeyValue and 
CamelAwsDdbScanRangeKeyConditionCamelAwsDdbStartKeyKeyPrimary key of the item from 
which to continue an earlier query.CamelAwsDdbHashKeyValueAttributeValueValue of the hash component of the 
composite primary key.From Camel 2.16.0 this header doesn't 
exist anymore.CamelAwsDdbLim
 itIntegerThe maximum number of items to 
return.CamelAwsDdbScanRangeKeyConditionConditionA container for the attribute values and 
comparison operators to use for the query.From Camel 2.16.0 this 
header doesn't exist anymore.CamelAwsDdbScanIndexForwardBooleanSpecifies forward or backward traversal of 
the 

camel git commit: Upgrade RX

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 74a6d416d -> 9a44a1ac0


Upgrade RX


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

Branch: refs/heads/master
Commit: 9a44a1ac06daf89e32697d59cd841f6bceb2d093
Parents: 74a6d41
Author: Claus Ibsen 
Authored: Wed Nov 23 14:58:17 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 14:58:17 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9a44a1ac/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 681ee64..7a9ecc1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -510,7 +510,7 @@
 2.19.0.Final
 1.0_3
 1.0
-1.2.2
+1.2.3
 1.3.2_2
 9.7.0-10_1
 9.7.0-10



camel git commit: CAMEL-10509: dump model to xml should include namespaces. Work in progress.

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/CAMEL-10509 [created] 4ccf30dd5


CAMEL-10509: dump model to xml should include namespaces. Work in progress.


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

Branch: refs/heads/CAMEL-10509
Commit: 4ccf30dd59ff54ee15c3292aefa6456046a38691
Parents: 74a6d41
Author: Claus Ibsen 
Authored: Wed Nov 23 14:22:52 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 14:22:52 2016 +0100

--
 .../builder/xml/DefaultNamespaceContext.java|  4 ++
 .../apache/camel/builder/xml/XPathBuilder.java  |  4 ++
 .../org/apache/camel/model/ModelHelper.java | 58 
 .../model/dataformat/XMLSecurityDataFormat.java |  6 +-
 .../org/apache/camel/spi/NamespaceAware.java|  5 ++
 .../support/XMLTokenExpressionIterator.java |  5 ++
 .../util/DumpModelAsXmlAggregateRouteTest.java  |  2 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java | 46 
 .../camel/component/xquery/XQueryBuilder.java   |  4 ++
 9 files changed, 132 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4ccf30dd/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
 
b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
index 63cedd2..8555e1c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
@@ -99,6 +99,10 @@ public class DefaultNamespaceContext implements 
NamespaceContext, NamespaceAware
 map.putAll(namespaces);
 }
 
+public Map getNamespaces() {
+return map;
+}
+
 /**
  * toString() implementation that outputs the namespace mappings with the 
following format: "[me: {prefix -> value}, {prefix -> value}], [parent: {prefix 
-> value}, {prefix -> value}].
  * Recurses up the parent's chain.

http://git-wip-us.apache.org/repos/asf/camel/blob/4ccf30dd/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index 932d1ce..dc7ffb3 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -524,6 +524,10 @@ public class XPathBuilder extends ServiceSupport 
implements Expression, Predicat
 this.namespaces.putAll(namespaces);
 }
 
+public Map getNamespaces() {
+return namespaces;
+}
+
 /**
  * Gets the {@link XPathFunction} for getting the input message body.
  * 

http://git-wip-us.apache.org/repos/asf/camel/blob/4ccf30dd/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java 
b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
index 801d2a0..3a1aa68 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
@@ -19,15 +19,24 @@ package org.apache.camel.model;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Expression;
 import org.apache.camel.NamedNode;
+import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.spi.NamespaceAware;
 import org.apache.camel.util.IOHelper;
 
+import static 
org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
+
 /**
  * Helper for the Camel {@link org.apache.camel.model model} classes.
  */
@@ -53,6 +62,21 @@ public final class ModelHelper {
 jaxbContext = 
context.getModelJAXBContextFactory().newJAXBContext();
 }
 
+final Map namespaces = new LinkedHashMap<>();
+
+// gather all namespaces from the 

camel git commit: [CAMEL-10505] FILE component - resolved FileNotFountException in Generic File Rename Exclusive Read Lock Strategy in case of work file is locked by another application

2016-11-23 Thread cschneider
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 9ef8327e7 -> 7bc1957e3


[CAMEL-10505] FILE component - resolved FileNotFountException in Generic File 
Rename Exclusive Read Lock Strategy in case of work file is locked by another 
application


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

Branch: refs/heads/camel-2.16.x
Commit: 7bc1957e37daad6c7f81a5abf0f679a2480cb790
Parents: 9ef8327
Author: apoltavt...@gmail.com 
Authored: Tue Nov 22 15:39:11 2016 +0300
Committer: Christian Schneider 
Committed: Wed Nov 23 13:51:33 2016 +0100

--
 .../GenericFileRenameExclusiveReadLockStrategy.java| 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7bc1957e/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
index 976c965..ef5fdb1 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
@@ -16,11 +16,14 @@
  */
 package org.apache.camel.component.file.strategy;
 
+import java.io.FileNotFoundException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.component.file.GenericFile;
 import org.apache.camel.component.file.GenericFileEndpoint;
 import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
+import org.apache.camel.component.file.GenericFileOperationFailedException;
 import org.apache.camel.component.file.GenericFileOperations;
 import org.apache.camel.util.CamelLogger;
 import org.apache.camel.util.StopWatch;
@@ -70,7 +73,15 @@ public class GenericFileRenameExclusiveReadLockStrategy 
implements GenericFil
 }
 }
 
-exclusive = operations.renameFile(file.getAbsoluteFilePath(), 
newFile.getAbsoluteFilePath());
+try {
+exclusive = operations.renameFile(file.getAbsoluteFilePath(), 
newFile.getAbsoluteFilePath());
+} catch (GenericFileOperationFailedException ex) {
+if (ex.getCause() != null && ex.getCause() instanceof 
FileNotFoundException) {
+exclusive = false;
+} else {
+throw ex;
+}
+}
 if (exclusive) {
 LOG.trace("Acquired exclusive read lock to file: {}", file);
 // rename it back so we can read it



camel git commit: Camel CDI: prepare CDI 2.0 compatibility

2016-11-23 Thread astefanutti
Repository: camel
Updated Branches:
  refs/heads/master a37b24de0 -> 74a6d416d


Camel CDI: prepare CDI 2.0 compatibility


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

Branch: refs/heads/master
Commit: 74a6d416d9117ceaa9951ff629adffb9b68fc5fd
Parents: a37b24d
Author: Antonin Stefanutti 
Authored: Wed Nov 23 13:17:08 2016 +0100
Committer: Antonin Stefanutti 
Committed: Wed Nov 23 13:17:08 2016 +0100

--
 components/camel-cdi/pom.xml| 34 
 .../cdi/test/MultiContextEventNotifierTest.java | 16 -
 parent/pom.xml  |  2 ++
 3 files changed, 44 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74a6d416/components/camel-cdi/pom.xml
--
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 096a862..26b328f 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -263,6 +263,40 @@
 
 
 
+  weld-2.0
+
+  
+
+
+
+
+  javax.enterprise
+  cdi-api
+  ${cdi-api-2.0-version}
+  provided
+
+
+
+
+
+  org.jboss.weld
+  weld-core-impl
+  ${weld3-version}
+  test
+
+
+
+  org.jboss.arquillian.container
+  arquillian-weld-embedded
+  ${arquillian-weld-embedded-version}
+  test
+
+
+  
+
+
+
+
   owb-1.0
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/74a6d416/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
--
diff --git 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
index 937f933..b2f0c2c 100644
--- 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
+++ 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
@@ -77,7 +77,7 @@ public class MultiContextEventNotifierTest {
 @Inject @Uri("mock:outbound")
 private MockEndpoint defaultOutbound;
 
-@Produces @ApplicationScoped
+@Produces @ApplicationScoped @Named("defaultContext")
 private List defaultFiredEvents = new ArrayList<>();
 
 
@@ -107,7 +107,7 @@ public class MultiContextEventNotifierTest {
 private List secondFiredEvents = new ArrayList<>();
 
 
-@Produces @ApplicationScoped @Any @Named("anyContext")
+@Produces @ApplicationScoped @Named("anyContext")
 private List anyFiredEvents = new ArrayList<>();
 
 
@@ -124,15 +124,15 @@ public class MultiContextEventNotifierTest {
 }
 
 
-private void onDefaultContextStartingEvent(@Observes @Default 
CamelContextStartingEvent event, List events) {
+private void onDefaultContextStartingEvent(@Observes @Default 
CamelContextStartingEvent event, @Named("defaultContext") List events) {
 events.add(CamelContextStartingEvent.class);
 }
 
-private void onDefaultContextStartedEvent(@Observes @Default 
CamelContextStartedEvent event, List events) {
+private void onDefaultContextStartedEvent(@Observes @Default 
CamelContextStartedEvent event, @Named("defaultContext") List events) {
 events.add(CamelContextStartedEvent.class);
 }
 
-private void onDefaultExchangeEvent(@Observes @Default 
AbstractExchangeEvent event, List events) {
+private void onDefaultExchangeEvent(@Observes @Default 
AbstractExchangeEvent event, @Named("defaultContext") List events) {
 events.add(event.getClass());
 }
 
@@ -180,7 +180,7 @@ public class MultiContextEventNotifierTest {
 
 @Test
 @InSequence(1)
-public void configureCamelContexts(List defaultEvents,
+public void configureCamelContexts(@Named("defaultContext") List 
defaultEvents,
@ContextName("first") List 
firstEvents,
@ContextName("second") List 
secondEvents,
@Named("anyContext") List 
anyEvents) throws Exception {
@@ -214,7 +214,7 @@ public class MultiContextEventNotifierTest {
 
 @Test
 @InSequence(2)
-public void sendMessageToDefaultCamelContextInbound(List events) 
throws InterruptedException {
+public void 
sendMessageToDefaultCamelContextInbound(@Named("defaultContext") List 
events) 

camel git commit: Camel CDI: better use of Java 8 functional API

2016-11-23 Thread astefanutti
Repository: camel
Updated Branches:
  refs/heads/master 662dd8f99 -> a37b24de0


Camel CDI: better use of Java 8 functional API


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

Branch: refs/heads/master
Commit: a37b24de01744280dea902e6c973a7a535140ba4
Parents: 662dd8f
Author: Antonin Stefanutti 
Authored: Wed Nov 23 11:56:41 2016 +0100
Committer: Antonin Stefanutti 
Committed: Wed Nov 23 11:56:41 2016 +0100

--
 .../org/apache/camel/cdi/AnnotatedDelegate.java |  5 +
 .../org/apache/camel/cdi/CdiCamelEnvironment.java   |  4 +---
 .../org/apache/camel/cdi/CdiCamelExtension.java | 16 +---
 .../java/org/apache/camel/cdi/CdiSpiHelper.java |  6 ++
 .../org/apache/camel/cdi/SyntheticAnnotated.java|  5 +
 5 files changed, 10 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a37b24de/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
index c9c9777..53f3d0e 100644
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
@@ -66,10 +66,7 @@ class AnnotatedDelegate implements Annotated {
 
 @Override
 public boolean isAnnotationPresent(Class type) {
-return annotations.stream()
-.filter(isAnnotationType(type))
-.findAny()
-.isPresent();
+return annotations.stream().anyMatch(isAnnotationType(type));
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/a37b24de/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
index 3aabe6f..feb38df 100644
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
@@ -47,9 +47,7 @@ final class CdiCamelEnvironment {
 try {
 
getClassLoader(CdiCamelExtension.class).loadClass("org.apache.camel.core.osgi.OsgiCamelContextHelper");
 return true;
-} catch (ClassNotFoundException cause) {
-return false;
-} catch (NoClassDefFoundError cause) {
+} catch (ClassNotFoundException | NoClassDefFoundError cause) {
 return false;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a37b24de/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index f4bb9bb..e16ec42 100755
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -208,7 +208,7 @@ public class CdiCamelExtension implements Extension {
 if (qualifiers.isEmpty()) {
 eventQualifiers.add(ANY);
 } else if (qualifiers.size() == 1 && qualifiers.stream()
-.filter(isAnnotationType(Named.class)).findAny().isPresent()) {
+.anyMatch(isAnnotationType(Named.class))) {
 eventQualifiers.add(DEFAULT);
 } else {
 eventQualifiers.addAll(qualifiers);
@@ -333,22 +333,18 @@ public class CdiCamelExtension implements Extension {
 
.or(hasType(RouteContainer.class).or(hasType(RoutesBuilder.class
 .map(Bean::getQualifiers)
 .flatMap(Set::stream)
-.filter(isEqual(DEFAULT))
-.findAny()
-.isPresent()
+.anyMatch(isEqual(DEFAULT))
 // Or a bean with Camel annotations?
 || concat(camelBeans.stream().map(AnnotatedType::getFields),
   camelBeans.stream().map(AnnotatedType::getMethods))
 .flatMap(Set::stream)
 .map(Annotated::getAnnotations)
 .flatMap(Set::stream)
-

camel git commit: Improve javadoc

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 1b7ddbefc -> 662dd8f99


Improve javadoc


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

Branch: refs/heads/master
Commit: 662dd8f99eed339f64bbed2db56850e13942608a
Parents: 1b7ddbe
Author: Claus Ibsen 
Authored: Wed Nov 23 10:17:25 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 10:17:25 2016 +0100

--
 .../main/java/org/apache/camel/CamelContext.java   | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/662dd8f9/camel-core/src/main/java/org/apache/camel/CamelContext.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java 
b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 9b4ecac..e3710d8 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -1218,13 +1218,23 @@ public interface CamelContext extends 
SuspendableService, RuntimeConfiguration {
 
 /**
  * Sets the properties that can be referenced in the camel context
+ * 
+ * Important: This has nothing to do with property placeholders, 
and is just a plain set of key/value pairs
+ * which are used to configure global settings on CamelContext, such as a 
maximum debug logging length etc.
+ * For property placeholders use {@link 
#resolvePropertyPlaceholders(String)} method and see more details
+ * at the http://camel.apache.org/using-propertyplaceholder.html;>property 
placeholder documentation.
  *
  * @param properties properties
  */
 void setProperties(Map properties);
 
 /**
- * Gets the properties that can be referenced in the camel context
+ * Gets the properties that can be referenced in the camel context.
+ * 
+ * Important: This has nothing to do with property placeholders, 
and is just a plain set of key/value pairs
+ * which are used to configure global settings on CamelContext, such as a 
maximum debug logging length etc.
+ * For property placeholders use {@link 
#resolvePropertyPlaceholders(String)} method and see more details
+ * at the http://camel.apache.org/using-propertyplaceholder.html;>property 
placeholder documentation.
  *
  * @return the properties
  */
@@ -1232,6 +1242,11 @@ public interface CamelContext extends 
SuspendableService, RuntimeConfiguration {
 
 /**
  * Gets the property value that can be referenced in the camel context
+ * 
+ * Important: This has nothing to do with property placeholders, 
and is just a plain set of key/value pairs
+ * which are used to configure global settings on CamelContext, such as a 
maximum debug logging length etc.
+ * For property placeholders use {@link 
#resolvePropertyPlaceholders(String)} method and see more details
+ * at the http://camel.apache.org/using-propertyplaceholder.html;>property 
placeholder documentation.
  *
  * @return the string value of property
  */



[2/3] camel git commit: CAMEL-10472 Update Salesforce component to support recent items REST API

2016-11-23 Thread davsclaus
CAMEL-10472 Update Salesforce component to support recent items REST API

 - added documentation.
 - updates by
camel-package-maven-plugin:prepare-spring-boot-auto-configuration to the
SalesforceComponentConfiguration.java.

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

Branch: refs/heads/master
Commit: 679b09982d889ad5de6a24a0baf9ad916f4fd3b7
Parents: 4e3b2f7
Author: Zoran Regvart 
Authored: Tue Nov 22 18:48:41 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 09:44:01 2016 +0100

--
 .../SalesforceComponentConfiguration.java   | 15 +++
 .../src/main/docs/salesforce-component.adoc | 20 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/679b0998/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
--
diff --git 
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
 
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 30b68c5..91f478c 100644
--- 
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++ 
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -394,6 +394,13 @@ public class SalesforceComponentConfiguration {
  * Replay IDs to start from per channel name.
  */
 private Map initialReplayIdMap;
+/**
+ * Limit on number of returned records. Applicable to some of the API,
+ * check the Salesforce documentation.
+ * 
+ * @param limit
+ */
+private Integer limit;
 
 public PayloadFormat getFormat() {
 return format;
@@ -676,6 +683,14 @@ public class SalesforceComponentConfiguration {
 public void setInitialReplayIdMap(Map initialReplayIdMap) {
 this.initialReplayIdMap = initialReplayIdMap;
 }
+
+public Integer getLimit() {
+return limit;
+}
+
+public void setLimit(Integer limit) {
+this.limit = limit;
+}
 }
 
 public static class SalesforceLoginConfigNestedConfiguration {

http://git-wip-us.apache.org/repos/asf/camel/blob/679b0998/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
 
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index a3d062f..089ca7c 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -68,6 +68,7 @@ field
 results) using result link returned from the 'query' API
 * search - Runs a Salesforce SOSL query
 * limits - fetching organization API usage limits
+* recent - fetching recent items
 
 For example, the following producer endpoint uses the upsertSObject API,
 with the sObjectIdName parameter specifying 'Name' as the external id
@@ -218,6 +219,22 @@ from("direct:querySalesforce")
 .endChoice()
 
-
 
+[[Salesforce-RecentItems]]
+Using Salesforce Recent Items API
+~
+
+To fetch the recent items use `salesforce:recent` operation. This operation 
returns an `java.util.List` of
+`org.apache.camel.component.salesforce.api.dto.RecentItem` objects 
(`List`) that in turn contain
+the `Id`, `Name` and `Attributes` (with `type` and `url` properties). You can 
limit the number of returned items
+by specifying `limit` parameter set to maximum number of records to return. 
For example:
+
+[source,java]
+-
+from("direct:fetchRecentItems")
+to("salesforce:recent")
+.split().body()
+.log("${body.name} at ${body.attributes.url}");

[1/3] camel git commit: Regenrate code

2016-11-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master a52ab3cdc -> 1b7ddbefc


Regenrate code


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

Branch: refs/heads/master
Commit: 1b7ddbefc338c205e0c5d614d29d963ce78d95cb
Parents: 679b099
Author: Claus Ibsen 
Authored: Wed Nov 23 09:43:54 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 09:44:01 2016 +0100

--
 .../camel-spring-boot-dependencies/pom.xml  | 78 ++--
 1 file changed, 39 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1b7ddbef/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
--
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index b0255af..d23ed18 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2882,223 +2882,223 @@
   
 org.optaplanner
 optaplanner-benchmark
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-benchmark
-6.4.0.Final
+6.5.0.Final
 sources
   
   
 org.optaplanner
 optaplanner-benchmark
-6.4.0.Final
+6.5.0.Final
 test-jar
   
   
 org.optaplanner
 optaplanner-benchmark
-6.4.0.Final
+6.5.0.Final
 javadoc
   
   
 org.optaplanner
 optaplanner-core
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-core
-6.4.0.Final
+6.5.0.Final
 sources
   
   
 org.optaplanner
 optaplanner-core
-6.4.0.Final
+6.5.0.Final
 test-jar
   
   
 org.optaplanner
 optaplanner-core
-6.4.0.Final
+6.5.0.Final
 javadoc
   
   
 org.optaplanner
 optaplanner-distribution
-6.4.0.Final
+6.5.0.Final
 zip
   
   
 org.optaplanner
 optaplanner-docs
-6.4.0.Final
+6.5.0.Final
 jdocbook
   
   
 org.optaplanner
 optaplanner-examples
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-examples
-6.4.0.Final
+6.5.0.Final
 sources
   
   
 org.optaplanner
 optaplanner-examples
-6.4.0.Final
+6.5.0.Final
 test-jar
   
   
 org.optaplanner
 optaplanner-persistence-common
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-persistence-common
-6.4.0.Final
+6.5.0.Final
 sources
   
   
 org.optaplanner
 optaplanner-persistence-common
-6.4.0.Final
+6.5.0.Final
 test-jar
   
   
 org.optaplanner
 optaplanner-persistence-common
-6.4.0.Final
+6.5.0.Final
 javadoc
   
   
 org.optaplanner
 optaplanner-persistence-jpa
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-persistence-jpa
-6.4.0.Final
+6.5.0.Final
 sources
   
   
 org.optaplanner
 optaplanner-persistence-jpa
-6.4.0.Final
+6.5.0.Final
 test-jar
   
   
 org.optaplanner
 optaplanner-persistence-jpa
-6.4.0.Final
+6.5.0.Final
 javadoc
   
   
 org.optaplanner
 optaplanner-persistence-xstream
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-persistence-xstream
-6.4.0.Final
+6.5.0.Final
 sources
   
   
 org.optaplanner
 optaplanner-persistence-xstream
-6.4.0.Final
+6.5.0.Final
 test-jar
   
   
 org.optaplanner
 optaplanner-persistence-xstream
-6.4.0.Final
+6.5.0.Final
 javadoc
   
   
 org.optaplanner
 optaplanner-wb-domain-editor-api
-6.4.0.Final
+6.5.0.Final
   
   
 org.optaplanner
 optaplanner-wb-domain-editor-api
-6.4.0.Final
+6.5.0.Final
 sources

[3/3] camel git commit: CAMEL-10472 Update Salesforce component to support recent items REST API

2016-11-23 Thread davsclaus
CAMEL-10472 Update Salesforce component to support recent items REST API

This commit adds support for getting recent items via Salesforce REST API[1].

New operation `recent` was added and can be used like:

...to("salesforce:recent")
.split().body()
  .log("${body.name} at ${body.attributes.url}");

Number of items returned can be limited by the `limit` parameter in URI,
body or headers.

[1] 
https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_recent_items.htm


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

Branch: refs/heads/master
Commit: 4e3b2f7af9ed3d7c99fcfd32f0c84c37838ea19f
Parents: a52ab3c
Author: Zoran Regvart 
Authored: Tue Nov 22 18:24:32 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 23 09:44:01 2016 +0100

--
 .../salesforce/SalesforceEndpointConfig.java|  17 +++
 .../salesforce/api/TypeReferences.java  |   4 +
 .../salesforce/internal/OperationName.java  |   1 +
 .../internal/client/DefaultRestClient.java  |  13 ++
 .../salesforce/internal/client/RestClient.java  |  12 ++
 .../processor/AbstractRestProcessor.java|  10 ++
 .../internal/processor/JsonRestProcessor.java   |   5 +
 .../salesforce/RecentIntegrationTest.java   | 140 +++
 .../salesforce/api/dto/RecentItemTest.java  |  65 +
 9 files changed, 267 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4e3b2f7a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
index ad18aab..3d59a19 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
@@ -56,6 +56,7 @@ public class SalesforceEndpointConfig implements Cloneable {
 public static final String SOBJECT_SEARCH = "sObjectSearch";
 public static final String APEX_METHOD = "apexMethod";
 public static final String APEX_URL = "apexUrl";
+public static final String LIMIT = "limit";
 
 // prefix for parameters in headers
 public static final String APEX_QUERY_PARAM_PREFIX = "apexQueryParam.";
@@ -173,6 +174,9 @@ public class SalesforceEndpointConfig implements Cloneable {
 @UriParam
 private long maxBackoff = DEFAULT_MAX_BACKOFF;
 
+@UriParam
+private Integer limit;
+
 public SalesforceEndpointConfig copy() {
 try {
 final SalesforceEndpointConfig copy = (SalesforceEndpointConfig) 
super.clone();
@@ -563,6 +567,7 @@ public class SalesforceEndpointConfig implements Cloneable {
 valueMap.put(SOBJECT_SEARCH, sObjectSearch);
 valueMap.put(APEX_METHOD, apexMethod);
 valueMap.put(APEX_URL, apexUrl);
+valueMap.put(LIMIT, limit);
 // apexQueryParams are handled explicitly in AbstractRestProcessor
 
 // add bulk API properties
@@ -608,4 +613,16 @@ public class SalesforceEndpointConfig implements Cloneable 
{
 public void setInitialReplayIdMap(Map initialReplayIdMap) 
{
 this.initialReplayIdMap = initialReplayIdMap;
 }
+
+public Integer getLimit() {
+return limit;
+}
+
+/**
+ * Limit on number of returned records. Applicable to some of the API, 
check the Salesforce documentation.
+ * @param limit
+ */
+public void setLimit(final Integer limit) {
+this.limit = limit;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/4e3b2f7a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/TypeReferences.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/TypeReferences.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/TypeReferences.java
index 42f022d..7128312 100644
--- 

camel git commit: CAMEL-10514: Camel-Kubernetes: Copy headers from in to out in producer operations

2016-11-23 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/master afced0dea -> a52ab3cdc


CAMEL-10514: Camel-Kubernetes: Copy headers from in to out in producer 
operations


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

Branch: refs/heads/master
Commit: a52ab3cdcd05c53818fe8c5ba0c71212dd7c5a3b
Parents: afced0d
Author: Andrea Cosentino 
Authored: Wed Nov 23 09:26:22 2016 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 23 09:26:22 2016 +0100

--
 .../producer/KubernetesBuildConfigsProducer.java|  4 
 .../kubernetes/producer/KubernetesBuildsProducer.java   |  5 -
 .../producer/KubernetesConfigMapsProducer.java  |  8 
 .../producer/KubernetesNamespacesProducer.java  |  9 +
 .../kubernetes/producer/KubernetesNodesProducer.java|  6 ++
 .../KubernetesPersistentVolumesClaimsProducer.java  |  9 +
 .../producer/KubernetesPersistentVolumesProducer.java   |  7 +++
 .../kubernetes/producer/KubernetesPodsProducer.java | 11 +++
 .../KubernetesReplicationControllersProducer.java   | 12 
 .../producer/KubernetesResourcesQuotaProducer.java  |  9 +
 .../kubernetes/producer/KubernetesSecretsProducer.java  |  9 +
 .../producer/KubernetesServiceAccountsProducer.java |  9 +
 12 files changed, 97 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a52ab3cd/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java
--
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java
index 39b5e5f..0033f99 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java
@@ -31,6 +31,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.component.kubernetes.KubernetesConstants;
 import org.apache.camel.component.kubernetes.KubernetesEndpoint;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -106,6 +107,7 @@ public class KubernetesBuildConfigsProducer extends 
DefaultProducer {
 }
 buildConfigsList = buildConfigs.list();
 }
+MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
 exchange.getOut().setBody(buildConfigsList.getItems());
 }
 
@@ -124,6 +126,8 @@ public class KubernetesBuildConfigsProducer extends 
DefaultProducer {
 }
 buildConfig = 
getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs()
 .inNamespace(namespaceName).withName(buildConfigName).get();
+
+MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
 exchange.getOut().setBody(buildConfig);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a52ab3cd/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducer.java
--
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducer.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducer.java
index f9c5a10..7083e0b 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducer.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducer.java
@@ -20,7 +20,6 @@ import java.util.Map;
 
 import io.fabric8.kubernetes.client.dsl.ClientMixedOperation;
 import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.ClientResource;
 import io.fabric8.kubernetes.client.dsl.LogWatch;
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.BuildList;
@@ -32,6 +31,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.component.kubernetes.KubernetesConstants;
 import