Author: ningjiang
Date: Fri Mar 26 11:38:27 2010
New Revision: 927779
URL: http://svn.apache.org/viewvc?rev=927779&view=rev
Log:
CAMEL-2576: Renamed redeliverDelay to redeliveryDelay on Spring configration
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
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/SpringDefaultErrorHandlerNotHandledPolicyTest.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/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml
Fri Mar 26 11:38:27 2010
@@ -50,6 +50,6 @@
</route>
</camelContext>
- <bean id="noErrorHandler"
class="org.apache.camel.builder.NoErrorHandlerBuilder"/>
+ <errorHandler id="noErrorHandler" type="NoErrorHandler"
xmlns="http://camel.apache.org/schema/spring"; />
</beans>
\ No newline at end of file
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
Fri Mar 26 11:38:27 2010
@@ -63,7 +63,7 @@
<bean id="myRedeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="5"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
<camelContext errorHandlerRef="errorHandler" id="camel"
xmlns="http://camel.apache.org/schema/spring";>
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
Fri Mar 26 11:38:27 2010
@@ -63,7 +63,7 @@
<bean id="myRedeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="5"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
<camelContext errorHandlerRef="errorHandler" id="camel"
xmlns="http://camel.apache.org/schema/spring";>
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
Fri Mar 26 11:38:27 2010
@@ -58,7 +58,7 @@
<bean id="myRedeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="5"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
<camelContext errorHandlerRef="errorHandler" id="camel"
xmlns="http://camel.apache.org/schema/spring";>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
Fri Mar 26 11:38:27 2010
@@ -47,7 +47,7 @@
<!-- try redelivery at most 3 times, after that the exchange is
dead and its routed to the mock:dead endpoint -->
<property name="maximumRedeliveries" value="3"/>
<!-- delay 250ms before redelivery -->
- <property name="redeliverDelay" value="250"/>
+ <property name="redeliveryDelay" value="250"/>
</bean>
<!-- END SNIPPET: e2 -->
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
Fri Mar 26 11:38:27 2010
@@ -42,7 +42,7 @@
<bean id="rsRedeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="1"/>
- <property name="redeliverDelay" value="30000"/>
+ <property name="redeliveryDelay" value="30000"/>
<property name="useExponentialBackOff" value="true"/>
</bean>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
Fri Mar 26 11:38:27 2010
@@ -29,7 +29,7 @@
<bean id="myPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
<bean id="myProcessor"
class="org.apache.camel.processor.InheritErrorHandlerDefaultTest$MyProcessor"/>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
Fri Mar 26 11:38:27 2010
@@ -29,7 +29,7 @@
<bean id="myPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
<bean id="myProcessor"
class="org.apache.camel.processor.InheritErrorHandlerFalseTest$MyProcessor"/>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
Fri Mar 26 11:38:27 2010
@@ -29,7 +29,7 @@
<bean id="myPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
<bean id="myProcessor"
class="org.apache.camel.processor.InheritErrorHandlerTrueTest$MyProcessor"/>
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -34,7 +34,7 @@
<bean id="myRedelivery"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="logStackTrace" value="false"/>
</bean>
<!-- END SNIPPET: e1 -->
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -34,7 +34,7 @@
<bean id="myRedelivery"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="logStackTrace" value="false"/>
</bean>
<!-- END SNIPPET: e1 -->
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -36,7 +36,7 @@
<bean id="myRedelivery"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="logStackTrace" value="false"/>
</bean>
<!-- END SNIPPET: e1 -->
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -36,7 +36,7 @@
<bean id="myRedelivery"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="0"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="logStackTrace" value="false"/>
</bean>
<!-- END SNIPPET: e1 -->
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDefaultErrorHandlerNotHandledPolicyTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDefaultErrorHandlerNotHandledPolicyTest.xml?rev=927779&r1=927778&r2=927779&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDefaultErrorHandlerNotHandledPolicyTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDefaultErrorHandlerNotHandledPolicyTest.xml
Fri Mar 26 11:38:27 2010
@@ -29,7 +29,7 @@
<bean id="myRedelivery"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="2"/>
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="logStackTrace" value="false"/>
</bean>
<!-- END SNIPPET: e1 -->
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -37,7 +37,7 @@
<bean id="redeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="5"/>
<!-- go fast since its a unit test -->
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
</bean>
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -29,7 +29,7 @@
</bean>
<bean id="myRedeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="logStackTrace" value="false"/>
<property name="maximumRedeliveries" value="0"/>
</bean>
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=927779&r1=927778&r2=927779&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
Fri Mar 26 11:38:27 2010
@@ -29,7 +29,7 @@
</bean>
<bean id="policy" class="org.apache.camel.processor.RedeliveryPolicy">
- <property name="redeliverDelay" value="0"/>
+ <property name="redeliveryDelay" value="0"/>
<property name="maximumRedeliveries" value="1"/>
</bean>
