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 2009/07/10 17:00:06 UTC

svn commit: r792966 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/processor/ camel-core/s...

Author: davsclaus
Date: Fri Jul 10 15:00:05 2009
New Revision: 792966

URL: http://svn.apache.org/viewvc?rev=792966&view=rev
Log:
CAMEL-1820: useOriginalBody renamed to useOriginalMessage. JmsMessage is a pain so special care here.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.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/DeadLetterChannelUseOriginalInBodyWithFileTest.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml

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=792966&r1=792965&r2=792966&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 Fri Jul 10 15:00:05 2009
@@ -54,7 +54,7 @@
     public Processor createErrorHandler(RouteContext routeContext, Processor processor) throws Exception {
         DeadLetterChannel answer = new DeadLetterChannel(processor, getLogger(), getOnRedelivery(), getRedeliveryPolicy(),
                 getHandledPolicy(), getExceptionPolicyStrategy(), getFailureProcessor(), getDeadLetterUri(),
-                isUseOriginalBody());
+                isUseOriginalMessage());
         // configure error handler before we can use it
         configure(answer);
         return answer;

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=792966&r1=792965&r2=792966&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 Jul 10 15:00:05 2009
@@ -46,7 +46,7 @@
     protected Processor failureProcessor;
     protected Endpoint deadLetter;
     protected String deadLetterUri;
-    protected boolean useOriginalBody;
+    protected boolean useOriginalMessage;
 
     public DefaultErrorHandlerBuilder() {
     }
@@ -235,22 +235,26 @@
     }
 
     /**
-     * Will use the original input body when an {@link org.apache.camel.Exchange} is moved to the dead letter queue.
+     * Will use the original input {@link org.apache.camel.Message} when an {@link org.apache.camel.Exchange}
+     * is moved to the dead letter queue.
      * <p/>
-     * <b>Notice:</b> this only applies when all redeliveries attempt have failed and the {@link org.apache.camel.Exchange} is doomed for failure.
+     * <b>Notice:</b> this only applies when all redeliveries attempt have failed and the {@link org.apache.camel.Exchange}
+     * is doomed for failure.
      * <br/>
-     * Instead of using the current inprogress {@link org.apache.camel.Exchange} IN body we use the original IN body instead. This allows
-     * you to store the original input in the dead letter queue instead of the inprogress snapshot of the IN body.
+     * Instead of using the current inprogress {@link org.apache.camel.Exchange} IN message we use the original
+     * IN message instead. This allows you to store the original input in the dead letter queue instead of the inprogress
+     * snapshot of the IN message.
      * For instance if you route transform the IN body during routing and then failed. With the original exchange
-     * store in the dead letter queue it might be easier to manually re submit the {@link org.apache.camel.Exchange} again as the IN body
-     * is the same as when Camel received it. So you should be able to send the {@link org.apache.camel.Exchange} to the same input.
+     * store in the dead letter queue it might be easier to manually re submit the {@link org.apache.camel.Exchange}
+     * again as the IN message is the same as when Camel received it.
+     * So you should be able to send the {@link org.apache.camel.Exchange} to the same input.
      * <p/>
      * By default this feature is off.
      *
      * @return the builder
      */
-    public DefaultErrorHandlerBuilder useOriginalBody() {
-        setUseOriginalBody(true);
+    public DefaultErrorHandlerBuilder useOriginalMessage() {
+        setUseOriginalMessage(true);
         return this;
     }
 
@@ -346,12 +350,12 @@
         this.deadLetterUri = deadLetter.getEndpointUri();
     }
 
-    public boolean isUseOriginalBody() {
-        return useOriginalBody;
+    public boolean isUseOriginalMessage() {
+        return useOriginalMessage;
     }
 
-    public void setUseOriginalBody(boolean useOriginalBody) {
-        this.useOriginalBody = useOriginalBody;
+    public void setUseOriginalMessage(boolean useOriginalMessage) {
+        this.useOriginalMessage = useOriginalMessage;
     }
 
     protected Predicate createHandledPolicy() {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Fri Jul 10 15:00:05 2009
@@ -24,6 +24,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.Message;
 import org.apache.camel.RouteNode;
 import org.apache.camel.Service;
 import org.apache.camel.model.ProcessorDefinition;
@@ -46,10 +47,17 @@
     private List<Synchronization> synchronizations;
     private List<RouteNode> routeNodes;
     private Map<ProcessorDefinition, AtomicInteger> routeIndex = new HashMap<ProcessorDefinition, AtomicInteger>();
-    private Object originalInBody;
+    private Message originalInMessage;
 
     public DefaultUnitOfWork(Exchange exchange) {
-        this.originalInBody = exchange.getIn().getBody();
+        // special for JmsMessage as it can cause it to loose headers later. Yeah JMS suchs
+        if (exchange.getIn().getClass().getSimpleName().equals("JmsMessage")) {
+            this.originalInMessage = new DefaultMessage();
+            this.originalInMessage.setBody(exchange.getIn().getBody());
+            // cannot copy headers with a JmsMessage as the underlying javax.jms.Message object goes nuts 
+        } else {
+            this.originalInMessage = exchange.getIn().copy();
+        }
     }
 
     public void start() throws Exception {
@@ -65,7 +73,7 @@
             routeNodes.clear();
         }
         routeIndex.clear();
-        originalInBody = null;
+        originalInMessage = null;
     }
 
     public synchronized void addSynchronization(Synchronization synchronization) {
@@ -144,8 +152,8 @@
         return Collections.unmodifiableList(routeNodes);
     }
 
-    public Object getOriginalInBody() {
-        return originalInBody;
+    public Message getOriginalInMessage() {
+        return originalInMessage;
     }
 
     public int getAndIncrement(ProcessorDefinition node) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Fri Jul 10 15:00:05 2009
@@ -65,8 +65,8 @@
     private ExpressionSubElementDefinition handled;
     @XmlAttribute(name = "onRedeliveryRef", required = false)
     private String onRedeliveryRef;
-    @XmlAttribute(name = "useOriginalBody", required = false)
-    private Boolean useOriginalBodyPolicy = Boolean.FALSE;
+    @XmlAttribute(name = "useOriginalMessage", required = false)
+    private Boolean useOriginalMessagePolicy = Boolean.FALSE;
     @XmlElementRef
     private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
     @XmlTransient
@@ -387,7 +387,7 @@
      * @return the builder
      */
     public OnExceptionDefinition useOriginalBody() {
-        setUseOriginalBodyPolicy(Boolean.TRUE);
+        setUseOriginalMessagePolicy(Boolean.TRUE);
         return this;
     }
 
@@ -498,12 +498,12 @@
         this.onRedeliveryRef = onRedeliveryRef;
     }
 
-    public Boolean getUseOriginalBodyPolicy() {
-        return useOriginalBodyPolicy;
+    public Boolean getUseOriginalMessagePolicy() {
+        return useOriginalMessagePolicy;
     }
 
-    public void setUseOriginalBodyPolicy(Boolean useOriginalBodyPolicy) {
-        this.useOriginalBodyPolicy = useOriginalBodyPolicy;
+    public void setUseOriginalMessagePolicy(Boolean useOriginalMessagePolicy) {
+        this.useOriginalMessagePolicy = useOriginalMessagePolicy;
     }
 
     // Implementation methods

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java Fri Jul 10 15:00:05 2009
@@ -46,7 +46,7 @@
     protected final RedeliveryPolicy redeliveryPolicy;
     protected final Predicate handledPolicy;
     protected final Logger logger;
-    protected final boolean useOriginalBodyPolicy;
+    protected final boolean useOriginalMessagePolicy;
 
     protected class RedeliveryData {
         int redeliveryCounter;
@@ -59,12 +59,12 @@
         Processor failureProcessor;
         Processor onRedeliveryProcessor = redeliveryProcessor;
         Predicate handledPredicate = handledPolicy;
-        boolean useOriginalInBody = useOriginalBodyPolicy;
+        boolean useOriginalInMessage = useOriginalMessagePolicy;
     }
 
     public RedeliveryErrorHandler(Processor output, Logger logger, Processor redeliveryProcessor,
                                   RedeliveryPolicy redeliveryPolicy, Predicate handledPolicy, Processor deadLetter,
-                                  String deadLetterUri, boolean useOriginalBodyPolicy) {
+                                  String deadLetterUri, boolean useOriginalMessagePolicy) {
         this.redeliveryProcessor = redeliveryProcessor;
         this.deadLetter = deadLetter;
         this.output = output;
@@ -72,7 +72,7 @@
         this.logger = logger;
         this.deadLetterUri = deadLetterUri;
         this.handledPolicy = handledPolicy;
-        this.useOriginalBodyPolicy = useOriginalBodyPolicy;
+        this.useOriginalMessagePolicy = useOriginalMessagePolicy;
     }
 
     public boolean supportTransacted() {
@@ -243,7 +243,7 @@
             data.currentRedeliveryPolicy = exceptionPolicy.createRedeliveryPolicy(exchange.getContext(), data.currentRedeliveryPolicy);
             data.handledPredicate = exceptionPolicy.getHandledPolicy();
             data.retryUntilPredicate = exceptionPolicy.getRetryUntilPolicy();
-            data.useOriginalInBody = exceptionPolicy.getUseOriginalBodyPolicy();
+            data.useOriginalInMessage = exceptionPolicy.getUseOriginalMessagePolicy();
 
             // route specific failure handler?
             Processor processor = exceptionPolicy.getErrorHandler();
@@ -310,13 +310,13 @@
 
         if (processor != null) {
             // prepare original IN body if it should be moved instead of current body
-            if (data.useOriginalInBody) {
+            if (data.useOriginalInMessage) {
                 if (log.isTraceEnabled()) {
-                    log.trace("Using the original IN body instead of the current IN body");
+                    log.trace("Using the original IN message instead of current");
                 }
 
-                Object original = exchange.getUnitOfWork().getOriginalInBody();
-                exchange.getIn().setBody(original);
+                Message original = exchange.getUnitOfWork().getOriginalInMessage();
+                exchange.setIn(original);
             }
 
             if (log.isTraceEnabled()) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java Fri Jul 10 15:00:05 2009
@@ -17,6 +17,7 @@
 package org.apache.camel.spi;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.Message;
 
 /**
  * An object representing the unit of work processing an {@link Exchange}
@@ -67,9 +68,9 @@
     String getId();
 
     /**
-     * Gets the original IN body this Unit of Work was started with.
+     * Gets the original IN {@link Message} this Unit of Work was started with.
      *
-     * @return the original IN body
+     * @return the original IN {@link Message}
      */
-    Object getOriginalInBody();
+    Message getOriginalInMessage();
 }

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=792966&r1=792965&r2=792966&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 Jul 10 15:00:05 2009
@@ -55,7 +55,7 @@
             public void configure() throws Exception {
                 // will use original
                 ErrorHandlerBuilder a = deadLetterChannel("mock:a")
-                    .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).useOriginalBody().handled(true);
+                    .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).useOriginalMessage().handled(true);
 
                 // will NOT use original
                 ErrorHandlerBuilder b = deadLetterChannel("mock:b")

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java Fri Jul 10 15:00:05 2009
@@ -50,7 +50,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                errorHandler(deadLetterChannel("mock:dead").disableRedelivery().logStackTrace(false).useOriginalBody().handled(true));
+                errorHandler(deadLetterChannel("mock:dead").disableRedelivery().logStackTrace(false).useOriginalMessage().handled(true));
 
                 from("file://target/originalexchange?noop=true")
                     .transform(body().append(" World"))

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java Fri Jul 10 15:00:05 2009
@@ -61,7 +61,7 @@
             public void configure() throws Exception {
                 // will use original
                 ErrorHandlerBuilder a = deadLetterChannel("mock:a")
-                    .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).useOriginalBody().handled(true);
+                    .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).useOriginalMessage().handled(true);
 
                 // will NOT use original
                 ErrorHandlerBuilder b = deadLetterChannel("mock:b")

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml Fri Jul 10 15:00:05 2009
@@ -29,8 +29,8 @@
         <!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
              does not receive an exception -->
         <property name="handled" value="true"/>
-        <!-- use the original input body when moving to dead letter queue -->
-        <property name="useOriginalBody" value="true"/>
+        <!-- use the original input message when moving to dead letter queue -->
+        <property name="useOriginalMessage" value="true"/>
         <property name="redeliveryPolicy" ref="myRedelivery"/>
     </bean>
 
@@ -47,8 +47,8 @@
         <!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
              does not receive an exception -->
         <property name="handled" value="true"/>
-        <!-- do NOT use the original input body when moving to dead letter queue -->
-        <property name="useOriginalBody" value="false"/>
+        <!-- do NOT use the original input message when moving to dead letter queue -->
+        <property name="useOriginalMessage" value="false"/>
         <property name="redeliveryPolicy" ref="myRedelivery"/>
     </bean>
 

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml Fri Jul 10 15:00:05 2009
@@ -29,8 +29,8 @@
         <!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
              does not receive an exception -->
         <property name="handled" value="true"/>
-        <!-- use the original input body when moving to dead letter queue -->
-        <property name="useOriginalBody" value="true"/>
+        <!-- use the original input message when moving to dead letter queue -->
+        <property name="useOriginalMessage" value="true"/>
         <property name="redeliveryPolicy" ref="myRedelivery"/>
     </bean>
 
@@ -47,8 +47,8 @@
         <!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
              does not receive an exception -->
         <property name="handled" value="true"/>
-        <!-- do NOT use the original input body when moving to dead letter queue -->
-        <property name="useOriginalBody" value="false"/>
+        <!-- do NOT use the original input message when moving to dead letter queue -->
+        <property name="useOriginalMessage" value="false"/>
         <property name="redeliveryPolicy" ref="myRedelivery"/>
     </bean>
 

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml Fri Jul 10 15:00:05 2009
@@ -30,14 +30,14 @@
 
     <camelContext errorHandlerRef="deadLetter" xmlns="http://camel.apache.org/schema/spring">
 
-        <onException useOriginalBody="true">
+        <onException useOriginalMessage="true">
             <exception>org.apache.camel.processor.onexception.MyTechnicalException</exception>
             <redeliveryPolicy maximumRedeliveries="0" logStackTrace="false"/>
             <handled><constant>true</constant></handled>
             <to uri="mock:tech"/>
         </onException>
 
-        <onException useOriginalBody="true">
+        <onException useOriginalMessage="true">
             <exception>org.apache.camel.processor.onexception.MyFunctionalException</exception>
             <redeliveryPolicy maximumRedeliveries="0" logStackTrace="false"/>
             <handled><constant>true</constant></handled>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml?rev=792966&r1=792965&r2=792966&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml Fri Jul 10 15:00:05 2009
@@ -44,7 +44,7 @@
 
     <camelContext errorHandlerRef="deadLetter" xmlns="http://camel.apache.org/schema/spring">
 
-        <onException useOriginalBody="true">
+        <onException useOriginalMessage="true">
             <exception>java.lang.IllegalArgumentException</exception>
             <redeliveryPolicy maximumRedeliveries="2"/>
             <handled><constant>true</constant></handled>