camel git commit: added the missing license and notice file to the camel-telegram component

2016-10-05 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master fb5901681 -> 03f231e0b


added the missing license and notice file to the camel-telegram component


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

Branch: refs/heads/master
Commit: 03f231e0b7f9a735ae06805ae16d953faa1dad24
Parents: fb59016
Author: Christian Mueller 
Authored: Thu Oct 6 07:57:37 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 07:57:37 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/03f231e0/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-telegram/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-telegram/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 of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by

camel git commit: added the missing license and notice file to the camel-servicenow component

2016-10-05 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master dfa25dbfb -> fb5901681


added the missing license and notice file to the camel-servicenow component


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

Branch: refs/heads/master
Commit: fb5901681c35ad9cbadd243ef98fda73bc29
Parents: dfa25db
Author: Christian Mueller 
Authored: Thu Oct 6 07:54:38 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 07:54:38 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/fb590168/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt
--
diff --git 
a/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-servicenow/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-servicenow/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 of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been

camel git commit: added the missing license and notice file to the camel-cm-sms component

2016-10-05 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master 53afcd0fb -> dfa25dbfb


added the missing license and notice file to the camel-cm-sms component


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

Branch: refs/heads/master
Commit: dfa25dbfb11a2745e7d99d601c4fe1d9d1887f44
Parents: 53afcd0
Author: Christian Mueller 
Authored: Thu Oct 6 07:47:35 2016 +0200
Committer: Christian Mueller 
Committed: Thu Oct 6 07:47:35 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/dfa25dbf/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt
--
diff --git a/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt 
b/components/camel-cm-sms/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++ b/components/camel-cm-sms/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 of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor

camel git commit: CAMEL-10370: Conversion to CxfPayload throws Exception for Non-XML payload

2016-10-05 Thread siano 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x e6d985d2f -> 1df40f5f5


CAMEL-10370: Conversion to CxfPayload throws Exception for Non-XML payload

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

Branch: refs/heads/camel-2.18.x
Commit: 1df40f5f5097eca6c208cdef24be9a75dbcb2510
Parents: e6d985d
Author: Stephan Siano 
Authored: Tue Oct 4 16:25:20 2016 +0200
Committer: Stephan Siano 
Committed: Thu Oct 6 07:42:56 2016 +0200

--
 .../cxf/converter/CxfPayloadConverter.java  | 96 +++-
 .../cxf/converter/CxfPayloadConverterTest.java  | 21 +
 2 files changed, 73 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1df40f5f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 1da3fff..5801a7b 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -36,6 +36,7 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.FallbackConverter;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
@@ -123,54 +124,61 @@ public final class CxfPayloadConverter {
 // use fallback type converter, so we can probably convert into
 // CxfPayloads from other types
 if (type.isAssignableFrom(CxfPayload.class)) {
-if (!value.getClass().isArray()) {
-Source src = null;
-// many of the common format that can have a Source created 
directly
-if (value instanceof InputStream) {
-src = new StreamSource((InputStream) value);
-} else if (value instanceof Reader) {
-src = new StreamSource((Reader) value);
-} else if (value instanceof String) {
-src = new StreamSource(new StringReader((String) value));
-} else if (value instanceof Node) {
-src = new DOMSource((Node) value);
-} else if (value instanceof Source) {
-src = (Source) value;
-}
-if (src == null) {
-// assuming staxsource is preferred, otherwise use the one 
preferred
-TypeConverter tc = 
registry.lookup(javax.xml.transform.stax.StAXSource.class, value.getClass());
-if (tc == null) {
-tc = registry.lookup(Source.class, value.getClass());
+try {
+if (!value.getClass().isArray()) {
+Source src = null;
+// many of the common format that can have a Source created
+// directly
+if (value instanceof InputStream) {
+src = new StreamSource((InputStream)value);
+} else if (value instanceof Reader) {
+src = new StreamSource((Reader)value);
+} else if (value instanceof String) {
+src = new StreamSource(new 
StringReader((String)value));
+} else if (value instanceof Node) {
+src = new DOMSource((Node)value);
+} else if (value instanceof Source) {
+src = (Source)value;
+}
+if (src == null) {
+// assuming staxsource is preferred, otherwise use the
+// one preferred
+TypeConverter tc = 
registry.lookup(javax.xml.transform.stax.StAXSource.class, value.getClass());
+if (tc == null) {
+tc = registry.lookup(Source.class, 
value.getClass());
+}
+if (tc != null) {
+src = tc.convertTo(Source.class, exchange, value);
+}
 }
-if (tc != null) {
-src = tc.convertTo(Source.class,

camel git commit: CAMEL-10345: Logging additional summary for routes coverage in camel-test

2016-10-05 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 1ad9f9da4 -> 53afcd0fb


CAMEL-10345: Logging additional summary for routes coverage in camel-test


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

Branch: refs/heads/master
Commit: 53afcd0fbefe4270d4c90c6a826b5b9e6a459b09
Parents: 1ad9f9d
Author: Tomasz Kopczynski 
Authored: Wed Oct 5 22:12:35 2016 +0200
Committer: Claus Ibsen 
Committed: Wed Oct 5 22:41:44 2016 -0400

--
 .../camel/test/junit4/CamelTestSupport.java | 26 
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/53afcd0f/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
--
diff --git 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index 1ac6918..d264f86 100644
--- 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++ 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -44,6 +44,7 @@ import org.apache.camel.RoutesBuilder;
 import org.apache.camel.Service;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
+import org.apache.camel.api.management.mbean.ManagedRouteMBean;
 import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -57,6 +58,7 @@ import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.management.JmxSystemPropertyKeys;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.Language;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.StopWatch;
@@ -94,6 +96,8 @@ public abstract class CamelTestSupport extends TestSupport {
 private final Map fromEndpoints = new HashMap();
 private CamelTestWatcher camelTestWatcher = new CamelTestWatcher();
 
+private static final String ROUTE_COVERAGE_LOG_ENTRY = "Route coverage ({} 
out of {} routes used)";
+
 /**
  * Use the RouteBuilder or not
  * @return true then {@link CamelContext} will be auto started,
@@ -384,6 +388,15 @@ public abstract class CamelTestSupport extends TestSupport 
{
 if (managedCamelContext == null) {
 log.warn("Cannot dump route coverage to file as JMX is not 
enabled. Override useJmx() method to enable JMX in the unit test classes.");
 } else {
+int routes = managedCamelContext.getTotalRoutes();
+int covered = countCoveredRoutes(context);
+
+if (routes != covered) {
+log.warn(ROUTE_COVERAGE_LOG_ENTRY, covered, routes);
+} else {
+log.info(ROUTE_COVERAGE_LOG_ENTRY, covered, routes);
+}
+
 String xml = managedCamelContext.dumpRoutesCoverageAsXml();
 String combined = "\n" + 
gatherTestDetailsAsXml() + xml + "\n";
 
@@ -411,6 +424,19 @@ public abstract class CamelTestSupport extends TestSupport 
{
 doStopCamelContext(context, camelContextService);
 }
 
+private int countCoveredRoutes(ModelCamelContext context) throws Exception 
{
+int covered = 0;
+
+for (RouteDefinition routeDefinition : context.getRouteDefinitions()) {
+ManagedRouteMBean route = 
context.getManagedRoute(routeDefinition.getId(), ManagedRouteMBean.class);
+if (route.getExchangesTotal() > 0) {
+covered++;
+}
+}
+
+return covered;
+}
+
 @AfterClass
 public static void tearDownAfterClass() throws Exception {
 INIT.remove();

camel git commit: CAMEL-10367: remove stale dependency and version prop, fix a couple typos

2016-10-05 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master bb5709100 -> 1ad9f9da4


CAMEL-10367: remove stale dependency and version prop, fix a couple typos


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

Branch: refs/heads/master
Commit: 1ad9f9da486ee33209da756228e9a9d046f8c3b5
Parents: bb57091
Author: Robert Gemmell 
Authored: Tue Oct 4 12:20:28 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Oct 5 22:39:00 2016 -0400

--
 components/camel-amqp/pom.xml | 7 +--
 components/readme.adoc| 2 +-
 parent/pom.xml| 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1ad9f9da/components/camel-amqp/pom.xml
--
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 6cd4434..fae5e90 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -27,7 +27,7 @@
   camel-amqp
   jar
   Camel :: AMQP
-  Camel AMQP component which is based on the Apache Qid 
project
+  Camel AMQP component which is based on the Apache Qpid 
project
 
   
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1ad9f9da/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index 775c202..4a18a4f 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -13,7 +13,7 @@ Components
 `ahc-ws:httpUri` | To exchange data with external Websocket servers using 
Async Http Client.
 
 | link:camel-amqp/src/main/docs/amqp-component.adoc[AMQP] (camel-amqp) +
-`amqp:destinationType:destinationName` | Messaging with AMQP protocol using 
Apache QPid Client.
+`amqp:destinationType:destinationName` | Messaging with AMQP protocol using 
Apache Qpid Client.
 
 | link:camel-flink/src/main/docs/flink-component.adoc[Apache Flink] 
(camel-flink) +
 `flink:endpointType` | The flink component can be used to send DataSet jobs to 
Apache Flink cluster.

http://git-wip-us.apache.org/repos/asf/camel/blob/1ad9f9da/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 22371d4..bbe94ff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -481,7 +481,6 @@
 1.6.1
 3.1.0
 0.28_1
-0.28
 0.14.0
 0.11.0
 1.8.6_1

camel git commit: CAMEL-10345: camel-test has route coverage summary. Work in progress.

2016-10-05 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/10345 [created] 202c1b2a4


CAMEL-10345: camel-test has route coverage summary. Work in progress.


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

Branch: refs/heads/10345
Commit: 202c1b2a4c442dfb6a6f3f8a784ad3b037fdd4d0
Parents: bb57091
Author: Claus Ibsen 
Authored: Wed Oct 5 22:35:36 2016 -0400
Committer: Claus Ibsen 
Committed: Wed Oct 5 22:35:36 2016 -0400

--
 .../camel/test/junit4/CamelTestSupport.java | 44 
 .../camel/test/patterns/SimpleMockTest.java |  5 +++
 .../src/test/resources/log4j2.properties|  1 +
 3 files changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/202c1b2a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
--
diff --git 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index 1ac6918..15b6164 100644
--- 
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++ 
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -25,7 +25,10 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
@@ -40,10 +43,13 @@ import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.Route;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.Service;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
+import org.apache.camel.api.management.mbean.ManagedProcessMBean;
+import org.apache.camel.api.management.mbean.ManagedRouteMBean;
 import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -387,11 +393,49 @@ public abstract class CamelTestSupport extends 
TestSupport {
 String xml = managedCamelContext.dumpRoutesCoverageAsXml();
 String combined = "\n" + 
gatherTestDetailsAsXml() + xml + "\n";
 
+
+
 File file = new File(dir);
 // ensure dir exists
 file.mkdirs();
 file = new File(dir, name);
 
+// gather summary of number of routes and whether any routes 
was missing
+long total = managedCamelContext.getExchangesTotal();
+
+StringBuffer sb = new StringBuffer();
+sb.append("Coverage Summary\n");
+sb.append("\tCamelContext: 
").append(managedCamelContext.getCamelId()).append(" Total: 
").append(total).append("\n");
+
+// loop routes and get their total counter
+for (Route route : context.getRoutes()) {
+String id = route.getId();
+ManagedRouteMBean managedRoute = 
context.getManagedRoute(id, ManagedRouteMBean.class);
+Long routeTotal = managedRoute.getExchangesTotal();
+int routePercentage = Math.round(total / routeTotal * 100);
+sb.append("\tRoute: ").append(id).append(" Total: 
").append(routeTotal).append(" Percentage: 
").append(routePercentage).append("%\n");
+// find all the processors
+
+MBeanServer server = 
context.getManagementStrategy().getManagementAgent().getMBeanServer();
+if (server != null) {
+String domain = 
context.getManagementStrategy().getManagementAgent().getMBeanServerDefaultDomain();
+ObjectName on = new ObjectName(domain + ":context=" + 
context.getManagementName() + ",type=processors,name=*");
+Set names = server.queryNames(on, null);
+for (ObjectName o : names) {
+String pName = o.getKeyProperty("name");
+pName = ObjectName.unquote(pName);
+ManagedProcessMBean managedProcessor = 
context.getManagedProcessor(pName, ManagedProcessMBean.class);
+if

[1/3] camel git commit: CAMEL-10366: Include input/output/deprecated in the spring model json schema files so they are similar to EIP model files. Thanks to Aurelien Pupier for reporting this.

2016-10-05 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master fa007d74a -> bb5709100


CAMEL-10366: Include input/output/deprecated in the spring model json schema 
files so they are similar to EIP model files. Thanks to Aurelien Pupier for 
reporting this.


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

Branch: refs/heads/master
Commit: 8127bbfbfe4b37466cd84f9cc5c1148a9ed665cd
Parents: fa007d7
Author: Claus Ibsen 
Authored: Wed Oct 5 11:49:18 2016 -0400
Committer: Claus Ibsen 
Committed: Wed Oct 5 11:49:18 2016 -0400

--
 .../org/apache/camel/tools/apt/SpringAnnotationProcessor.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8127bbfb/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
index 064872f..e6ea40c 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
@@ -128,7 +128,10 @@ public class SpringAnnotationProcessor {
 }
 buffer.append("\n\"description\": 
\"").append(safeNull(eipModel.getDescription())).append("\",");
 buffer.append("\n\"javaType\": 
\"").append(eipModel.getJavaType()).append("\",");
-buffer.append("\n\"label\": 
\"").append(safeNull(eipModel.getLabel())).append("\"");
+buffer.append("\n\"label\": 
\"").append(safeNull(eipModel.getLabel())).append("\",");
+buffer.append("\n\"deprecated\": 
\"").append("false").append("\",");
+buffer.append("\n\"input\": \"").append("false").append("\",");
+buffer.append("\n\"output\": \"").append("false").append("\"");
 buffer.append("\n  },");
 
 buffer.append("\n  \"properties\": {");

[2/3] camel git commit: Fixed syntax on endpoint for component docs in camel-chronicele

2016-10-05 Thread davsclaus 
Fixed syntax on endpoint for component docs in camel-chronicele


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

Branch: refs/heads/master
Commit: 52a962ba8a93c67f0fb71f17cec108a5c74a9423
Parents: 8127bbf
Author: Claus Ibsen 
Authored: Wed Oct 5 11:53:41 2016 -0400
Committer: Claus Ibsen 
Committed: Wed Oct 5 11:53:41 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/camel/blob/52a962ba/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
--
diff --git 
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
 
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
index 2c8a1ec..9bc32d3 100644
--- 
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
+++ 
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
@@ -27,11 +27,11 @@ import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.ObjectHelper;
 
-@UriEndpoint(scheme = "consul", title = "Consul", syntax = 
"consul://apiEndpoint", label = "api,cloud")
+@UriEndpoint(scheme = "consul", title = "Consul", syntax = 
"consul:apiEndpoint", label = "api,cloud")
 public class ConsulEndpoint extends DefaultEndpoint {
 
 @UriParam(description = "The consul configuration")
-@Metadata(required = "true")
+@Metadata
 private final ConsulConfiguration configuration;
 
 @UriPath(description = "The API endpoint")

[3/3] camel git commit: Fixed camel-chronoicle component docs and schema

2016-10-05 Thread davsclaus 
Fixed camel-chronoicle component docs and schema


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

Branch: refs/heads/master
Commit: bb570910090c71abd4bb813214e8bde4414d519c
Parents: 52a962b
Author: Claus Ibsen 
Authored: Wed Oct 5 12:11:32 2016 -0400
Committer: Claus Ibsen 
Committed: Wed Oct 5 12:11:32 2016 -0400

--
 .../main/docs/chronicle-engine-component.adoc   | 12 +++-
 .../engine/ChronicleEngineComponent.java|  9 ++-
 .../engine/ChronicleEngineConfiguration.java| 63 +---
 .../engine/ChronicleEngineEndpoint.java | 42 -
 4 files changed, 43 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bb570910/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
--
diff --git 
a/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc 
b/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
index 1d79ecb..3f8998b 100644
--- a/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
+++ b/components/camel-chronicle/src/main/docs/chronicle-engine-component.adoc
@@ -6,13 +6,21 @@ The Chronicle Engine component has no options.
 
 
 // endpoint options: START
-The Chronicle Engine component supports 5 endpoint options which are listed 
below:
+The Chronicle Engine component supports 13 endpoint options which are listed 
below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
-| path | common |  | String | *Required* engine path
+| addresses | common |  | String | *Required* Engine addresses. Multiple 
addresses can be separated by comman.
+| path | common |  | String | *Required* Engine path
+| action | common |  | String | The default action to perform valid values 
are: - PUBLISH - PPUBLISH_AND_INDEX - PPUT - PGET_AND_PUT - PPUT_ALL - 
PPUT_IF_ABSENT - PGET - PGET_AND_REMOVE - PREMOVE - PIS_EMPTY - PSIZE
+| filteredMapEvents | common |  | String | A comma separated list of Map event 
type to filer valid values are: INSERT UPDATE REMOVE.
+| persistent | common | true | boolean | Enable/disable data persistence
+| subscribeMapEvents | common | true | boolean | Set if consumer should 
subscribe to Map events default true.
+| subscribeTopicEvents | common | false | boolean | Set if consumer should 
subscribe to TopicEventsd efault false.
+| subscribeTopologicalEvents | common | false | boolean | Set if consumer 
should subscribe to TopologicalEventsd efault false.
+| wireType | common | BINARY | String | The Wire type to use default to binary 
wire.
 | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN/ERROR level and ignored.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN/ERROR level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.

http://git-wip-us.apache.org/repos/asf/camel/blob/bb570910/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
--
diff --git 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
index 06d7d7d..eb26058 100644
--- 
a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
+++ 
b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
@@ -39,12 +39,11 @@ public class ChronicleEngineComponent extends 
UriEndpointComponent {
 @Override
 protected Endpoint createEndpoint(String uri, String remaining, 
Map

buildbot success in on camel-site-production

2016-10-05 Thread buildbot 
The Buildbot has detected a restored build on builder camel-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/11128

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

2016-10-05 Thread buildbot 
The Buildbot has detected a new failure on builder camel-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/11127

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

camel git commit: CAMEL-10370: Conversion to CxfPayload throws Exception for Non-XML payload

2016-10-05 Thread siano 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x b0d37a924 -> 091855d68


CAMEL-10370: Conversion to CxfPayload throws Exception for Non-XML payload

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

Branch: refs/heads/camel-2.17.x
Commit: 091855d68cd1ff7f16217f54c5752c16893b624d
Parents: b0d37a9
Author: Stephan Siano 
Authored: Tue Oct 4 16:25:20 2016 +0200
Committer: Stephan Siano 
Committed: Wed Oct 5 12:16:00 2016 +0200

--
 .../cxf/converter/CxfPayloadConverter.java  | 96 +++-
 .../cxf/converter/CxfPayloadConverterTest.java  | 21 +
 2 files changed, 73 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/091855d6/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 1da3fff..5801a7b 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -36,6 +36,7 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.FallbackConverter;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
@@ -123,54 +124,61 @@ public final class CxfPayloadConverter {
 // use fallback type converter, so we can probably convert into
 // CxfPayloads from other types
 if (type.isAssignableFrom(CxfPayload.class)) {
-if (!value.getClass().isArray()) {
-Source src = null;
-// many of the common format that can have a Source created 
directly
-if (value instanceof InputStream) {
-src = new StreamSource((InputStream) value);
-} else if (value instanceof Reader) {
-src = new StreamSource((Reader) value);
-} else if (value instanceof String) {
-src = new StreamSource(new StringReader((String) value));
-} else if (value instanceof Node) {
-src = new DOMSource((Node) value);
-} else if (value instanceof Source) {
-src = (Source) value;
-}
-if (src == null) {
-// assuming staxsource is preferred, otherwise use the one 
preferred
-TypeConverter tc = 
registry.lookup(javax.xml.transform.stax.StAXSource.class, value.getClass());
-if (tc == null) {
-tc = registry.lookup(Source.class, value.getClass());
+try {
+if (!value.getClass().isArray()) {
+Source src = null;
+// many of the common format that can have a Source created
+// directly
+if (value instanceof InputStream) {
+src = new StreamSource((InputStream)value);
+} else if (value instanceof Reader) {
+src = new StreamSource((Reader)value);
+} else if (value instanceof String) {
+src = new StreamSource(new 
StringReader((String)value));
+} else if (value instanceof Node) {
+src = new DOMSource((Node)value);
+} else if (value instanceof Source) {
+src = (Source)value;
+}
+if (src == null) {
+// assuming staxsource is preferred, otherwise use the
+// one preferred
+TypeConverter tc = 
registry.lookup(javax.xml.transform.stax.StAXSource.class, value.getClass());
+if (tc == null) {
+tc = registry.lookup(Source.class, 
value.getClass());
+}
+if (tc != null) {
+src = tc.convertTo(Source.class, exchange, value);
+}
 }
-if (tc != null) {
-src = tc.convertTo(Source.class,

buildbot success in on camel-site-production

2016-10-05 Thread buildbot 
The Buildbot has detected a restored build on builder camel-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/11121

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r998906 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache timer.html

2016-10-05 Thread buildbot 
Author: buildbot
Date: Wed Oct  5 09:22:09 2016
New Revision: 998906

Log:
Production update by buildbot for camel

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

Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Wed Oct  5 
09:22:09 2016
@@ -621,8 +621,8 @@ cometds://localhost:8443/service/mychann
  
   When using CXF in streaming modes (see DataFormat option), then also read 
about Stream caching.
  
-The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to 
JAX-WS services hosted in CXF./**/ 
div.rbtoc1474791649730 {padding: 0px;} div.rbtoc1474791649730 ul {list-style: 
disc;margin-left: 0px;} div.rbtoc1474791649730 li {margin-left: 
0px;padding-left: 0px;} /**/
-  
+The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to 
JAX-WS services hosted in CXF./**/ 
div.rbtoc1475659129898 {padding: 0px;} div.rbtoc1475659129898 ul {list-style: 
disc;margin-left: 0px;} div.rbtoc1475659129898 li {margin-left: 
0px;padding-left: 0px;} /**/
+  
   CXF Component 
 URI formatOptions 
   The descriptions 
of the dataformats 
@@ -5970,7 +5970,7 @@ test.endpoint = result2
  
 Options
   
-  NameDefault ValueDescriptiontimenullA java.util.Date the 
first event should be generated. If using the URI, the pattern 
expected is: -MM-dd HH:mm:ss or 
-MM-dd'T'HH:mm:ss.patternnullAllows you to specify a custom 
Date pattern to use for setting the time option using 
 URI syntax.period1000If greater than 0, generate periodic events every 
period milliseconds.delay0 / 
1000The number of milliseconds to wait before the first 
event is generated. Should not be used in conjunction with the 
time option. The default value has been changed to 
1000 from Camel 2.11 onwards. In older releases 
the default value is 0.From Camel 2.17 is 
possible to specify a negative delay. In this scenario the time
 r will generate and fire events as soon as possible.fixedRatefalseEvents take place at approximately regular 
intervals, separated by the specified period.daemontrueSpecifies whether or not the thread 
associated with the timer endpoint runs as a daemon.repeatCount0Camel 2.8: Specifies a 
maximum limit of number of fires. So if
  you set it to 1, the timer will only fire once. If you set it to 5, it will 
only fire five times. A value of zero or negative means fire 
forever. 
+  NameDefault ValueDescriptiontimenullA java.util.Date the 
first event should be generated. If using the URI, the pattern 
expected is: -MM-dd HH:mm:ss or 
-MM-dd'T'HH:mm:ss.patternnullAllows you to specify a custom 
Date pattern to use for setting the time option using 
 URI syntax.period1000If greater than 0, generate periodic events every 
period milliseconds.You can also specify time 
values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), 
and 1h (1 hour).delay0 / 
1000The number of milliseconds to wait before the first 
event is generated. Should not be used in conjunction with the 
time option.You can also specify time 
values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 s
 econds), and 1h (1 hour).Before Camel 
2.11 the default value is 0From Camel 
2.11 the default value is 1000From Camel 2.17 it is possible to 
specify a negative delay. In this scenario the timer will generate and fire 
events as soon as possible.fixedRatefalseEvents take place at approximately regular 
intervals, separated by the specified period.daemontrueSpecifies whether or not the thread 
associated with 
 the timer endpoint runs as a daemon.repeatCount0Camel 2.8: 
Specifies a maximum limit of number of fires. So if you set it to 1, the timer 
will only fire once. If you set it to 5, it will only fire five times. A value 
of zero or negative means fire forever. 
  
 Exchange 
PropertiesWhen the timer is fired, it adds the following information as 
properties to the Exchange:
   

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 Wed Oct  5 09:22:09 
2016
@@ -4040,11 +4040,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

camel git commit: CAMEL-10370: Conversion to CxfPayload throws Exception for Non-XML payload

2016-10-05 Thread siano 
Repository: camel
Updated Branches:
  refs/heads/master ee78cb64c -> fa007d74a


CAMEL-10370: Conversion to CxfPayload throws Exception for Non-XML payload

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

Branch: refs/heads/master
Commit: fa007d74a22ba5d27fd1fbd9b58bc15786ea5280
Parents: ee78cb6
Author: Stephan Siano 
Authored: Tue Oct 4 16:25:20 2016 +0200
Committer: Stephan Siano 
Committed: Wed Oct 5 11:11:40 2016 +0200

--
 .../cxf/converter/CxfPayloadConverter.java  | 96 +++-
 .../cxf/converter/CxfPayloadConverterTest.java  | 21 +
 2 files changed, 73 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fa007d74/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 1da3fff..5801a7b 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -36,6 +36,7 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.FallbackConverter;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
@@ -123,54 +124,61 @@ public final class CxfPayloadConverter {
 // use fallback type converter, so we can probably convert into
 // CxfPayloads from other types
 if (type.isAssignableFrom(CxfPayload.class)) {
-if (!value.getClass().isArray()) {
-Source src = null;
-// many of the common format that can have a Source created 
directly
-if (value instanceof InputStream) {
-src = new StreamSource((InputStream) value);
-} else if (value instanceof Reader) {
-src = new StreamSource((Reader) value);
-} else if (value instanceof String) {
-src = new StreamSource(new StringReader((String) value));
-} else if (value instanceof Node) {
-src = new DOMSource((Node) value);
-} else if (value instanceof Source) {
-src = (Source) value;
-}
-if (src == null) {
-// assuming staxsource is preferred, otherwise use the one 
preferred
-TypeConverter tc = 
registry.lookup(javax.xml.transform.stax.StAXSource.class, value.getClass());
-if (tc == null) {
-tc = registry.lookup(Source.class, value.getClass());
+try {
+if (!value.getClass().isArray()) {
+Source src = null;
+// many of the common format that can have a Source created
+// directly
+if (value instanceof InputStream) {
+src = new StreamSource((InputStream)value);
+} else if (value instanceof Reader) {
+src = new StreamSource((Reader)value);
+} else if (value instanceof String) {
+src = new StreamSource(new 
StringReader((String)value));
+} else if (value instanceof Node) {
+src = new DOMSource((Node)value);
+} else if (value instanceof Source) {
+src = (Source)value;
+}
+if (src == null) {
+// assuming staxsource is preferred, otherwise use the
+// one preferred
+TypeConverter tc = 
registry.lookup(javax.xml.transform.stax.StAXSource.class, value.getClass());
+if (tc == null) {
+tc = registry.lookup(Source.class, 
value.getClass());
+}
+if (tc != null) {
+src = tc.convertTo(Source.class, exchange, value);
+}
 }
-if (tc != null) {
-src = tc.convertTo(Source.class, exchange,

camel git commit: Upgrade Narayana to version 5.3.5.Final

2016-10-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master f92b853ee -> ee78cb64c


Upgrade Narayana to version 5.3.5.Final


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

Branch: refs/heads/master
Commit: ee78cb64c3228976a46506d8bc6e0ffd49826abb
Parents: f92b853
Author: Andrea Cosentino 
Authored: Wed Oct 5 11:01:56 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 5 11:01:56 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/ee78cb64/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 11015df..22371d4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -442,7 +442,7 @@
 0.9.3_1
 2.3.1.Final
 3.4.1
-5.3.4.Final
+5.3.5.Final
 3.0.1
 3.10.6.Final
 4.1.5.Final

camel git commit: Upgrade Jolokia to version 1.3.5

2016-10-05 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 5336f1153 -> f92b853ee


Upgrade Jolokia to version 1.3.5


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

Branch: refs/heads/master
Commit: f92b853ee2ae1080613d1e07d674d1419eeb29f6
Parents: 5336f11
Author: Andrea Cosentino 
Authored: Wed Oct 5 10:22:22 2016 +0200
Committer: Andrea Cosentino 
Committed: Wed Oct 5 10:22:22 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/f92b853e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9295fa4..11015df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -338,7 +338,7 @@
 1.5
 1.6.2
 2.9.4
-1.3.4
+1.3.5
 0.0.22
 0.0.22_1
 0.9.5

buildbot failure in on camel-site-production

2016-10-05 Thread buildbot 
The Buildbot has detected a new failure on builder camel-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/11120

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot