[2/2] camel git commit: Added camel-jsonpath language to Gitbook

2016-05-01 Thread acosentino
Added camel-jsonpath language to Gitbook


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

Branch: refs/heads/master
Commit: 802c3dbb55943d2ed616b5e82f6f30bb0f35932b
Parents: a9e450b
Author: Andrea Cosentino 
Authored: Mon May 2 08:47:56 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon May 2 08:47:56 2016 +0200

--
 .../camel-jsonpath/src/main/docs/jsonpath.adoc  | 156 +++
 docs/user-manual/en/SUMMARY.md  |   1 +
 2 files changed, 157 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/802c3dbb/components/camel-jsonpath/src/main/docs/jsonpath.adoc
--
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath.adoc 
b/components/camel-jsonpath/src/main/docs/jsonpath.adoc
new file mode 100644
index 000..cf1
--- /dev/null
+++ b/components/camel-jsonpath/src/main/docs/jsonpath.adoc
@@ -0,0 +1,156 @@
+[[JSonPath-JSonPath]]
+JSonPath
+
+
+*Available as of Camel 2.13*
+
+Camel supports https://code.google.com/p/json-path/[JSonPath] to allow
+using link:expression.html[Expression] or link:predicate.html[Predicate]
+on json messages.
+
+[source,java]
+-
+from("queue:books.new")
+  .choice()
+.when().jsonpath("$.store.book[?(@.price < 10)]")
+  .to("jms:queue:book.cheap")
+.when().jsonpath("$.store.book[?(@.price < 30)]")
+  .to("jms:queue:book.average")
+.otherwise()
+  .to("jms:queue:book.expensive")
+-
+
+[[JSonPath-UsingXMLconfiguration]]
+Using XML configuration
+^^^
+
+If you prefer to configure your routes in your link:spring.html[Spring]
+XML file then you can use link:jsonpath.html[JSonPath] expressions as
+follows
+
+[source,xml]
+-
+  http://camel.apache.org/schema/spring";>
+
+  
+  
+
+  $.store.book[?(@.price < 10)]
+  
+
+
+  $.store.book[?(@.price < 30)]
+  
+
+
+  
+
+  
+
+  
+-
+
+[[JSonPath-Syntax]]
+Syntax
+^^
+
+See the https://code.google.com/p/json-path/[JSonPath] project page for
+further examples.
+
+[[JSonPath-Suppressexceptions]]
+Suppress exceptions
+~~~
+
+*Available as of Camel 2.16*
+
+By default jsonpath will throw an exception if the json payload does not
+have a valid path accordingly to the configured jsonpath expression. In
+some use-cases you may want to ignore this in case the json payload
+contains optional data. Therefore you can set the option
+suppressExceptions to true to ignore this as shown:
+
+[source,java]
+---
+from("direct:start")
+.choice()
+// use true to suppress exceptions
+.when().jsonpath("person.middlename", true)
+.to("mock:middle")
+.otherwise()
+.to("mock:other");
+---
+
+And in XML DSL:
+
+[source,xml]
+--
+
+  
+  
+
+  person.middlename
+  
+
+
+  
+
+  
+
+--
+
+ 
+
+This option is also available on the `@JsonPath` annotation.
+
+[[JSonPath-JSonPathinjection]]
+JSonPath injection
+~~
+
+You can use link:bean-integration.html[Bean Integration] to invoke a
+method on a bean and use various languages such as JSonPath to extract a
+value from the message and bind it to a method parameter.
+
+For example
+
+[source,java]
+---
+public class Foo {
+
+@Consume(uri = "activemq:queue:books.new")
+public void doSomething(@JsonPath("$.store.book[*].author") String author, 
@Body String json) {
+  // process the inbound message here
+}
+}
+---
+
+[[JSonPath-EncodingDetection]]
+Encoding Detection
+~~
+
+*Since Camel version 2.16*, the encoding of the JSON document is
+detected automatically, if the document is encoded in unicode  (UTF-8,
+UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE ) as specified in  RFC-4627. If
+the encoding is a non-unicode encoding, you can either make su

[1/2] camel git commit: Added camel-jsch docs to Gitbook

2016-05-01 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/master 65aea6a54 -> 802c3dbb5


Added camel-jsch docs to Gitbook


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

Branch: refs/heads/master
Commit: a9e450b293aeef6780c5d1a7995beab728b5e150
Parents: 65aea6a
Author: Andrea Cosentino 
Authored: Mon May 2 08:43:38 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon May 2 08:43:38 2016 +0200

--
 components/camel-jsch/src/main/docs/scp.adoc | 127 ++
 docs/user-manual/en/SUMMARY.md   |   1 +
 2 files changed, 128 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a9e450b2/components/camel-jsch/src/main/docs/scp.adoc
--
diff --git a/components/camel-jsch/src/main/docs/scp.adoc 
b/components/camel-jsch/src/main/docs/scp.adoc
new file mode 100644
index 000..ce604f2
--- /dev/null
+++ b/components/camel-jsch/src/main/docs/scp.adoc
@@ -0,0 +1,127 @@
+[[Jsch-Jsch]]
+Jsch
+
+
+The *camel-jsch* component supports the
+http://en.wikipedia.org/wiki/Secure_copy[SCP protocol] using the Client
+API of the http://www.jcraft.com/jsch/[Jsch] project. Jsch is already
+used in camel by the link:ftp.html[FTP] component for the *sftp:*
+protocol.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-jsch
+x.x.x
+
+
+
+
+[[Jsch-URIformat]]
+URI format
+^^
+
+[source,java]
+---
+scp://host[:port]/destination[?options]
+---
+
+You can append query options to the URI in the following format,
+`?option=value&option=value&...`
+
+The file name can be specified either in the  part of the URI or
+as a "CamelFileName" header on the message (`Exchange.FILE_NAME` if used
+in code).
+
+[[Jsch-Options]]
+Options
+^^^
+
+
+// component options: START
+The SCP component supports 1 options which are listed below.
+
+
+
+[width="100%",cols="2s,1m,8",options="header"]
+|===
+| Name | Java Type | Description
+| verboseLogging | boolean | JSCH is verbose logging out of the box. Therefore 
we turn the logging down to DEBUG logging by default. But setting this option 
to true turns on the verbose logging again.
+|===
+// component options: END
+
+
+
+// endpoint options: START
+The SCP component supports 42 endpoint options which are listed below:
+
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|===
+| Name | Group | Default | Java Type | Description
+| host | producer |  | String | *Required* Hostname of the FTP server
+| port | producer |  | int | Port of the FTP server
+| directoryName | producer |  | String | The starting directory
+| binary | producer | false | boolean | Specifies the file transfer mode 
BINARY or ASCII. Default is ASCII (false).
+| charset | producer |  | String | This option is used to specify the encoding 
of the file. You can use this on the consumer to specify the encodings of the 
files which allow Camel to know the charset it should load the file content in 
case the file content is being accessed. Likewise when writing a file you can 
use this option to specify which charset to write the file as well.
+| chmod | producer | 664 | String | Allows you to set chmod on the stored 
file. For example chmod=664.
+| ciphers | producer |  | String | Set a comma separated list of ciphers that 
will be used in order of preference. Possible cipher names are defined by 
JCraft JSCH. Some examples include: 
aes128-ctraes128-cbc3des-ctr3des-cbcblowfish-cbcaes192-cbcaes256-cbc. If not 
specified the default list from JSCH will be used.
+| disconnect | producer | false | boolean | Whether or not to disconnect from 
remote FTP server right after use. Disconnect will only disconnect the current 
connection to the FTP server. If you have a consumer which you want to stop 
then you need to stop the consumer/route instead.
+| doneFileName | producer |  | String | If provided then Camel will write a 
2nd done file when the original file has been written. The done file will be 
empty. This option configures what file name to use. Either you can specify a 
fixed name. Or you can use dynamic placeholders. The done file will always be 
written in the same folder as the origina

camel git commit: Added camel-jpa docs to Gitbook

2016-05-01 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/master ec54b23f3 -> 65aea6a54


Added camel-jpa docs to Gitbook


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

Branch: refs/heads/master
Commit: 65aea6a54b8dd4a2711a361ee0685b4c763bb045
Parents: ec54b23
Author: Andrea Cosentino 
Authored: Mon May 2 08:35:39 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon May 2 08:35:57 2016 +0200

--
 components/camel-jpa/src/main/docs/jpa.adoc | 381 +++
 docs/user-manual/en/SUMMARY.md  |   1 +
 2 files changed, 382 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/65aea6a5/components/camel-jpa/src/main/docs/jpa.adoc
--
diff --git a/components/camel-jpa/src/main/docs/jpa.adoc 
b/components/camel-jpa/src/main/docs/jpa.adoc
new file mode 100644
index 000..937f461
--- /dev/null
+++ b/components/camel-jpa/src/main/docs/jpa.adoc
@@ -0,0 +1,381 @@
+[[JPA-JPAComponent]]
+JPA Component
+~
+
+The *jpa* component enables you to store and retrieve Java objects from
+persistent storage using EJB 3's Java Persistence Architecture (JPA),
+which is a standard interface layer that wraps Object/Relational Mapping
+(ORM) products such as OpenJPA, Hibernate, TopLink, and so on.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-jpa
+x.x.x
+
+
+
+
+[[JPA-Sendingtotheendpoint]]
+Sending to the endpoint
+^^^
+
+You can store a Java entity bean in a database by sending it to a JPA
+producer endpoint. The body of the _In_ message is assumed to be an
+entity bean (that is, a POJO with an
+http://java.sun.com/javaee/5/docs/api/javax/persistence/Entity.html[@Entity]
+annotation on it) or a collection or array of entity beans.
+
+If the body is a List of entities, make sure to use
+*entityType=java.util.ArrayList* as a configuration passed to the
+producer endpoint.
+
+If the body does not contain one of the previous listed types, put a
+link:message-translator.html[Message Translator] in front of the
+endpoint to perform the necessary conversion first.
+
+[[JPA-Consumingfromtheendpoint]]
+Consuming from the endpoint
+^^^
+
+Consuming messages from a JPA consumer endpoint removes (or updates)
+entity beans in the database. This allows you to use a database table as
+a logical queue: consumers take messages from the queue and then
+delete/update them to logically remove them from the queue.
+
+If you do not wish to delete the entity bean when it has been processed
+(and when routing is done), you can specify `consumeDelete=false` on the
+URI. This will result in the entity being processed each poll.
+
+If you would rather perform some update on the entity to mark it as
+processed (such as to exclude it from a future query) then you can
+annotate a method with
+http://camel.apache.org/maven/current/camel-jpa/apidocs/org/apache/camel/component/jpa/Consumed.html[@Consumed]
+which will be invoked on your entity bean when the entity bean when it
+has been processed (and when routing is done).
+
+From *Camel 2.13* onwards you can use
+http://camel.apache.org/maven/current/camel-jpa/apidocs/org/apache/camel/component/jpa/PreConsumed.html[@PreConsumed]
+which will be invoked on your entity bean before it has been processed
+(before routing).
+
+If you are consuming a lot (100K+) of rows and experience OutOfMemory
+problems you should set the maximumResults to sensible value.
+
+[[JPA-URIformat]]
+URI format
+^^
+
+[source,java]
+-
+jpa:entityClassName[?options]
+-
+
+For sending to the endpoint, the _entityClassName_ is optional. If
+specified, it helps the link:type-converter.html[Type Converter] to
+ensure the body is of the correct type.
+
+For consuming, the _entityClassName_ is mandatory.
+
+You can append query options to the URI in the following format,
+`?option=value&option=value&...`
+
+[[JPA-Options]]
+Options
+^^^
+
+
+// component options: START
+The JPA component supports 4 options which are listed below.
+
+
+
+[width="100%",cols="2s,1m,8",options="header"]
+|===
+| Name | Java Type | Description
+| entityManagerFactory | EntityManagerFactory | To use the 
EntityManagerFactory. This is strongly recommended to configure.
+| transactionManager | PlatformTransactionMa

camel git commit: Component docs. This closes #971

2016-05-01 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 6fb84cfb7 -> ec54b23f3


Component docs. This closes #971


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

Branch: refs/heads/master
Commit: ec54b23f34810a943f50a3db48d70c64c98ab4c9
Parents: 6fb84cf
Author: Claus Ibsen 
Authored: Mon May 2 08:34:51 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 2 08:34:51 2016 +0200

--
 components/camel-irc/src/main/docs/irc.adoc | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ec54b23f/components/camel-irc/src/main/docs/irc.adoc
--
diff --git a/components/camel-irc/src/main/docs/irc.adoc 
b/components/camel-irc/src/main/docs/irc.adoc
index 5660992..ed9fbc9 100644
--- a/components/camel-irc/src/main/docs/irc.adoc
+++ b/components/camel-irc/src/main/docs/irc.adoc
@@ -43,8 +43,9 @@ The IRC component has no options.
 
 
 
+
 // endpoint options: START
-The IRC component supports 23 endpoint options which are listed below:
+The IRC component supports 24 endpoint options which are listed below:
 
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
@@ -53,7 +54,7 @@ The IRC component supports 23 endpoint options which are 
listed below:
 | port | common | 6667,6668,6669 | int | Port number for the IRC chat server
 | autoRejoin | common | true | boolean | Whether to auto re-join when being 
kicked
 | colors | common | true | boolean | Whether or not the server supports color 
codes.
-| namesOnJoin | common | false | boolean | Whether or not to send the NAMES 
command after a channel has been joined.
+| namesOnJoin | common | false | boolean | Sends NAMES command to channel 
after joining it. link onReply has to be true in order to process the result 
which will have the header value irc.num = '353'.
 | nickname | common |  | String | The nickname used in chat.
 | nickPassword | common |  | String | Your IRC server nickname password.
 | onJoin | common | true | boolean | Handle user join events.
@@ -77,6 +78,7 @@ The IRC component supports 23 endpoint options which are 
listed below:
 // endpoint options: END
 
 
+
 [[IRC-SSLSupport]]
 SSL Support
 ^^^



[2/2] camel git commit: Add support for listing users of a channel after it has been joined.

2016-05-01 Thread davsclaus
Add support for listing users of a channel after
it has been joined.


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

Branch: refs/heads/master
Commit: abfae23c8e69f118890a1baadcb8beb637200175
Parents: f3f2f34
Author: Wladislaw Mitzel 
Authored: Sun May 1 13:05:12 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 2 08:24:59 2016 +0200

--
 components/camel-irc/src/main/docs/irc.adoc | 19 +
 .../camel/component/irc/IrcConfiguration.java   | 17 +++-
 .../apache/camel/component/irc/IrcEndpoint.java |  3 +
 .../irc/IrcsListUsersIntegrationTest.java   | 90 
 .../src/test/resources/it-list-users.properties |  3 +
 5 files changed, 131 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/abfae23c/components/camel-irc/src/main/docs/irc.adoc
--
diff --git a/components/camel-irc/src/main/docs/irc.adoc 
b/components/camel-irc/src/main/docs/irc.adoc
index 07b96e9..5660992 100644
--- a/components/camel-irc/src/main/docs/irc.adoc
+++ b/components/camel-irc/src/main/docs/irc.adoc
@@ -53,6 +53,7 @@ The IRC component supports 23 endpoint options which are 
listed below:
 | port | common | 6667,6668,6669 | int | Port number for the IRC chat server
 | autoRejoin | common | true | boolean | Whether to auto re-join when being 
kicked
 | colors | common | true | boolean | Whether or not the server supports color 
codes.
+| namesOnJoin | common | false | boolean | Whether or not to send the NAMES 
command after a channel has been joined.
 | nickname | common |  | String | The nickname used in chat.
 | nickPassword | common |  | String | Your IRC server nickname password.
 | onJoin | common | true | boolean | Handle user join events.
@@ -170,6 +171,24 @@ For example we join 3 channels where as only channel 1 and 
3 uses a key.
 irc:n...@irc.server.org?channels=#chan1,#chan2,#chan3&keys=chan1Key,,chan3key
 -
 
+Getting a list of users of the channel
+^^
+
+Using the `namesOnJoin` option one can invoke the IRC-`NAMES` command after 
the component has joined a channel. 
+The server will reply with `irc.num = 353`. So in order to process the result 
the property `onReply` has to be `true`.
+Furthermore one has to filter the `onReply` exchanges in order to get the 
names.
+
+For example we want to get all exchanges that contain the usernames of the 
channel:
+
+[source,java]
+-
+from("ircs:nick@myserver:1234/#mychannelname?listOnJoin=true&onReply=true")
+   .choice()
+   .when(header("irc.messageType").isEqualToIgnoreCase("REPLY"))
+   .filter(header("irc.num").isEqualTo("353"))
+   .to("mock:result").stop();
+-
+
 [[IRC-SeeAlso]]
 See Also
 

http://git-wip-us.apache.org/repos/asf/camel/blob/abfae23c/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
--
diff --git 
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
 
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
index 4536ba2..8b107ad 100644
--- 
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
+++ 
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
@@ -83,6 +83,13 @@ public class IrcConfiguration implements Cloneable {
 private boolean onPrivmsg = true;
 @UriParam(defaultValue = "true")
 private boolean autoRejoin = true;
+   /**
+* Sends NAMES command to channel after joining it.
+* {@link #onReply} has to be true in order to process the
+* result which will have the header value irc.num = '353'.
+*/
+@UriParam(defaultValue = "false")
+private boolean namesOnJoin = false;
 private SSLContextParameters sslContextParameters;
 @UriParam
 private String nickPassword;
@@ -453,8 +460,16 @@ public class IrcConfiguration implements Cloneable {
 public void setNickPassword(String nickPassword) {
 this.nickPassword = nickPassword;
 }
+
+public boolean isNamesOnJoin() {
+   return namesOnJoin;
+   }
+
+   public void setNamesOnJoin(boolean namesOnJoin) {
+   this.namesOnJoin = namesOnJoin;
+   }
 
-public

[1/2] camel git commit: Fix checkstyle warnings.

2016-05-01 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master f3f2f34e0 -> 6fb84cfb7


Fix checkstyle warnings.

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

Branch: refs/heads/master
Commit: 6fb84cfb700f04f41bcd6a075ae5c6571db8d50d
Parents: abfae23
Author: Wladislaw Mitzel 
Authored: Sun May 1 14:30:24 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 2 08:24:59 2016 +0200

--
 .../camel/component/irc/IrcConfiguration.java   | 27 +++---
 .../apache/camel/component/irc/IrcEndpoint.java |  4 +-
 .../irc/IrcsListUsersIntegrationTest.java   | 90 ++--
 3 files changed, 62 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6fb84cfb/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
--
diff --git 
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
 
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
index 8b107ad..0731ce7 100644
--- 
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
+++ 
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
@@ -83,13 +83,13 @@ public class IrcConfiguration implements Cloneable {
 private boolean onPrivmsg = true;
 @UriParam(defaultValue = "true")
 private boolean autoRejoin = true;
-   /**
-* Sends NAMES command to channel after joining it.
-* {@link #onReply} has to be true in order to process the
-* result which will have the header value irc.num = '353'.
-*/
+/**
+ * Sends NAMES command to channel after joining it.
+ * {@link #onReply} has to be true in order to process the
+ * result which will have the header value irc.num = '353'.
+ */
 @UriParam(defaultValue = "false")
-private boolean namesOnJoin = false;
+private boolean namesOnJoin;
 private SSLContextParameters sslContextParameters;
 @UriParam
 private String nickPassword;
@@ -462,15 +462,16 @@ public class IrcConfiguration implements Cloneable {
 }
 
 public boolean isNamesOnJoin() {
-   return namesOnJoin;
-   }
+return namesOnJoin;
+}
 
-   public void setNamesOnJoin(boolean namesOnJoin) {
-   this.namesOnJoin = namesOnJoin;
-   }
+public void setNamesOnJoin(boolean namesOnJoin) {
+this.namesOnJoin = namesOnJoin;
+}
 
-   public String toString() {
-return "IrcConfiguration[hostname: " + hostname + ", ports=" + 
Arrays.toString(ports) + ", username=" + username + "]";
+public String toString() {
+return "IrcConfiguration[hostname: " + hostname + ", ports=" + 
Arrays.toString(ports) + ", username=" + username
++ "]";
 }
 
 private static IrcChannel createChannel(String channelInfo) {

http://git-wip-us.apache.org/repos/asf/camel/blob/6fb84cfb/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
--
diff --git 
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
 
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
index 5ddef4a..1f88cc0 100644
--- 
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
+++ 
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
@@ -205,8 +205,8 @@ public class IrcEndpoint extends DefaultEndpoint {
 connection.doJoin(chn);
 }
 if (configuration.isNamesOnJoin()) {
-   connection.doNames(chn);
-   }
+connection.doNames(chn);
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/6fb84cfb/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
--
diff --git 
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
 
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
index 7bb34db..fc3241d 100644
--- 
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
+++ 
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
@@ -35,56 +35,58 @@ import org.slf4j.LoggerFactory;
  * listed for the channel.
  */
 public class IrcsLis

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

2016-05-01 Thread gzurowski
http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jms/pom.xml
--
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 8b425b2..2614ed5 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jmx/pom.xml
--
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index df70791..359961e 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jolt/pom.xml
--
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 002a1ee..1e28453 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-jolt

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-josql/pom.xml
--
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 2380351..24b010e 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-josql

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jpa/pom.xml
--
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index f5fe315..5dcc797 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-jpa

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jsch/pom.xml
--
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index 513457d..a9add92 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-jsch

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index c45a291..8e04bd3 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-jsonpath

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jt400/pom.xml
--
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index f569ed9..5570f7f 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-jt400

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-juel/pom.xml
--
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index 28ad220..8118721 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-juel

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index d862bec..fc4794c 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index ced9310..ef3e1c3 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1

[camel] Git Push Summary

2016-05-01 Thread gzurowski
Repository: camel
Updated Tags:  refs/tags/camel-2.17.1 [created] 7d601e971


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

2016-05-01 Thread gzurowski
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/camel-2.17.x
Commit: e11056e84a351a2dc5de5852a1fdcb4219be589a
Parents: c3d54e2
Author: Gregor Zurowski 
Authored: Sun May 1 19:38:33 2016 +
Committer: Gregor Zurowski 
Committed: Sun May 1 19:38:33 2016 +

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

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

2016-05-01 Thread gzurowski
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x c3d54e2ff -> e11056e84


http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index 41a7ed5..d8e8c75 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index b82d0e2..ae074a8 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-example-cxf

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-etl/pom.xml
--
diff --git a/examples/camel-example-etl/pom.xml 
b/examples/camel-example-etl/pom.xml
index 75d53ca..2fbf767 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-example-etl

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-ftp/pom.xml
--
diff --git a/examples/camel-example-ftp/pom.xml 
b/examples/camel-example-ftp/pom.xml
index 1b55ab5..17c3590 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-example-ftp

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-gae/pom.xml
--
diff --git a/examples/camel-example-gae/pom.xml 
b/examples/camel-example-gae/pom.xml
index 7bcd640..f3da146 100644
--- a/examples/camel-example-gae/pom.xml
+++ b/examples/camel-example-gae/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-example-gae

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-gauth/pom.xml
--
diff --git a/examples/camel-example-gauth/pom.xml 
b/examples/camel-example-gauth/pom.xml
index 769970c..2d2042d 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-example-gauth

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml 
b/examples/camel-example-guice-jms/pom.xml
index bfc02ea..cc2cf8f 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
 
 
 camel-example-guice-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/e11056e8/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index ea5ba8a..ee36632 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.17.1
+2.17.2-SNAPSHOT
   
 
   camel-example-jdbc

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

org.apache.camel
examples
-   2.17.1
+   2.17.2-SNAPSHOT

 
camel-example-jms-file

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

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

2016-05-01 Thread gzurowski
http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jms/pom.xml
--
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 8dc79aa..8b425b2 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jmx/pom.xml
--
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 8b487fb..df70791 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jolt/pom.xml
--
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 4397f52..002a1ee 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-jolt

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-josql/pom.xml
--
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 0106b17..2380351 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-josql

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jpa/pom.xml
--
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index c54925a..f5fe315 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-jpa

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jsch/pom.xml
--
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index 9bb38d4..513457d 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-jsch

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index 8d25ae5..c45a291 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-jsonpath

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jt400/pom.xml
--
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index 19b2268..f569ed9 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-jt400

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-juel/pom.xml
--
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index 2573abb..28ad220 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-juel

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 3b31025..d862bec 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 660864e..ced9310 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.17.1-

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

2016-05-01 Thread gzurowski
[maven-release-plugin] prepare release camel-2.17.1


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

Branch: refs/heads/camel-2.17.x
Commit: c3d54e2ff5c412ff9d663e6386c38eb9c18e2282
Parents: 6937dd7
Author: Gregor Zurowski 
Authored: Sun May 1 19:38:03 2016 +
Committer: Gregor Zurowski 
Committed: Sun May 1 19:38:03 2016 +

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

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

2016-05-01 Thread gzurowski
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 6937dd75d -> c3d54e2ff


http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index f8306d4..41a7ed5 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index 472a4f5..b82d0e2 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-example-cxf

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-etl/pom.xml
--
diff --git a/examples/camel-example-etl/pom.xml 
b/examples/camel-example-etl/pom.xml
index e59b9be..75d53ca 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-example-etl

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-ftp/pom.xml
--
diff --git a/examples/camel-example-ftp/pom.xml 
b/examples/camel-example-ftp/pom.xml
index 5923a1c..1b55ab5 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-example-ftp

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-gae/pom.xml
--
diff --git a/examples/camel-example-gae/pom.xml 
b/examples/camel-example-gae/pom.xml
index 8466509..7bcd640 100644
--- a/examples/camel-example-gae/pom.xml
+++ b/examples/camel-example-gae/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-example-gae

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-gauth/pom.xml
--
diff --git a/examples/camel-example-gauth/pom.xml 
b/examples/camel-example-gauth/pom.xml
index 6fabe52..769970c 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-example-gauth

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml 
b/examples/camel-example-guice-jms/pom.xml
index 90383eb..bfc02ea 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
 
 
 camel-example-guice-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index fafcce9..ea5ba8a 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.17.1-SNAPSHOT
+2.17.1
   
 
   camel-example-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d54e2f/examples/camel-example-jms-file/pom.xml
--
diff --git a/examples/camel-example-jms-file/pom.xml 
b/examples/camel-example-jms-file/pom.xml
index 47e4060..7da8915 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -21,7 +21,7 @@

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

 
camel-example-jms-file

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

camel git commit: CAMEL-9932: sql-stored - Add support for arrays in grammar so you can refer to arrays when using simple tokens.

2016-05-01 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 6bd086fac -> f3f2f34e0


CAMEL-9932: sql-stored - Add support for arrays in grammar so you can refer to 
arrays when using simple tokens.


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

Branch: refs/heads/master
Commit: f3f2f34e02b5b7bb6bee7dc2a27b5bbd56caee17
Parents: 6bd086f
Author: Claus Ibsen 
Authored: Sun May 1 17:31:16 2016 +0200
Committer: Claus Ibsen 
Committed: Sun May 1 17:31:16 2016 +0200

--
 .../generated/SSPTParserTokenManager.java   |  6 +-
 .../sql/stored/template/grammar/sspt.jj |  2 +-
 .../sql/stored/ProducerBodyArrayTest.java   | 78 
 .../component/sql/stored/ProducerTest.java  |  1 -
 4 files changed, 82 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f3f2f34e/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index 15a9347..8b3c31b 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -291,7 +291,7 @@ private int jjMoveNfa_0(int startState, int curPos)
 {
case 10:
case 14:
-  if ((0x2ffe87feL & l) == 0L)
+  if ((0x2ffeaffeL & l) == 0L)
  break;
   if (kind > 14)
  kind = 14;
@@ -302,7 +302,7 @@ private int jjMoveNfa_0(int startState, int curPos)
  jjCheckNAdd(8);
   break;
case 8:
-  if ((0x2ffe87feL & l) != 0L)
+  if ((0x2ffeaffeL & l) != 0L)
  jjCheckNAddTwoStates(8, 9);
   break;
case 9:
@@ -310,7 +310,7 @@ private int jjMoveNfa_0(int startState, int curPos)
  kind = 12;
   break;
case 12:
-  if ((0x2ffe87feL & l) == 0L)
+  if ((0x2ffeaffeL & l) == 0L)
  break;
   if (kind > 13)
  kind = 13;

http://git-wip-us.apache.org/repos/asf/camel/blob/f3f2f34e/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
index d078591..bd3546f 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
@@ -142,7 +142,7 @@ TOKEN: {
 }
 
 TOKEN: {
-<#SPECIAL: (["#","_","-","'",".","$","{","}","\""])>
+<#SPECIAL: (["#","_","-","'",".","$","{","}","\"","[","]"])>
 }
 
 TOKEN: {

http://git-wip-us.apache.org/repos/asf/camel/blob/f3f2f34e/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
--
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
new file mode 100644
index 000..c9612dc
--- /dev/null
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
@@ -0,0 +1,78 @@
+/**
+ * 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 app

camel git commit: CAMEL-9932: sql-stored - Add support for arrays in grammar so you can refer to arrays when using simple tokens.

2016-05-01 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 0b12de948 -> 6937dd75d


CAMEL-9932: sql-stored - Add support for arrays in grammar so you can refer to 
arrays when using simple tokens.


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

Branch: refs/heads/camel-2.17.x
Commit: 6937dd75df541357d6027c9461c1b7b5780df689
Parents: 0b12de9
Author: Claus Ibsen 
Authored: Sun May 1 17:31:16 2016 +0200
Committer: Claus Ibsen 
Committed: Sun May 1 17:35:24 2016 +0200

--
 .../generated/SSPTParserTokenManager.java   |  6 +-
 .../sql/stored/template/grammar/sspt.jj |  2 +-
 .../sql/stored/ProducerBodyArrayTest.java   | 78 
 .../component/sql/stored/ProducerTest.java  |  1 -
 4 files changed, 82 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6937dd75/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index 15a9347..8b3c31b 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -291,7 +291,7 @@ private int jjMoveNfa_0(int startState, int curPos)
 {
case 10:
case 14:
-  if ((0x2ffe87feL & l) == 0L)
+  if ((0x2ffeaffeL & l) == 0L)
  break;
   if (kind > 14)
  kind = 14;
@@ -302,7 +302,7 @@ private int jjMoveNfa_0(int startState, int curPos)
  jjCheckNAdd(8);
   break;
case 8:
-  if ((0x2ffe87feL & l) != 0L)
+  if ((0x2ffeaffeL & l) != 0L)
  jjCheckNAddTwoStates(8, 9);
   break;
case 9:
@@ -310,7 +310,7 @@ private int jjMoveNfa_0(int startState, int curPos)
  kind = 12;
   break;
case 12:
-  if ((0x2ffe87feL & l) == 0L)
+  if ((0x2ffeaffeL & l) == 0L)
  break;
   if (kind > 13)
  kind = 13;

http://git-wip-us.apache.org/repos/asf/camel/blob/6937dd75/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
index d078591..bd3546f 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
@@ -142,7 +142,7 @@ TOKEN: {
 }
 
 TOKEN: {
-<#SPECIAL: (["#","_","-","'",".","$","{","}","\""])>
+<#SPECIAL: (["#","_","-","'",".","$","{","}","\"","[","]"])>
 }
 
 TOKEN: {

http://git-wip-us.apache.org/repos/asf/camel/blob/6937dd75/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
--
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
new file mode 100644
index 000..c9612dc
--- /dev/null
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
@@ -0,0 +1,78 @@
+/**
+ * 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 req

camel git commit: Fixed KafkaProducerTest test in camel-kafka component

2016-05-01 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 2f8592754 -> 0b12de948


Fixed KafkaProducerTest test in camel-kafka component


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

Branch: refs/heads/camel-2.17.x
Commit: 0b12de94819f5839a2f25fd2de9ef740a7abfa45
Parents: 2f85927
Author: Andrea Cosentino 
Authored: Sun May 1 13:49:11 2016 +0200
Committer: Andrea Cosentino 
Committed: Sun May 1 13:49:11 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/0b12de94/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
--
diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index 8e94320..06deedc 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -53,7 +53,7 @@ public class KafkaProducerTest {
 Future future = Mockito.mock(Future.class);
 Mockito.when(future.get()).thenReturn(rm);
 org.apache.kafka.clients.producer.KafkaProducer kp = 
Mockito.mock(org.apache.kafka.clients.producer.KafkaProducer.class);
-Mockito.when(kp.send(Mockito.any())).thenReturn(future);
+
Mockito.when(kp.send(Mockito.any(ProducerRecord.class))).thenReturn(future);
 
 producer.setKafkaProducer(kp);
 }



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

2016-05-01 Thread buildbot
Author: buildbot
Date: Sun May  1 09:18:41 2016
New Revision: 987223

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2180-release.html
==
--- websites/production/camel/content/camel-2180-release.html (original)
+++ websites/production/camel/content/camel-2180-release.html Sun May  1 
09:18:41 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.18.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png"; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png";> New and NoteworthyWelcome to 
the 2.18.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)Added Hystrix EIP as EIP pattern that uses native Hystrix 
as the Circuit Breaker implementation. This requires 
having camel-hsytrix on the classpath.Improved 
the Bean component to better match method 
parameter types when using Simple 
language as parameter values.Added BindyConverter 
that allows to implement custom data converters for BindyThe access in the Rest DSL has been deprecated and no longer in use - 
its not part of swagger specification anymore.Camel-NATS now uses JNATS client instead of the 
deprecated Java_nats one.During startup of CamelContext the services that are used as part of 
routes are now deferred being started to the end of the startup process. Some 
IoC frameworks like Spring can otherwise causes a circular dependency issue if 
services are started too early. A side effect is that if service startup 
failures happen w
 hen being started later, they are now wrapped in the 
FailedToStartupRouteException to better pin point which route thas 
the problem.Improved the startup sequence of Spring Java Config to be similar to Spring Boot that helps prevent Spring 
initialization errors about circular dependencies issues.Added PATCH 
to Rest DSLAdded "starts 
with" and "ends with" operator to the Simple language.Added BeanIOSplitter
 to BeanIO that can be used with 
the Splitter EIP to split big 
payloads in streaming mode without reading the entire content into 
memory.Some of the AWS components allows to specify ARN in
  the endpoint configuration. The create operation in Zookeeper now creates sub paths if 
missing.Added support for async mode for SERVLET component to leverage Asynchronous Servlet from 
the Servlet 3.0 spec.Bean component and Bean Language validates method name must be 
a valid according to java identifier rules, and also if parameter syntax has an 
ending parenthesis.You can now 
use @RunWith(CamelSpringBootJUnit4ClassRunner.class) to test 
Camel Spring 
Boot applications and use the Camel test annotations from Spring Testing such 
as @MockEndpoints.To turn on logging exhausted 
message body with the message history you
  can configure this easily on the CamelContext level 
with setLogExhaustedMessageBodyCamel-Infinispan now supports Aggregation 
Repository: InfinispanLocalAggregationRepository and 
InfinispanRemoteAggregationRepositoryThe SQL Component and ElSql now supports 
outputType=StreamList to use an iterator for the output of 
the SQL query that allows to process the data in a streaming fashion such as 
with the Splitter EIP to process 
the data row by row, and load data from the database as needed.Camel CDI now supports importing Camel XML 
configuration filesCamel 
CDI does not deploy an empty Camel context bean anymore if not route 
builder beans nor Camel beans are 
 deployedCamel CDI adds 
the @Named qualifier to Camel route management events so that 
it's possible to observe these events for a specific route with an explicit 
idFixed these issues:Fixed Bean component to avoid ambiguous error for 
classes that extends generic interface and calling which could lead to falsely 
duplicate methods (due Java type erasure inserts bridge 
methods) Fixed splitting using tarfile could cause OOME if 
splitting big files which was mistakenly loaded into memory. Now we work on the 
tar stream directly.Fixed Netty HTTP and Netty4 HTTP issue when not specifying a port number 
then port 80 would not be used but an error about port -1 is not 
allowed.Fixed Swagger Java when using property placeholders in Rest DSL could cause invalid parameters 
to be included that was from the 
placeholder.The threads EIP now lets Error handling in 
Camel perform redeliveries if the thread pool would otherwise reject 
accepting the task. This allows the error handler to perform redeliveries to 
attempt to put the task on the thread pool queue, or eventually move the 
message to a dead letter

camel git commit: CAMEL-3142: JpaPollingConsumer - So you can more easily work with pollEnrich

2016-05-01 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master bd6f84639 -> 6bd086fac


CAMEL-3142: JpaPollingConsumer - So you can more easily work with pollEnrich


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

Branch: refs/heads/master
Commit: 6bd086fac7fb5350712ee5cda07332191ea29780
Parents: bd6f846
Author: Claus Ibsen 
Authored: Sun May 1 10:16:24 2016 +0200
Committer: Claus Ibsen 
Committed: Sun May 1 10:43:54 2016 +0200

--
 .../camel/component/jpa/JpaComponent.java   |  19 ++
 .../apache/camel/component/jpa/JpaEndpoint.java |  17 ++
 .../camel/component/jpa/JpaPollingConsumer.java | 259 +++
 .../processor/jpa/JpaPollingConsumerTest.java   |  93 +++
 .../jpa/JpaPollingConsumerTimeoutTest.java  |  43 +++
 5 files changed, 431 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6bd086fa/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
--
diff --git 
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
 
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
index c2c0227..5427e9a 100644
--- 
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
+++ 
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.jpa;
 
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import javax.persistence.EntityManagerFactory;
 
 import org.apache.camel.Endpoint;
@@ -38,6 +39,7 @@ public class JpaComponent extends UriEndpointComponent {
 private PlatformTransactionManager transactionManager;
 private boolean joinTransaction = true;
 private boolean sharedEntityManager;
+private ExecutorService pollingConsumerExecutorService;
 
 public JpaComponent() {
 super(JpaEndpoint.class);
@@ -93,6 +95,14 @@ public class JpaComponent extends UriEndpointComponent {
 this.sharedEntityManager = sharedEntityManager;
 }
 
+synchronized ExecutorService getOrCreatePollingConsumerExecutorService() {
+if (pollingConsumerExecutorService == null) {
+LOG.debug("Creating thread pool for JpaPollingConsumer to support 
polling using timeout");
+pollingConsumerExecutorService = 
getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, 
"JpaPollingConsumer");
+}
+return pollingConsumerExecutorService;
+}
+
 // Implementation methods
 //-
 
@@ -173,4 +183,13 @@ public class JpaComponent extends UriEndpointComponent {
 }
 }
 
+@Override
+protected void doStop() throws Exception {
+super.doStop();
+
+if (pollingConsumerExecutorService != null) {
+
getCamelContext().getExecutorServiceManager().shutdown(pollingConsumerExecutorService);
+pollingConsumerExecutorService = null;
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/6bd086fa/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
--
diff --git 
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
 
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
index fc97224..c5b9734 100644
--- 
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
+++ 
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
@@ -26,6 +26,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.InvalidPayloadRuntimeException;
+import org.apache.camel.PollingConsumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.ScheduledPollEndpoint;
@@ -141,6 +142,11 @@ public class JpaEndpoint extends ScheduledPollEndpoint {
 this.transactionManager = transactionManager;
 }
 
+@Override
+public JpaComponent getComponent() {
+return (JpaComponent) super.getComponent();
+}
+
 public Producer createProducer() throws Exception {
 validate();
 return new JpaProducer(this, getProducerExpression());
@@ -165,6 +171,17 @@ public class JpaEndpoint extends ScheduledPollEndpoint {
 }
 
 @Override
+public PollingConsumer createPollingConsumer() throws Exception {
+JpaPollingC

camel git commit: Upgrade Jackson to version 2.7.4

2016-05-01 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/master bfd4c62eb -> bd6f84639


Upgrade Jackson to version 2.7.4


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

Branch: refs/heads/master
Commit: bd6f84639a154cdddb0ca541c25cf7c65389b00e
Parents: bfd4c62
Author: Andrea Cosentino 
Authored: Sun May 1 09:00:11 2016 +0200
Committer: Andrea Cosentino 
Committed: Sun May 1 09:00:34 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/bd6f8463/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 948a72a..094fcfc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -261,7 +261,7 @@
 1.9.12
 2.4.5
 2.6.1
-2.7.3
+2.7.4
 2.12.1
 15.0
 1.2.154_2