Author: hadrian
Date: Tue May 17 22:54:37 2011
New Revision: 1104616
URL: http://svn.apache.org/viewvc?rev=1104616&view=rev
Log:
CAMEL-3931. Fixes for the xml dsl
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelHandledPolicyTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandledPolicyTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
Tue May 17 22:54:37 2011
@@ -54,7 +54,6 @@ public class DeadLetterChannelBuilder ex
public Processor createErrorHandler(RouteContext routeContext, Processor
processor) throws Exception {
validateDeadLetterUri(routeContext);
- @SuppressWarnings("deprecation")
DeadLetterChannel answer = new
DeadLetterChannel(routeContext.getCamelContext(), processor, getLogger(),
getOnRedelivery(),
getRedeliveryPolicy(), getExceptionPolicyStrategy(),
getFailureProcessor(), getDeadLetterUri(), isUseOriginalMessage(),
getRetryWhilePolicy(routeContext.getCamelContext()),
getExecutorServiceRef());
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
Tue May 17 22:54:37 2011
@@ -25,5 +25,4 @@ public class SpringRollbackTest extends
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/processor/rollback.xml");
}
-
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelHandledPolicyTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelHandledPolicyTest.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelHandledPolicyTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelHandledPolicyTest.xml
Tue May 17 22:54:37 2011
@@ -28,7 +28,6 @@
<property name="deadLetterUri" value="mock:dead"/>
<!-- we mark all exchanges as handled when they are moved to the dead
letter queue, so the client
does not receive an exception -->
- <property name="handled" value="true"/>
<property name="redeliveryPolicy" ref="myRedelivery"/>
</bean>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandledPolicyTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandledPolicyTest.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandledPolicyTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandledPolicyTest.xml
Tue May 17 22:54:37 2011
@@ -28,7 +28,6 @@
<property name="deadLetterUri" value="mock:dead"/>
<!-- we mark all exchanges as NOT handled when they are moved to the
dead letter queue, so the client
wil receive the caused exception (this is also the default
behaviour) -->
- <property name="handled" value="false"/>
<property name="redeliveryPolicy" ref="myRedelivery"/>
</bean>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
Tue May 17 22:54:37 2011
@@ -28,7 +28,6 @@
<property name="deadLetterUri" value="mock:a"/>
<!-- we mark all exchanges as handled when they are moved to the dead
letter queue, so the client
does not receive an exception -->
- <property name="handled" value="true"/>
<!-- use the original input message when moving to dead letter queue
-->
<property name="useOriginalMessage" value="true"/>
<property name="redeliveryPolicy" ref="myRedelivery"/>
@@ -46,7 +45,6 @@
<property name="deadLetterUri" value="mock:b"/>
<!-- we mark all exchanges as handled when they are moved to the dead
letter queue, so the client
does not receive an exception -->
- <property name="handled" value="true"/>
<!-- do NOT use the original input message when moving to dead letter
queue -->
<property name="useOriginalMessage" value="false"/>
<property name="redeliveryPolicy" ref="myRedelivery"/>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
Tue May 17 22:54:37 2011
@@ -28,7 +28,6 @@
<property name="deadLetterUri" value="mock:dead"/>
<!-- we mark all exchanges as handled when they are moved to the dead
letter queue, so the client
does not receive an exception -->
- <property name="handled" value="true"/>
<!-- use the original input message when moving to dead letter queue
-->
<property name="useOriginalMessage" value="true"/>
<property name="redeliveryPolicy" ref="myRedelivery"/>
@@ -46,7 +45,6 @@
<property name="deadLetterUri" value="mock:b"/>
<!-- we mark all exchanges as handled when they are moved to the dead
letter queue, so the client
does not receive an exception -->
- <property name="handled" value="true"/>
<!-- do NOT use the original input message when moving to dead letter
queue -->
<property name="useOriginalMessage" value="false"/>
<property name="redeliveryPolicy" ref="myRedelivery"/>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
Tue May 17 22:54:37 2011
@@ -60,7 +60,6 @@
<bean id="deadLetterErrorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="redeliveryPolicy"/>
- <property name="handled" value="false"/>
</bean>
<bean id="redeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
Tue May 17 22:54:37 2011
@@ -26,7 +26,6 @@
<property name="deadLetter" ref="dead"/>
<property name="onRedelivery" ref="myRedeliveryProcessor"/>
<property name="redeliveryPolicy" ref="redeliveryPolicy"/>
- <property name="handled" value="false"/>
</bean>
<bean id="dead" class="org.apache.camel.component.mock.MockEndpoint">
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
Tue May 17 22:54:37 2011
@@ -25,7 +25,6 @@
<bean id="deadLetter"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="myRedeliveryPolicy"/>
- <property name="handled" value="false"/>
</bean>
<bean id="myRedeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml?rev=1104616&r1=1104615&r2=1104616&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml
Tue May 17 22:54:37 2011
@@ -25,7 +25,6 @@
<bean id="errorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="policy"/>
- <property name="handled" value="false"/>
</bean>
<bean id="policy" class="org.apache.camel.processor.RedeliveryPolicy">
@@ -35,6 +34,10 @@
<!-- START SNIPPET: e1 -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
+ <onException>
+ <exception>org.apache.camel.RollbackExchangeException</exception>
+ <handled><constant>false</constant></handled>
+ </onException>
<route errorHandlerRef="errorHandler">
<from uri="direct:start"/>
<choice>