Author: gertv
Date: Tue Oct 28 07:26:44 2008
New Revision: 708581
URL: http://svn.apache.org/viewvc?rev=708581&view=rev
Log:
CAMEL-122: Enabling Spring tests for Camel error handling
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java?rev=708581&r1=708580&r2=708581&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
Tue Oct 28 07:26:44 2008
@@ -29,16 +29,4 @@
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/processor/faultRoute.xml");
}
-
- @Override
- public void testWithThrowFaultMessageUnhandled() throws Exception {
- // Route cannot be configured due to lack of support for errorHandler
- // in the xml dsl (CAMEL-122)
- }
-
- @Override
- public void testWithHandleFaultMessage() throws Exception {
- // Route cannot be configured due to lack of support for errorHandler
- // in the xml dsl (CAMEL-122)
- }
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml?rev=708581&r1=708580&r2=708581&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
Tue Oct 28 07:26:44 2008
@@ -43,10 +43,42 @@
<throwFault faultRef="ExceptionMessage"/>
<to uri="mock:b"/>
</route>
+
+ <route errorHandlerRef="deadLetterErrorHandler">
+ <from uri="direct:fault" />
+ <to uri="mock:a" />
+ <throwFault faultRef="camelFault" />
+ <to uri="mock:b" />
+ </route>
+
+ <route errorHandlerRef="deadLetterErrorHandler">
+ <from uri="direct:error" />
+ <to uri="mock:a" />
+ <interceptor ref="handleFaultProcessor">
+ <throwFault faultRef="camelFault" />
+ <to uri="mock:b" />
+ </interceptor>
+ </route>
</camelContext>
<!-- END SNIPPET: example -->
<bean id="myFault" class="java.lang.IllegalStateException" >
<constructor-arg index="0" value="It makes no sense of business logic"/>
</bean>
+
+ <bean id="camelFault" class="org.apache.camel.CamelException" >
+ <constructor-arg value="ExceptionMessage" />
+ </bean>
+
+ <bean id="deadLetterErrorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <property name="redeliveryPolicy" ref="redeliveryPolicyConfig" />
+ <property name="defaultDeadLetterEndpointUri" value="mock:error"/>
+ </bean>
+
+ <bean id="redeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
+ <property name="maximumRedeliveries" value="2" />
+ </bean>
+
+ <bean id="handleFaultProcessor"
class="org.apache.camel.processor.HandleFaultProcessor" />
+
</beans>
