Author: davsclaus
Date: Thu Jul  1 05:56:24 2010
New Revision: 959519

URL: http://svn.apache.org/viewvc?rev=959519&view=rev
Log:
CAMEL-2877: transacted works with async routing engine.

Added:
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
   (with props)
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
      - copied, changed from r959503, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
   (with props)
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
   (with props)
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java
      - copied, changed from r959503, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java 
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Thu Jul 
 1 05:56:24 2010
@@ -115,7 +115,6 @@ public interface Exchange {
     String SPLIT_COMPLETE     = "CamelSplitComplete";
     String SPLIT_SIZE         = "CamelSplitSize";
 
-    String TRANSACTED            = "CamelTransacted";
     String TRANSFER_ENCODING     = "Transfer-Encoding";
     String TRACE_EVENT           = "CamelTraceEvent";
     String TRACE_EVENT_NODE_ID   = "CamelTraceEventNodeId";

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java 
Thu Jul  1 05:56:24 2010
@@ -304,7 +304,7 @@ public final class DefaultExchange imple
     }
 
     public boolean isTransacted() {
-        return Boolean.TRUE.equals(getProperty(Exchange.TRANSACTED));
+        return getUnitOfWork() != null && getUnitOfWork().isTransacted();
     }
 
     public boolean isRollbackOnly() {

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=959519&r1=959518&r2=959519&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
 Thu Jul  1 05:56:24 2010
@@ -202,6 +202,10 @@ public class DefaultUnitOfWork implement
         return tracedRouteNodes;
     }
 
+    public boolean isTransacted() {
+        return transactedBy != null && !transactedBy.isEmpty();
+    }
+
     public boolean isTransactedBy(Object transactionDefinition) {
         return getTransactedBy().contains(transactionDefinition);
     }

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=959519&r1=959518&r2=959519&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 
Thu Jul  1 05:56:24 2010
@@ -82,6 +82,13 @@ public interface UnitOfWork {
     TracedRouteNodes getTracedRouteNodes();
 
     /**
+     * Are we transacted?
+     *
+     * @return <tt>true</tt> if transacted, <tt>false</tt> otherwise
+     */
+    boolean isTransacted();
+
+    /**
      * Are we already transacted by the given transaction definition
      * <p/>
      * The definition will most likely be a Spring TransactionTemplate when 
using Spring Transaction

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java
 Thu Jul  1 05:56:24 2010
@@ -72,12 +72,14 @@ public class AsyncEndpointJmsTX2Test ext
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("async:Hi Camel")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("log:after")

Added: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java?rev=959519&view=auto
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
 (added)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
 Thu Jul  1 05:56:24 2010
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.tx;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.async.MyAsyncComponent;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version $Revision$
+ */
+public class AsyncEndpointJmsTXMulticastTest extends CamelSpringTestSupport {
+
+    @Override
+    protected int getExpectedRouteCount() {
+        // no routes in Spring XML so return 0
+        return 0;
+    }
+
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        return new 
ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
+    }
+
+    private static String beforeThreadName;
+    private static String afterThreadName;
+
+    @Test
+    public void testAsyncEndpointOK() throws Exception {
+        getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
+        getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
+
+        template.sendBody("activemq:queue:inbox", "Hello Camel");
+
+        assertMockEndpointsSatisfied();
+
+        // we are synchronous due to TX so the we are using same threads 
during the routing
+        assertTrue("Should use same threads", 
beforeThreadName.equalsIgnoreCase(afterThreadName));
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                context.addComponent("async", new MyAsyncComponent());
+
+                from("activemq:queue:inbox")
+                    .transacted()
+                        .to("mock:before")
+                        .to("log:before")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
+                            }
+                        })
+                        .multicast().to("direct:foo");
+
+                from("direct:foo")
+                        // tx should be conveyed to this route as well
+                        .to("async:Bye Camel")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
+                            }
+                        })
+                        .to("log:after")
+                        .to("mock:after")
+                        .to("mock:result");
+            }
+        };
+    }
+}
\ No newline at end of file

Propchange: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
 (from r959503, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java?p2=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java&p1=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java&r1=959503&r2=959519&rev=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
 Thu Jul  1 05:56:24 2010
@@ -28,7 +28,7 @@ import org.springframework.context.suppo
 /**
  * @version $Revision$
  */
-public class AsyncEndpointJmsTXTest extends CamelSpringTestSupport {
+public class AsyncEndpointJmsTXRecipientListTest extends 
CamelSpringTestSupport {
 
     @Override
     protected int getExpectedRouteCount() {
@@ -72,12 +72,18 @@ public class AsyncEndpointJmsTXTest exte
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
+                        .recipientList(constant("direct:foo"));
+
+                from("direct:foo")
+                        // tx should be conveyed to this route as well
                         .to("async:Bye Camel")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("log:after")
@@ -86,4 +92,4 @@ public class AsyncEndpointJmsTXTest exte
             }
         };
     }
-}
+}
\ No newline at end of file

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java
 Thu Jul  1 05:56:24 2010
@@ -76,12 +76,14 @@ public class AsyncEndpointJmsTXRollback2
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("async:Hi Camel")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("log:after")
@@ -98,6 +100,7 @@ public class AsyncEndpointJmsTXRollback2
                             if (invoked < 2) {
                                 throw new IllegalArgumentException("Damn");
                             }
+                            assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                         }
                     });
 

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java
 Thu Jul  1 05:56:24 2010
@@ -76,12 +76,14 @@ public class AsyncEndpointJmsTXRollbackT
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("async:Bye Camel")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("log:after")
@@ -92,6 +94,7 @@ public class AsyncEndpointJmsTXRollbackT
                                 if (invoked < 2) {
                                     throw new IllegalArgumentException("Damn");
                                 }
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("mock:result");

Added: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java?rev=959519&view=auto
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
 (added)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
 Thu Jul  1 05:56:24 2010
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.tx;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.async.MyAsyncComponent;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version $Revision$
+ */
+public class AsyncEndpointJmsTXRoutingSlipTest extends CamelSpringTestSupport {
+
+    @Override
+    protected int getExpectedRouteCount() {
+        // no routes in Spring XML so return 0
+        return 0;
+    }
+
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        return new 
ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
+    }
+
+    private static String beforeThreadName;
+    private static String afterThreadName;
+
+    @Test
+    public void testAsyncEndpointOK() throws Exception {
+        getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
+        getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
+
+        template.sendBody("activemq:queue:inbox", "Hello Camel");
+
+        assertMockEndpointsSatisfied();
+
+        // we are synchronous due to TX so the we are using same threads 
during the routing
+        assertTrue("Should use same threads", 
beforeThreadName.equalsIgnoreCase(afterThreadName));
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                context.addComponent("async", new MyAsyncComponent());
+
+                from("activemq:queue:inbox")
+                    .transacted()
+                        .to("mock:before")
+                        .to("log:before")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
+                            }
+                        })
+                        .routingSlip(constant("direct:foo"));
+
+                from("direct:foo")
+                        // tx should be conveyed to this route as well
+                        .to("async:Bye Camel")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
+                            }
+                        })
+                        .to("log:after")
+                        .to("mock:after")
+                        .to("mock:result");
+            }
+        };
+    }
+}
\ No newline at end of file

Propchange: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
 Thu Jul  1 05:56:24 2010
@@ -72,12 +72,14 @@ public class AsyncEndpointJmsTXTest exte
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("async:Bye Camel")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("log:after")

Added: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java?rev=959519&view=auto
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
 (added)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
 Thu Jul  1 05:56:24 2010
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.tx;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.async.MyAsyncComponent;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version $Revision$
+ */
+public class AsyncEndpointJmsTXTryCatchFinallyTest extends 
CamelSpringTestSupport {
+
+    @Override
+    protected int getExpectedRouteCount() {
+        // no routes in Spring XML so return 0
+        return 0;
+    }
+
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        return new 
ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
+    }
+
+    private static String beforeThreadName;
+    private static String afterThreadName;
+
+    @Test
+    public void testAsyncEndpointOK() throws Exception {
+        getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
+        getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
+        getMockEndpoint("mock:catch").expectedMessageCount(0);
+        getMockEndpoint("mock:finally").expectedBodiesReceived("Bye Camel");
+
+        template.sendBody("activemq:queue:inbox", "Hello Camel");
+
+        assertMockEndpointsSatisfied();
+
+        // we are synchronous due to TX so the we are using same threads 
during the routing
+        assertTrue("Should use same threads", 
beforeThreadName.equalsIgnoreCase(afterThreadName));
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                context.addComponent("async", new MyAsyncComponent());
+
+                from("activemq:queue:inbox")
+                    .transacted()
+                        .to("mock:before")
+                        .to("log:before")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
+                            }
+                        })
+                        .doTry()
+                            .to("direct:foo")
+                        .doCatch(Exception.class)
+                            .to("mock:catch")
+                        .doFinally()
+                            .to("mock:finally")
+                        .end()
+                        .to("mock:result");
+
+                from("direct:foo")
+                        // tx should be conveyed to this route as well
+                        .to("async:Bye Camel")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                afterThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
+                            }
+                        })
+                        .to("log:after")
+                        .to("mock:after");
+            }
+        };
+    }
+}
\ No newline at end of file

Propchange: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java
 (from r959503, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java?p2=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java&p1=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java&r1=959503&r2=959519&rev=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java
 Thu Jul  1 05:56:24 2010
@@ -28,7 +28,7 @@ import org.springframework.context.suppo
 /**
  * @version $Revision$
  */
-public class AsyncEndpointJmsTXTest extends CamelSpringTestSupport {
+public class AsyncEndpointJmsTXWireTapTest extends CamelSpringTestSupport {
 
     @Override
     protected int getExpectedRouteCount() {
@@ -43,19 +43,20 @@ public class AsyncEndpointJmsTXTest exte
 
     private static String beforeThreadName;
     private static String afterThreadName;
+    private static volatile boolean txA;
+    private static volatile boolean txB;
 
     @Test
     public void testAsyncEndpointOK() throws Exception {
-        getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
-        getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
+        getMockEndpoint("mock:tap").expectedBodiesReceived("Hi Camel");
         getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
 
         template.sendBody("activemq:queue:inbox", "Hello Camel");
 
         assertMockEndpointsSatisfied();
 
-        // we are synchronous due to TX so the we are using same threads 
during the routing
-        assertTrue("Should use same threads", 
beforeThreadName.equalsIgnoreCase(afterThreadName));
+        // the tapped exchange is not transacted
+        assertFalse("Should use different threads", 
beforeThreadName.equalsIgnoreCase(afterThreadName));
     }
 
     @Override
@@ -67,23 +68,30 @@ public class AsyncEndpointJmsTXTest exte
 
                 from("activemq:queue:inbox")
                     .transacted()
-                        .to("mock:before")
-                        .to("log:before")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
-                                beforeThreadName = 
Thread.currentThread().getName();
+                                assertTrue("Exchange should be transacted", 
exchange.isTransacted());
                             }
                         })
                         .to("async:Bye Camel")
+                        .wireTap("direct:tap")
+                        .to("mock:result");
+
+                from("direct:tap")
+                        .process(new Processor() {
+                            public void process(Exchange exchange) throws 
Exception {
+                                beforeThreadName = 
Thread.currentThread().getName();
+                                assertFalse("Exchange should NOT be 
transacted", exchange.isTransacted());
+                            }
+                        })
+                        .to("async:Hi Camel")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws 
Exception {
                                 afterThreadName = 
Thread.currentThread().getName();
                             }
                         })
-                        .to("log:after")
-                        .to("mock:after")
-                        .to("mock:result");
+                        .to("mock:tap");
             }
         };
     }
-}
+}
\ No newline at end of file

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=959519&r1=959518&r2=959519&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
 Thu Jul  1 05:56:24 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.spring.spi;
 
-import java.util.concurrent.CountDownLatch;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
@@ -149,8 +147,6 @@ public class TransactionErrorHandler ext
                 // IMPORTANT: Must be a runtime exception to let Spring regard 
it as to do "rollback"
                 RuntimeException rce = null;
 
-                exchange.setProperty(Exchange.TRANSACTED, Boolean.TRUE);
-
                 // and now let process the exchange by the error handler
                 processByErrorHandler(exchange);
 


Reply via email to