date:20161122

camel git commit: Upgrade Undertow to version 1.4.6.Final

2016-11-22 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 5155fa37a -> afced0dea


Upgrade Undertow to version 1.4.6.Final


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

Branch: refs/heads/master
Commit: afced0deadea5a227e1f8ca66686cb0c9ee1fee2
Parents: 5155fa3
Author: Andrea Cosentino 
Authored: Wed Nov 23 08:17:30 2016 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 23 08:17:54 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/afced0de/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 715012e..01d85eb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -602,7 +602,7 @@
 2.1.1
 4.0.5_1
 4.0.5
-1.4.4.Final
+1.4.6.Final
 2.2.3
 
2015-01-27T15-02-14
 
1.0.0

[2/2] camel git commit: CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement exchange property instead of message header

2016-11-22 Thread davsclaus

CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement 
exchange property instead of message header


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

Branch: refs/heads/camel-2.18.x
Commit: 466bcab19b3faa722f075a6f286e64419ca3fc5f
Parents: d1a9f9f
Author: Quinn Stevenson 
Authored: Tue Nov 22 12:04:04 2016 -0700
Committer: Claus Ibsen 
Committed: Tue Nov 22 20:56:25 2016 +0100

--
 .../apache/camel/component/mllp/MllpTcpServerConsumer.java   | 1 -
 .../mllp/impl/AcknowledgmentSynchronizationAdapter.java  | 2 +-
 .../camel/processor/mllp/Hl7AcknowledgementGenerator.java| 8 
 3 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/466bcab1/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 1648b8a..05b8cbe 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -324,7 +324,6 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
  */
 class ClientSocketThread extends Thread {
 Socket clientSocket;
-Hl7AcknowledgementGenerator acknowledgementGenerator = new 
Hl7AcknowledgementGenerator();
 
 Integer initialByte;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/466bcab1/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
index 6d4b76c..c7916d4 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
@@ -72,7 +72,7 @@ public class AcknowledgmentSynchronizationAdapter extends 
SynchronizationAdapter
 }
 
 // Find the acknowledgement body
-// TODO:  Enhance this to say whether or not the acknowlment is 
missing or just of an uncovertable type
+// TODO:  Enhance this to say whether or not the acknowledgment is 
missing or just of an unconvertible type
 byte[] acknowledgementMessageBytes = 
exchange.getProperty(MLLP_ACKNOWLEDGEMENT, byte[].class);
 String acknowledgementMessageType = null;
 if (null == acknowledgementMessageBytes) {

http://git-wip-us.apache.org/repos/asf/camel/blob/466bcab1/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
index 265db76..c7f4473 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
@@ -56,13 +56,13 @@ public class Hl7AcknowledgementGenerator implements 
Processor {
 byte[] acknowledgementBytes = null;
 if (null == exchange.getException()) {
 acknowledgementBytes = 
generateApplicationAcceptAcknowledgementMessage(hl7Bytes);
-message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
+exchange.setProperty(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
 } else {
 acknowledgementBytes = 
generateApplicationErrorAcknowledgementMessage(hl7Bytes);
-message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
+exchange.setProperty(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
 }
 
-message.setHeader(MLLP_ACKNOWLEDGEMENT, acknowledgementBytes);
+exchange.setProperty(MLLP_ACKNOWLEDGEMENT, acknowledgementBytes);
 }
 
 public byte[] generateApplicationAcceptAcknowledgementMessage(byte[]

[1/2] camel git commit: CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement exchange property instead of message header

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x d1a9f9fb0 -> 466bcab19
  refs/heads/master 8902592b3 -> 5155fa37a


CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement 
exchange property instead of message header


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

Branch: refs/heads/master
Commit: 5155fa37a3f1c8ae56b7e22f4fb3750be1e758ea
Parents: 8902592
Author: Quinn Stevenson 
Authored: Tue Nov 22 12:04:04 2016 -0700
Committer: Claus Ibsen 
Committed: Tue Nov 22 20:56:04 2016 +0100

--
 .../apache/camel/component/mllp/MllpTcpServerConsumer.java   | 1 -
 .../mllp/impl/AcknowledgmentSynchronizationAdapter.java  | 2 +-
 .../camel/processor/mllp/Hl7AcknowledgementGenerator.java| 8 
 3 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5155fa37/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 1648b8a..05b8cbe 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -324,7 +324,6 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
  */
 class ClientSocketThread extends Thread {
 Socket clientSocket;
-Hl7AcknowledgementGenerator acknowledgementGenerator = new 
Hl7AcknowledgementGenerator();
 
 Integer initialByte;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5155fa37/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
index 6d4b76c..c7916d4 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
@@ -72,7 +72,7 @@ public class AcknowledgmentSynchronizationAdapter extends 
SynchronizationAdapter
 }
 
 // Find the acknowledgement body
-// TODO:  Enhance this to say whether or not the acknowlment is 
missing or just of an uncovertable type
+// TODO:  Enhance this to say whether or not the acknowledgment is 
missing or just of an unconvertible type
 byte[] acknowledgementMessageBytes = 
exchange.getProperty(MLLP_ACKNOWLEDGEMENT, byte[].class);
 String acknowledgementMessageType = null;
 if (null == acknowledgementMessageBytes) {

http://git-wip-us.apache.org/repos/asf/camel/blob/5155fa37/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
index 265db76..c7f4473 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
@@ -56,13 +56,13 @@ public class Hl7AcknowledgementGenerator implements 
Processor {
 byte[] acknowledgementBytes = null;
 if (null == exchange.getException()) {
 acknowledgementBytes = 
generateApplicationAcceptAcknowledgementMessage(hl7Bytes);
-message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
+exchange.setProperty(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
 } else {
 acknowledgementBytes = 
generateApplicationErrorAcknowledgementMessage(hl7Bytes);
-message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
+exchange.setProperty(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
 }
 
-message.setHeader(MLLP_ACKNOWLEDGEMENT, acknowledgementBytes);
+

[3/3] 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-22 Thread davsclaus

[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/b2b62d06
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b2b62d06
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b2b62d06

Branch: refs/heads/camel-2.17.x
Commit: b2b62d06bb22c00186824ee6956751ce342cac2b
Parents: b430437
Author: apoltavt...@gmail.com 
Authored: Tue Nov 22 15:39:11 2016 +0300
Committer: Claus Ibsen 
Committed: Tue Nov 22 20:43:47 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/b2b62d06/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

[2/3] 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-22 Thread davsclaus

[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/d1a9f9fb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1a9f9fb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1a9f9fb

Branch: refs/heads/camel-2.18.x
Commit: d1a9f9fb0b65010b46ebe8e54188975246ca
Parents: 4cc5bc0
Author: apoltavt...@gmail.com 
Authored: Tue Nov 22 15:39:11 2016 +0300
Committer: Claus Ibsen 
Committed: Tue Nov 22 20:43:23 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d1a9f9fb/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

[1/3] 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-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x b43043757 -> b2b62d06b
  refs/heads/camel-2.18.x 4cc5bc065 -> d1a9f9fb0
  refs/heads/master 9615ed790 -> 8902592b3


[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/8902592b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8902592b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8902592b

Branch: refs/heads/master
Commit: 8902592b3361f6fb195e49669712fd34883640c4
Parents: 9615ed7
Author: apoltavt...@gmail.com 
Authored: Tue Nov 22 15:39:11 2016 +0300
Committer: Claus Ibsen 
Committed: Tue Nov 22 20:05:43 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8902592b/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

svn commit: r1001492 - in /websites/production/camel/content: articles.html cache/main.pageCache

2016-11-22 Thread buildbot

Author: buildbot
Date: Tue Nov 22 16:19:49 2016
New Revision: 1001492

Log:
Production update by buildbot for camel

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

Modified: websites/production/camel/content/articles.html
==
--- websites/production/camel/content/articles.html (original)
+++ websites/production/camel/content/articles.html Tue Nov 22 16:19:49 2016
@@ -75,7 +75,7 @@

 
 
-See alsoSee also http://camel.apache.org/user-stories.html;>Camel 
User Stories.If you have never used or seen Camel 
before, then you should start with http://www.kai-waehner.de/blog/2012/05/04/apache-camel-tutorial-introduction/;
 rel="nofollow">Apache Camel Tutorial  Introduction to EIP, Routes, 
Components, Testing, and other Concepts - an article by Kai Whner, 
where he puts EIP and Camel into the big picture and gives a run down of the 
important Camel concepts. https://github.com/megachucky/camel-infoq; rel="nofollow">Demo source code
  can be downloaded at github to get started with your first Camel project 
easily.Archived Webinars 
and Screencastshttps://www.youtube.com/watch?v=fxpS9pf6TVklist=PLUDjw7NbNcoyOyhrIIw9cChAHWdaCxIobindex=17;
 rel="nofollow">Apache Camel - The Integration Library - A 50 minute video 
from September 2016 where Claus Ibsen presents Apache Camel at the JDKIO 2016 
conference.https://www.youtube.com/watch?v=jZE-YSHK_gwsns=tw; 
rel="nofollow">Apache Camel First Steps - A 10 minute video from December 
2015 where Vivian van Zyl gives a high level overview of Apache Camel and 
demonstrates how to start using Camel with live code demo.https://www.youtube.com/watch?v=ouJ3SQHnQ6Ifeature=youtu.bea; 
rel="nofollow">Fabric8 Camel Microservices for Docker an
 d Kubernetes - A 55 minute video from http://rigadevday.lv/#/index; rel="nofollow">Riga 
Dev Day 2016 conference where Claus Ibsen talks about developing Camel 
microservices ready for the container platforms.https://www.youtube.com/watch?v=91UiQgazt3g; 
rel="nofollow">Developing Microservices with Apache Camel - Video from 
November 2015 at the MSA Day in New York where Claus Ibsen talks developing 
Camel based microservices for docker containers running on Kubernetes. http://www.slideshare.net/davsclaus/developing-microservices-with-apache-camel;
 rel="nofollow">Slides are here.https://www.youtube.com/watch?v=o8ZRE9DM3Es; 
rel="nofollow">Wild Flies and A Camel - Video from Oredev 2015 where Markus 
Eisele talks about Apache Camel and JBoss Wildfly.https://www.youtube.com/watch?v=nqQaR7vUxfgindex=13list=PLPIzp-E1msrZz6RNdbDiK0nKuxAUZPs77;
 rel="nofollow">JavaOne 2015 Riding a Camel through the JEEHara - Video 
from JavaOne 2015 where Markus Eisele introduces Apache Camel and how to use it 
with JEE.https://www.youtube.com/watch?v=jbj1TJ_2XBQfeature=youtu.bea; 
style="line-height: 1.42857;" rel="nofollow">Apache Camel in the clouds - 
Video from Devnexus 2015 where Markus Eisele talk about Apache Camel in the 
clouds running on openshifthttps://vimeo.com/130993910; rel="nofollow">GeeCON 2015: Markus Eisele - 
Wild Flies and a Camel - Java EE Integration- Video from GeeCon 2015 
where Markus Eisele talks about Apache Camel and how Camel can work with 
Wildflyhttps://vimeo.com/105743314; rel="nofollow">Hvordan f en ka
 mel til  danse (September 2014) byPer Jrgen 
Walstrm  Audun Fauchald Strand - (JavaZone 2014) in 
Norwegianhttp://www.youtube.com/watch?v=_pEwoztbfYIfeature=youtu.bea; 
rel="nofollow">Integration using Apache Camel and Groovy (June 2014) by 
Claus Ibsen, presenting Camel, Groovy, and http://hawt.io/; rel="nofollow">hawtio at http://gr8conf.eu/#/; 
rel="nofollow">gr8conf 2014.https://skillsmatter.com/skillscasts/5074-effective-system-integrations-with-apache-camel;
 rel="nofollow">Effective System Integrations with Apache Camel (March 
2014) by Jakub Korabhttp://www.youtube.com/watch?v=lOxUs_JleSsfeature=youtu.bea; 
rel="nofollow">Getting started with Apache Camel video from Barcel
 onaJUG (January 2014) by Claus Ibsenhttp://vimeo.com/68442425; rel="nofollow">Camel in 
the cloud demo from CamelOne 2013 - Video presentation from CamelOne 2013 
demonstrating Camel in the cloud using http://fuse.fusesource.org/fabric/; rel="nofollow">Fuse Fabric and http://hawt.io/; 
rel="nofollow">hawtiohttp://javagruppen.dk/index.php/moder/historiske-moder/285-javagruppemode-115-apache-camel-i-aarhus;
 rel="nofollow">Getting started with Apache Camel - Video presentation from 
Javagruppen meeting by Claus Ibsen (May 2013)http://blip.tv/dzone/apache-camel-essential-components-6511579; 
rel="nofollow">Apache Camel Essential Components by Christian 
Posta (January 2013)http://www.youtube.com/watch?v=i_g91CzHgxg; 
rel="nofollow">Leverage Enterprise Integration Patterns with Apache Camel and 
Twitter by Bruno Borges (JavaOne

camel git commit: Upgrade spark-java-rest

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 6ade9d6b3 -> 9615ed790


Upgrade spark-java-rest


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

Branch: refs/heads/master
Commit: 9615ed790cca5599c7cf6417d8f06237bc20043e
Parents: 6ade9d6
Author: Claus Ibsen 
Authored: Tue Nov 22 13:33:35 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 13:33:35 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9615ed79/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 76ff2f3..715012e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -541,7 +541,7 @@
 5.5.0
 [5,6)
 1.6.1
-2.5
+2.5.3
 2.5_1
 1.5.0.0_1
 3.0.7.RELEASE

camel git commit: Remove dependencies exclusion as SNAPSHOT dep in release jar has been fixed upstream

2016-11-22 Thread lburgazzoli

Repository: camel
Updated Branches:
  refs/heads/master 0c5786f4d -> 6ade9d6b3


Remove dependencies exclusion as SNAPSHOT dep in release jar has been fixed 
upstream


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

Branch: refs/heads/master
Commit: 6ade9d6b3e14b9fc2e9c61c145b6df153d0c17e9
Parents: 0c5786f
Author: lburgazzoli 
Authored: Tue Nov 22 12:40:35 2016 +0100
Committer: lburgazzoli 
Committed: Tue Nov 22 12:40:35 2016 +0100

--
 components/camel-chronicle/pom.xml | 12 
 1 file changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6ade9d6b/components/camel-chronicle/pom.xml
--
diff --git a/components/camel-chronicle/pom.xml 
b/components/camel-chronicle/pom.xml
index ccbac3d..469ccbc 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -44,22 +44,10 @@
   org.apache.camel
   camel-core
 
-
-
-  net.openhft
-  chronicle-wire
-  ${chronicle-wire-version}
-
 
   net.openhft
   chronicle-engine
   ${chronicle-engine-version}
-  
-
-  net.openhft
-  chronicle-wire
-
-  
 
 
   org.apache.camel

svn commit: r1001479 - in /websites/production/camel/content: book-in-one-page.html book-pattern-appendix.html cache/main.pageCache content-enricher.html

2016-11-22 Thread buildbot

Author: buildbot
Date: Tue Nov 22 11:21:59 2016
New Revision: 1001479

Log:
Production update by buildbot for camel

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

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 Tue Nov 22 11:21:59 
2016
@@ -3966,11 +3966,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
@@ -6085,11 +6085,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
@@ -13250,7 +13250,7 @@ from(direct:start)
  
 The same example in the Spring DSL (Camel 2.16 or newer)
   
-  &lt;camelContext id=&quot;camel&quot; 
xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt; 
&lt;route&gt; &lt;from 
uri=&quot;direct:start&quot;/&gt; &lt;enrich 
strategyRef=&quot;aggregationStrategy&quot;&gt; 
&lt;constant&gt;direct:resource&lt;/constant&gt; &lt;to 
uri=&quot;direct:result&quot;/&gt; &lt;/route&gt; 
&lt;route&gt; &lt;from 
uri=&quot;direct:resource&quot;/&gt; ... &lt;/route&gt; 
&lt;/camelContext&gt; &lt;bean 
id=&quot;aggregationStrategy&quot; class=&quot;...&quot; 
/&gt;  
+  &lt;camelContext id=&quot;camel&quot; 
xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt; 
&lt;route&gt; &lt;from 
uri=&quot;direct:start&quot;/&gt; &lt;enrich 
strategyRef=&quot;aggregationStrategy&quot;&gt; 
&lt;constant&gt;direct:resource&lt;/constant&gt; 
&lt;/enrich&gt; &lt;to 
uri=&quot;direct:result&quot;/&gt; &lt;/route&gt; 
&lt;route&gt; &lt;from 
uri=&quot;direct:resource&quot;/&gt; ... &lt;/route&gt; 
&lt;/camelContext&gt; &lt;bean 
id=&quot;aggregationStrategy&quot; class=&quot;...&quot; 
/&gt;  
  
 Aggregation strategy is 
optionalThe aggregation strategy is optional. If you do not provide it 
Camel will by default just use the body obtained from the resource.
   
@@ -14323,8 +14323,8 @@ cometds://localhost:8443/service/mychann
  
   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./**/ 
div.rbtoc1479464384516 {padding: 0px;} div.rbtoc1479464384516 ul {list-style: 
disc;margin-left: 0px;} div.rbtoc1479464384516 li {margin-left: 
0px;padding-left: 0px;} /**/
-  
+The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to 
JAX-WS services hosted in

camel git commit: CAMEL-10507 Make TypeReference inline anonymous classes constant

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 573368a83 -> 0c5786f4d


CAMEL-10507  Make TypeReference inline anonymous classes constant

Created a class (o.a.c.c.s.a.TypeReferences) to hold any TypeReferences
as constants and replaced all usage with the constant values.

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

Branch: refs/heads/master
Commit: 0c5786f4dc162fc6203145de2ae54da47fe780b0
Parents: 573368a
Author: Zoran Regvart 
Authored: Tue Nov 22 12:08:43 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 12:17:02 2016 +0100

--
 .../salesforce/api/TypeReferences.java  | 62 
 .../component/salesforce/api/dto/Limits.java|  7 +--
 .../client/DefaultAnalyticsApiClient.java   | 17 ++
 .../internal/client/DefaultRestClient.java  |  9 +--
 .../internal/processor/JsonRestProcessor.java   |  8 +--
 5 files changed, 74 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0c5786f4/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
new file mode 100644
index 000..42f022d
--- /dev/null
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/TypeReferences.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.salesforce.api;
+
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import org.apache.camel.component.salesforce.api.dto.Limits.Operation;
+import org.apache.camel.component.salesforce.api.dto.Limits.Usage;
+import org.apache.camel.component.salesforce.api.dto.RestError;
+import org.apache.camel.component.salesforce.api.dto.SearchResult;
+import org.apache.camel.component.salesforce.api.dto.Version;
+import 
org.apache.camel.component.salesforce.api.dto.analytics.reports.RecentReport;
+import 
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportInstance;
+
+/**
+ * Class that holds {@link TypeReference} instances needed for Jackson mapper 
to support generics.
+ */
+public final class TypeReferences {
+
+public static final TypeReference> USAGES_TYPE = new 
TypeReference>() {
+};
+
+public static final TypeReference REST_ERROR_LIST_TYPE = 
new TypeReference() {
+};
+
+public static final TypeReference 
REPORT_INSTANCE_LIST_TYPE = new TypeReference() {
+};
+
+public static final TypeReference 
RECENT_REPORT_LIST_TYPE = new TypeReference() {
+};
+
+public static final TypeReference STRING_LIST_TYPE = new 
TypeReference() {
+};
+
+public static final TypeReference VERSION_LIST_TYPE = new 
TypeReference() {
+};
+
+public static final TypeReference SEARCH_RESULT_TYPE = 
new TypeReference() {
+};
+
+private TypeReferences() {
+// not meant for instantiation, only for TypeReference constants
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/0c5786f4/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
--
diff --git

[3/4] camel git commit: Upgrade Optaplanner to version 6.5.0.Final

2016-11-22 Thread acosentino

Upgrade Optaplanner to version 6.5.0.Final


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

Branch: refs/heads/master
Commit: 0c1eaecaa61ed555f40c21eed311ceb2dc976f30
Parents: 84705ed
Author: Andrea Cosentino 
Authored: Tue Nov 22 11:47:27 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 11:47:27 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/0c1eaeca/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a56a14e..224c965 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -471,7 +471,7 @@
 2.4.1
 2.7.0.Final
 1.4.20
-6.4.0.Final
+6.5.0.Final
 2.0.8_6
 2.4_5
 4.3.1

[1/4] camel git commit: Upgrade Drools to version 6.5.0.Final

2016-11-22 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 22f30a300 -> 3ddd88c06


Upgrade Drools to version 6.5.0.Final


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

Branch: refs/heads/master
Commit: 35e42c38a497978a6f68e26403dde8715ac87373
Parents: 22f30a3
Author: Andrea Cosentino 
Authored: Tue Nov 22 11:43:22 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 11:43:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/35e42c38/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2161436..78d6461 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
 3.0.6
 1.6.1_5
 5.5.1
-6.4.0.Final
+6.5.0.Final
 1.8.2
 3.4
 4.2.2

camel git commit: CAMEL-10471 Update Salesforce component to support limits REST API

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 3ddd88c06 -> 573368a83


CAMEL-10471 Update Salesforce component to support limits REST API

This commits updates the Salesforce component documentation for the
limits operation.


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

Branch: refs/heads/master
Commit: 573368a83a2b3ba5e7bcda008d5f40e464c8b133
Parents: 3ddd88c
Author: Zoran Regvart 
Authored: Tue Nov 22 11:40:18 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 11:52:12 2016 +0100

--
 .../src/main/docs/salesforce-component.adoc | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/573368a8/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 6084153..a3d062f 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
@@ -67,6 +67,7 @@ field
 * queryMore - Retrieves more results (in case of large number of
 results) using result link returned from the 'query' API
 * search - Runs a Salesforce SOSL query
+* limits - fetching organization API usage limits
 
 For example, the following producer endpoint uses the upsertSObject API,
 with the sObjectIdName parameter specifying 'Name' as the external id
@@ -187,6 +188,37 @@ Give the output from the processor to the Salesforce 
component:
 .to("salesforce:createSObject"); 
 
-
 
+[[Salesforce-LimitsAPI]]
+Using Salesforce Limits API
+~~~
+
+With `salesforce:limits` operation you can fetch of API limits from Salesforce 
and then act upon that data received.
+The result of `salesforce:limits` operation is mapped to 
`org.apache.camel.component.salesforce.api.dto.Limits`
+class and can be used in a custom processors or expressions.
+
+For instance, consider that you need to limit the API usage of Salesforce so 
that 10% of daily API requests is left for
+other routes. The body of output message contains an instance of
+`org.apache.camel.component.salesforce.api.dto.Limits` object that can be used 
in conjunction with
+link:content-based-router.html[Content Based Router] and 
link:content-based-router.html[Content Based Router] and 
+link:spel-language.html[Spring Expression Language (SpEL)] to choose when to 
perform queries.
+
+Notice how multiplying `1.0` with the integer value held in 
`body.dailyApiRequests.remaining` makes the expression
+evaluate as with floating point arithmetic, without it - it would end up 
making integral division which would result
+with either `0` (some API limits consumed) or `1` (no API limits consumed).
+
+[source,java]
+-
+from("direct:querySalesforce")
+.to("salesforce:limits")
+.choice()
+.when(spel("#{1.0 * body.dailyApiRequests.remaining / 
body.dailyApiRequests.max < 0.1}"))
+.to("salesforce:query?...")
+.otherwise()
+.setBody(constant("Used up Salesforce API limits, leaving 10% for 
critical routes"))
+.endChoice()
+-
+
+
 [[Salesforce-CamelSalesforceMavenPlugin]]
 Camel Salesforce Maven Plugin
 ~

[4/4] camel git commit: Upgrade Kie to version 6.5.0.Final

2016-11-22 Thread acosentino

Upgrade Kie to version 6.5.0.Final


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

Branch: refs/heads/master
Commit: 3ddd88c066cf6c79a7745fa811b224fd848d6a2f
Parents: 0c1eaec
Author: Andrea Cosentino 
Authored: Tue Nov 22 11:48:05 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 11:48:05 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/3ddd88c0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 224c965..76ff2f3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -380,7 +380,7 @@
 2.4.4
 3.0.8
 4.0.7
-6.4.0.Final
+6.5.0.Final
 0.4.9
 1.4.20
 1.0.63

[2/4] camel git commit: Upgrade JBPM to version 6.5.0.Final

2016-11-22 Thread acosentino

Upgrade JBPM to version 6.5.0.Final


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

Branch: refs/heads/master
Commit: 84705edf7eaa5ecc9f2f2f061d299612fd865641
Parents: 35e42c3
Author: Andrea Cosentino 
Authored: Tue Nov 22 11:45:43 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 11:45:43 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/84705edf/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 78d6461..a56a14e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -306,7 +306,7 @@
 3.1.0
 2.2.11_1
 1.1.6
-6.4.0.Final
+6.5.0.Final
 1.0.0.Final
 3.3.0.Final
 1.4.10.Final

[1/4] camel git commit: Capitalize on validateLogs

2016-11-22 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 0be70c532 -> 22f30a300


Capitalize on validateLogs


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

Branch: refs/heads/master
Commit: 1a8b2c4bd662edd8b2769b91daca0814d4d88b4f
Parents: e396f77
Author: Olivier Antibi 
Authored: Tue Nov 22 10:34:25 2016 +0100
Committer: Olivier Antibi 
Committed: Tue Nov 22 10:34:41 2016 +0100

--
 .../camel/component/git/GitTestSupport.java |  12 ++
 .../component/git/consumer/GitConsumerTest.java |  26 +---
 .../component/git/producer/GitProducerTest.java | 152 ++-
 3 files changed, 35 insertions(+), 155 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a8b2c4b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
index 15bd8ce..65c1f12 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
@@ -23,6 +23,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
 public class GitTestSupport extends CamelTestSupport {
@@ -78,4 +79,15 @@ public class GitTestSupport extends CamelTestSupport {
 protected Git getGitTestRepository() throws IOException, 
IllegalStateException, GitAPIException {
 return new Git(getTestRepository());
 }
+
+protected void validateGitLogs(Git git, String... messages) throws 
GitAPIException {
+Iterable logs = git.log().call();
+int count = 0;
+for (RevCommit rev : logs) {
+assertEquals(messages[count], rev.getShortMessage());
+count++;
+}
+assertEquals(messages.length, count);
+}
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/1a8b2c4b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index f2b5db1..bb3d594 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.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.
@@ -16,26 +16,20 @@
  */
 package org.apache.camel.component.git.consumer;
 
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.git.GitConstants;
 import org.apache.camel.component.git.GitTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
-import org.eclipse.jgit.internal.storage.file.RefDirectory;
 import org.eclipse.jgit.lib.ObjectIdRef;
 import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Test;
 
+import java.io.File;
+import java.util.List;
+
 public class GitConsumerTest extends GitTestSupport {
 
 @Test
@@ -59,12 +53,7 @@ public class GitConsumerTest extends GitTestSupport {
 assertTrue(status.getAdded().contains(filenameBranchToAdd));
 git.commit().setMessage("Test test Commit").call();

[4/4] camel git commit: Fixed CS

2016-11-22 Thread acosentino

Fixed CS


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

Branch: refs/heads/master
Commit: 22f30a300144f1234884081b31c4e602906db23f
Parents: f878eb2
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:59:54 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:59:54 2016 +0100

--
 .../apache/camel/component/git/consumer/GitConsumerTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22f30a30/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index ded0b07..49d063c 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.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.

[2/4] camel git commit: Refactor unit tests using Jgit instead of camel-git to initialise the context

2016-11-22 Thread acosentino

Refactor unit tests using Jgit instead of camel-git to initialise the context


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

Branch: refs/heads/master
Commit: e396f77d3ba24e8271fc8d6169c68a9af0e23afb
Parents: 0be70c5
Author: Olivier Antibi 
Authored: Mon Nov 21 22:34:03 2016 +0100
Committer: Olivier Antibi 
Committed: Tue Nov 22 10:34:41 2016 +0100

--
 .../camel/component/git/GitTestSupport.java |   4 +
 .../component/git/consumer/GitConsumerTest.java | 215 ++
 .../component/git/producer/GitProducerTest.java | 774 ++-
 3 files changed, 309 insertions(+), 684 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e396f77d/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
index ce0cc01..15bd8ce 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
@@ -74,4 +74,8 @@ public class GitTestSupport extends CamelTestSupport {
 .build();
 return repo;
 }
+
+protected Git getGitTestRepository() throws IOException, 
IllegalStateException, GitAPIException {
+return new Git(getTestRepository());
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e396f77d/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index a36c746..f2b5db1 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
@@ -18,124 +18,79 @@ package org.apache.camel.component.git.consumer;
 
 import java.io.File;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.git.GitConstants;
 import org.apache.camel.component.git.GitTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
+import org.eclipse.jgit.internal.storage.file.RefDirectory;
+import org.eclipse.jgit.lib.ObjectIdRef;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Test;
 
 public class GitConsumerTest extends GitTestSupport {
-
+
 @Test
 public void commitConsumerTest() throws Exception {
-
-Repository repository = getTestRepository();
-MockEndpoint added = getMockEndpoint("mock:result-commit");
-
-File fileToAdd = new File(gitLocalRepo, filenameToAdd);
-fileToAdd.createNewFile();
-
-template.send("direct:add", new Processor() {
-@Override
-public void process(Exchange exchange) throws Exception {
-exchange.getIn().setHeader(GitConstants.GIT_FILE_NAME, 
filenameToAdd);
-}
-});
+// Init
+MockEndpoint mockResultCommit = getMockEndpoint("mock:result-commit");
+mockResultCommit.expectedMessageCount(2);
+Git git = getGitTestRepository();
 File gitDir = new File(gitLocalRepo, ".git");
 assertEquals(gitDir.exists(), true);
-
-Status status = new Git(repository).status().call();
+File fileToAdd = new File(gitLocalRepo, filenameToAdd);
+fileToAdd.createNewFile();
+git.add().addFilepattern(filenameToAdd).call();
+Status status = git.status().call();
 assertTrue(status.getAdded().contains(filenameToAdd));
-
-template.send("direct:commit", new Processor() {
-@Override
-public void process(Exchange exchange) throws Exception {
-exchange.getIn().setHeader(GitConstants.GIT_COMMIT_MESSAGE, 
commitMessage);
-}
-});
-Iterable logs =

[3/4] camel git commit: Check code style

2016-11-22 Thread acosentino

Check code style


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

Branch: refs/heads/master
Commit: f878eb201be51a5949fd5dd89613cfb53487679d
Parents: 1a8b2c4
Author: Olivier Antibi 
Authored: Tue Nov 22 10:55:07 2016 +0100
Committer: Olivier Antibi 
Committed: Tue Nov 22 10:55:07 2016 +0100

--
 .../apache/camel/component/git/consumer/GitConsumerTest.java   | 6 +++---
 .../apache/camel/component/git/producer/GitProducerTest.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f878eb20/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index bb3d594..ded0b07 100644
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
@@ -16,6 +16,9 @@
  */
 package org.apache.camel.component.git.consumer;
 
+import java.io.File;
+import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.git.GitTestSupport;
@@ -27,9 +30,6 @@ import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Test;
 
-import java.io.File;
-import java.util.List;
-
 public class GitConsumerTest extends GitTestSupport {
 
 @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/f878eb20/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
index c0fa799..6f73e21 100755
--- 
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
+++ 
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -32,7 +33,6 @@ import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.PullResult;
 import org.eclipse.jgit.api.RemoteAddCommand;
 import org.eclipse.jgit.api.Status;
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;

camel git commit: CAMEL-10503 - Camel-Git: Add RemoteAdd command Finally add RemoteList command too as it goes together

2016-11-22 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 52459d26a -> 0be70c532


CAMEL-10503 - Camel-Git: Add RemoteAdd command
Finally add RemoteList command too as it goes together


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

Branch: refs/heads/master
Commit: 0be70c532e819bd6d8ab4b8cf24f83b86917214d
Parents: 52459d2
Author: Olivier Antibi 
Authored: Mon Nov 21 19:36:40 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:21:58 2016 +0100

--
 .../apache/camel/component/git/GitEndpoint.java |  2 +-
 .../component/git/producer/GitOperation.java|  2 +
 .../component/git/producer/GitProducer.java | 43 
 .../camel/component/git/GitTestSupport.java | 12 --
 .../component/git/producer/GitProducerTest.java | 43 
 5 files changed, 97 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0be70c53/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
--
diff --git 
a/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
 
b/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
index aec38d8..575784e 100644
--- 
a/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
+++ 
b/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
@@ -66,7 +66,7 @@ public class GitEndpoint extends DefaultEndpoint {
 @Metadata(label = "producer")
 private boolean allowEmpty = true;
 
-@UriParam(enums = 
"clone,init,add,remove,commit,commitAll,createBranch,deleteBranch,createTag,deleteTag,status,log,push,pull,showBranches,cherryPick",
 label = "producer")
+@UriParam(enums = 
"clone,init,add,remove,commit,commitAll,createBranch,deleteBranch,createTag,deleteTag,status,log,push,pull,showBranches,cherryPick,remoteAdd,remoteList",
 label = "producer")
 private String operation;
 
 public GitEndpoint(String uri, GitComponent component) {

http://git-wip-us.apache.org/repos/asf/camel/blob/0be70c53/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitOperation.java
--
diff --git 
a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitOperation.java
 
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitOperation.java
index ce6ae25..b74b48c 100644
--- 
a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitOperation.java
+++ 
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitOperation.java
@@ -34,4 +34,6 @@ public interface GitOperation {
 String PULL_OPERATION = "pull";
 String SHOW_BRANCHES = "showBranches";
 String CHERRYPICK_OPERATION = "cherryPick";
+String REMOTE_ADD_OPERATION = "remoteAdd";
+String REMOTE_LIST_OPERATION = "remoteList";
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0be70c53/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
--
diff --git 
a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
 
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
index b6bedd2..d45f309 100644
--- 
a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
+++ 
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.git.producer;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.component.git.GitConstants;
 import org.apache.camel.component.git.GitEndpoint;
@@ -29,6 +30,7 @@ import org.eclipse.jgit.api.CherryPickResult;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ListBranchCommand.ListMode;
 import org.eclipse.jgit.api.PullResult;
+import org.eclipse.jgit.api.RemoteAddCommand;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
@@ -37,6 +39,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.transport.PushResult;
+import org.eclipse.jgit.transport.RemoteConfig;
+import

camel git commit: Update Camel Salesforce integration tests

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 603dfb48a -> 52459d26a


Update Camel Salesforce integration tests

Tests in SalesforceComponentConfigurationTest were not updated to the
latest functionality provided by the
SalesforceComponent::completeEndpointPath.

Also renamed SalesforceComponentConfigurationTest to
SalesforceComponentConfigurationIntegrationTest, the test requires
Salesforce access to run. Renamed the `salesforce-test` profile to
`integration` and enforced existence of
`test-salesforce-login.properties` file in the root of
`camel-salesforce-parent` project -- it is needed for the integration
tests and contains the credentials required for accessing Salesforce
account used.

Details in README.md.


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

Branch: refs/heads/master
Commit: 52459d26ae17bb0436fb84354b169e8a649e4f3e
Parents: 603dfb4
Author: Zoran Regvart 
Authored: Thu Nov 10 11:51:28 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 10:19:12 2016 +0100

--
 .../camel-salesforce-component/README.md|  36 
 .../salesforce/RestApiIntegrationTest.java  |  24 ++-
 ...ceComponentConfigurationIntegrationTest.java | 209 +++
 .../SalesforceComponentConfigurationTest.java   | 200 --
 components/camel-salesforce/pom.xml |  23 +-
 5 files changed, 288 insertions(+), 204 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/52459d26/components/camel-salesforce/camel-salesforce-component/README.md
--
diff --git a/components/camel-salesforce/camel-salesforce-component/README.md 
b/components/camel-salesforce/camel-salesforce-component/README.md
index 9bf9845..ef3dc12 100644
--- a/components/camel-salesforce/camel-salesforce-component/README.md
+++ b/components/camel-salesforce/camel-salesforce-component/README.md
@@ -66,3 +66,39 @@ To create and subscribe to a topic
 To subscribe to an existing topic
 
from("force:CamelTestTopic=Merchandise__c")...
+
+## Developing the Camel Salesforce component
+
+### Running the integration tests
+
+**Note:** These instructions are only for running integration tests, they use 
permissions and IP restrictions that should be reconsidered for production use. 
+
+In order to run the integration tests you need a Salesforce Developer account. 
You can get a Salesforce Developer account by visiting 
[developer.salesforce.com](https://developer.salesforce.com/) and sign up for 
one.
+
+Besides that account you'll need a _test user_ account that has `Bulk API Hard 
Delete` permission. You can create one by going to _My Developer Account_ (link 
from [developer.salesforce.com](https://login.salesforce.com/?lt=de)). Under 
_Administer_ expand _Manage Users_  and select _Profiles_ find _System 
Administrator_ profile and select _Clone_. Use `System Administrator With Hard 
Delete` as the profile name, and after saving under _Administrative 
Permissions_ click edit and tick _Bulk API Hard Delete_ and save. Next, create 
a new user under _Administer_ expand _Manage Users_  and select _Users_ and 
then click on _New User_. Fill in the required fields, and select _Salesforce_ 
for _User License_ and newly created profile for _Profile_. You get two user 
_Salesforce_ licenses so the newly created user will put you at a maximum.
+
+Install the Warehouse package, tested with _Spring 2013_ (version 1.2) that 
can be installed from the 
[https://login.salesforce.com/packaging/installPackage.apexp?p0=04ti000Pj8s](https://login.salesforce.com/packaging/installPackage.apexp?p0=04ti000Pj8s),
 and make the following modifications manually:
+ - add custom field `Description` of type `Text` with maxumum length of `100` 
on the `Merchandise` object
+ - add custom **required** field `Total_Inventory` of type `Number` with 
maximum length of `18` without default value on the `Merchandise` object
+ - add custom field `Shipping_Location` of type `GeoLocation` on the `Account` 
object
+ - add custom field `Units_Sold` of `Number` type with maximum length of `18` 
on the `Line_Item` object
+ - delete custom fields `Quantity`, `Invoice`, `Line_Item_Total` from the 
`Line_Item` object
+ - delete custom field `Quantity` from the `Merchanidise` object, you will 
need to delete dependencies (ApexClass and Visualforce Page)
+ - create new ApexClass named `MerchandiseRestResource` with the content of 
`MerchandiseRestResource.apxc`
+
+You'll need to access a Merchandise record and run a `Test Report` in order 
for them to appear in _Recent Items_ and

[6/6] camel git commit: Upgrade Chronicle Engine to version 1.13.16

2016-11-22 Thread acosentino

Upgrade Chronicle Engine to version 1.13.16


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

Branch: refs/heads/master
Commit: 9a3046b7eb78b6bcaecb2336205f42aeda47fb28
Parents: bc06b3e
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:10:01 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:18:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9a3046b7/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 703eca6..bddeeff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,7 +103,7 @@
 3.2.4
 1.7.22
 1.7.7
-1.13.10
+1.13.16
 2.4.15
 1.7.3
 4.5.15

[2/6] camel git commit: Upgrade Chronicle Network to version 1.7.6

2016-11-22 Thread acosentino

Upgrade Chronicle Network to version 1.7.6


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

Branch: refs/heads/master
Commit: a42b38b32040f22184d35339197d24b1cdac1b95
Parents: 9a3046b
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:10:57 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:18:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/a42b38b3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index bddeeff..2743cad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -105,7 +105,7 @@
 1.7.7
 1.13.16
 2.4.15
-1.7.3
+1.7.6
 4.5.15
 1.7.2
 1.7.14

[4/6] camel git commit: Upgrade Chronicle Core to version 1.7.7

2016-11-22 Thread acosentino

Upgrade Chronicle Core to version 1.7.7


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

Branch: refs/heads/master
Commit: bc06b3efaa49c6d903f26aa709b1dbc11fa149d3
Parents: 4891f88
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:09:16 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:18:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/bc06b3ef/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f8a3e8d..703eca6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
 3.2.4_1
 3.2.4
 1.7.22
-1.7.6
+1.7.7
 1.13.10
 2.4.15
 1.7.3

[3/6] camel git commit: Upgrade Chronicle Bytes to version 1.7.22

2016-11-22 Thread acosentino

Upgrade Chronicle Bytes to version 1.7.22


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

Branch: refs/heads/master
Commit: 4891f888fc37d0d0adb1e78c8bbe711a558a4aa7
Parents: fc447e8
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:08:02 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:18:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/4891f888/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 298a1fe..f8a3e8d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -101,7 +101,7 @@
 1.2
 3.2.4_1
 3.2.4
-1.7.17
+1.7.22
 1.7.6
 1.13.10
 2.4.15

[5/6] camel git commit: Upgrade Chronicle queue to version 4.5.17

2016-11-22 Thread acosentino

Upgrade Chronicle queue to version 4.5.17


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

Branch: refs/heads/master
Commit: 3c39c35b088e86700ca4a5984ec13d35918284bc
Parents: a42b38b
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:12:02 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:18:22 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/3c39c35b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2743cad..2161436 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
 1.13.16
 2.4.15
 1.7.6
-4.5.15
+4.5.17
 1.7.2
 1.7.14
 3.2.3

[1/6] camel git commit: Fixed ChronicleEngineProducer After upgrade

2016-11-22 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master fc447e8ba -> 603dfb48a


Fixed ChronicleEngineProducer After upgrade


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

Branch: refs/heads/master
Commit: 603dfb48a6f0aa5a091f82c40e585a5d2b46eda8
Parents: 3c39c35
Author: Andrea Cosentino 
Authored: Tue Nov 22 10:18:01 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Nov 22 10:18:22 2016 +0100

--
 .../camel/component/chronicle/engine/ChronicleEngineProducer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/603dfb48/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
--
diff --git 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
index 9d41799..c8513d4 100644
--- 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
+++ 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineProducer.java
@@ -147,7 +147,7 @@ public class ChronicleEngineProducer extends 
HeaderSelectorProducer {
 message.getHeader(ChronicleEngineConstants.DEFAULT_VALUE))
 );
 } else {
-QueueView.Excerpt excerpt = 
queueView.get().get(index.longValue());
+QueueView.Excerpt excerpt = 
queueView.get().getExcerpt(index.longValue());
 
 message.setHeader(ChronicleEngineConstants.PATH, excerpt.topic());
 message.setBody(excerpt.message());

[2/2] camel git commit: Component docs

2016-11-22 Thread davsclaus

Component docs


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

Branch: refs/heads/master
Commit: fc447e8ba05523cd1d060907dc989757c0a533a5
Parents: af15067
Author: Claus Ibsen 
Authored: Tue Nov 22 10:15:12 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 10:15:12 2016 +0100

--
 .../src/main/docs/salesforce-component.adoc | 4 ++--
 .../apache/camel/component/salesforce/SalesforceEndpoint.java   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fc447e8b/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 01e8f3e..6084153 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
@@ -249,8 +249,8 @@ The Salesforce component supports 41 endpoint options which 
are listed below:
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
-| operationName | common |  | OperationName | 
-| topicName | common |  | String | 
+| operationName | producer |  | OperationName | The operation to use
+| topicName | consumer |  | String | The name of the topic to use
 | apexMethod | common |  | String | APEX method name
 | apexQueryParams | common |  | Map | Query params for APEX method
 | apexUrl | common |  | String | APEX method URL

http://git-wip-us.apache.org/repos/asf/camel/blob/fc447e8b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
index 0e8b3b1..3f6be0f 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
@@ -22,6 +22,7 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.salesforce.internal.OperationName;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.SynchronousDelegateProducer;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -37,9 +38,9 @@ public class SalesforceEndpoint extends DefaultEndpoint {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(SalesforceEndpoint.class);
 
-@UriPath
+@UriPath(label = "producer", description = "The operation to use")
 private final OperationName operationName;
-@UriPath
+@UriPath(label = "consumer", description = "The name of the topic to use")
 private final String topicName;
 @UriParam
 private final SalesforceEndpointConfig config;

[1/2] camel git commit: CAMEL-8396 Update Salesforce component to support new REST APIs in Salesforce API V33.0

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master b77de5f41 -> fc447e8ba


CAMEL-8396 Update Salesforce component to support new REST APIs in Salesforce 
API V33.0

This commit adds support for the Organization Limits Salesforce API[1].

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

...to("salesforce:limit")
.choice()
  .when(
 simple("${body.dailyApiRequests.remaining} > 0")
  )...
.endChoice();

Supports all usage limits currently returned with v38.0 Salesforce API.
Adding of new usage limits is performed by adding enum constant to
Limits.Operation and corresponding getter to Limits class.

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


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

Branch: refs/heads/master
Commit: af150675aa2f436c57c30cc1c5373fbef240e8b1
Parents: b77de5f
Author: Zoran Regvart 
Authored: Thu Nov 10 17:57:11 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 10:07:49 2016 +0100

--
 .../component/salesforce/api/dto/Limits.java| 276 +++
 .../salesforce/internal/OperationName.java  |   5 +-
 .../internal/client/DefaultRestClient.java  |  10 +
 .../salesforce/internal/client/RestClient.java  |   7 +
 .../processor/AbstractRestProcessor.java|   7 +
 .../internal/processor/JsonRestProcessor.java   |   6 +
 .../salesforce/LimitsIntegrationTest.java   |  97 +++
 .../salesforce/api/dto/LimitsTest.java  |  87 ++
 .../component/salesforce/api/dto/limits.json|  94 +++
 9 files changed, 588 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/af150675/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
new file mode 100644
index 000..20f7c15
--- /dev/null
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Limits.java
@@ -0,0 +1,276 @@
+/**
+ * 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.salesforce.api.dto;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import org.apache.camel.component.salesforce.api.dto.Limits.LimitsDeserializer;
+
+/**
+ * Data given by the `Limits` resource on Salesforce.
+ *
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_limits.htm;>
+ *  
https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_limits.htm
+ */
+@JsonDeserialize(using = LimitsDeserializer.class)
+public final class Limits implements Serializable {
+
+public static final class LimitsDeserializer extends JsonDeserializer {
+
+private static final TypeReference> USAGES_TYPE 
= new TypeReference>() {
+};
+
+@Override
+public Object deserialize(final JsonParser parser,

camel git commit: Salesforce Maven plugin: run without Maven project

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master f30365ece -> b77de5f41


Salesforce Maven plugin: run without Maven project

Adds `requiresProject = false` to `@Mojo` annotation which allows the
camel-salesforce-maven-plugin to work in a directory without Maven
project (without pom.xml).


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

Branch: refs/heads/master
Commit: b77de5f41e8b59e5d2cd41187ef11d00e720e9f2
Parents: f30365e
Author: Zoran Regvart 
Authored: Mon Nov 21 12:16:36 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 09:49:48 2016 +0100

--
 .../main/java/org/apache/camel/maven/CamelSalesforceMojo.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b77de5f4/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 88e6b92..5b6ce07 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -82,7 +82,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 /**
  * Goal to generate DTOs for Salesforce SObjects
  */
-@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "generate", requiresProject = false, defaultPhase = 
LifecyclePhase.GENERATE_SOURCES)
 public class CamelSalesforceMojo extends AbstractMojo {
 
 // default connect and call timeout
@@ -376,6 +376,9 @@ public class CamelSalesforceMojo extends AbstractMojo {
 if (!packageName.matches(PACKAGE_NAME_PATTERN)) {
 throw new MojoExecutionException("Invalid package name " + 
packageName);
 }
+if (outputDirectory.getAbsolutePath().contains("$")) {
+outputDirectory = new 
File("generated-sources/camel-salesforce");
+}
 final File pkgDir = new File(outputDirectory, 
packageName.trim().replace('.', File.separatorChar));
 if (!pkgDir.exists()) {
 if (!pkgDir.mkdirs()) {

[1/2] camel git commit: Component docs

2016-11-22 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 8ab374b1e -> f30365ece


Component docs


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

Branch: refs/heads/master
Commit: f30365ece5f5c15d2208a4de3516273730bc949e
Parents: 23c7dc4
Author: Claus Ibsen 
Authored: Tue Nov 22 09:47:19 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 22 09:47:26 2016 +0100

--
 .../websocket/springboot/WebsocketComponentConfiguration.java   | 4 ++--
 .../src/main/docs/atmosphere-websocket-component.adoc   | 5 +++--
 .../camel-spring-ldap/src/main/docs/spring-ldap-component.adoc  | 2 +-
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml   | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f30365ec/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
--
diff --git 
a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
 
b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
index 190bb22..c930430 100644
--- 
a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
+++ 
b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
@@ -42,8 +42,8 @@ public class WebsocketComponentConfiguration {
 private HttpRegistry httpRegistry;
 /**
  * Whether to automatic bind multipart/form-data as attachments on the 
Camel
- * Exchange. This is turn off by default as this may require servet 
specific
- * configuration to enable this when using Servlet's.
+ * Exchange. This is turn off by default as this may require servlet
+ * specific configuration to enable this when using Servlet's.
  */
 private Boolean attachmentMultipartBinding;
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/f30365ec/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
--
diff --git 
a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
 
b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index 46b80f4..860d653 100644
--- 
a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ 
b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -48,7 +48,7 @@ The Atmosphere Websocket component supports 7 options which 
are listed below.
 | Name | Java Type | Description
 | servletName | String | Default name of servlet to use. The default name is 
CamelServlet.
 | httpRegistry | HttpRegistry | To use a custom 
org.apache.camel.component.servlet.HttpRegistry.
-| attachmentMultipartBinding | boolean | Whether to automatic bind 
multipart/form-data as attachments on the Camel Exchange. This is turn off by 
default as this may require servet specific configuration to enable this when 
using Servlet's.
+| attachmentMultipartBinding | boolean | Whether to automatic bind 
multipart/form-data as attachments on the Camel Exchange. This is turn off by 
default as this may require servlet specific configuration to enable this when 
using Servlet's.
 | httpBinding | HttpBinding | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient.
 | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration 
as base configuration.
 | allowJavaSerializedObject | boolean | Whether to allow java serialization 
when a request uses context-type=application/x-java-serialized-object This is 
by default turned off. If you enable this then be aware that Java will 
deserialize the incoming data from the request to Java and that can be a 
potential security risk.
@@ -61,7 +61,7 @@ The Atmosphere Websocket component supports 7 options which 
are listed below.
 
 
 // endpoint options: START
-The Atmosphere Websocket component supports 35 endpoint options which are 
listed below:
+The Atmosphere Websocket component supports 36 endpoint options which are 
listed below:
 
 {% raw %}

[2/2] camel git commit: CAMEL-10491 - Spring-LDAP - Updated component documentation

2016-11-22 Thread davsclaus

CAMEL-10491 - Spring-LDAP - Updated component documentation


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

Branch: refs/heads/master
Commit: 23c7dc4663a4e7d4aa3cdd98c5951237139a36c8
Parents: 8ab374b
Author: Thakker 
Authored: Mon Nov 21 11:03:01 2016 -0500
Committer: Claus Ibsen 
Committed: Tue Nov 22 09:47:26 2016 +0100

--
 .../src/main/docs/spring-ldap-component.adoc| 34 +---
 1 file changed, 30 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/23c7dc46/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
--
diff --git 
a/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc 
b/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
index 562bb52..d7a18a2 100644
--- a/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
+++ b/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
@@ -46,7 +46,7 @@ The Spring LDAP component has no options.
 
 
 // endpoint options: START
-The Spring LDAP component supports 4 endpoint options which are listed below:
+The Spring LDAP component supports 7 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -68,12 +68,12 @@ Usage
 The component supports producer endpoint only. An attempt to create a
 consumer endpoint will result in an `UnsupportedOperationException`. +
  The body of the message must be a map (an instance of `java.util.Map`).
-This map must contain at least an entry with the key *`dn`* that
+This map must contain at least an entry with the key *`dn`* (not needed for 
function_driven operation) that
 specifies the root node for the LDAP operation to be performed. Other
 entries of the map are operation-specific (see below).
 
 The body of the message remains unchanged for the `bind` and `unbind`
-operations. For the `search` operation, the body is set to the result of
+operations. For the `search` and `function_driven` operations, the body is set 
to the result of
 the search, see
 
http://static.springsource.org/spring-ldap/site/apidocs/org/springframework/ldap/core/LdapTemplate.html#search%28java.lang.String,%20java.lang.String,%20int,%20org.springframework.ldap.core.AttributesMapper%29[http://static.springsource.org/spring-ldap/site/apidocs/org/springframework/ldap/core/LdapTemplate.html#search%28java.lang.String,%20java.lang.String,%20int,%20org.springframework.ldap.core.AttributesMapper%29].
 
@@ -82,7 +82,7 @@ Search
 ++
 
 The message body must have an entry with the key *`filter`*. The value
-must be a String representing a valid LDAP filter, see
+must be a `String` representing a valid LDAP filter, see
 
http://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol#Search_and_Compare[http://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol#Search_and_Compare].
 
 [[SpringLDAP-Bind]]
@@ -101,6 +101,28 @@ Unbind
 No further entries necessary, the node with the specified *`dn`* is
 deleted.
 
+[[SpringLDAP-Authenticate]]
+Authenticate

+
+The message body must have entries with the keys *`filter`* and  *`password`*. 
The
+values must be an instance of `String` representing a valid LDAP filter and a 
user password, respectively.
+
+[[SpringLDAP-ModifyAttributes]]
+Modify Attributes
+
+
+The message body must have an entry with the key *`modificationItems`*. The
+value must be an instance of any array of type 
+http://docs.oracle.com/javase/6/docs/api/javax/naming/directory/ModificationItem.html[javax.naming.directory.ModificationItem]
+
+[[SpringLDAP-FunctionDriven]]
+Function-Driven
+
+
+The message body must have entries with the keys *`function`* and *`request`*. 
The *`function`* value must be of type 
`org.apache.camel.component.springldap.LdapOperationsFunction`. The 
*`request`* value must be the same type as the `Q` type parameter in the 
*`function`* and it must encapsulate the parameters expected by the 
LdapTemplate method being invoked within the *`function`*. The `S` type 
parameter represents the response type as returned by the LdapTemplate method 
being invoked.
+This operation allows dynamic invocation of LdapTemplate methods that are not 
covered by the operations mentioned above.
+
 *Key definitions*
 
 In order to avoid spelling errors, the following constants are defined
@@ -109,4 +131,8 @@ in `org.apache.camel.springldap.SpringLdapProducer`:
 * public static final String DN = "dn"
 * public static final String FILTER =

camel git commit: CAMEL-10502 - Camel-git : Copy headers from in to out

2016-11-22 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 0bb63d5ba -> 8ab374b1e


CAMEL-10502 - Camel-git : Copy headers from in to out


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

Branch: refs/heads/master
Commit: 8ab374b1ea3074d64bbde4cfca25a6751572f622
Parents: 0bb63d5
Author: Olivier Antibi 
Authored: Mon Nov 21 18:09:36 2016 +0100
Committer: Olivier Antibi 
Committed: Mon Nov 21 22:44:44 2016 +0100

--
 .../component/git/producer/GitProducer.java | 18 ++---
 .../component/git/producer/GitProducerTest.java | 42 
 2 files changed, 46 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8ab374b1/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
--
diff --git 
a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
 
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
index f6eae4f..b6bedd2 100644
--- 
a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
+++ 
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.component.git.GitConstants;
 import org.apache.camel.component.git.GitEndpoint;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.eclipse.jgit.api.CherryPickResult;
 import org.eclipse.jgit.api.Git;
@@ -335,7 +336,7 @@ public class GitProducer extends DefaultProducer {
 LOG.error("There was an error in Git " + operation + " operation");
 throw e;
 }
-exchange.getOut().setBody(status);
+updateExchange(exchange, status);
 }
 
 protected void doLog(Exchange exchange, String operation) throws Exception 
{
@@ -349,7 +350,7 @@ public class GitProducer extends DefaultProducer {
 LOG.error("There was an error in Git " + operation + " operation");
 throw e;
 }
-exchange.getOut().setBody(revCommit);
+updateExchange(exchange, revCommit);
 }
 
 protected void doPush(Exchange exchange, String operation) throws 
Exception {
@@ -371,7 +372,7 @@ public class GitProducer extends DefaultProducer {
 LOG.error("There was an error in Git " + operation + " operation");
 throw e;
 }
-exchange.getOut().setBody(result);
+updateExchange(exchange, result);
 }
 
 protected void doPull(Exchange exchange, String operation) throws 
Exception {
@@ -393,7 +394,7 @@ public class GitProducer extends DefaultProducer {
 LOG.error("There was an error in Git " + operation + " operation");
 throw e;
 }
-exchange.getOut().setBody(result);
+updateExchange(exchange, result);
 }
 
 protected void doCreateTag(Exchange exchange, String operation) throws 
Exception {
@@ -428,7 +429,7 @@ public class GitProducer extends DefaultProducer {
 LOG.error("There was an error in Git " + operation + " operation");
 throw e;
 }
-exchange.getOut().setBody(result);
+updateExchange(exchange, result);
 }
 
 protected void doCherryPick(Exchange exchange, String operation) throws 
Exception {
@@ -452,7 +453,7 @@ public class GitProducer extends DefaultProducer {
 LOG.error("There was an error in Git " + operation + " operation");
 throw e;
 }
-exchange.getOut().setBody(result);
+updateExchange(exchange, result);
 }
 
 private Repository getLocalRepository() throws IOException {
@@ -471,4 +472,9 @@ public class GitProducer extends DefaultProducer {
 }
 return repo;
 }
+
+private void updateExchange(Exchange exchange, Object body) {
+exchange.getOut().setBody(body);
+MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8ab374b1/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
--
diff --git 
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
 
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
index

svn commit: r1001472 - in /websites/production/camel/content: articles.html cache/main.pageCache

2016-11-22 Thread buildbot

Author: buildbot
Date: Tue Nov 22 08:20:10 2016
New Revision: 1001472

Log:
Production update by buildbot for camel

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

Modified: websites/production/camel/content/articles.html
==
--- websites/production/camel/content/articles.html (original)
+++ websites/production/camel/content/articles.html Tue Nov 22 08:20:10 2016
@@ -75,7 +75,7 @@

 
 
-See alsoSee also http://camel.apache.org/user-stories.html;>Camel 
User Stories.If you have never used or seen Camel 
before, then you should start with http://www.kai-waehner.de/blog/2012/05/04/apache-camel-tutorial-introduction/;
 rel="nofollow">Apache Camel Tutorial  Introduction to EIP, Routes, 
Components, Testing, and other Concepts - an article by Kai Whner, 
where he puts EIP and Camel into the big picture and gives a run down of the 
important Camel concepts. https://github.com/megachucky/camel-infoq; rel="nofollow">Demo source code
  can be downloaded at github to get started with your first Camel project 
easily.Archived Webinars 
and Screencastshttps://www.youtube.com/watch?v=fxpS9pf6TVklist=PLUDjw7NbNcoyOyhrIIw9cChAHWdaCxIobindex=17;
 rel="nofollow">Apache Camel - The Integration Library - A 50 minute video 
from September 2016 where Claus Ibsen presents Apache Camel at the JDKIO 2016 
conference.https://www.youtube.com/watch?v=jZE-YSHK_gwsns=tw; 
rel="nofollow">Apache Camel First Steps - A 10 minute video from December 
2015 where Vivian van Zyl gives a high level overview of Apache Camel and 
demonstrates how to start using Camel with live code demo.https://www.youtube.com/watch?v=ouJ3SQHnQ6Ifeature=youtu.bea; 
rel="nofollow">Fabric8 Camel Microservices for Docker an
 d Kubernetes - A 55 minute video from http://rigadevday.lv/#/index; rel="nofollow">Riga 
Dev Day 2016 conference where Claus Ibsen talks about developing Camel 
microservices ready for the container platforms.https://www.youtube.com/watch?v=91UiQgazt3g; 
rel="nofollow">Developing Microservices with Apache Camel - Video from 
November 2015 at the MSA Day in New York where Claus Ibsen talks developing 
Camel based microservices for docker containers running on Kubernetes. http://www.slideshare.net/davsclaus/developing-microservices-with-apache-camel;
 rel="nofollow">Slides are here.https://www.youtube.com/watch?v=o8ZRE9DM3Es; 
rel="nofollow">Wild Flies and A Camel - Video from Oredev 2015 where Markus 
Eisele talks about Apache Camel and JBoss Wildfly.https://www.youtube.com/watch?v=nqQaR7vUxfgindex=13list=PLPIzp-E1msrZz6RNdbDiK0nKuxAUZPs77;
 rel="nofollow">JavaOne 2015 Riding a Camel through the JEEHara - Video 
from JavaOne 2015 where Markus Eisele introduces Apache Camel and how to use it 
with JEE.https://www.youtube.com/watch?v=jbj1TJ_2XBQfeature=youtu.bea; 
style="line-height: 1.42857;" rel="nofollow">Apache Camel in the clouds - 
Video from Devnexus 2015 where Markus Eisele talk about Apache Camel in the 
clouds running on openshifthttps://vimeo.com/130993910; rel="nofollow">GeeCON 2015: Markus Eisele - 
Wild Flies and a Camel - Java EE Integration- Video from GeeCon 2015 
where Markus Eisele talks about Apache Camel and how Camel can work with 
Wildflyhttps://vimeo.com/105743314; rel="nofollow">Hvordan f en ka
 mel til  danse (September 2014) byPer Jrgen 
Walstrm  Audun Fauchald Strand - (JavaZone 2014) in 
Norwegianhttp://www.youtube.com/watch?v=_pEwoztbfYIfeature=youtu.bea; 
rel="nofollow">Integration using Apache Camel and Groovy (June 2014) by 
Claus Ibsen, presenting Camel, Groovy, and http://hawt.io/; rel="nofollow">hawtio at http://gr8conf.eu/#/; 
rel="nofollow">gr8conf 2014.https://skillsmatter.com/skillscasts/5074-effective-system-integrations-with-apache-camel;
 rel="nofollow">Effective System Integrations with Apache Camel (March 
2014) by Jakub Korabhttp://www.youtube.com/watch?v=lOxUs_JleSsfeature=youtu.bea; 
rel="nofollow">Getting started with Apache Camel video from Barcel
 onaJUG (January 2014) by Claus Ibsenhttp://vimeo.com/68442425; rel="nofollow">Camel in 
the cloud demo from CamelOne 2013 - Video presentation from CamelOne 2013 
demonstrating Camel in the cloud using http://fuse.fusesource.org/fabric/; rel="nofollow">Fuse Fabric and http://hawt.io/; 
rel="nofollow">hawtiohttp://javagruppen.dk/index.php/moder/historiske-moder/285-javagruppemode-115-apache-camel-i-aarhus;
 rel="nofollow">Getting started with Apache Camel - Video presentation from 
Javagruppen meeting by Claus Ibsen (May 2013)http://blip.tv/dzone/apache-camel-essential-components-6511579; 
rel="nofollow">Apache Camel Essential Components by Christian 
Posta (January 2013)http://www.youtube.com/watch?v=i_g91CzHgxg; 
rel="nofollow">Leverage Enterprise Integration Patterns with Apache Camel and 
Twitter by Bruno Borges (JavaOne

camel git commit: Upgrade Undertow to version 1.4.6.Final

[2/2] camel git commit: CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement exchange property instead of message header

[1/2] camel git commit: CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement exchange property instead of message header

[3/3] 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

[2/3] 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

[1/3] 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

svn commit: r1001492 - in /websites/production/camel/content: articles.html cache/main.pageCache

camel git commit: Upgrade spark-java-rest

camel git commit: Remove dependencies exclusion as SNAPSHOT dep in release jar has been fixed upstream

svn commit: r1001479 - in /websites/production/camel/content: book-in-one-page.html book-pattern-appendix.html cache/main.pageCache content-enricher.html

camel git commit: CAMEL-10507 Make TypeReference inline anonymous classes constant

[3/4] camel git commit: Upgrade Optaplanner to version 6.5.0.Final

[1/4] camel git commit: Upgrade Drools to version 6.5.0.Final

camel git commit: CAMEL-10471 Update Salesforce component to support limits REST API

[4/4] camel git commit: Upgrade Kie to version 6.5.0.Final

[2/4] camel git commit: Upgrade JBPM to version 6.5.0.Final

[1/4] camel git commit: Capitalize on validateLogs

[4/4] camel git commit: Fixed CS

[2/4] camel git commit: Refactor unit tests using Jgit instead of camel-git to initialise the context

[3/4] camel git commit: Check code style

camel git commit: CAMEL-10503 - Camel-Git: Add RemoteAdd command Finally add RemoteList command too as it goes together

camel git commit: Update Camel Salesforce integration tests

[6/6] camel git commit: Upgrade Chronicle Engine to version 1.13.16

[2/6] camel git commit: Upgrade Chronicle Network to version 1.7.6

[4/6] camel git commit: Upgrade Chronicle Core to version 1.7.7

[3/6] camel git commit: Upgrade Chronicle Bytes to version 1.7.22

[5/6] camel git commit: Upgrade Chronicle queue to version 4.5.17

[1/6] camel git commit: Fixed ChronicleEngineProducer After upgrade

[2/2] camel git commit: Component docs

[1/2] camel git commit: CAMEL-8396 Update Salesforce component to support new REST APIs in Salesforce API V33.0

camel git commit: Salesforce Maven plugin: run without Maven project

[1/2] camel git commit: Component docs

[2/2] camel git commit: CAMEL-10491 - Spring-LDAP - Updated component documentation

camel git commit: CAMEL-10502 - Camel-git : Copy headers from in to out

svn commit: r1001472 - in /websites/production/camel/content: articles.html cache/main.pageCache

35 matches

Site Navigation

Mail list logo

Footer information