[1/2] camel git commit: Add forgotton redelivery option in xml dsl
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 378e9c1f1 - f75a68706
refs/heads/master e08c8700b - ef764be21
Add forgotton redelivery option in xml dsl
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef764be2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef764be2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef764be2
Branch: refs/heads/master
Commit: ef764be21255fe629fed6cd79eb6fb93915cc92a
Parents: e08c870
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 11 20:42:17 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 11 20:42:28 2015 +0100
--
.../xml/AbstractCamelRedeliveryPolicyFactoryBean.java | 13 +
1 file changed, 13 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ef764be2/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
index b36232c..f353415 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
@@ -66,6 +66,8 @@ public abstract class
AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
@XmlAttribute
private String logExhausted;
@XmlAttribute
+private String logExhaustedMessageHistory;
+@XmlAttribute
private String disableRedelivery;
@XmlAttribute
private String delayPattern;
@@ -129,6 +131,9 @@ public abstract class
AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
if (logExhausted != null) {
answer.setLogExhausted(CamelContextHelper.parseBoolean(context,
logExhausted));
}
+if (logExhaustedMessageHistory != null) {
+
answer.setLogExhaustedMessageHistory(CamelContextHelper.parseBoolean(context,
logExhaustedMessageHistory));
+}
if (disableRedelivery != null) {
if (CamelContextHelper.parseBoolean(context, disableRedelivery)) {
answer.setMaximumRedeliveries(0);
@@ -279,6 +284,14 @@ public abstract class
AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
this.logExhausted = logExhausted;
}
+public String getLogExhaustedMessageHistory() {
+return logExhaustedMessageHistory;
+}
+
+public void setLogExhaustedMessageHistory(String
logExhaustedMessageHistory) {
+this.logExhaustedMessageHistory = logExhaustedMessageHistory;
+}
+
public String getDisableRedelivery() {
return disableRedelivery;
}
[2/2] camel git commit: Add forgotton redelivery option in xml dsl
Add forgotton redelivery option in xml dsl
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f75a6870
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f75a6870
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f75a6870
Branch: refs/heads/camel-2.15.x
Commit: f75a687063bd1d3929ada2f1c1196e9a7a3e1450
Parents: 378e9c1
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 11 20:42:17 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 11 20:43:00 2015 +0100
--
.../xml/AbstractCamelRedeliveryPolicyFactoryBean.java | 13 +
1 file changed, 13 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f75a6870/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
index b36232c..f353415 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
@@ -66,6 +66,8 @@ public abstract class
AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
@XmlAttribute
private String logExhausted;
@XmlAttribute
+private String logExhaustedMessageHistory;
+@XmlAttribute
private String disableRedelivery;
@XmlAttribute
private String delayPattern;
@@ -129,6 +131,9 @@ public abstract class
AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
if (logExhausted != null) {
answer.setLogExhausted(CamelContextHelper.parseBoolean(context,
logExhausted));
}
+if (logExhaustedMessageHistory != null) {
+
answer.setLogExhaustedMessageHistory(CamelContextHelper.parseBoolean(context,
logExhaustedMessageHistory));
+}
if (disableRedelivery != null) {
if (CamelContextHelper.parseBoolean(context, disableRedelivery)) {
answer.setMaximumRedeliveries(0);
@@ -279,6 +284,14 @@ public abstract class
AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
this.logExhausted = logExhausted;
}
+public String getLogExhaustedMessageHistory() {
+return logExhaustedMessageHistory;
+}
+
+public void setLogExhaustedMessageHistory(String
logExhaustedMessageHistory) {
+this.logExhaustedMessageHistory = logExhaustedMessageHistory;
+}
+
public String getDisableRedelivery() {
return disableRedelivery;
}
camel git commit: added missing license and notice files
Repository: camel Updated Branches: refs/heads/master 88f7a86b7 - 4ccd72677 added missing license and notice files Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ccd7267 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ccd7267 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ccd7267 Branch: refs/heads/master Commit: 4ccd72677a363d001eee7346d3bb5852aa5dbf3a Parents: 88f7a86 Author: Christian Mueller cmuel...@apache.org Authored: Wed Mar 11 08:53:27 2015 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Wed Mar 11 08:53:27 2015 +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/4ccd7267/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt -- diff --git a/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt b/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt new file mode 100755 index 000..6b0b127 --- /dev/null +++ b/components/camel-google-calendar/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 +
[2/2] camel git commit: Updated the spring.schemas versions
Updated the spring.schemas versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/378e9c1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/378e9c1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/378e9c1f
Branch: refs/heads/camel-2.15.x
Commit: 378e9c1f1a365d13e5ef76a128618c4f188dd98a
Parents: 8937742
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 11 16:28:40 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 16:30:06 2015 +0800
--
.../camel-cxf/src/main/resources/META-INF/spring.schemas | 7 +++
.../src/main/resources/META-INF/spring.schemas| 7 +++
.../src/main/resources/META-INF/spring.schemas| 7 +++
.../camel-spring/src/main/resources/META-INF/spring.schemas | 7 +++
4 files changed, 28 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/378e9c1f/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 9f71194..616f2c9 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -70,7 +70,14 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.13.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/378e9c1f/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index b7643ef..a4a6c0d 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -67,7 +67,14 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.2.xsd=schema/camel-spring-integration.xsd
[1/2] camel git commit: Updated the spring.schemas versions
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 55633081a - 3515a52da
refs/heads/camel-2.15.x 893774209 - 378e9c1f1
Updated the spring.schemas versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3515a52d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3515a52d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3515a52d
Branch: refs/heads/camel-2.14.x
Commit: 3515a52da047ece92c553428e5cdedd127de219f
Parents: 5563308
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 11 16:25:32 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 16:25:32 2015 +0800
--
.../camel-cxf/src/main/resources/META-INF/spring.schemas | 6 ++
.../src/main/resources/META-INF/spring.schemas | 6 ++
.../src/main/resources/META-INF/spring.schemas | 6 ++
.../camel-spring/src/main/resources/META-INF/spring.schemas| 6 ++
4 files changed, 24 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3515a52d/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 9f71194..da6ae55 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -70,7 +70,13 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.13.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/3515a52d/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index b7643ef..515d1be 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -67,7 +67,13 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd
svn commit: r943340 [2/3] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/camel-2150-release.html == --- websites/production/camel/content/camel-2150-release.html (original) +++ websites/production/camel/content/camel-2150-release.html Wed Mar 11 11:30:43 2015 @@ -84,7 +84,7 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth1 id=Camel2.15.0Release-Camel2.15.0release(currentlyinprogress)Camel#160;2.15.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px;pimg class=confluence-embedded-image confluence-external-resource src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv style=min-height:200px#160;/divh2 id=Camel2.15.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.15.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pullispanComponent, data format, language and eip documentation now included in the built component JARs. And Java API and JMX API to access that documentation. And APIs to explain an endpoint uri, eip configuration and what all those configured options mean. In other words the same level of complete d ocumentation of your Camel apps at both design and runtime, accessible from Java / JMX and tooling./span/lilispanComponent, data format, language and eip can now have#160;associated#160;label(s) which are used for grouping components into: core, database, messaging, http, rest, etc./span/lilispanThe XML DSL schema now include documentation/span/lilispanProvide Configurer for user to configure the CXF conduit and CXF destination from Java code/span/lilispanspanAdded a codeDelegateEndpoint/code#160;interface into Camel API/span/span/liliSupport to setup the SslContextParameters in the a shape=rect href=restlet.htmlcamel-restlet/a component/liliJava DSL - Should support nested choice in doTry .. doCatch/lilia shape=rect href=mongodb.htmlMongoDb/a component now a shape=rect class=external-link href=https://issues.apache.org/jira/browse/CAMEL-7996;stores OIDs/a#160;of the inserted records in the message he ader/lilia shape=rect href=recipient-list.htmlRecipient List/a now supports specifying custom#160;a shape=rect href=exchange-pattern.htmlExchange Pattern/a in the endpoint ur's/lilia shape=rect href=type-converter.htmlType Converter/a to enum's is now case insensitive, so you can convert safely level=info to an enum with name Level.INFO etc./lilia shape=rect href=xslt.htmlXSLT/a and#160;a shape=rect href=https://cwiki.apache.org/confluence/display/SM/Validation;Validation/a components now provides all their endpoint configurations in the endpoint, and not only in the component, making these components like any other components./liliMade the a shape=rect href=karaf.htmlCamel Karaf Commands/a reusable by moving common code into a#160;codecamel-commands-core/code module that SPI can extend and plugin Camel commands for other environments./liliFurther hardening of the#160;a shape=rect href=sjms.htmlSJMS/a #160;component./lilia shape=rect href=rest-dsl.htmlRest DSL/a with embedded routes now supports a shape=rect href=exception-clause.htmlonException/a, a shape=rect href=intercept.htmlintercept/a etc in use for those embedded routes, just like any regular routes.#160;/lilia shape=rect href=rest-dsl.htmlRest DSL/a now by default uses custom error message as-is without attempting to binding output (requires a HTTP error code of 300+ is set as a header)/liliCamel#160;a shape=rect href=using-propertyplaceholder.htmlUsing PropertyPlaceholder/a now supports specifying a default value together with the key to lookup./liliCamel#160;a shape=rect href=using-propertyplaceholder.htmlUsing PropertyPlaceholder/a now supports not having to define a PropertiesComponent if all the placeholder keys has default values which are to be used (less configuration needed in those situations)./liliCamel#160;a shape=rect href=using-pro pertyplaceholder.htmlUsing PropertyPlaceholder/a now supports 3rd party functions to lookup the property values, this allow end users to implement their own logic - we provide 3 out of the box functions to lookup values from OS environment variable, JVM system properties, or the service name idiom./lilia shape=rect href=rabbitmq.htmlRabbitMQ/a now pools Channels for the producer to avoid sharing same Channel among concurrent producers which are not recommended by RabbitMQ client./liliCamel commands is now reusable outside Apache Karaf as a base by the#160;codecommands-core/code module./liliCamel commands using a shape=rect class=external-link href=http://www.jolokia.org/; rel=nofollowJolokia/a for remote communication by the#160;codecommands-jolokia/code module./liliMore minor processors such as setHeader, removeHeader,
svn commit: r943340 [3/3] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/error-handler.html == --- websites/production/camel/content/error-handler.html (original) +++ websites/production/camel/content/error-handler.html Wed Mar 11 11:30:43 2015 @@ -86,56 +86,21 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth2 id=ErrorHandler-ErrorHandlerError Handler/h2 - -pCamel supports pluggable a shape=rect class=external-link href=http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/ErrorHandler.html;ErrorHandler/a strategies to deal with errors processing an a shape=rect href=event-driven-consumer.htmlEvent Driven Consumer/a. An alternative is to specify the error handling directly in the a shape=rect href=dsl.htmlDSL/a using the a shape=rect href=exception-clause.htmlException Clause/a./p - -pFor introduction and background material see a shape=rect href=error-handling-in-camel.htmlError handling in Camel/a./p - -div class=aui-message success shadowed information-macro +div class=wiki-content maincontenth2 id=ErrorHandler-ErrorHandlerError Handler/h2pCamel supports pluggable a shape=rect class=external-link href=http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/ErrorHandler.html;ErrorHandler/a strategies to deal with errors processing an a shape=rect href=event-driven-consumer.htmlEvent Driven Consumer/a. An alternative is to specify the error handling directly in the a shape=rect href=dsl.htmlDSL/a using the a shape=rect href=exception-clause.htmlException Clause/a./ppFor introduction and background material see a shape=rect href=error-handling-in-camel.htmlError handling in Camel/a./pdiv class=aui-message success shadowed information-macro p class=titleException Clause/p span class=aui-icon icon-successIcon/span div class=message-content - -pUsing a shape=rect href=error-handler.htmlError Handler/a combined with a shape=rect href=exception-clause.htmlException Clause/a is a very powerful combination. We encourage end-users to use this combination in your error handling strategies. See samples and a shape=rect href=exception-clause.htmlException Clause/a./p +pUsing a shape=rect href=error-handler.htmlError Handler/a combined with a shape=rect href=exception-clause.htmlException Clause/a is a very powerful combination. We encourage end-users to use this combination in your error handling strategies. See samples and a shape=rect href=exception-clause.htmlException Clause/a./p /div /div - - div class=aui-message success shadowed information-macro p class=titleUsing try ... catch ... finally/p span class=aui-icon icon-successIcon/span div class=message-content - -pRelated to error handling is the a shape=rect href=try-catch-finally.htmlTry Catch Finally/a as DSL you can use directly in your route. Its basically a mimic of the regular try catch finally in the Java language but with more power./p +pRelated to error handling is the a shape=rect href=try-catch-finally.htmlTry Catch Finally/a as DSL you can use directly in your route. Its basically a mimic of the regular try catch finally in the Java language but with more power./p /div /div - - -pThe current implementations Camel provides out of the box are:/p - -h4 id=ErrorHandler-NontransactedNon transacted/h4 -ullia shape=rect href=defaulterrorhandler.htmlDefaultErrorHandler/a is the default error handler in Camel. This error handler does not support a dead letter queue, it will propagate exceptions back to the caller, as if there where no error handler at all. It has a limited set of features./lilia shape=rect href=dead-letter-channel.htmlDead Letter Channel/a which supports attempting to redeliver the message exchange a number of times before sending it to a dead letter endpoint/liliLoggingErrorHandler for just catching and logging exceptions/liliNoErrorHandler for no error handling/li/ul - - -h4 id=ErrorHandler-TransactedTransacted/h4 -ullia shape=rect href=transactionerrorhandler.htmlTransactionErrorHandler/a is the default error handler in Camel for transacted routes. See the a shape=rect href=transactional-client.htmlTransactional Client/a EIP pattern./li/ul - - -pThese error handlers can be applied in the a shape=rect href=dsl.htmlDSL/a to an entire set of rules or a specific routing rule as we show in the next examples. Error handling rules are inherited on each routing rule within a single a shape=rect href=routebuilder.htmlRouteBuilder/a/p - -h3 id=ErrorHandler-ShortSummaryoftheprovidedErrorHandlersShort Summary of the provided Error
[3/3] camel git commit: CAMEL-7808 Added a karaf integration test
CAMEL-7808 Added a karaf integration test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3754f4c4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3754f4c4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3754f4c4
Branch: refs/heads/master
Commit: 3754f4c46d3522e15915a2f5094c5492c6df41c6
Parents: 803a62a
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 11 17:31:28 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 17:31:28 2015 +0800
--
.../apache/camel/itest/karaf/CamelBoonTest.java | 46
1 file changed, 46 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3754f4c4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
new file mode 100644
index 000..5b5901b
--- /dev/null
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
@@ -0,0 +1,46 @@
+/**
+ * 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.itest.karaf;
+
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.BoonDataFormat;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelBoonTest extends AbstractFeatureTest {
+
+public static final String COMPONENT = extractName(CamelBoonTest.class);
+
+protected DataFormatDefinition createDataformatDefinition(String format) {
+return new BoonDataFormat();
+}
+
+@Test
+public void test() throws Exception {
+testDataFormat(COMPONENT);
+}
+
+@Configuration
+public static Option[] configure() {
+return configure(COMPONENT);
+}
+
+}
[1/3] camel git commit: CAMEL-7808 - Added version 1 of camel-boon
Repository: camel
Updated Branches:
refs/heads/master 188769f8a - 3754f4c46
CAMEL-7808 - Added version 1 of camel-boon
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2470023e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2470023e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2470023e
Branch: refs/heads/master
Commit: 2470023e25b8814279cbadb3ebc8002bed6d8fc8
Parents: 188769f
Author: Gareth Healy garethahe...@gmail.com
Authored: Mon Mar 9 14:27:05 2015 +
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 17:07:24 2015 +0800
--
.../src/main/descriptors/common-bin.xml | 1 +
.../camel/model/dataformat/BoonDataFormat.java | 64 ++
components/camel-boon/pom.xml | 70 +++
.../camel/component/boon/BoonDataFormat.java| 98 +
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/dataformat/boon | 18 ++
.../component/boon/BoonConcurrentTest.java | 78 +++
.../component/boon/BoonDataFormatTest.java | 85
.../apache/camel/component/boon/TestPojo.java | 45
.../src/test/resources/log4j.properties | 36
components/pom.xml | 1 +
parent/pom.xml | 6 +
.../features/src/main/resources/features.xml| 5 +
14 files changed, 721 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2470023e/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 3e3ed65..7515fa8 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -40,6 +40,7 @@
includeorg.apache.camel:camel-beanstalk/include
includeorg.apache.camel:camel-bean-validator/include
includeorg.apache.camel:camel-bindy/include
+includeorg.apache.camel:camel-boon/include
includeorg.apache.camel:camel-box/include
includeorg.apache.camel:camel-blueprint/include
includeorg.apache.camel:camel-cache/include
http://git-wip-us.apache.org/repos/asf/camel/blob/2470023e/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
b/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
new file mode 100644
index 000..a1ba363
--- /dev/null
+++
b/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
@@ -0,0 +1,64 @@
+/**
+ * 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.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Metadata;
+
+/**
+ * Boon data format
+ */
+@Metadata(label = dataformat,transformation)
+@XmlRootElement(name = boon)
+@XmlAccessorType(XmlAccessType.FIELD)
+public class BoonDataFormat extends DataFormatDefinition {
+
+@XmlAttribute(required = true)
+private Class? unmarshalType;
+
+public BoonDataFormat() {
+super(boon);
+}
+
+public BoonDataFormat(Class? unmarshalType) {
+this();
+setUnmarshalType(unmarshalType);
+}
+
+public Class? getUnmarshalType() {
+return unmarshalType;
+}
+
+public void setUnmarshalType(Class? unmarshalType) {
+this.unmarshalType = unmarshalType;
+}
+
+@Override
+protected void
[2/3] camel git commit: CAMEL-8473 Fixed CS error
CAMEL-8473 Fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/803a62a2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/803a62a2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/803a62a2
Branch: refs/heads/master
Commit: 803a62a21f1641eb3bbc0a510e60f1aa730f9de3
Parents: 2470023
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 11 17:30:08 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 17:30:08 2015 +0800
--
.../apache/camel/spring/handler/ErrorHandlerDefinitionParser.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/803a62a2/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
--
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
index 5ca1974..65ae81a 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
@@ -147,7 +147,8 @@ public class ErrorHandlerDefinitionParser extends
BeanDefinitionParser {
+ type.name() + , in error handler with id: + id);
}
String onPrepareFailureRef =
element.getAttribute(onPrepareFailureRef);
-if (ObjectHelper.isNotEmpty(onPrepareFailureRef)
(type.equals(ErrorHandlerType.TransactionErrorHandler) ||
type.equals(ErrorHandlerType.LoggingErrorHandler) ||
type.equals(ErrorHandlerType.NoErrorHandler))) {
+if (ObjectHelper.isNotEmpty(onPrepareFailureRef)
(type.equals(ErrorHandlerType.TransactionErrorHandler) ||
type.equals(ErrorHandlerType.LoggingErrorHandler)
+|| type.equals(ErrorHandlerType.NoErrorHandler))) {
throw new IllegalArgumentException(Attribute onPrepareFailureRef
is not supported by error handler type:
+ type.name() + , in error handler with id: + id);
}
svn commit: r943340 [1/3] - in /websites/production/camel/content: ./ cache/
Author: buildbot
Date: Wed Mar 11 11:30:43 2015
New Revision: 943340
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/book-pattern-appendix.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2150-release.html
websites/production/camel/content/camel-2160-release.html
websites/production/camel/content/dead-letter-channel.html
websites/production/camel/content/error-handler.html
websites/production/camel/content/release-guide.html
websites/production/camel/content/servlet.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 Mar 11
11:30:43 2015
@@ -1325,11 +1325,11 @@ template.send(quot;direct:alias-verify
/div
/div
pThe strongcxf:/strong component provides integration with a
shape=rect href=http://cxf.apache.org;Apache CXF/a for connecting to
JAX-WS services hosted in CXF./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1425921458520 {padding: 0px;}
-div.rbtoc1425921458520 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1425921458520 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1426073168742 {padding: 0px;}
+div.rbtoc1426073168742 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1426073168742 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1425921458520
+/*]]*//style/pdiv class=toc-macro rbtoc1426073168742
ul class=toc-indentationlia shape=rect href=#CXF-CXFComponentCXF
Component/a
ul class=toc-indentationlia shape=rect href=#CXF-URIformatURI
format/a/lilia shape=rect href=#CXF-OptionsOptions/a
ul class=toc-indentationlia shape=rect
href=#CXF-ThedescriptionsofthedataformatsThe descriptions of the
dataformats/a
@@ -10225,66 +10225,26 @@ public class FooEventConsumer {
int size = seda.getExchanges().size();
]]/script
/div/divp/ph3 id=BookComponentAppendix-SeeAlso.55See Also/h3
-ullia shape=rect href=configuring-camel.htmlConfiguring
Camel/a/lilia shape=rect
href=component.htmlComponent/a/lilia shape=rect
href=endpoint.htmlEndpoint/a/lilia shape=rect
href=getting-started.htmlGetting Started/a/li/ulul
class=alternatelia shape=rect href=vm.htmlVM/a/lilia
shape=rect href=disruptor.htmlDisruptor/a/lilia shape=rect
href=direct.htmlDirect/a/lilia shape=rect
href=async.htmlAsync/a/li/ul h2
id=BookComponentAppendix-ServletComponentServlet Component/h2
-
-pThe strongservlet:/strong component provides HTTP based a shape=rect
href=endpoint.htmlendpoints/a for consuming HTTP requests that arrive at a
HTTP endpoint that is bound to a published Servlet./p
-
-pMaven users will need to add the following dependency to their
codepom.xml/code for this component:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent
panelContent pdl
-script class=theme: Default; brush: xml; gutter: false
type=syntaxhighlighter![CDATA[
-lt;dependencygt;
+ullia shape=rect href=configuring-camel.htmlConfiguring
Camel/a/lilia shape=rect
href=component.htmlComponent/a/lilia shape=rect
href=endpoint.htmlEndpoint/a/lilia shape=rect
href=getting-started.htmlGetting Started/a/li/ulul
class=alternatelia shape=rect href=vm.htmlVM/a/lilia
shape=rect href=disruptor.htmlDisruptor/a/lilia shape=rect
href=direct.htmlDirect/a/lilia shape=rect
href=async.htmlAsync/a/li/ul h2
id=BookComponentAppendix-ServletComponentServlet Component/h2pThe
strongservlet:/strong component provides HTTP based a shape=rect
href=endpoint.htmlendpoints/a for consuming HTTP requests that arrive at a
HTTP endpoint that is bound to a published Servlet./ppMaven users will need
to add the following dependency to their codepom.xml/code for this
component:/pdiv class=code panel pdl style=border-width: 1px;div
class=codeContent panelCont
ent pdl
+script class=theme: Default; brush: xml; gutter: false
type=syntaxhighlighter![CDATA[lt;dependencygt;
lt;groupIdgt;org.apache.camellt;/groupIdgt;
lt;artifactIdgt;camel-servletlt;/artifactIdgt;
lt;versiongt;x.x.xlt;/versiongt;
lt;\!-\- use the same version as your Camel core version \--gt;
lt;/dependencygt;
]]/script
-/div/div
-
-div class=aui-message hint shadowed information-macro
+/div/divdiv class=aui-message hint shadowed information-macro
p class=titleStream/p
span class=aui-icon icon-hintIcon/span
div class=message-content
-
-pServlet is stream based, which means the input it receives is submitted to
Camel as a stream. That means you will only be able to read the content of the
stream
[2/3] camel git commit: CAMEL-8473: Error handler add onPrepare to allow custom processor to prepare the exchange before sending to failure processor such as dead letter queue.
CAMEL-8473: Error handler add onPrepare to allow custom processor to prepare
the exchange before sending to failure processor such as dead letter queue.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c47e24b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c47e24b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c47e24b
Branch: refs/heads/master
Commit: 8c47e24bd0516b97ad286a75a0649f9be592dc49
Parents: 1faeeb2
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 11 09:13:23 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 11 10:02:06 2015 +0100
--
.../camel/builder/DeadLetterChannelBuilder.java | 2 +-
.../builder/DefaultErrorHandlerBuilder.java | 25 +++-
.../camel/processor/DeadLetterChannel.java | 6 +-
.../camel/processor/DefaultErrorHandler.java| 7 ++-
.../camel/processor/LoggingErrorHandler.java| 2 +-
.../camel/processor/RedeliveryErrorHandler.java | 28 -
.../DeadLetterChannelOnPrepareTest.java | 57 ++
.../DefaultErrorHandlerOnPrepareTest.java | 61
.../blueprint/CamelErrorHandlerFactoryBean.java | 5 ++
.../camel/spring/ErrorHandlerDefinition.java| 2 +
.../handler/ErrorHandlerDefinitionParser.java | 7 +++
.../spring/spi/TransactionErrorHandler.java | 2 +-
...pringDeadLetterChannelOnPrepareTestTest.java | 29 ++
...ingDefaultErrorHandlerOnPrepareTestTest.java | 29 ++
.../DeadLetterChannelOnPrepareTest.xml | 43 ++
.../DefaultErrorHandlerOnPrepareTest.xml| 43 ++
.../DeadLetterChannelOnPrepareTestTest.java | 49
.../DefaultErrorHandlerOnPrepareTestTest.java | 53 +
.../DeadLetterChannelOnPrepareTestTest.xml | 42 ++
.../DefaultErrorHandlerOnPrepareTestTest.xml| 42 ++
20 files changed, 525 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8c47e24b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
index e1e417d..d7a9d3b 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
@@ -56,7 +56,7 @@ public class DeadLetterChannelBuilder extends
DefaultErrorHandlerBuilder {
DeadLetterChannel answer = new
DeadLetterChannel(routeContext.getCamelContext(), processor, getLogger(),
getOnRedelivery(),
getRedeliveryPolicy(), getExceptionPolicyStrategy(),
getFailureProcessor(), getDeadLetterUri(), isDeadLetterHandleNewException(),
-isUseOriginalMessage(),
getRetryWhilePolicy(routeContext.getCamelContext()),
getExecutorService(routeContext.getCamelContext()));
+isUseOriginalMessage(),
getRetryWhilePolicy(routeContext.getCamelContext()),
getExecutorService(routeContext.getCamelContext()), getOnPrepareFailure());
// configure error handler before we can use it
configure(routeContext, answer);
return answer;
http://git-wip-us.apache.org/repos/asf/camel/blob/8c47e24b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
index 091c166..c879cca 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
@@ -54,13 +54,15 @@ public class DefaultErrorHandlerBuilder extends
ErrorHandlerBuilderSupport {
protected boolean asyncDelayedRedelivery;
protected String executorServiceRef;
protected ScheduledExecutorService executorService;
+protected Processor onPrepareFailure;
public DefaultErrorHandlerBuilder() {
}
public Processor createErrorHandler(RouteContext routeContext, Processor
processor) throws Exception {
DefaultErrorHandler answer = new
DefaultErrorHandler(routeContext.getCamelContext(), processor, getLogger(),
getOnRedelivery(),
-getRedeliveryPolicy(), getExceptionPolicyStrategy(),
getRetryWhilePolicy(routeContext.getCamelContext()),
getExecutorService(routeContext.getCamelContext()));
+getRedeliveryPolicy(),
[1/3] camel git commit: Add some error handler options to its mbean that we forgot to add
Repository: camel
Updated Branches:
refs/heads/master 1faeeb2d4 - 188769f8a
Add some error handler options to its mbean that we forgot to add
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1162e059
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1162e059
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1162e059
Branch: refs/heads/master
Commit: 1162e0591c5412cbf41a6ce36cc4907cba2f1cb2
Parents: 8c47e24
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 11 09:31:25 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 11 10:02:06 2015 +0100
--
.../mbean/ManagedErrorHandlerMBean.java | 12 +++
.../management/mbean/ManagedErrorHandler.java | 36 +++-
2 files changed, 47 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1162e059/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedErrorHandlerMBean.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedErrorHandlerMBean.java
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedErrorHandlerMBean.java
index 9ba5c74..0cb5a3b 100644
---
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedErrorHandlerMBean.java
+++
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedErrorHandlerMBean.java
@@ -122,6 +122,12 @@ public interface ManagedErrorHandlerMBean {
@ManagedAttribute(description = RedeliveryPolicy for logging new
exceptions)
void setLogNewException(Boolean log);
+@ManagedAttribute(description = RedeliveryPolicy for logging exhausted
with message history)
+Boolean getLogExhaustedMessageHistory();
+
+@ManagedAttribute(description = RedeliveryPolicy for logging exhausted
with message history)
+void setLogExhaustedMessageHistory(Boolean log);
+
@ManagedAttribute(description = RedeliveryPolicy for logging handled and
continued exceptions)
Boolean getLogContinued();
@@ -146,4 +152,10 @@ public interface ManagedErrorHandlerMBean {
@ManagedAttribute(description = RedeliveryPolicy for using exponential
backoff)
void setUseExponentialBackOff(Boolean backoff);
+@ManagedAttribute(description = RedeliveryPolicy for allow redelivery
while stopping)
+Boolean getAllowRedeliveryWhileStopping();
+
+@ManagedAttribute(description = RedeliveryPolicy for allow redelivery
while stopping)
+void setAllowRedeliveryWhileStopping(Boolean allow);
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/1162e059/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
index 3bf076b..e298ae8 100644
---
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
+++
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
@@ -21,7 +21,6 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedErrorHandlerMBean;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
import org.apache.camel.processor.ErrorHandlerSupport;
import org.apache.camel.processor.RedeliveryErrorHandler;
import org.apache.camel.spi.ManagementStrategy;
@@ -350,6 +349,24 @@ public class ManagedErrorHandler implements
ManagedErrorHandlerMBean {
redelivery.getRedeliveryPolicy().setLogNewException(log);
}
+public Boolean getLogExhaustedMessageHistory() {
+if (!isSupportRedelivery()) {
+throw new IllegalArgumentException(This error handler does not
support redelivery);
+}
+
+RedeliveryErrorHandler redelivery = (RedeliveryErrorHandler)
errorHandler;
+return redelivery.getRedeliveryPolicy().isLogExhaustedMessageHistory();
+}
+
+public void setLogExhaustedMessageHistory(Boolean log) {
+if (!isSupportRedelivery()) {
+throw new IllegalArgumentException(This error handler does not
support redelivery);
+}
+
+RedeliveryErrorHandler redelivery = (RedeliveryErrorHandler)
errorHandler;
+redelivery.getRedeliveryPolicy().setLogExhaustedMessageHistory(log);
+}
+
public Boolean getLogContinued() {
if (!isSupportRedelivery()) {
return null;
@@ -422,4 +439,21 @@ public class ManagedErrorHandler implements
[3/3] camel git commit: Fixed test
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/188769f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/188769f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/188769f8
Branch: refs/heads/master
Commit: 188769f8aa31e4018d9dd559bc57a71edf968adf
Parents: 1162e05
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 11 09:37:40 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 11 10:02:07 2015 +0100
--
.../processor/async/AsyncProcessorAwaitManagerInterruptTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/188769f8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptTest.java
b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptTest.java
index da442f1..2e24346 100644
---
a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptTest.java
+++
b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptTest.java
@@ -64,7 +64,7 @@ public class AsyncProcessorAwaitManagerInterruptTest extends
ContextTestSupport
from(direct:start).routeId(myRoute)
.to(mock:before)
-.to(async:bye:camel?delay=1000).id(myAsync)
+.to(async:bye:camel?delay=2000).id(myAsync)
.to(mock:after)
.process(new Processor() {
@Override
camel git commit: added missing license and notice files
Repository: camel Updated Branches: refs/heads/camel-2.15.x 3dab2d812 - 893774209 added missing license and notice files Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89377420 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89377420 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89377420 Branch: refs/heads/camel-2.15.x Commit: 893774209fcbdea61fc713dba9df8fa98ba6d46b Parents: 3dab2d8 Author: Christian Mueller cmuel...@apache.org Authored: Wed Mar 11 08:53:27 2015 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Wed Mar 11 08:54:33 2015 +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/89377420/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt -- diff --git a/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt b/components/camel-google-calendar/src/main/resources/META-INF/LICENSE.txt new file mode 100755 index 000..6b0b127 --- /dev/null +++ b/components/camel-google-calendar/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
camel git commit: Updated the spring.schemas versions
Repository: camel
Updated Branches:
refs/heads/master 4ccd72677 - 1faeeb2d4
Updated the spring.schemas versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1faeeb2d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1faeeb2d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1faeeb2d
Branch: refs/heads/master
Commit: 1faeeb2d41f5a5fe0b7f4c82757369e0b88b7482
Parents: 4ccd726
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Mar 11 16:28:40 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 16:28:50 2015 +0800
--
.../camel-cxf/src/main/resources/META-INF/spring.schemas | 7 +++
.../src/main/resources/META-INF/spring.schemas| 7 +++
.../src/main/resources/META-INF/spring.schemas| 7 +++
.../camel-spring/src/main/resources/META-INF/spring.schemas | 7 +++
4 files changed, 28 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1faeeb2d/components/camel-cxf/src/main/resources/META-INF/spring.schemas
--
diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 9f71194..616f2c9 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -70,7 +70,14 @@
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.12.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.12.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.13.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.13.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.13.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.0.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.1.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.14.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.15.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
http://git-wip-us.apache.org/repos/asf/camel/blob/1faeeb2d/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
--
diff --git
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index b7643ef..a4a6c0d 100644
---
a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -67,7 +67,14 @@
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.12.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.13.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.0.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.14.1.xsd=schema/camel-spring-integration.xsd
