Author: janstey
Date: Fri Nov 7 09:37:13 2008
New Revision: 712205
URL: http://svn.apache.org/viewvc?rev=712205&view=rev
Log:
CAMEL-1061 - Some more changes related to the initialRedeliveryDelay rename...
also re-enabled ObjectConverter method since it enlists in Camel's type
conversion (i.e. its very useful)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest-context.xml
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java?rev=712205&r1=712204&r2=712205&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
Fri Nov 7 09:37:13 2008
@@ -77,7 +77,16 @@
return Boolean.FALSE;
}
-
+ /**
+ * Creates an iterator over the value
+ */
+ @SuppressWarnings("unchecked")
+ @Converter
+ public static Iterator iterator(Object value) {
+ return ObjectHelper.createIterator(value);
+ }
+
+
/**
* Returns the converted value, or null if the value is null
*/
Modified:
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest-context.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest-context.xml?rev=712205&r1=712204&r2=712205&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest-context.xml
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest-context.xml
Fri Nov 7 09:37:13 2008
@@ -46,7 +46,7 @@
<bean id="myRedeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="4"/>
- <property name="initialRedeliveryDelay" value="500"/>
+ <property name="delay" value="500"/>
<property name="useExponentialBackOff" value="true"/>
<property name="backOffMultiplier" value="2"/>
</bean>
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=712205&r1=712204&r2=712205&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
Fri Nov 7 09:37:13 2008
@@ -108,14 +108,6 @@
}
/**
- * @deprecated use delay - will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder initialRedeliveryDelay(long
initialRedeliveryDelay) {
- getDelayPolicy().delay(initialRedeliveryDelay);
- return this;
- }
-
- /**
* @deprecated will be removed in Camel 2.0
*/
public TransactionErrorHandlerBuilder maximumRedeliveries(int
maximumRedeliveries) {
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml?rev=712205&r1=712204&r2=712205&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
Fri Nov 7 09:37:13 2008
@@ -39,7 +39,7 @@
<bean id="myRedeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="3"/>
- <property name="initialRedeliveryDelay" value="250"/>
+ <property name="delay" value="250"/>
</bean>
</beans>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml?rev=712205&r1=712204&r2=712205&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
Fri Nov 7 09:37:13 2008
@@ -46,7 +46,7 @@
<bean id="rsRedeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="1" />
- <property name="initialRedeliveryDelay" value="30000"/>
+ <property name="delay" value="30000"/>
<property name="useExponentialBackOff" value="true"/>
</bean>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml?rev=712205&r1=712204&r2=712205&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
Fri Nov 7 09:37:13 2008
@@ -54,7 +54,7 @@
<onException>
<exception>java.io.IOException</exception>
<redeliveryPolicy
- initialRedeliveryDelay="1000"
+ delay="1000"
maximumRedeliveries="3"
maximumRedeliveryDelay="10000"
backOffMultiplier="1.0"
