camel git commit: added the missing notice and license files

2016-03-24 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x f85da -> e9bb6ba36


added the missing notice and license files


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

Branch: refs/heads/camel-2.17.x
Commit: e9bb6ba365edb27e3951acacd94301ffd84833a9
Parents: f85
Author: Christian Mueller 
Authored: Thu Mar 24 22:58:23 2016 +0100
Committer: Christian Mueller 
Committed: Thu Mar 24 23:00:30 2016 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 8 files changed, 856 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e9bb6ba3/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or

camel git commit: added the missing notice and license files

2016-03-24 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master b4e7644bd -> 8533e76e6


added the missing notice and license files


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

Branch: refs/heads/master
Commit: 8533e76e647478b1a089558924f575eda2492f4a
Parents: b4e7644
Author: Christian Mueller 
Authored: Thu Mar 24 22:58:23 2016 +0100
Committer: Christian Mueller 
Committed: Thu Mar 24 22:58:23 2016 +0100

--
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 8 files changed, 856 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8533e76e/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-braintree/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf

[1/3] camel git commit: fix incorrect Time factory methods

2016-03-24 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 2fa5943e5 -> d60324cbd
  refs/heads/camel-2.17.x 8cea456b5 -> f85da
  refs/heads/master a351e3a4b -> b4e7644bd


fix incorrect Time factory methods

Time#minutes(long)
Time#hours(long)
Time#days(long)


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

Branch: refs/heads/master
Commit: b4e7644bdd83e96f454847718738c66024401d3c
Parents: a351e3a
Author: Ernestas Mitkus 
Authored: Thu Mar 24 17:29:24 2016 +0200
Committer: Ernestas Mitkus 
Committed: Thu Mar 24 17:29:26 2016 +0200

--
 camel-core/src/main/java/org/apache/camel/util/Time.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4e7644b/camel-core/src/main/java/org/apache/camel/util/Time.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/Time.java 
b/camel-core/src/main/java/org/apache/camel/util/Time.java
index eb06daa..2b793e7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/Time.java
+++ b/camel-core/src/main/java/org/apache/camel/util/Time.java
@@ -43,15 +43,15 @@ public class Time {
 }
 
 public static Time minutes(long value) {
-return new Time(minutesAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(minutesAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public static Time hours(long value) {
-return new Time(hoursAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(hoursAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public static Time days(long value) {
-return new Time(daysAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(daysAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public long toMillis() {

[2/3] camel git commit: fix incorrect Time factory methods

2016-03-24 Thread davsclaus 
fix incorrect Time factory methods

Time#minutes(long)
Time#hours(long)
Time#days(long)


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

Branch: refs/heads/camel-2.17.x
Commit: f85dad5d6f5548cfe13c9e2d0999b221115d
Parents: 8cea456
Author: Ernestas Mitkus 
Authored: Thu Mar 24 17:29:24 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Mar 24 22:00:33 2016 +0100

--
 camel-core/src/main/java/org/apache/camel/util/Time.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f85d/camel-core/src/main/java/org/apache/camel/util/Time.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/Time.java 
b/camel-core/src/main/java/org/apache/camel/util/Time.java
index eb06daa..2b793e7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/Time.java
+++ b/camel-core/src/main/java/org/apache/camel/util/Time.java
@@ -43,15 +43,15 @@ public class Time {
 }
 
 public static Time minutes(long value) {
-return new Time(minutesAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(minutesAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public static Time hours(long value) {
-return new Time(hoursAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(hoursAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public static Time days(long value) {
-return new Time(daysAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(daysAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public long toMillis() {

[3/3] camel git commit: fix incorrect Time factory methods

2016-03-24 Thread davsclaus 
fix incorrect Time factory methods

Time#minutes(long)
Time#hours(long)
Time#days(long)


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

Branch: refs/heads/camel-2.16.x
Commit: d60324cbdf2ef12438a1d93f7bc466c4f77525b4
Parents: 2fa5943
Author: Ernestas Mitkus 
Authored: Thu Mar 24 17:29:24 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Mar 24 22:00:48 2016 +0100

--
 camel-core/src/main/java/org/apache/camel/util/Time.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d60324cb/camel-core/src/main/java/org/apache/camel/util/Time.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/Time.java 
b/camel-core/src/main/java/org/apache/camel/util/Time.java
index eb06daa..2b793e7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/Time.java
+++ b/camel-core/src/main/java/org/apache/camel/util/Time.java
@@ -43,15 +43,15 @@ public class Time {
 }
 
 public static Time minutes(long value) {
-return new Time(minutesAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(minutesAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public static Time hours(long value) {
-return new Time(hoursAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(hoursAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public static Time days(long value) {
-return new Time(daysAsSeconds(value), TimeUnit.MILLISECONDS);
+return new Time(daysAsSeconds(value), TimeUnit.SECONDS);
 }
 
 public long toMillis() {

camel git commit: CAMEL-9736 SolrComponent gets the wrong Content Type

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 58ee935ee -> 8cea456b5


CAMEL-9736 SolrComponent gets the wrong Content Type


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

Branch: refs/heads/camel-2.17.x
Commit: 8cea456b5a0f0739b1e5b3eff5795a1e022627cd
Parents: 58ee935
Author: Andrea Cosentino 
Authored: Thu Mar 24 15:54:38 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 15:56:32 2016 +0100

--
 .../camel/component/solr/SolrProducer.java  | 108 +++
 1 file changed, 64 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8cea456b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
--
diff --git 
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
 
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
index 7d0f32b..0052b7d 100644
--- 
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
+++ 
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
@@ -26,6 +26,7 @@ import javax.activation.MimetypesFileTypeMap;
 import org.apache.camel.Exchange;
 import org.apache.camel.WrappedFile;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
 import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -41,13 +42,14 @@ public class SolrProducer extends DefaultProducer {
 private SolrClient concSolrServer;
 private SolrClient cloudSolrServer;
 
-public SolrProducer(SolrEndpoint endpoint, SolrClient solrServer, 
SolrClient concSolrServer, SolrClient cloudSolrServer) {
+public SolrProducer(SolrEndpoint endpoint, SolrClient solrServer, 
SolrClient concSolrServer,
+SolrClient cloudSolrServer) {
 super(endpoint);
 this.httpServer = solrServer;
 this.concSolrServer = concSolrServer;
 this.cloudSolrServer = cloudSolrServer;
 }
-
+
 private SolrClient getBestSolrServer(String operation) {
 if (this.cloudSolrServer != null) {
 return this.cloudSolrServer;
@@ -66,7 +68,7 @@ public class SolrProducer extends DefaultProducer {
 if (operation == null) {
 throw new IllegalArgumentException(SolrConstants.OPERATION + " 
header is missing");
 }
-
+
 SolrClient serverToUse = getBestSolrServer(operation);
 
 if (operation.equalsIgnoreCase(SolrConstants.OPERATION_INSERT)) {
@@ -88,7 +90,8 @@ public class SolrProducer extends DefaultProducer {
 } else if 
(operation.equalsIgnoreCase(SolrConstants.OPERATION_OPTIMIZE)) {
 serverToUse.optimize();
 } else {
-throw new IllegalArgumentException(SolrConstants.OPERATION + " 
header value '" + operation + "' is not supported");
+throw new IllegalArgumentException(
+SolrConstants.OPERATION + " header value '" + operation + 
"' is not supported");
 }
 }
 
@@ -96,12 +99,11 @@ public class SolrProducer extends DefaultProducer {
 Object body = exchange.getIn().getBody();
 boolean invalid = false;
 if (body instanceof WrappedFile) {
-body = ((WrappedFile)body).getFile();
+body = ((WrappedFile) body).getFile();
 }
 
-if (body instanceof File) {
-MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
-String mimeType = mimeTypesMap.getContentType((File)body);
+if 
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Exchange.CONTENT_TYPE, 
String.class))) {
+String mimeType = 
exchange.getIn().getHeader(Exchange.CONTENT_TYPE, String.class);
 ContentStreamUpdateRequest updateRequest = new 
ContentStreamUpdateRequest(getRequestHandler());
 updateRequest.addFile((File) body, mimeType);
 
@@ -113,68 +115,86 @@ public class SolrProducer extends DefaultProducer {
 }
 
 updateRequest.process(solrServer);
+} else {
 
-} else if (body instanceof SolrInputDocument) {
+if (body instanceof File) {
+MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
+String mimeType = mimeTypesMap.getContentType((File) body);
+ContentStreamUpdateRequest updateRequest = new

camel git commit: CAMEL-9736 SolrComponent gets the wrong Content Type

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 79a178d81 -> a351e3a4b


CAMEL-9736 SolrComponent gets the wrong Content Type


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

Branch: refs/heads/master
Commit: a351e3a4b3aea6843916ab42381730f5a8a5797e
Parents: 79a178d
Author: Andrea Cosentino 
Authored: Thu Mar 24 15:54:38 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 15:55:10 2016 +0100

--
 .../camel/component/solr/SolrProducer.java  | 108 +++
 1 file changed, 64 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a351e3a4/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
--
diff --git 
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
 
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
index 7d0f32b..0052b7d 100644
--- 
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
+++ 
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
@@ -26,6 +26,7 @@ import javax.activation.MimetypesFileTypeMap;
 import org.apache.camel.Exchange;
 import org.apache.camel.WrappedFile;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
 import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -41,13 +42,14 @@ public class SolrProducer extends DefaultProducer {
 private SolrClient concSolrServer;
 private SolrClient cloudSolrServer;
 
-public SolrProducer(SolrEndpoint endpoint, SolrClient solrServer, 
SolrClient concSolrServer, SolrClient cloudSolrServer) {
+public SolrProducer(SolrEndpoint endpoint, SolrClient solrServer, 
SolrClient concSolrServer,
+SolrClient cloudSolrServer) {
 super(endpoint);
 this.httpServer = solrServer;
 this.concSolrServer = concSolrServer;
 this.cloudSolrServer = cloudSolrServer;
 }
-
+
 private SolrClient getBestSolrServer(String operation) {
 if (this.cloudSolrServer != null) {
 return this.cloudSolrServer;
@@ -66,7 +68,7 @@ public class SolrProducer extends DefaultProducer {
 if (operation == null) {
 throw new IllegalArgumentException(SolrConstants.OPERATION + " 
header is missing");
 }
-
+
 SolrClient serverToUse = getBestSolrServer(operation);
 
 if (operation.equalsIgnoreCase(SolrConstants.OPERATION_INSERT)) {
@@ -88,7 +90,8 @@ public class SolrProducer extends DefaultProducer {
 } else if 
(operation.equalsIgnoreCase(SolrConstants.OPERATION_OPTIMIZE)) {
 serverToUse.optimize();
 } else {
-throw new IllegalArgumentException(SolrConstants.OPERATION + " 
header value '" + operation + "' is not supported");
+throw new IllegalArgumentException(
+SolrConstants.OPERATION + " header value '" + operation + 
"' is not supported");
 }
 }
 
@@ -96,12 +99,11 @@ public class SolrProducer extends DefaultProducer {
 Object body = exchange.getIn().getBody();
 boolean invalid = false;
 if (body instanceof WrappedFile) {
-body = ((WrappedFile)body).getFile();
+body = ((WrappedFile) body).getFile();
 }
 
-if (body instanceof File) {
-MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
-String mimeType = mimeTypesMap.getContentType((File)body);
+if 
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Exchange.CONTENT_TYPE, 
String.class))) {
+String mimeType = 
exchange.getIn().getHeader(Exchange.CONTENT_TYPE, String.class);
 ContentStreamUpdateRequest updateRequest = new 
ContentStreamUpdateRequest(getRequestHandler());
 updateRequest.addFile((File) body, mimeType);
 
@@ -113,68 +115,86 @@ public class SolrProducer extends DefaultProducer {
 }
 
 updateRequest.process(solrServer);
+} else {
 
-} else if (body instanceof SolrInputDocument) {
+if (body instanceof File) {
+MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
+String mimeType = mimeTypesMap.getContentType((File) body);
+ContentStreamUpdateRequest updateRequest = new

camel git commit: Add test dep so the test can run

2016-03-24 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 71ff90090 -> 79a178d81


Add test dep so the test can run


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

Branch: refs/heads/master
Commit: 79a178d81eaa6e1c8d8740ff0619e31a0afca788
Parents: 71ff900
Author: Claus Ibsen 
Authored: Thu Mar 24 13:38:09 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 24 13:38:09 2016 +0100

--
 components/camel-elasticsearch/pom.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/79a178d8/components/camel-elasticsearch/pom.xml
--
diff --git a/components/camel-elasticsearch/pom.xml 
b/components/camel-elasticsearch/pom.xml
index 18677e7..438a43d 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -58,6 +58,12 @@
   ${elasticsearch-cluster-runner-version}
   test
 
+
+  com.fasterxml.jackson.core
+  jackson-databind
+  ${jackson2-version}
+  test
+

camel git commit: Upgrade asm to fix test failures

2016-03-24 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master d7e76880b -> 71ff90090


Upgrade asm to fix test failures


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

Branch: refs/heads/master
Commit: 71ff900901ecb5a6ada8b930ed1e259b7c003031
Parents: d7e7688
Author: Claus Ibsen 
Authored: Thu Mar 24 13:24:19 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 24 13:24:19 2016 +0100

--
 tests/camel-blueprint-cxf-test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/71ff9009/tests/camel-blueprint-cxf-test/pom.xml
--
diff --git a/tests/camel-blueprint-cxf-test/pom.xml 
b/tests/camel-blueprint-cxf-test/pom.xml
index b971830..d9a8dc9 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -34,7 +34,7 @@
 
   org.ow2.asm
   asm-all
-  4.0
+  5.1
   test

[1/3] camel git commit: Same fix in camel-zipfile as we recently did in camel-tarfile.

2016-03-24 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x d4d61aecc -> 2fa5943e5
  refs/heads/camel-2.17.x 91f7d4146 -> 58ee935ee
  refs/heads/master 3680450e4 -> d7e76880b


Same fix in camel-zipfile as we recently did in camel-tarfile.


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

Branch: refs/heads/master
Commit: d7e76880be0c0635ad2e4ba108fac47f8c35b539
Parents: 3680450
Author: Claus Ibsen 
Authored: Thu Mar 24 13:19:20 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 24 13:19:20 2016 +0100

--
 .../camel/dataformat/zipfile/ZipIterator.java   | 60 +++-
 .../zipfile/ZipSplitterRouteIssueTest.java  | 13 ++---
 2 files changed, 38 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d7e76880/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
--
diff --git 
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
 
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index 998bee1..ed8e68e 100644
--- 
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++ 
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dataformat.zipfile;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,8 +41,8 @@ public class ZipIterator implements Iterator, 
Closeable {
 static final Logger LOGGER = LoggerFactory.getLogger(ZipIterator.class);
 
 private final Message inputMessage;
-private ZipInputStream zipInputStream;
-private Message parent;
+private volatile ZipInputStream zipInputStream;
+private volatile Message parent;
 
 public ZipIterator(Message inputMessage) {
 this.inputMessage = inputMessage;
@@ -64,12 +65,12 @@ public class ZipIterator implements Iterator, 
Closeable {
 if (!availableDataInCurrentEntry) {
 // advance to the next entry.
 parent = getNextElement();
-// check if there are more data.
-availableDataInCurrentEntry = zipInputStream.available() == 1;
-// if there are not more data, close the stream.
-if (!availableDataInCurrentEntry) {
+if (parent == null) {
 zipInputStream.close();
-}
+availableDataInCurrentEntry = false;
+} else {
+availableDataInCurrentEntry = true;
+}
 }
 return availableDataInCurrentEntry;
 } catch (IOException exception) {
@@ -91,30 +92,34 @@ public class ZipIterator implements Iterator, 
Closeable {
 }
 
 private Message getNextElement() {
-Message answer = null;
+if (zipInputStream == null) {
+return null;
+}
 
-if (zipInputStream != null) {
-try {
-ZipEntry current = getNextEntry();
+try {
+ZipEntry current = getNextEntry();
 
-if (current != null) {
-LOGGER.debug("read zipEntry {}", current.getName());
-answer = new DefaultMessage();
-answer.getHeaders().putAll(inputMessage.getHeaders());
-answer.setHeader("zipFileName", current.getName());
-answer.setHeader(Exchange.FILE_NAME, current.getName());
+if (current != null) {
+LOGGER.debug("read zipEntry {}", current.getName());
+Message answer = new DefaultMessage();
+answer.getHeaders().putAll(inputMessage.getHeaders());
+answer.setHeader("zipFileName", current.getName());
+answer.setHeader(Exchange.FILE_NAME, current.getName());
+if (current.getSize() > 0) {
 answer.setBody(new ZipInputStreamWrapper(zipInputStream));
-return answer;
 } else {
-LOGGER.trace("close zipInputStream");
+// Workaround for the case when the entry is zero bytes big
+answer.setBody(new ByteArrayInputStream(new byte[0]));
 }
-} catch (IOException exception) {
-//Just

[3/3] camel git commit: Same fix in camel-zipfile as we recently did in camel-tarfile.

2016-03-24 Thread davsclaus 
Same fix in camel-zipfile as we recently did in camel-tarfile.


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

Branch: refs/heads/camel-2.16.x
Commit: 2fa5943e524da7fd2421f3c6635b9666e04a93d9
Parents: d4d61ae
Author: Claus Ibsen 
Authored: Thu Mar 24 13:19:20 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 24 13:20:21 2016 +0100

--
 .../camel/dataformat/zipfile/ZipIterator.java   | 60 +++-
 .../zipfile/ZipSplitterRouteIssueTest.java  | 13 ++---
 2 files changed, 38 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2fa5943e/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
--
diff --git 
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
 
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index 998bee1..ed8e68e 100644
--- 
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++ 
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dataformat.zipfile;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,8 +41,8 @@ public class ZipIterator implements Iterator, 
Closeable {
 static final Logger LOGGER = LoggerFactory.getLogger(ZipIterator.class);
 
 private final Message inputMessage;
-private ZipInputStream zipInputStream;
-private Message parent;
+private volatile ZipInputStream zipInputStream;
+private volatile Message parent;
 
 public ZipIterator(Message inputMessage) {
 this.inputMessage = inputMessage;
@@ -64,12 +65,12 @@ public class ZipIterator implements Iterator, 
Closeable {
 if (!availableDataInCurrentEntry) {
 // advance to the next entry.
 parent = getNextElement();
-// check if there are more data.
-availableDataInCurrentEntry = zipInputStream.available() == 1;
-// if there are not more data, close the stream.
-if (!availableDataInCurrentEntry) {
+if (parent == null) {
 zipInputStream.close();
-}
+availableDataInCurrentEntry = false;
+} else {
+availableDataInCurrentEntry = true;
+}
 }
 return availableDataInCurrentEntry;
 } catch (IOException exception) {
@@ -91,30 +92,34 @@ public class ZipIterator implements Iterator, 
Closeable {
 }
 
 private Message getNextElement() {
-Message answer = null;
+if (zipInputStream == null) {
+return null;
+}
 
-if (zipInputStream != null) {
-try {
-ZipEntry current = getNextEntry();
+try {
+ZipEntry current = getNextEntry();
 
-if (current != null) {
-LOGGER.debug("read zipEntry {}", current.getName());
-answer = new DefaultMessage();
-answer.getHeaders().putAll(inputMessage.getHeaders());
-answer.setHeader("zipFileName", current.getName());
-answer.setHeader(Exchange.FILE_NAME, current.getName());
+if (current != null) {
+LOGGER.debug("read zipEntry {}", current.getName());
+Message answer = new DefaultMessage();
+answer.getHeaders().putAll(inputMessage.getHeaders());
+answer.setHeader("zipFileName", current.getName());
+answer.setHeader(Exchange.FILE_NAME, current.getName());
+if (current.getSize() > 0) {
 answer.setBody(new ZipInputStreamWrapper(zipInputStream));
-return answer;
 } else {
-LOGGER.trace("close zipInputStream");
+// Workaround for the case when the entry is zero bytes big
+answer.setBody(new ByteArrayInputStream(new byte[0]));
 }
-} catch (IOException exception) {
-//Just wrap the IOException as CamelRuntimeException
-throw new RuntimeCamelException(exception);
+return answer;
+} else {
+

[2/3] camel git commit: Same fix in camel-zipfile as we recently did in camel-tarfile.

2016-03-24 Thread davsclaus 
Same fix in camel-zipfile as we recently did in camel-tarfile.


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

Branch: refs/heads/camel-2.17.x
Commit: 58ee935eef65d405c25e913bb47a2a3dbc274d90
Parents: 91f7d41
Author: Claus Ibsen 
Authored: Thu Mar 24 13:19:20 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 24 13:20:03 2016 +0100

--
 .../camel/dataformat/zipfile/ZipIterator.java   | 60 +++-
 .../zipfile/ZipSplitterRouteIssueTest.java  | 13 ++---
 2 files changed, 38 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/58ee935e/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
--
diff --git 
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
 
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index 998bee1..ed8e68e 100644
--- 
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++ 
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dataformat.zipfile;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,8 +41,8 @@ public class ZipIterator implements Iterator, 
Closeable {
 static final Logger LOGGER = LoggerFactory.getLogger(ZipIterator.class);
 
 private final Message inputMessage;
-private ZipInputStream zipInputStream;
-private Message parent;
+private volatile ZipInputStream zipInputStream;
+private volatile Message parent;
 
 public ZipIterator(Message inputMessage) {
 this.inputMessage = inputMessage;
@@ -64,12 +65,12 @@ public class ZipIterator implements Iterator, 
Closeable {
 if (!availableDataInCurrentEntry) {
 // advance to the next entry.
 parent = getNextElement();
-// check if there are more data.
-availableDataInCurrentEntry = zipInputStream.available() == 1;
-// if there are not more data, close the stream.
-if (!availableDataInCurrentEntry) {
+if (parent == null) {
 zipInputStream.close();
-}
+availableDataInCurrentEntry = false;
+} else {
+availableDataInCurrentEntry = true;
+}
 }
 return availableDataInCurrentEntry;
 } catch (IOException exception) {
@@ -91,30 +92,34 @@ public class ZipIterator implements Iterator, 
Closeable {
 }
 
 private Message getNextElement() {
-Message answer = null;
+if (zipInputStream == null) {
+return null;
+}
 
-if (zipInputStream != null) {
-try {
-ZipEntry current = getNextEntry();
+try {
+ZipEntry current = getNextEntry();
 
-if (current != null) {
-LOGGER.debug("read zipEntry {}", current.getName());
-answer = new DefaultMessage();
-answer.getHeaders().putAll(inputMessage.getHeaders());
-answer.setHeader("zipFileName", current.getName());
-answer.setHeader(Exchange.FILE_NAME, current.getName());
+if (current != null) {
+LOGGER.debug("read zipEntry {}", current.getName());
+Message answer = new DefaultMessage();
+answer.getHeaders().putAll(inputMessage.getHeaders());
+answer.setHeader("zipFileName", current.getName());
+answer.setHeader(Exchange.FILE_NAME, current.getName());
+if (current.getSize() > 0) {
 answer.setBody(new ZipInputStreamWrapper(zipInputStream));
-return answer;
 } else {
-LOGGER.trace("close zipInputStream");
+// Workaround for the case when the entry is zero bytes big
+answer.setBody(new ByteArrayInputStream(new byte[0]));
 }
-} catch (IOException exception) {
-//Just wrap the IOException as CamelRuntimeException
-throw new RuntimeCamelException(exception);
+return answer;
+} else {
+

camel git commit: CAMEL-9752 Quartz2 Scheduled route too many workers. Thanks to Hans Orbaan for the patch.

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 77fd40bf6 -> d4d61aecc


CAMEL-9752 Quartz2 Scheduled route too many workers. Thanks to Hans Orbaan for 
the patch.


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

Branch: refs/heads/camel-2.16.x
Commit: d4d61aecc1bda9c6964a01f627a5486487f5592e
Parents: 77fd40b
Author: Andrea Cosentino 
Authored: Thu Mar 24 11:18:46 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 11:29:49 2016 +0100

--
 .../camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d4d61aec/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
--
diff --git 
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
 
b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
index 7e06f7f..13fee12 100644
--- 
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
+++ 
b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
@@ -20,11 +20,13 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
 import org.apache.camel.Route;
 import org.apache.camel.component.quartz2.CamelJob;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@DisallowConcurrentExecution
 public class QuartzScheduledPollConsumerJob extends CamelJob {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(QuartzScheduledPollConsumerJob.class);

camel git commit: CAMEL-9752 Quartz2 Scheduled route too many workers. Thanks to Hans Orbaan for the patch.

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 0de49d45a -> 91f7d4146


CAMEL-9752 Quartz2 Scheduled route too many workers. Thanks to Hans Orbaan for 
the patch.


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

Branch: refs/heads/camel-2.17.x
Commit: 91f7d4146c362d867635a6e1f63f28e0c542a5c0
Parents: 0de49d4
Author: Andrea Cosentino 
Authored: Thu Mar 24 11:18:46 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 11:28:21 2016 +0100

--
 .../camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91f7d414/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
--
diff --git 
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
 
b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
index 7e06f7f..13fee12 100644
--- 
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
+++ 
b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
@@ -20,11 +20,13 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
 import org.apache.camel.Route;
 import org.apache.camel.component.quartz2.CamelJob;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@DisallowConcurrentExecution
 public class QuartzScheduledPollConsumerJob extends CamelJob {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(QuartzScheduledPollConsumerJob.class);

camel git commit: CAMEL-9752 Quartz2 Scheduled route too many workers. Thanks to Hans Orbaan for the patch.

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 057e87eb7 -> 3680450e4


CAMEL-9752 Quartz2 Scheduled route too many workers. Thanks to Hans Orbaan for 
the patch.


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

Branch: refs/heads/master
Commit: 3680450e447e2e8ed4a550916e92bc94ff0f6245
Parents: 057e87e
Author: Andrea Cosentino 
Authored: Thu Mar 24 11:18:46 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 11:18:46 2016 +0100

--
 .../camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3680450e/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
--
diff --git 
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
 
b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
index 7e06f7f..13fee12 100644
--- 
a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
+++ 
b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
@@ -20,11 +20,13 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
 import org.apache.camel.Route;
 import org.apache.camel.component.quartz2.CamelJob;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@DisallowConcurrentExecution
 public class QuartzScheduledPollConsumerJob extends CamelJob {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(QuartzScheduledPollConsumerJob.class);

svn commit: r983576 - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html transport.html uris.ht

2016-03-24 Thread buildbot 
Author: buildbot
Date: Thu Mar 24 10:21:10 2016
New Revision: 983576

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/component-list.html
websites/production/camel/content/component.html
websites/production/camel/content/components.html
websites/production/camel/content/transport.html
websites/production/camel/content/uris.html

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Thu Mar 24 
10:21:10 2016
@@ -551,7 +551,9 @@ disruptor-vm:someName[?option]
 Camel 
component of http://www.schematron.com/index.html; 
rel="nofollow">Schematronwhich supports to validate the XML instance 
documents.SEDA / camel-core
 
-Asynchronous call to another endpoint in the same Camel 
ContextSERVLET / camel-servlet
+Asynchronous call to another endpoint in the same Camel 
ContextServiceNow / 
camel-servicenow
+
+Camel 
component for http://www.servicenow.com/; 
rel="nofollow">ServiceNowSERVLET / 
camel-servlet
 
 For 
exposing services over HTTP through the servlet which is deployed into the Web 
container.SFTP / 
camel-ftp

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 Thu Mar 24 10:21:10 
2016
@@ -895,7 +895,9 @@ disruptor-vm:someName[?option]
 Camel 
component of http://www.schematron.com/index.html; 
rel="nofollow">Schematronwhich supports to validate the XML instance 
documents.SEDA / camel-core
 
-Asynchronous call to another endpoint in the same Camel 
ContextSERVLET / camel-servlet
+Asynchronous call to another endpoint in the same Camel 
ContextServiceNow / 
camel-servicenow
+
+Camel 
component for http://www.servicenow.com/; 
rel="nofollow">ServiceNowSERVLET / 
camel-servlet
 
 For 
exposing services over HTTP through the servlet which is deployed into the Web 
container.SFTP / 
camel-ftp
@@ -3724,11 +3726,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
@@ -5843,11 +5845,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
@@ -17276,11 +17278,11 @@ template.send(direct:alias-verify&
 ]]>
 See Also
 Configuring 
CamelComponentEndpointGetting StartedCrypto Crypto is also available as a Data Format CXF ComponentWhen using CXF as a consumer, the 
CXF Bean Component allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to consume web 
 services. The

camel git commit: CAMEL-9737 : add an option to configure default resource to access

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 8a03f0e40 -> 057e87eb7


CAMEL-9737 : add an option to configure default resource to access


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

Branch: refs/heads/master
Commit: 057e87eb7af4379434384bb6f6a1cb035f2d978d
Parents: 8a03f0e
Author: lburgazzoli 
Authored: Thu Mar 24 10:32:15 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 10:42:18 2016 +0100

--
 .../servicenow/ServiceNowConfiguration.java | 13 
 .../servicenow/ServiceNowConstants.java |  2 +-
 .../servicenow/ServiceNowProducer.java  |  2 +-
 .../servicenow/ServiceNowTableTest.java | 34 
 4 files changed, 49 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/057e87eb/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConfiguration.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConfiguration.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConfiguration.java
index 9c0b424..ddf83d8 100644
--- 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConfiguration.java
+++ 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConfiguration.java
@@ -51,6 +51,8 @@ public class ServiceNowConfiguration {
 @UriParam(label = "advanced")
 private String apiUrl;
 @UriParam
+private String resource;
+@UriParam
 private String table;
 @UriParam
 private Boolean excludeReferenceLink = false;
@@ -152,6 +154,17 @@ public class ServiceNowConfiguration {
 && ObjectHelper.isNotEmpty(oauthClientSecret);
 }
 
+public String getResource() {
+return resource;
+}
+
+/**
+ * The default resource, can be overridden by header 
CamelServiceNowResource
+ */
+public void setResource(String resource) {
+this.resource = resource;
+}
+
 public String getTable() {
 return table;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/057e87eb/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java
index 3dfb20e..8cd6c4b 100644
--- 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java
+++ 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java
@@ -24,7 +24,7 @@ public interface ServiceNowConstants {
 
 String RESOURCE_TABLE = "table";
 String RESOURCE_AGGREGATE = "aggregate";
-String RESOURCE_IMPORT = "aggregate";
+String RESOURCE_IMPORT = "import";
 
 String ACTION_RETRIEVE = "retrieve";
 String ACTION_CREATE = "create";

http://git-wip-us.apache.org/repos/asf/camel/blob/057e87eb/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowProducer.java
--
diff --git 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowProducer.java
 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowProducer.java
index cd7d4a7..0830bad 100644
--- 
a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowProducer.java
+++ 
b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowProducer.java
@@ -49,7 +49,7 @@ public class ServiceNowProducer extends DefaultProducer {
 
 @Override
 public void process(Exchange exchange) throws Exception {
-final String resource = 
exchange.getIn().getHeader(ServiceNowConstants.RESOURCE, String.class);
+String resource = 
exchange.getIn().getHeader(ServiceNowConstants.RESOURCE, 
configuration.getResource(), String.class);
 
 if (ObjectHelper.equal(ServiceNowConstants.RESOURCE_TABLE, resource, 
true)) {
 tableCache.get().process(exchange);

[1/2] camel git commit: Speed up InfinispanProducerTest

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 7e12832b8 -> 8a03f0e40


Speed up InfinispanProducerTest


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

Branch: refs/heads/master
Commit: 551142974c117449cd95add196d36b048231f9a9
Parents: 7e12832
Author: Martin Gencur 
Authored: Tue Mar 22 09:45:26 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 10:23:05 2016 +0100

--
 .../infinispan/InfinispanContinuousQueryIT.java |   4 +-
 .../infinispan/InfinispanProducerTest.java  | 401 ++-
 .../InfinispanRemoteQueryProducerIT.java|   7 +-
 .../camel/component/infinispan/UserUtils.java   |  81 
 .../component/infinispan/util/Condition.java|   8 +
 .../component/infinispan/util/UserUtils.java|  81 
 .../camel/component/infinispan/util/Wait.java   |  39 ++
 7 files changed, 263 insertions(+), 358 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/55114297/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
--
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
index b591555..82888b0 100644
--- 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
+++ 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
@@ -38,8 +38,8 @@ import 
org.infinispan.query.remote.client.MarshallerRegistration;
 import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
 import org.junit.Test;
 
-import static org.apache.camel.component.infinispan.UserUtils.CQ_USERS;
-import static org.apache.camel.component.infinispan.UserUtils.createKey;
+import static org.apache.camel.component.infinispan.util.UserUtils.CQ_USERS;
+import static org.apache.camel.component.infinispan.util.UserUtils.createKey;
 
 public class InfinispanContinuousQueryIT extends CamelTestSupport {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/55114297/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
--
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index c4cd561..b3f227d 100644
--- 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++ 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -23,16 +23,20 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.infinispan.util.Condition;
 import org.infinispan.commons.util.concurrent.NotifyingFuture;
 import org.junit.Test;
 
+import static org.apache.camel.component.infinispan.util.Wait.waitFor;
+
+
 public class InfinispanProducerTest extends InfinispanTestSupport {
 
 private static final String COMMAND_VALUE = "commandValue";
 private static final String COMMAND_KEY = "commandKey1";
-private static final long LIFESPAN_TIME = 5;
+private static final long LIFESPAN_TIME = 100;
 private static final long LIFESPAN_FOR_MAX_IDLE = -1;
-private static final long MAX_IDLE_TIME = 3;
+private static final long MAX_IDLE_TIME = 200;
 
 @Test
 public void keyAndValueArePublishedWithDefaultOperation() throws Exception 
{
@@ -81,7 +85,7 @@ public class InfinispanProducerTest extends 
InfinispanTestSupport {
 
 @Test
 public void publishKeyAndValueAsync() throws Exception {
-Exchange exchange = template.send("direct:putasync", new Processor() {
+final Exchange exchange = template.send("direct:putasync", new 
Processor() {
 @Override
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(InfinispanConstants.KEY, KEY_ONE);
@@ -89,74 +93,64 @@ public class InfinispanProducerTest extends 
InfinispanTestSupport {
 }
 });
 
-Thread.sleep(1);
-NotifyingFuture resultPutAsync =

[2/2] camel git commit: Fixed CS

2016-03-24 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/8a03f0e4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a03f0e4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a03f0e4

Branch: refs/heads/master
Commit: 8a03f0e40c4496c8f3d806b6502fbb8d69af684e
Parents: 5511429
Author: Andrea Cosentino 
Authored: Thu Mar 24 10:34:31 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 10:34:31 2016 +0100

--
 .../component/infinispan/util/Condition.java| 19 +---
 .../camel/component/infinispan/util/Wait.java   | 24 
 2 files changed, 36 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8a03f0e4/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Condition.java
--
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Condition.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Condition.java
index 917c6e9..bd780ab 100644
--- 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Condition.java
+++ 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Condition.java
@@ -1,8 +1,21 @@
-package org.apache.camel.component.infinispan.util;
-
 /**
- * @author Martin Gencur
+ * 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.infinispan.util;
+
 public interface Condition {
 boolean isSatisfied() throws Exception;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8a03f0e4/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
--
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
index 6806548..65fcefc 100644
--- 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
+++ 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
@@ -1,11 +1,27 @@
+/**
+ * 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.infinispan.util;
 
 import static org.junit.Assert.assertTrue;
 
-/**
- * @author Martin Gencur
- */
-public class Wait {
+public final class Wait {
+
+private Wait() {
+}
 
 public static void waitFor(Condition ec, long timeout) {
 waitFor(ec, timeout, 10);

svn commit: r983572 - in /websites/production/camel/content: cache/main.pageCache servicenow.html

2016-03-24 Thread buildbot 
Author: buildbot
Date: Thu Mar 24 09:18:42 2016
New Revision: 983572

Log:
Production update by buildbot for camel

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

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

Added: websites/production/camel/content/servicenow.html
==
--- websites/production/camel/content/servicenow.html (added)
+++ websites/production/camel/content/servicenow.html Thu Mar 24 09:18:42 2016
@@ -0,0 +1,182 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+  
+  
+  
+  
+  
+  
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  
+
+
+Apache Camel: ServiceNow
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+   
+http://camel.apache.org/;>Camel
+http://www.apache.org;>Apache
+   
+
+  
+
+  
+
+Apache CamelDocumentationComponentsServiceNow
+  
+  
+Download 
| JavaDoc | Source | Forums | Support
+  
+
+
+   
+   
+
+
+ServiceNow 
ComponentAvailable as of Camel 2.18The 
ServiceNow component provides access to all of ServiceNow https://developer.servicenow.com/app.do#!/rest_api_doc?v=fuji; 
rel="nofollow">REST API.Maven users will need to add the 
following dependency to their pom.xml for this component:
+
+URI format
+
+OptionsNameDefault ValueDescriptionuserNamenullThe user name to use for 
authenticationpasswordnullThe password to use for 
authenticationoauthClientIdnullOAuth2 client idoauthClientSecretnullOAuth2 client 
secretoauthTokenUrlhttps://incenceName.service-now.com/oauth_token.doThe OAuth2 token 
urlapiUrlhttps://incenceName.service-now.com/api/nowThe ServiceNow API 
urltablenullThe default table, can 
 be overridden by header CamelServiceNowTableexcludeReferenceLinkfalseTrue to exclude Table API links for reference 
fieldssuppressAutoSysFieldfalseTrue to suppress auto generation of system 
fieldsdisplayValuefalseReturn the display value (true), actual value (false), 
or both (all) for reference fields (default: false)inputDisplayValuefalseTrue to set raw value of input 
fieldsmodelsnullDefines the default model to use for a table i.e 
models.incident = my.company.model.IncidentmapperServiceNow component uses Jackson Databind to translate 
request/response to/from Json and you can customize how it is done by providing 
a custom ObjectMapperHeadersNameTypeDescriptionCamelServiceNowResourceStringThe resource to access TABLE, AGGREGATE, 
IMPORTCamelServiceNowTableStringThe table to accessCamelServiceNowActionStringThe action to perform RETRIEVE, 
CREATE, MODIFY, DELETE, UPDATECamelServiceNowModelClassThe data modelCamelServiceNowSysIdStringServiceNow sysy_idCamelServiceNowQueryStringAn encoded queryCamelServiceNowDisplayValueStringReturn the display value (true), actual value (false), or both 
(all) for reference fields (default: false)CamelServiceNowInputDisplayValueBooleanTrue to set raw value of 
input fieldsCamelServiceNowExcludeReferenceLinkBooleanTrue to exclude Table API 
links for reference fieldsCamelServiceNowFieldsStringComma-separated field names to return in the 
responseCamelServiceNowMinFieldsStringA 
comma-sepa
 rated list of fields for which to calculate the minimum 
valueCamelServiceNowMaxFieldsStringA 
comma-separated list of fields for which to calculate the maximum 
valueCamelServiceNowSumFieldsStringA 
comma-separated list of fields for which to calculate the sum of the 
valuesCamelServiceNowLimitIntegerLimit to be applied on 
paginationCamelServiceNowViewStringUI view to determine fields returned in the 
response.CamelServiceNowSuppressAutoSysFieldBooleanTrue to suppress auto 
generation of system fieldsCamelServiceNowAvgFieldsStringA 
comma-separated list of fields for which to calculate the average 
valueCamelServiceNowCountBooleanA 
boolean flag. You can set this parameter totruefor the number of records returned by the 
queryCamelServiceGroupByStringThe fields to group the 
returned data byCamelServiceOrderByStringA 
list of values to order grouped results byCamelServiceHavingStringAn additional query allowing you to filter the data based on an 
aggregate operationUsage examples:
+

camel git commit: Upgrade Libphonenumber to version 7.2.8

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master d71f9e0be -> 7e12832b8


Upgrade Libphonenumber to version 7.2.8


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

Branch: refs/heads/master
Commit: 7e12832b868e6d4c68c70a81444a4f909c6225cb
Parents: d71f9e0
Author: Andrea Cosentino 
Authored: Thu Mar 24 08:59:05 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 08:59:05 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/7e12832b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 659fa5b..e8768ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -359,7 +359,7 @@
 1.0.43
 2.3.0_3
 1.8
-7.2.7
+7.2.8
 
 1.0.0
 1.2.17

camel git commit: Fixed CS

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master bc771a3e6 -> d71f9e0be


Fixed CS


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

Branch: refs/heads/master
Commit: d71f9e0be3d9d09679eb79172796b7d2beee62c4
Parents: bc771a3
Author: Andrea Cosentino 
Authored: Thu Mar 24 08:52:01 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 08:52:23 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d71f9e0b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7d90c09..659fa5b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -335,7 +335,7 @@
 2.1.0
 1.1.1
 2.2.1
-   1.8.3
+1.8.3
 1.0.1
 1.1.1
 2.1.0_4
@@ -359,7 +359,7 @@
 1.0.43
 2.3.0_3
 1.8
-   7.2.7
+7.2.7
 
 1.0.0
 1.2.17

camel git commit: Upgrade Async Http Client to version 1.9.36

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master d79ddcb67 -> a1627a02a


Upgrade Async Http Client to version 1.9.36


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

Branch: refs/heads/master
Commit: a1627a02abd6d8b3af8df1c08c057d428a14fc1c
Parents: d79ddcb
Author: Andrea Cosentino 
Authored: Thu Mar 24 08:29:48 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 08:29:48 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/a1627a02/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b4c641a..7d90c09 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -36,7 +36,7 @@
 1.1.3
 
 5.13.2
-1.9.35
+1.9.36
 1.7.0_6
 3.5.2_1
 3.5.2_1

camel git commit: Upgrade Aspectj to version 1.8.9

2016-03-24 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master ff595e019 -> d79ddcb67


Upgrade Aspectj to version 1.8.9


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

Branch: refs/heads/master
Commit: d79ddcb675b283ee3c9ab2c4453155bd00badf17
Parents: ff595e0
Author: Andrea Cosentino 
Authored: Thu Mar 24 08:18:41 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Mar 24 08:18:41 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d79ddcb6/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 63831e7..b4c641a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -54,7 +54,7 @@
 
1.0.0.CR9
 3.3.1_1
 3.3.1
-1.8.8
+1.8.9
 2.2.2
 2.4.3
 [2.4,3.0)

camel git commit: CAMEL-9747: Java 8 upgrade - Set source and target to java 1.8

2016-03-24 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 31991b581 -> ff595e019


CAMEL-9747: Java 8 upgrade - Set source and target to java 1.8


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

Branch: refs/heads/master
Commit: ff595e019f974a81dc795a0a9fd5e7a247e466d3
Parents: 31991b5
Author: Claus Ibsen 
Authored: Thu Mar 24 06:54:59 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Mar 24 06:54:59 2016 +0100

--
 .../main/java/org/apache/camel/tools/apt/DocumentationHelper.java  | 1 +
 .../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java| 2 +-
 .../org/apache/camel/tools/apt/EndpointAnnotationProcessor.java| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ff595e01/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index c3e72c5..eadf946 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -34,6 +34,7 @@ import static 
org.apache.camel.tools.apt.helper.JsonSchemaHelper.parseJsonSchema
  * Helper to find documentation for inherited options when a component extends 
another.
  */
 public final class DocumentationHelper {
+
 private DocumentationHelper() {
 //utility class, never constructed
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ff595e01/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 85d340e..325f4d2 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -56,7 +56,7 @@ import static 
org.apache.camel.tools.apt.helper.Strings.safeNull;
  * Process all camel-core's model classes (EIPs and DSL) and generate json 
schema documentation
  */
 @SupportedAnnotationTypes({"javax.xml.bind.annotation.*", 
"org.apache.camel.spi.Label"})
-@SupportedSourceVersion(SourceVersion.RELEASE_7)
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
 
 // special when using expression/predicates in the model

http://git-wip-us.apache.org/repos/asf/camel/blob/ff595e01/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index e686f32..f33dc44 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -62,7 +62,7 @@ import static 
org.apache.camel.tools.apt.helper.Strings.safeNull;
  * Processes all Camel {@link UriEndpoint}s and generate json schema and html 
documentation for the endpoint/component.
  */
 @SupportedAnnotationTypes({"org.apache.camel.spi.*"})
-@SupportedSourceVersion(SourceVersion.RELEASE_7)
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
 
 // CHECKSTYLE:OFF