You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/03/26 09:03:02 UTC
svn commit: r927722 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/
main/java/org/apache/camel/management/mbean/
main/java/org/apache/camel/model/ main/java/org/apache/camel/processor/
test/java/org/apache/camel/builder/ test/java...
Author: davsclaus
Date: Fri Mar 26 08:03:00 2010
New Revision: 927722
URL: http://svn.apache.org/viewvc?rev=927722&view=rev
Log:
CAMEL-2576: Renamed redeliverDelay to redeliveryDelay.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutWithErrorDeadLetterChannelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChannelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledPolicyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveringWhileShutdownTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerOnExceptionRedeliveryAndHandledTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerWrappedEachNodeTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceWithRedeliveryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerEagerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerDefaultTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerTrueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorNotUseSharedSchemaTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithInFlowExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexWithNestedErrorHandlerRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalBodyTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java Fri Mar 26 08:03:00 2010
@@ -76,8 +76,14 @@ public class DefaultErrorHandlerBuilder
return this;
}
+ @Deprecated
public DefaultErrorHandlerBuilder redeliverDelay(long delay) {
- getRedeliveryPolicy().redeliverDelay(delay);
+ getRedeliveryPolicy().redeliveryDelay(delay);
+ return this;
+ }
+
+ public DefaultErrorHandlerBuilder redeliveryDelay(long delay) {
+ getRedeliveryPolicy().redeliveryDelay(delay);
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java Fri Mar 26 08:03:00 2010
@@ -155,7 +155,7 @@ public class ManagedErrorHandler {
}
RedeliveryErrorHandler redelivery = (RedeliveryErrorHandler) errorHandler;
- return redelivery.getRedeliveryPolicy().getRedeliverDelay();
+ return redelivery.getRedeliveryPolicy().getRedeliveryDelay();
}
@ManagedAttribute(description = "RedeliveryPolicy for redelivery delay")
@@ -165,10 +165,10 @@ public class ManagedErrorHandler {
}
RedeliveryErrorHandler redelivery = (RedeliveryErrorHandler) errorHandler;
- redelivery.getRedeliveryPolicy().setRedeliverDelay(delay);
+ redelivery.getRedeliveryPolicy().setRedeliveryDelay(delay);
}
- @ManagedAttribute(description = "RedeliveryPolicy for backoff multipler")
+ @ManagedAttribute(description = "RedeliveryPolicy for backoff multiplier")
public Double getBackOffMultiplier() {
if (!isSupportRedelivery()) {
return null;
@@ -178,7 +178,7 @@ public class ManagedErrorHandler {
return redelivery.getRedeliveryPolicy().getBackOffMultiplier();
}
- @ManagedAttribute(description = "RedeliveryPolicy for backoff multipler")
+ @ManagedAttribute(description = "RedeliveryPolicy for backoff multiplier")
public void setBackOffMultiplier(Double multiplier) {
if (!isSupportRedelivery()) {
throw new IllegalArgumentException("This error handler does not support redelivery");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java Fri Mar 26 08:03:00 2010
@@ -165,7 +165,7 @@ public class RedeliveryPolicyDefinition
}
/**
- * Sets the fixed delay between redeliveries
+ * Sets the initial redelivery delay
*
* @param delay delay in millis
* @return the builder
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Fri Mar 26 08:03:00 2010
@@ -26,8 +26,6 @@ import org.apache.camel.util.ObjectHelpe
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-// Code taken from the ActiveMQ codebase
-
/**
* The policy used to decide how many times to redeliver and the time between
* the redeliveries before being sent to a <a
@@ -37,7 +35,7 @@ import org.apache.commons.logging.LogFac
* The default values are:
* <ul>
* <li>maximumRedeliveries = 0</li>
- * <li>redeliverDelay = 1000L (the initial delay)</li>
+ * <li>redeliveryDelay = 1000L (the initial delay)</li>
* <li>maximumRedeliveryDelay = 60 * 1000L</li>
* <li>backOffMultiplier = 2</li>
* <li>useExponentialBackOff = false</li>
@@ -230,10 +228,20 @@ public class RedeliveryPolicy implements
// -------------------------------------------------------------------------
/**
- * Sets the delay in milliseconds
+ * Sets the initial redelivery delay in milliseconds
+ *
+ * @deprecated use redeliveryDelay instead
*/
+ @Deprecated
public RedeliveryPolicy redeliverDelay(long delay) {
- setRedeliverDelay(delay);
+ return redeliveryDelay(delay);
+ }
+
+ /**
+ * Sets the initial redelivery delay in milliseconds
+ */
+ public RedeliveryPolicy redeliveryDelay(long delay) {
+ setRedeliveryDelay(delay);
return this;
}
@@ -380,7 +388,7 @@ public class RedeliveryPolicy implements
}
/**
- * Sets the delay in milliseconds
+ * Sets the initial redelivery delay in milliseconds
*/
public void setRedeliveryDelay(long redeliverDelay) {
this.redeliveryDelay = redeliverDelay;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java Fri Mar 26 08:03:00 2010
@@ -112,7 +112,7 @@ public class BuilderWithScopesTest exten
runTest(new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
from("direct:a").filter(header("foo").isEqualTo("bar")).process(orderProcessor).end()
.process(toProcessor);
@@ -125,7 +125,7 @@ public class BuilderWithScopesTest exten
runTest(new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
from("direct:a").filter(header("foo").isEqualTo("bar")).process(orderProcessor)
.process(toProcessor);
@@ -136,7 +136,7 @@ public class BuilderWithScopesTest exten
protected RouteBuilder createChoiceBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
from("direct:a").choice().when(header("foo").isEqualTo("bar")).process(orderProcessor)
.when(header("foo").isEqualTo("cheese")).process(orderProcessor2).end()
@@ -174,7 +174,7 @@ public class BuilderWithScopesTest exten
runTest(new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
from("direct:a").choice().when(header("foo").isEqualTo("bar")).process(orderProcessor)
.when(header("foo").isEqualTo("cheese")).process(orderProcessor2).process(toProcessor); // continuation of the second when clause
@@ -185,7 +185,7 @@ public class BuilderWithScopesTest exten
protected RouteBuilder createChoiceWithOtherwiseBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
from("direct:a").choice().when(header("foo").isEqualTo("bar")).process(orderProcessor)
.when(header("foo").isEqualTo("cheese")).process(orderProcessor2).otherwise()
@@ -223,7 +223,7 @@ public class BuilderWithScopesTest exten
runTest(new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
from("direct:a").choice().when(header("foo").isEqualTo("bar")).process(orderProcessor)
.when(header("foo").isEqualTo("cheese")).process(orderProcessor2).otherwise()
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java Fri Mar 26 08:03:00 2010
@@ -162,7 +162,7 @@ public class ExceptionBuilderTest extend
return new RouteBuilder() {
@SuppressWarnings("unchecked")
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
// START SNIPPET: exceptionBuilder1
onException(NullPointerException.class)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java Fri Mar 26 08:03:00 2010
@@ -77,7 +77,7 @@ public class ExceptionBuilderWithHandled
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
// START SNIPPET: exceptionBuilder1
onException(NullPointerException.class)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java Fri Mar 26 08:03:00 2010
@@ -112,7 +112,7 @@ public class FileConsumerFailureHandledT
public void configure() throws Exception {
// make sure mock:error is the dead letter channel
// use no delay for fast unit testing
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
// special for not handled when we got beer
onException(ValidationException.class).onWhen(exceptionMessage().contains("beer"))
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java Fri Mar 26 08:03:00 2010
@@ -59,7 +59,7 @@ public class FromFileDoNotDeleteFileIfPr
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
from("file://target/deletefile?delete=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java Fri Mar 26 08:03:00 2010
@@ -58,7 +58,7 @@ public class FromFileDoNotMoveFileIfProc
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
from("file://target/movefile?move=done").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutWithErrorDeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutWithErrorDeadLetterChannelTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutWithErrorDeadLetterChannelTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutWithErrorDeadLetterChannelTest.java Fri Mar 26 08:03:00 2010
@@ -45,7 +45,7 @@ public class SedaInOutWithErrorDeadLette
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0).handled(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0).handled(false));
from("direct:start").to("seda:foo");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java Fri Mar 26 08:03:00 2010
@@ -40,7 +40,7 @@ public class AmahDeadLetterTest extends
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:err").redeliverDelay(0));
+ errorHandler(deadLetterChannel("mock:err").redeliveryDelay(0));
from("seda:a").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/CacheInputStreamInDeadLetterIssue520Test.java Fri Mar 26 08:03:00 2010
@@ -71,7 +71,7 @@ public class CacheInputStreamInDeadLette
context.setStreamCaching(true);
// 0 delay for faster unit test
- errorHandler(deadLetterChannel("direct:errorHandler").maximumRedeliveries(3).redeliverDelay(0));
+ errorHandler(deadLetterChannel("direct:errorHandler").maximumRedeliveries(3).redeliveryDelay(0));
from("direct:start").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java Fri Mar 26 08:03:00 2010
@@ -100,7 +100,7 @@ public class ExceptionTest extends Conte
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
if (getName().endsWith("WithLongHandler")) {
log.debug("Using long exception handler");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java Fri Mar 26 08:03:00 2010
@@ -75,7 +75,7 @@ public class RomeksExceptionTest extends
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0));
onException(IllegalArgumentException.class).to("mock:exception");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java Fri Mar 26 08:03:00 2010
@@ -57,7 +57,7 @@ public class ExceptionWithManagementTest
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(IllegalArgumentException.class).maximumRedeliveries(1).to("mock:error");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChannelTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChannelTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChannelTest.java Fri Mar 26 08:03:00 2010
@@ -52,7 +52,7 @@ public class ChannelTest extends Context
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false));
from("direct:start")
.process(new Processor() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java Fri Mar 26 08:03:00 2010
@@ -45,7 +45,7 @@ public class DeadLetterChannelExceptionC
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(RuntimeException.class).handled(true).to("mock:failed");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledPolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledPolicyTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledPolicyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledPolicyTest.java Fri Mar 26 08:03:00 2010
@@ -38,7 +38,7 @@ public class DeadLetterChannelHandledPol
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(1).redeliverDelay(0).logStackTrace(false).handled(true));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(1).redeliveryDelay(0).logStackTrace(false).handled(true));
from("direct:start").process(new MyThrowExceptionProcessor());
}
@@ -57,7 +57,7 @@ public class DeadLetterChannelHandledPol
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(1).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(1).redeliveryDelay(0).logStackTrace(false).handled(false));
from("direct:start").process(new MyThrowExceptionProcessor());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java Fri Mar 26 08:03:00 2010
@@ -75,7 +75,7 @@ public class DeadLetterChannelOnExceptio
errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(5)
.onRedelivery(new MyRedeliverPrcessor())
// setting delay to zero is just to make unit teting faster
- .redeliverDelay(0L));
+ .redeliveryDelay(0L));
// END SNIPPET: e2
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java Fri Mar 26 08:03:00 2010
@@ -66,7 +66,7 @@ public class DeadLetterChannelOnRedelive
errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(5)
.onRedelivery(new MyRedeliverPrcessor())
// setting delay to zero is just to make unit teting faster
- .redeliverDelay(0L));
+ .redeliveryDelay(0L));
// END SNIPPET: e1
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java Fri Mar 26 08:03:00 2010
@@ -75,7 +75,7 @@ public class DeadLetterChannelRedeliverW
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").redeliverDelay(250).maximumRedeliveries(3).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:dead").redeliveryDelay(250).maximumRedeliveries(3).logStackTrace(false));
from("direct:start")
.process(new Processor() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveringWhileShutdownTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveringWhileShutdownTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveringWhileShutdownTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveringWhileShutdownTest.java Fri Mar 26 08:03:00 2010
@@ -49,7 +49,7 @@ public class DeadLetterChannelRedeliveri
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(3000));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(3000));
from("direct:start").delay(500).to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java Fri Mar 26 08:03:00 2010
@@ -98,7 +98,7 @@ public class DeadLetterChannelRedelivery
// we can assert the number of redeliver attempts to see if that works correct
from("direct:start")
- .errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).handled(false))
+ .errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).handled(false))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
counter++;
@@ -116,7 +116,7 @@ public class DeadLetterChannelRedelivery
});
from("direct:one")
- .errorHandler(deadLetterChannel("mock:one").maximumRedeliveries(1).redeliverDelay(0).handled(false))
+ .errorHandler(deadLetterChannel("mock:one").maximumRedeliveries(1).redeliveryDelay(0).handled(false))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
counter++;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java Fri Mar 26 08:03:00 2010
@@ -89,7 +89,7 @@ public class DeadLetterChannelTest exten
public void configure() {
from("direct:start").errorHandler(
deadLetterChannel("mock:failed").maximumRedeliveries(2)
- .redeliverDelay(50)
+ .redeliveryDelay(50)
.loggingLevel(LoggingLevel.DEBUG)
).process(processor).to("mock:success");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyTest.java Fri Mar 26 08:03:00 2010
@@ -55,11 +55,11 @@ public class DeadLetterChannelUseOrigina
public void configure() throws Exception {
// will use original
ErrorHandlerBuilder a = deadLetterChannel("mock:a")
- .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).useOriginalMessage().handled(true);
+ .maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).useOriginalMessage().handled(true);
// will NOT use original
ErrorHandlerBuilder b = deadLetterChannel("mock:b")
- .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(true);
+ .maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(true);
from("direct:a")
.errorHandler(a)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerOnExceptionRedeliveryAndHandledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerOnExceptionRedeliveryAndHandledTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerOnExceptionRedeliveryAndHandledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerOnExceptionRedeliveryAndHandledTest.java Fri Mar 26 08:03:00 2010
@@ -53,7 +53,7 @@ public class ErrorHandlerOnExceptionRede
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliverDelay(0));
+ errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(0));
onException(IOException.class).maximumRedeliveries(3).handled(true)
.process(new Processor() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java Fri Mar 26 08:03:00 2010
@@ -57,7 +57,7 @@ public class ErrorHandlerTest extends Co
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(1).redeliverDelay(0))
+ .errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(1).redeliveryDelay(0))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerWrappedEachNodeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerWrappedEachNodeTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerWrappedEachNodeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerWrappedEachNodeTest.java Fri Mar 26 08:03:00 2010
@@ -57,7 +57,7 @@ public class ErrorHandlerWrappedEachNode
@Override
public void configure() throws Exception {
// use dead letter channel that supports redeliveries
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(3).redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(3).redeliveryDelay(0).logStackTrace(false));
from("direct:start")
.pipeline("bean:foo?method=hi", "bean:foo?method=kabom").to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceWithRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceWithRedeliveryTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceWithRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceWithRedeliveryTest.java Fri Mar 26 08:03:00 2010
@@ -52,7 +52,7 @@ public class FailOverLoadBalanceWithRede
@Override
public void configure() throws Exception {
- errorHandler(defaultErrorHandler().maximumRedeliveries(2).redeliverDelay(0));
+ errorHandler(defaultErrorHandler().maximumRedeliveries(2).redeliveryDelay(0));
from("direct:start")
.loadBalance().failover().to("direct:a", "direct:b");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java Fri Mar 26 08:03:00 2010
@@ -64,7 +64,7 @@ public class IdempotentConsumerAsyncTest
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
from("direct:start").idempotentConsumer(
header("messageId"), MemoryIdempotentRepository.memoryIdempotentRepository(200)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java Fri Mar 26 08:03:00 2010
@@ -65,7 +65,7 @@ public class IdempotentConsumerConcurren
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0)
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0)
.logStackTrace(false).handled(false));
from("direct:start").idempotentConsumer(header("messageId"),
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerEagerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerEagerTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerEagerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerEagerTest.java Fri Mar 26 08:03:00 2010
@@ -65,7 +65,7 @@ public class IdempotentConsumerEagerTest
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
from("direct:start").idempotentConsumer(
header("messageId"), MemoryIdempotentRepository.memoryIdempotentRepository(200)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java Fri Mar 26 08:03:00 2010
@@ -64,7 +64,7 @@ public class IdempotentConsumerTest exte
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false));
from("direct:start").idempotentConsumer(
header("messageId"), MemoryIdempotentRepository.memoryIdempotentRepository(200)
@@ -98,7 +98,7 @@ public class IdempotentConsumerTest exte
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").handled(false).maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:error").handled(false).maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false));
from("direct:start").idempotentConsumer(
header("messageId"), MemoryIdempotentRepository.memoryIdempotentRepository(200)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerDefaultTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerDefaultTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerDefaultTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerDefaultTest.java Fri Mar 26 08:03:00 2010
@@ -46,7 +46,7 @@ public class InheritErrorHandlerDefaultT
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0));
from("direct:start")
.process(new MyProcessor())
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerTrueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerTrueTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerTrueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InheritErrorHandlerTrueTest.java Fri Mar 26 08:03:00 2010
@@ -46,7 +46,7 @@ public class InheritErrorHandlerTrueTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0));
from("direct:start")
.process(new MyProcessor()).inheritErrorHandler(true)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java Fri Mar 26 08:03:00 2010
@@ -86,12 +86,12 @@ public class MultiErrorHandlerInRouteNot
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .errorHandler(deadLetterChannel("mock:outer").maximumRedeliveries(1).handled(false).redeliverDelay(0))
+ .errorHandler(deadLetterChannel("mock:outer").maximumRedeliveries(1).handled(false).redeliveryDelay(0))
.process(outer)
.to("direct:outer");
from("direct:outer")
- .errorHandler(deadLetterChannel("mock:inner").maximumRedeliveries(2).handled(false).redeliverDelay(0))
+ .errorHandler(deadLetterChannel("mock:inner").maximumRedeliveries(2).handled(false).redeliveryDelay(0))
.process(inner)
.to("mock:end");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java Fri Mar 26 08:03:00 2010
@@ -71,12 +71,12 @@ public class MultiErrorHandlerInRouteTes
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .errorHandler(deadLetterChannel("mock:outer").maximumRedeliveries(1).redeliverDelay(0))
+ .errorHandler(deadLetterChannel("mock:outer").maximumRedeliveries(1).redeliveryDelay(0))
.process(outer)
.to("direct:outer");
from("direct:outer")
- .errorHandler(deadLetterChannel("mock:inner").maximumRedeliveries(2).redeliverDelay(0))
+ .errorHandler(deadLetterChannel("mock:inner").maximumRedeliveries(2).redeliveryDelay(0))
.process(inner)
.to("mock:end");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java Fri Mar 26 08:03:00 2010
@@ -78,7 +78,7 @@ public class MulticastStreamCachingTest
// enable stream caching
context.setStreamCaching(true);
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
//stream caching should fix re-readability issues when multicasting messags
from("direct:a").multicast().to("direct:x", "direct:y", "direct:z");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliverWithExceptionAndFaultTest.java Fri Mar 26 08:03:00 2010
@@ -73,7 +73,7 @@ public class RedeliverWithExceptionAndFa
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliverDelay(0));
+ errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(0));
from("direct:start")
.process(new Processor() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java Fri Mar 26 08:03:00 2010
@@ -87,7 +87,7 @@ public class RedeliveryPolicyPerExceptio
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(IllegalArgumentException.class).maximumRedeliveries(2).to("mock:a");
onException(NullPointerException.class).to("mock:b");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackTest.java Fri Mar 26 08:03:00 2010
@@ -80,7 +80,7 @@ public class RollbackTest extends Contex
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(4).redeliverDelay(0).handled(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(4).redeliveryDelay(0).handled(false));
from("direct:start")
.choice()
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java Fri Mar 26 08:03:00 2010
@@ -49,7 +49,7 @@ public class TraceableUnitOfWorkTest ext
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
// must enable tracer to trace the route path taken during runtime
context.setTracing(true);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorNotUseSharedSchemaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorNotUseSharedSchemaTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorNotUseSharedSchemaTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorNotUseSharedSchemaTest.java Fri Mar 26 08:03:00 2010
@@ -128,7 +128,7 @@ public class ValidatingProcessorNotUseSh
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(ValidationException.class).to("mock:invalid");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java Fri Mar 26 08:03:00 2010
@@ -127,7 +127,7 @@ public class ValidatingProcessorTest ext
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(ValidationException.class).to("mock:invalid");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java Fri Mar 26 08:03:00 2010
@@ -70,7 +70,7 @@ public class ValidationFinallyBlockNoCat
return new RouteBuilder() {
public void configure() {
// use dead letter channel that supports redeliveries
- errorHandler(deadLetterChannel("mock:dead").redeliverDelay(0).maximumRedeliveries(3).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:dead").redeliveryDelay(0).maximumRedeliveries(3).logStackTrace(false));
from("direct:start")
.doTry()
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java Fri Mar 26 08:03:00 2010
@@ -26,7 +26,7 @@ public class ValidationWithHandlePipelin
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(ValidationException.class).to("mock:outer");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithInFlowExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithInFlowExceptionTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithInFlowExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithInFlowExceptionTest.java Fri Mar 26 08:03:00 2010
@@ -26,7 +26,7 @@ public class ValidationWithInFlowExcepti
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
onException(ValidationException.class).to("mock:invalid");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java Fri Mar 26 08:03:00 2010
@@ -40,7 +40,7 @@ public class AsyncDeadLetterChannelTest
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
from("direct:in")
.threads(2)
@@ -76,7 +76,7 @@ public class AsyncDeadLetterChannelTest
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false));
from("direct:in")
.threads(2).waitForTaskToComplete(WaitForTaskToComplete.Never)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java Fri Mar 26 08:03:00 2010
@@ -65,7 +65,7 @@ public class DefaultExceptionPolicyStrat
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel(ERROR_QUEUE).maximumRedeliveries(0).redeliverDelay(100));
+ errorHandler(deadLetterChannel(ERROR_QUEUE).maximumRedeliveries(0).redeliveryDelay(100));
onException(MyUserException.class).onWhen(header("user").isNotNull())
.maximumRedeliveries(1).backOffMultiplier(2).redeliverDelay(0)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java Fri Mar 26 08:03:00 2010
@@ -69,7 +69,7 @@ public class DefaultExceptionPolicyStrat
return new RouteBuilder() {
// START SNIPPET e1
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
// here we define our onException to catch MyUserException when
// there is a header[user] on the exchange that is not null
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java Fri Mar 26 08:03:00 2010
@@ -108,7 +108,7 @@ public class OnExceptionComplexRouteTest
// START SNIPPET: e1
// global error handler
// as its based on a unit test we do not have any delays between and do not log the stack trace
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).logStackTrace(false));
// shared for both routes
onException(MyTechnicalException.class).handled(true).maximumRedeliveries(2).to("mock:tech.error");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexWithNestedErrorHandlerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexWithNestedErrorHandlerRouteTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexWithNestedErrorHandlerRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexWithNestedErrorHandlerRouteTest.java Fri Mar 26 08:03:00 2010
@@ -47,7 +47,7 @@ public class OnExceptionComplexWithNeste
public void configure() throws Exception {
// global error handler
// as its based on a unit test we do not have any delays between and do not log the stack trace
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).logStackTrace(false));
// shared for both routes
onException(MyTechnicalException.class).handled(true).maximumRedeliveries(2).to("mock:tech.error");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java Fri Mar 26 08:03:00 2010
@@ -44,7 +44,7 @@ public class OnExceptionRetryUntilTest e
@Override
public void configure() throws Exception {
// as its based on a unit test we do not have any delays between and do not log the stack trace
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(1).redeliverDelay(0).logStackTrace(false));
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(1).redeliveryDelay(0).logStackTrace(false));
// START SNIPPET: e1
// we want to use a predicate for retries so we can determine in our bean
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRouteTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRouteTest.java Fri Mar 26 08:03:00 2010
@@ -111,7 +111,7 @@ public class OnExceptionRouteTest extend
// START SNIPPET: e1
// default should errors go to mock:error
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0));
// if a MyTechnicalException is thrown we will not try to redeliver and we mark it as handled
// so the caller does not get a failure
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalBodyTest.java?rev=927722&r1=927721&r2=927722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalBodyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalBodyTest.java Fri Mar 26 08:03:00 2010
@@ -60,7 +60,7 @@ public class OnExceptionUseOriginalBodyT
@Override
public void configure() throws Exception {
// will not use original exchange
- errorHandler(deadLetterChannel("mock:dead").disableRedelivery().logStackTrace(false).redeliverDelay(0).handled(false));
+ errorHandler(deadLetterChannel("mock:dead").disableRedelivery().logStackTrace(false).redeliveryDelay(0).handled(false));
// will use original exchange
onException(IllegalArgumentException.class)