Author: davsclaus
Date: Mon Mar 16 07:51:48 2009
New Revision: 754836
URL: http://svn.apache.org/viewvc?rev=754836&view=rev
Log:
CAMEL-1460: A little cleanup in DLC, removing not used/needec code. Setting
endpoint as a ref is now also possible.
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
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/faultRoute.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
Mon Mar 16 07:51:48 2009
@@ -45,14 +45,6 @@
this.context = context;
}
- protected BuilderSupport(BuilderSupport parent) {
- this.context = parent.getContext();
- this.inheritErrorHandler = parent.inheritErrorHandler;
- if (inheritErrorHandler && parent.errorHandlerBuilder != null) {
- this.errorHandlerBuilder = parent.errorHandlerBuilder.copy();
- }
- }
-
// Builder methods
//
-------------------------------------------------------------------------
@@ -323,7 +315,7 @@
* @return the builder
*/
public DeadLetterChannelBuilder deadLetterChannel(Endpoint
deadLetterEndpoint) {
- return new DeadLetterChannelBuilder(new
SendProcessor(deadLetterEndpoint));
+ return new DeadLetterChannelBuilder(deadLetterEndpoint);
}
// Properties
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
Mon Mar 16 07:51:48 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.builder;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
@@ -24,6 +26,7 @@
import org.apache.camel.processor.Logger;
import org.apache.camel.processor.RecipientList;
import org.apache.camel.processor.RedeliveryPolicy;
+import org.apache.camel.processor.SendProcessor;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
import org.apache.camel.processor.interceptor.StreamCaching;
import org.apache.camel.spi.RouteContext;
@@ -38,35 +41,41 @@
* @version $Revision$
*/
public class DeadLetterChannelBuilder extends ErrorHandlerBuilderSupport {
+ private Logger logger = DeadLetterChannel.createDefaultLogger();
+ private ExceptionPolicyStrategy exceptionPolicyStrategy =
ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
private RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
private Processor onRedelivery;
- private ExceptionPolicyStrategy exceptionPolicyStrategy =
ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
- private ProcessorFactory deadLetterFactory;
- private Processor defaultDeadLetterEndpoint;
- private Expression defaultDeadLetterEndpointExpression;
- private String defaultDeadLetterEndpointUri =
"log:org.apache.camel.DeadLetterChannel?level=error";
- private Logger logger = DeadLetterChannel.createDefaultLogger();
+ private Processor failureProcessor;
+ private Endpoint deadLetter;
+ private String deadLetterUri;
+ /**
+ * Creates a default DeadLetterChannel with a default endpoint
+ */
public DeadLetterChannelBuilder() {
+ this("log:org.apache.camel.DeadLetterChannel?level=error");
}
- public DeadLetterChannelBuilder(Processor processor) {
- this(new ConstantProcessorBuilder(processor));
- }
-
- public DeadLetterChannelBuilder(ProcessorFactory deadLetterFactory) {
- this.deadLetterFactory = deadLetterFactory;
+ /**
+ * Creates a DeadLetterChannel using the given endpoint
+ *
+ * @param deadLetter the dead letter queue
+ */
+ public DeadLetterChannelBuilder(Endpoint deadLetter) {
+ setDeadLetter(deadLetter);
}
- public ErrorHandlerBuilder copy() {
- DeadLetterChannelBuilder answer = new
DeadLetterChannelBuilder(deadLetterFactory);
- answer.setRedeliveryPolicy(getRedeliveryPolicy().copy());
- return answer;
+ /**
+ * Creates a DeadLetterChannel using the given endpoint
+ *
+ * @param uri the dead letter queue
+ */
+ public DeadLetterChannelBuilder(String uri) {
+ setDeadLetterUri(uri);
}
public Processor createErrorHandler(RouteContext routeContext, Processor
processor) throws Exception {
- Processor deadLetter = getDeadLetterFactory().createProcessor();
- DeadLetterChannel answer = new DeadLetterChannel(processor,
deadLetter, onRedelivery, getRedeliveryPolicy(), getLogger(),
getExceptionPolicyStrategy());
+ DeadLetterChannel answer = new DeadLetterChannel(processor,
getFailureProcessor(), deadLetterUri, onRedelivery, getRedeliveryPolicy(),
getLogger(), getExceptionPolicyStrategy());
StreamCaching.enable(routeContext);
configure(answer);
return answer;
@@ -192,80 +201,54 @@
// Properties
//
-------------------------------------------------------------------------
- public RedeliveryPolicy getRedeliveryPolicy() {
- return redeliveryPolicy;
- }
- /**
- * Sets the redelivery policy
- */
- public void setRedeliveryPolicy(RedeliveryPolicy redeliveryPolicy) {
- this.redeliveryPolicy = redeliveryPolicy;
- }
-
- public ProcessorFactory getDeadLetterFactory() {
- if (deadLetterFactory == null) {
- deadLetterFactory = new ProcessorFactory() {
- public Processor createProcessor() {
- return getDefaultDeadLetterEndpoint();
- }
- };
+ public Processor getFailureProcessor() {
+ if (failureProcessor == null) {
+ if (deadLetter != null) {
+ failureProcessor = new SendProcessor(deadLetter);
+ } else {
+ // use a recipient list since we only have an uri for the
endpoint
+ failureProcessor = new RecipientList(new Expression() {
+ public Object evaluate(Exchange exchange) {
+ return deadLetterUri;
+ }
+
+ public <T> T evaluate(Exchange exchange, Class<T> type) {
+ return
exchange.getContext().getTypeConverter().convertTo(type, deadLetterUri);
+ }
+ });
+ }
}
- return deadLetterFactory;
- }
-
- /**
- * Sets the default dead letter queue factory
- */
- public void setDeadLetterFactory(ProcessorFactory deadLetterFactory) {
- this.deadLetterFactory = deadLetterFactory;
+ return failureProcessor;
}
- public Processor getDefaultDeadLetterEndpoint() {
- if (defaultDeadLetterEndpoint == null) {
- defaultDeadLetterEndpoint = new
RecipientList(getDefaultDeadLetterEndpointExpression());
- }
- return defaultDeadLetterEndpoint;
+ public String getDeadLetterUri() {
+ return deadLetterUri;
}
- /**
- * Sets the default dead letter endpoint used
- */
- public void setDefaultDeadLetterEndpoint(Processor
defaultDeadLetterEndpoint) {
- this.defaultDeadLetterEndpoint = defaultDeadLetterEndpoint;
+ public void setDeadLetterUri(final String deadLetterUri) {
+ this.deadLetter = null;
+ this.deadLetterUri = deadLetterUri;
}
- public Expression getDefaultDeadLetterEndpointExpression() {
- if (defaultDeadLetterEndpointExpression == null) {
- defaultDeadLetterEndpointExpression = ExpressionBuilder
- .constantExpression(getDefaultDeadLetterEndpointUri());
- }
- return defaultDeadLetterEndpointExpression;
+ public Endpoint getDeadLetter() {
+ return deadLetter;
}
- /**
- * Sets the expression used to decide the dead letter channel endpoint for
- * an exchange if no factory is provided via
- * {...@link #setDeadLetterFactory(ProcessorFactory)}
- */
- public void setDefaultDeadLetterEndpointExpression(Expression
defaultDeadLetterEndpointExpression) {
- this.defaultDeadLetterEndpointExpression =
defaultDeadLetterEndpointExpression;
+ public void setDeadLetter(Endpoint deadLetter) {
+ this.deadLetter = deadLetter;
+ this.deadLetterUri = deadLetter.getEndpointUri();
}
- public String getDefaultDeadLetterEndpointUri() {
- return defaultDeadLetterEndpointUri;
+ public RedeliveryPolicy getRedeliveryPolicy() {
+ return redeliveryPolicy;
}
/**
- * Sets the default dead letter endpoint URI used if no factory is provided
- * via {...@link #setDeadLetterFactory(ProcessorFactory)} and no
expression is
- * provided via {...@link
#setDefaultDeadLetterEndpointExpression(Expression)}
- *
- * @param defaultDeadLetterEndpointUri the default URI if no deadletter
- * factory or expression is provided
+ * Sets the redelivery policy
*/
- public void setDefaultDeadLetterEndpointUri(String
defaultDeadLetterEndpointUri) {
- this.defaultDeadLetterEndpointUri = defaultDeadLetterEndpointUri;
+ public void setRedeliveryPolicy(RedeliveryPolicy redeliveryPolicy) {
+ this.redeliveryPolicy = redeliveryPolicy;
}
public Logger getLogger() {
@@ -298,6 +281,6 @@
@Override
public String toString() {
- return "DeadLetterChannelBuilder(" + (deadLetterFactory != null ?
deadLetterFactory : defaultDeadLetterEndpoint) + ")";
+ return "DeadLetterChannelBuilder(" + deadLetterUri + ")";
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
Mon Mar 16 07:51:48 2009
@@ -30,23 +30,25 @@
public interface ErrorHandlerBuilder {
/**
- * Creates a copy of this builder
- */
- ErrorHandlerBuilder copy();
-
- /**
* Creates the error handler interceptor
+ *
+ * @param routeContext the route context
+ * @param processor the outer processor
+ * @return the error handler
+ * @throws Exception is thrown if the error handler could not be created
*/
Processor createErrorHandler(RouteContext routeContext, Processor
processor) throws Exception;
/**
* Adds error handler for the given exception type
+ *
* @param exception the exception to handle
*/
void addErrorHandlers(OnExceptionDefinition exception);
/**
* Adds the error handlers for the given list of exception types
+ *
* @param exceptions the list of exceptions to handle
*/
void setErrorHandlers(List<OnExceptionDefinition> exceptions);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
Mon Mar 16 07:51:48 2009
@@ -36,10 +36,6 @@
this.ref = ref;
}
- public ErrorHandlerBuilder copy() {
- return new ErrorHandlerBuilderRef(ref);
- }
-
@Override
public void addErrorHandlers(OnExceptionDefinition exception) {
if (handler != null) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
Mon Mar 16 07:51:48 2009
@@ -45,13 +45,6 @@
this.level = level;
}
- public ErrorHandlerBuilder copy() {
- LoggingErrorHandlerBuilder answer = new LoggingErrorHandlerBuilder();
- answer.setLog(getLog());
- answer.setLevel(getLevel());
- return answer;
- }
-
public Processor createErrorHandler(final RouteContext routeContext, final
Processor processor) {
LoggingErrorHandler handler = new LoggingErrorHandler(processor, log,
level);
configure(handler);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
Mon Mar 16 07:51:48 2009
@@ -30,10 +30,6 @@
*/
public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
- public ErrorHandlerBuilder copy() {
- return this;
- }
-
public Processor createErrorHandler(RouteContext routeContext, Processor
processor) {
return processor;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
Mon Mar 16 07:51:48 2009
@@ -49,12 +49,13 @@
private static final transient Log LOG =
LogFactory.getLog(DeadLetterChannel.class);
private static Timer timer = new Timer();
- private Processor output;
- private Processor deadLetter;
- private AsyncProcessor outputAsync;
+ private final Processor output;
+ private final Processor deadLetter;
+ private final String deadLetterUri;
+ private final AsyncProcessor outputAsync;
private RedeliveryPolicy redeliveryPolicy;
private Logger logger;
- private Processor redeliveryProcessor;
+ private final Processor redeliveryProcessor;
private class RedeliveryData {
int redeliveryCounter;
@@ -103,9 +104,22 @@
}
}
- public DeadLetterChannel(Processor output, Processor deadLetter, Processor
redeliveryProcessor, RedeliveryPolicy redeliveryPolicy, Logger logger,
ExceptionPolicyStrategy exceptionPolicyStrategy) {
+ /**
+ * Creates the dead letter channel.
+ *
+ * @param output outer processor that should use this
dead letter channel
+ * @param deadLetter the failure processor to send failed
exchanges to
+ * @param deadLetterUri an optional uri for logging purpose
+ * @param redeliveryProcessor an optional processor to run before
redelivert attempt
+ * @param redeliveryPolicy policy for redelivery
+ * @param logger logger to use for logging failures and
redelivery attempts
+ * @param exceptionPolicyStrategy strategy for onException handling
+ */
+ public DeadLetterChannel(Processor output, Processor deadLetter, String
deadLetterUri, Processor redeliveryProcessor,
+ RedeliveryPolicy redeliveryPolicy, Logger logger,
ExceptionPolicyStrategy exceptionPolicyStrategy) {
this.output = output;
this.deadLetter = deadLetter;
+ this.deadLetterUri = deadLetterUri;
this.redeliveryProcessor = redeliveryProcessor;
this.outputAsync = AsyncProcessorTypeConverter.convert(output);
this.redeliveryPolicy = redeliveryPolicy;
@@ -119,7 +133,7 @@
@Override
public String toString() {
- return "DeadLetterChannel[" + output + ", " + deadLetter + "]";
+ return "DeadLetterChannel[" + output + ", " + (deadLetterUri != null ?
deadLetterUri : deadLetter) + "]";
}
public void process(Exchange exchange) throws Exception {
@@ -307,7 +321,7 @@
* will be redelivered. This can be used to alter the Exchange.
*/
private void deliverToRedeliveryProcessor(final Exchange exchange, final
AsyncCallback callback,
- final RedeliveryData data) {
+ final RedeliveryData data) {
if (data.onRedeliveryProcessor == null) {
return;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
Mon Mar 16 07:51:48 2009
@@ -34,7 +34,7 @@
* @version $Revision$
*/
public abstract class ErrorHandlerSupport extends ServiceSupport implements
ErrorHandler {
- private Map<ExceptionPolicyKey, OnExceptionDefinition> exceptionPolicies =
new LinkedHashMap<ExceptionPolicyKey, OnExceptionDefinition>();
+ private final Map<ExceptionPolicyKey, OnExceptionDefinition>
exceptionPolicies = new LinkedHashMap<ExceptionPolicyKey,
OnExceptionDefinition>();
private ExceptionPolicyStrategy exceptionPolicy =
createDefaultExceptionPolicyStrategy();
public void addExceptionPolicy(OnExceptionDefinition exceptionType) {
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=754836&r1=754835&r2=754836&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
Mon Mar 16 07:51:48 2009
@@ -37,7 +37,7 @@
<!-- here we configure our DeadLetterChannel -->
<bean id="myDeadLetterErrorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
<!-- exchanges is routed to mock:dead in cased redelivery failed -->
- <property name="defaultDeadLetterEndpointUri" value="mock:dead"/>
+ <property name="deadLetterUri" value="mock:dead"/>
<!-- reference the redelivery policy to use -->
<property name="redeliveryPolicy" ref="myRedeliveryPolicyConfig"/>
</bean>
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=754836&r1=754835&r2=754836&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
Mon Mar 16 07:51:48 2009
@@ -23,31 +23,27 @@
">
- <camelContext id="camel" errorHandlerRef="deadLetterErrorHandler"
- xmlns="http://camel.apache.org/schema/spring";>
- <jmxAgent id="agent" disabled="true"/>
- <route>
- <from uri="seda:a"/>
- <to uri="seda:b"/>
- </route>
- <route>
- <from uri="direct:c"/>
- <to uri="direct:d"/>
- </route>
- </camelContext>
+ <camelContext id="camel" errorHandlerRef="deadLetterErrorHandler"
xmlns="http://camel.apache.org/schema/spring";>
+ <jmxAgent id="agent" disabled="true"/>
+ <route>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
+ </route>
+ <route>
+ <from uri="direct:c"/>
+ <to uri="direct:d"/>
+ </route>
+ </camelContext>
- <bean id="deadLetterErrorHandler"
- class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="defaultDeadLetterEndpointUri"
-value="bean:exceptionProcessor" />
- <property name="redeliveryPolicy" ref="rsRedeliveryPolicyConfig" />
- </bean>
+ <bean id="deadLetterErrorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <property name="deadLetterUri" value="bean:exceptionProcessor"/>
+ <property name="redeliveryPolicy" ref="rsRedeliveryPolicyConfig"/>
+ </bean>
- <bean id="rsRedeliveryPolicyConfig"
- class="org.apache.camel.processor.RedeliveryPolicy">
- <property name="maximumRedeliveries" value="1" />
- <property name="delay" value="30000"/>
- <property name="useExponentialBackOff" value="true"/>
- </bean>
+ <bean id="rsRedeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
+ <property name="maximumRedeliveries" value="1"/>
+ <property name="delay" value="30000"/>
+ <property name="useExponentialBackOff" value="true"/>
+ </bean>
</beans>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml?rev=754836&r1=754835&r2=754836&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/faultRoute.xml
Mon Mar 16 07:51:48 2009
@@ -72,7 +72,7 @@
<bean id="deadLetterErrorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
<property name="redeliveryPolicy" ref="redeliveryPolicyConfig" />
- <property name="defaultDeadLetterEndpointUri" value="mock:error"/>
+ <property name="deadLetterUri" value="mock:error"/>
</bean>
<bean id="redeliveryPolicyConfig"
class="org.apache.camel.processor.RedeliveryPolicy">
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml?rev=754836&r1=754835&r2=754836&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
Mon Mar 16 07:51:48 2009
@@ -23,10 +23,15 @@
">
<bean id="deadLetterErrorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="defaultDeadLetterEndpointUri" value="mock:error"/>
+ <property name="deadLetter" ref="dead"/>
<property name="onRedelivery" ref="myRedeliveryProcessor"/>
<property name="redeliveryPolicy" ref="redeliveryPolicy"/>
</bean>
+
+ <bean id="dead" class="org.apache.camel.component.mock.MockEndpoint">
+ <property name="endpointUriIfNotSpecified" value="mock:error"/>
+ <property name="camelContext" ref="camel"/>
+ </bean>
<bean id="redeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
<!-- go fast since its a unit test -->
@@ -49,7 +54,7 @@
class="org.apache.camel.processor.DeadLetterChannelOnExceptionOnRedeliveryTest$ThrowIOExceptionProcessor"/>
- <camelContext xmlns="http://camel.apache.org/schema/spring";
errorHandlerRef="deadLetterErrorHandler">
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";
errorHandlerRef="deadLetterErrorHandler">
<!-- START SNIPPET: e1 -->
<onException onRedeliveryRef="myIORedeliverProcessor">
