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/04/06 12:06:28 UTC

svn commit: r762267 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/model/ components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/ components/camel-spring/src/main/java/...

Author: davsclaus
Date: Mon Apr  6 10:06:27 2009
New Revision: 762267

URL: http://svn.apache.org/viewvc?rev=762267&view=rev
Log:
CAMEL:-1475: Transacted routes is now easier to configure as a TransactedErrorHandlerBuilder is not needed to be configured.

Added:
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
      - copied, changed from r762043, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
      - copied, changed from r762043, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
      - copied, changed from r762220, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml
      - copied, changed from r762043, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.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/ErrorHandlerBuilderSupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.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=762267&r1=762266&r2=762267&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 Mon Apr  6 10:06:27 2009
@@ -29,32 +29,10 @@
  */
 public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
 
-    private ExceptionPolicyStrategy exceptionPolicyStrategy = ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
-
     public Processor createErrorHandler(RouteContext routeContext, Processor processor) {
-        DefaultErrorHandler answer = new DefaultErrorHandler(processor, exceptionPolicyStrategy);
+        DefaultErrorHandler answer = new DefaultErrorHandler(processor, getExceptionPolicyStrategy());
         configure(answer);
         return answer;
     }
 
-    /**
-     * Sets the exception policy to use
-     */
-    public DefaultErrorHandlerBuilder exceptionPolicyStrategy(ExceptionPolicyStrategy exceptionPolicyStrategy) {
-        setExceptionPolicyStrategy(exceptionPolicyStrategy);
-        return this;
-    }
-
-    /**
-     * Sets the exception policy strategy to use for resolving the {@link org.apache.camel.model.OnExceptionDefinition}
-     * to use for a given thrown exception
-     */
-    public ExceptionPolicyStrategy getExceptionPolicyStrategy() {
-        return exceptionPolicyStrategy;
-    }
-
-    public void setExceptionPolicyStrategy(ExceptionPolicyStrategy exceptionPolicyStrategy) {
-        this.exceptionPolicyStrategy = exceptionPolicyStrategy;
-    }
-
 }
\ No newline at end of file

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=762267&r1=762266&r2=762267&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 Apr  6 10:06:27 2009
@@ -20,6 +20,7 @@
 
 import org.apache.camel.Processor;
 import org.apache.camel.model.OnExceptionDefinition;
+import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
 import org.apache.camel.spi.RouteContext;
 
 /**
@@ -53,4 +54,21 @@
      */
     void setErrorHandlers(List<OnExceptionDefinition> exceptions);
 
+    /**
+     * Gets the error handlers
+     */
+    List<OnExceptionDefinition> getErrorHandlers();
+
+    /**
+     * Gets the exception policy strategy
+     */
+    ExceptionPolicyStrategy getExceptionPolicyStrategy();
+
+    /**
+     * Sets the exception policy strategy to use for resolving the {@link org.apache.camel.model.OnExceptionDefinition}
+     * to use for a given thrown exception
+     *
+     * @param exceptionPolicyStrategy  the exception policy strategy
+     */
+    void setExceptionPolicyStrategy(ExceptionPolicyStrategy exceptionPolicyStrategy);
 }

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=762267&r1=762266&r2=762267&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 Apr  6 10:06:27 2009
@@ -55,7 +55,7 @@
         if (handler == null) {
             handler = routeContext.lookup(ref, ErrorHandlerBuilder.class);
             ObjectHelper.notNull(handler, "error handler '" + ref + "'");
-            List<OnExceptionDefinition> list = getExceptions();
+            List<OnExceptionDefinition> list = getErrorHandlers();
             for (OnExceptionDefinition exceptionType : list) {
                 handler.addErrorHandlers(exceptionType);
             }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java?rev=762267&r1=762266&r2=762267&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java Mon Apr  6 10:06:27 2009
@@ -21,6 +21,7 @@
 
 import org.apache.camel.model.OnExceptionDefinition;
 import org.apache.camel.processor.ErrorHandlerSupport;
+import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
 
 /**
  * Base class for builders of error handling.
@@ -29,6 +30,7 @@
  */
 public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder {
     private List<OnExceptionDefinition> exceptions = new ArrayList<OnExceptionDefinition>();
+    private ExceptionPolicyStrategy exceptionPolicyStrategy = ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
 
     public void addErrorHandlers(OnExceptionDefinition exception) {
         // only add if we not already have it
@@ -43,7 +45,7 @@
         }
     }
 
-    public List<OnExceptionDefinition> getExceptions() {
+    public List<OnExceptionDefinition> getErrorHandlers() {
         return exceptions;
     }
 
@@ -51,4 +53,20 @@
         this.exceptions.clear();
         this.exceptions.addAll(exceptions);
     }
+
+    /**
+     * Sets the exception policy to use
+     */
+    public ErrorHandlerBuilderSupport exceptionPolicyStrategy(ExceptionPolicyStrategy exceptionPolicyStrategy) {
+        setExceptionPolicyStrategy(exceptionPolicyStrategy);
+        return this;
+    }
+
+    public ExceptionPolicyStrategy getExceptionPolicyStrategy() {
+        return exceptionPolicyStrategy;
+    }
+
+    public void setExceptionPolicyStrategy(ExceptionPolicyStrategy exceptionPolicyStrategy) {
+        this.exceptionPolicyStrategy = exceptionPolicyStrategy;
+    }
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java?rev=762267&r1=762266&r2=762267&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java Mon Apr  6 10:06:27 2009
@@ -76,6 +76,17 @@
         this.ref = ref;
     }
 
+    /**
+     * Sets a reference to use for lookup the policy in the registry.
+     *
+     * @param ref the reference
+     * @return the builder
+     */
+    public PolicyDefinition ref(String ref) {
+        setRef(ref);
+        return this;
+    }
+
     @Override
     public Processor createProcessor(RouteContext routeContext) throws Exception {
         Processor childProcessor = createOutputsProcessor(routeContext);

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=762267&r1=762266&r2=762267&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Mon Apr  6 10:06:27 2009
@@ -1365,6 +1365,21 @@
     }
 
     /**
+     * Apply a {@link Policy}.
+     * <p/>
+     * Policy can be used for transactional policies.
+     *
+     * @param ref  reference to lookup a policy in the registry
+     * @return the policy builder to configure
+     */
+    public PolicyDefinition policy(String ref) {
+        PolicyDefinition answer = new PolicyDefinition();
+        answer.setRef(ref);
+        addOutput(answer);
+        return answer;
+    }
+
+    /**
      * Forces handling of faults as exceptions
      *
      * @return the current builder with the fault handler configured

Modified: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml?rev=762267&r1=762266&r2=762267&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml Mon Apr  6 10:06:27 2009
@@ -68,11 +68,7 @@
     </bean>
 
     <bean id="PROPAGATION_REQUIRED" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
-        <constructor-arg>
-            <bean class="org.springframework.transaction.support.TransactionTemplate">
-                <property name="transactionManager" ref="jmsTransactionManager"/>
-            </bean>
-        </constructor-arg>
+        <property name="transactionManager" ref="jmsTransactionManager"/>
     </bean>
     <!-- END SNIPPET: e2 -->
 

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java?rev=762267&r1=762266&r2=762267&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java Mon Apr  6 10:06:27 2009
@@ -21,6 +21,7 @@
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
 import org.apache.camel.spi.Policy;
 import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -47,17 +48,12 @@
         this.template = template;
     }
 
-    public Processor wrap(RouteContext routeContext, Processor processor) {
-        final TransactionTemplate transactionTemplate = getTransactionTemplate();
-
-        // TODO: Maybe we can auto create a template if non configured
-
-        if (transactionTemplate == null) {
-            LOG.warn("No TransactionTemplate available so transactions will not be enabled!");
-            return processor;
-        }
+    public SpringTransactionPolicy(PlatformTransactionManager transactionManager) {
+        this.transactionManager = transactionManager;
+    }
 
-        TransactionErrorHandler answer = new TransactionErrorHandler(transactionTemplate);
+    public Processor wrap(RouteContext routeContext, Processor processor) {
+        TransactionErrorHandler answer = new TransactionErrorHandler(getTransactionTemplate());
         answer.setOutput(processor);
 
         ErrorHandlerBuilder builder = routeContext.getRoute().getErrorHandlerBuilder();
@@ -65,18 +61,36 @@
             // its a reference to a error handler so lookup the reference
             ErrorHandlerBuilderRef ref = (ErrorHandlerBuilderRef) builder;
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Looking up errorHandlerRef: " + ref.getRef());
+                LOG.debug("Looking up ErrorHandlerBuilder with ref: " + ref.getRef());
             }
             builder = ref.lookupErrorHandlerBuilder(routeContext);
         }
 
         if (builder instanceof TransactionErrorHandlerBuilder) {
+            // use existing transaction error handler builder
             TransactionErrorHandlerBuilder txBuilder = (TransactionErrorHandlerBuilder) builder;
             answer.setExceptionPolicy(txBuilder.getExceptionPolicyStrategy());
             answer.setDelayPolicy(txBuilder.getDelayPolicy());
             txBuilder.configure(answer);
         } else {
-            LOG.warn("No TransactionErrorHandler defined so exception policies will not be enabled!");
+            // no transaction error handler builder configure so create a temporary one as we got all
+            // the needed information form the configured builder anyway this allow us to use transacted
+            // routes anway even though the error handler is not transactional, eg ease of configuration
+            if (builder != null && LOG.isDebugEnabled()) {
+                LOG.debug("The ErrorHandlerBuilder configured is not a TransactionErrorHandlerBuilder: " + builder);
+            } else {
+                LOG.debug("No ErrorHandlerBuilder configured, will use default TransactionErrorHandlerBuilder settings");
+            }
+            TransactionErrorHandlerBuilder txBuilder = new TransactionErrorHandlerBuilder();
+            txBuilder.setTransactionTemplate(getTransactionTemplate());
+            txBuilder.setSpringTransactionPolicy(this);
+            if (builder != null) {
+                // use error handlers from the configured builder
+                txBuilder.setErrorHandlers(builder.getErrorHandlers());
+            }
+            answer.setExceptionPolicy(txBuilder.getExceptionPolicyStrategy());
+            answer.setDelayPolicy(txBuilder.getDelayPolicy());
+            txBuilder.configure(answer);
         }
 
         return answer;
@@ -84,6 +98,7 @@
 
     public TransactionTemplate getTransactionTemplate() {
         if (template == null) {
+            ObjectHelper.notNull(transactionManager, "transactionManager");
             template = new TransactionTemplate(transactionManager);
             if (propagationBehaviorName != null) {
                 template.setPropagationBehaviorName(propagationBehaviorName);

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java (from r762043, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java&r1=762043&r2=762267&rev=762267&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java Mon Apr  6 10:06:27 2009
@@ -16,116 +16,30 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import javax.sql.DataSource;
-
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
-import org.apache.camel.spring.SpringTestSupport;
-import org.apache.camel.spring.spi.SpringTransactionPolicy;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
- * Unit test to demonstrate the transactional client pattern.
+ * Easier transaction configuration as we do not have to setup a transaction error handler
  */
-public class TransactionalClientDataSourceTest extends SpringTestSupport {
-
-    protected JdbcTemplate jdbc;
-    protected boolean useTransactionErrorHandler = true;
-
-    protected AbstractXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext(
-            "/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml");
-    }
-
-    protected int getExpectedRouteCount() {
-        return 0;
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        this.disableJMX();
-        super.setUp();
-
-        // START SNIPPET: e5
-        // create database and insert dummy data
-        final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
-        jdbc = new JdbcTemplate(ds);
-        jdbc.execute("create table books (title varchar(50))");
-        jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
-        // END SNIPPET: e5
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        jdbc.execute("drop table books");
-        this.enableJMX();
-    }
-
-    // START SNIPPET: e3
-    public void testTransactionSuccess() throws Exception {
-        template.sendBody("direct:okay", "Hello World");
-
-        int count = jdbc.queryForInt("select count(*) from books");
-        assertEquals("Number of books", 3, count);
-    }
-    // END SNIPPET: e3
-
-    // START SNIPPET: e4
-    public void testTransactionRollback() throws Exception {
-        try {
-            template.sendBody("direct:fail", "Hello World");
-        } catch (RuntimeCamelException e) {
-            // expeced as we fail
-            assertTrue(e.getCause() instanceof IllegalArgumentException);
-            assertEquals("We don't have Donkeys, only Camels", e.getCause().getMessage());
-        }
-
-        int count = jdbc.queryForInt("select count(*) from books");
-        assertEquals("Number of books", 1, count);
-    }
-    // END SNIPPET: e4
+public class TransactionalClientDataSourceWithNoErrorHandlerConfigureTest extends TransactionalClientDataSourceTest {
 
     protected RouteBuilder createRouteBuilder() throws Exception {
-        // START SNIPPET: e1
-        // Notice that we use the SpringRouteBuilder that has a few more features than
-        // the standard RouteBuilder
         return new SpringRouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: e1
-                // setup the transaction policy
-                SpringTransactionPolicy required = context.getRegistry()
-                    .lookup("PROPAGATION_REQUIRED", SpringTransactionPolicy.class);
-
-                // use this error handler instead of DeadLetterChannel that is the default
-                // Notice: transactionErrorHandler is in SpringRouteBuilder
-                if (useTransactionErrorHandler) {
-                    // useTransactionErrorHandler is only used for unit testing to reuse code
-                    // for doing a 2nd test without this transaction error handler, so ignore
-                    // this. For spring based transaction, end users are encouraged to use the
-                    // transaction error handler instead of the default DeadLetterChannel.
-                    errorHandler(transactionErrorHandler(required).
-                        // notice that the builder has builder methods for chained configuration
-                        delay(1 * 1000L));
-                }
-                // END SNIPPET: e1
-
-                // START SNIPPET: e2
-                // set the required policy for this route
-                from("direct:okay").policy(required).
+                // set the required policy for this route to indicate its transactional
+                from("direct:okay").policy("PROPAGATION_REQUIRED").
                     setBody(constant("Tiger in Action")).beanRef("bookService").
                     setBody(constant("Elephant in Action")).beanRef("bookService");
 
-                // set the required policy for this route
-                from("direct:fail").policy(required).
+                // set the required policy for this route to indicate its transactional
+                from("direct:fail").policy("PROPAGATION_REQUIRED").
                     setBody(constant("Tiger in Action")).beanRef("bookService").
                     setBody(constant("Donkey in Action")).beanRef("bookService");
-                // END SNIPPET: e2
+                // END SNIPPET: e1
             }
         };
     }
 
-}
+}
\ No newline at end of file

Copied: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java (from r762043, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java?p2=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java&p1=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java&r1=762043&r2=762267&rev=762267&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java Mon Apr  6 10:06:27 2009
@@ -36,7 +36,7 @@
  * @version $Revision$
  */
 @ContextConfiguration
-public class JmsToHttpTXWithOnExceptionTest extends AbstractJUnit38SpringContextTests {
+public class JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest extends AbstractJUnit38SpringContextTests {
 
     @Autowired
     private ProducerTemplate template;

Copied: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java (from r762220, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java?p2=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java&p1=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java&r1=762220&r2=762267&rev=762267&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java Mon Apr  6 10:06:27 2009
@@ -31,14 +31,11 @@
  *
  * @version $Revision$
  */
-public class JmsToHttpWithOnExceptionRoute extends JmsToHttpRoute {
+public class JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute extends JmsToHttpRoute {
 
     private String noAccess = "<?xml version=\"1.0\"?><reply><status>Access denied</status></reply>";
 
     public void configure() throws Exception {
-        // configure a global transacted error handler
-        errorHandler(transactionErrorHandler(required));
-
         // if its a 404 then regard it as handled
         onException(HttpOperationFailedException.class).onWhen(new Predicate() {
             public boolean matches(Exchange exchange) {

Copied: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml (from r762043, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml?p2=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml&p1=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml&r1=762043&r2=762267&rev=762267&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest-context.xml Mon Apr  6 10:06:27 2009
@@ -59,7 +59,7 @@
         <property name="configuration" ref="jmsConfig"/>
     </bean>
 
-    <bean id="route" class="org.apache.camel.itest.tx.JmsToHttpWithOnExceptionRoute"/>
+    <bean id="route" class="org.apache.camel.itest.tx.JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute"/>
 
     <!-- Camel context -->
     <camelContext id="camel2" xmlns="http://camel.apache.org/schema/spring">