camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1132608 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/issues/ components/camel-spring/src/test/java/org/apache/camel/spring/issues/ components/camel-spring/src/test/resources/org/apache/camel/spring/issues/
Date Mon, 06 Jun 2011 12:07:47 GMT
Author: davsclaus
Date: Mon Jun  6 12:07:46 2011
New Revision: 1132608

URL: http://svn.apache.org/viewvc?rev=1132608&view=rev
Log:
CAMEL-4022: Added more tests.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
      - copied, changed from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -25,7 +25,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionErrorHandlerRefIssueTest extends ContextTestSupport {
+public class ContextScopedOnExceptionErrorHandlerRefIssueTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -51,11 +51,12 @@ public class OnExceptionErrorHandlerRefI
             public void configure() throws Exception {
                 errorHandler(new ErrorHandlerBuilderRef("myDLC"));
 
+                onException(IllegalArgumentException.class)
+                    .handled(true)
+                    .to("mock:handled")
+                .end();
+
                 from("direct:start")
-                    .onException(IllegalArgumentException.class)
-                        .handled(true)
-                        .to("mock:handled")
-                    .end()
                     .to("mock:a")
                     .throwException(new IllegalArgumentException("Damn"));
             }

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.issues;
 
+import java.io.IOException;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
@@ -25,7 +27,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
+public class ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -59,17 +61,18 @@ public class OnExceptionErrorHandlerRefI
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                errorHandler(new ErrorHandlerBuilderRef("myDLC"));
+                onException(IllegalArgumentException.class)
+                    .handled(true)
+                    .to("mock:handled")
+                .end();
 
                 from("direct:foo")
+                    .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
                     .to("mock:foo")
-                    .throwException(new IllegalArgumentException("Damn Foo"));
+                    .throwException(new IOException("Damn IO"));
 
                 from("direct:start")
-                    .onException(IllegalArgumentException.class)
-                        .handled(true)
-                        .to("mock:handled")
-                    .end()
+                    .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
                     .to("mock:a")
                     .throwException(new IllegalArgumentException("Damn"));
             }

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -26,7 +26,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionNotHandledErrorHandlerRefIssueTest extends ContextTestSupport {
+public class ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -56,13 +56,14 @@ public class OnExceptionNotHandledErrorH
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
+                onException(IllegalArgumentException.class)
+                    .handled(false)
+                    .to("mock:handled")
+                .end();
+
                 errorHandler(new ErrorHandlerBuilderRef("myDLC"));
 
                 from("direct:start")
-                    .onException(IllegalArgumentException.class)
-                        .handled(false)
-                        .to("mock:handled")
-                    .end()
                     .to("mock:a")
                     .throwException(new IllegalArgumentException("Damn"));
             }

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.issues;
 
+import java.io.IOException;
+
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
@@ -26,7 +28,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
+public class ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -68,15 +70,16 @@ public class OnExceptionNotHandledErrorH
             public void configure() throws Exception {
                 errorHandler(new ErrorHandlerBuilderRef("myDLC"));
 
+                onException(IllegalArgumentException.class)
+                    .handled(false)
+                    .to("mock:handled")
+                .end();
+
                 from("direct:foo")
                     .to("mock:foo")
-                    .throwException(new IllegalArgumentException("Damn Foo"));
+                    .throwException(new IOException("Damn IO"));
 
                 from("direct:start")
-                    .onException(IllegalArgumentException.class)
-                        .handled(false)
-                        .to("mock:handled")
-                    .end()
                     .to("mock:a")
                     .throwException(new IllegalArgumentException("Damn"));
             }

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -26,7 +26,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest extends ContextTestSupport {
+public class ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.issues;
 
+import java.io.IOException;
+
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
@@ -26,7 +28,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
+public class ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -66,17 +68,18 @@ public class OnExceptionNotHandledRouteS
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
+                onException(IllegalArgumentException.class)
+                    .handled(false)
+                    .to("mock:handled")
+                .end();
+
                 from("direct:foo")
                     .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
                     .to("mock:foo")
-                    .throwException(new IllegalArgumentException("Damn Foo"));
+                    .throwException(new IOException("Damn IO"));
 
                 from("direct:start")
                     .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
-                    .onException(IllegalArgumentException.class)
-                        .handled(false)
-                        .to("mock:handled")
-                    .end()
                     .to("mock:a")
                     .throwException(new IllegalArgumentException("Damn"));
             }

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java?rev=1132608&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -0,0 +1,65 @@
+/**
+ * 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
+import org.apache.camel.builder.ErrorHandlerBuilderRef;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.JndiRegistry;
+
+/**
+ *
+ */
+public class ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest extends ContextTestSupport {
+
+    public void testOnExceptionErrorHandlerRef() throws Exception {
+        getMockEndpoint("mock:a").expectedMessageCount(1);
+        getMockEndpoint("mock:handled").expectedMessageCount(1);
+        getMockEndpoint("mock:dead").expectedMessageCount(0);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry jndi = super.createRegistry();
+        jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
+        return  jndi;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+
+                onException(IllegalArgumentException.class)
+                    .handled(true)
+                    .to("mock:handled")
+                .end();
+
+                from("direct:start")
+                    .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
+                    .to("mock:a")
+                    .throwException(new IllegalArgumentException("Damn"));
+            }
+        };
+    }
+}

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.issues;
 
+import java.io.IOException;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
@@ -25,7 +27,7 @@ import org.apache.camel.impl.JndiRegistr
 /**
  *
  */
-public class OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
+public class ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest extends ContextTestSupport {
 
     public void testOnExceptionErrorHandlerRef() throws Exception {
         getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -59,17 +61,18 @@ public class OnExceptionRouteScopedError
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
+                onException(IllegalArgumentException.class)
+                    .handled(true)
+                    .to("mock:handled")
+                .end();
+
                 from("direct:foo")
                     .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
                     .to("mock:foo")
-                    .throwException(new IllegalArgumentException("Damn Foo"));
+                    .throwException(new IOException("Damn IO"));
 
                 from("direct:start")
                     .errorHandler(new ErrorHandlerBuilderRef("myDLC"))
-                    .onException(IllegalArgumentException.class)
-                        .handled(true)
-                        .to("mock:handled")
-                    .end()
                     .to("mock:a")
                     .throwException(new IllegalArgumentException("Damn"));
             }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionErrorHandlerRefIssueTest;
+import org.apache.camel.issues.ContextScopedOnExceptionErrorHandlerRefIssueTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionErrorHandlerRefIssueTest extends OnExceptionErrorHandlerRefIssueTest {
+public class ContextScopedSpringOnExceptionErrorHandlerRefIssueTest extends ContextScopedOnExceptionErrorHandlerRefIssueTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionNotHandledErrorHandlerRefIssueTest;
+import org.apache.camel.issues.ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionNotHandledErrorHandlerRefIssueTest extends OnExceptionNotHandledErrorHandlerRefIssueTest {
+public class ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest extends ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest;
+import org.apache.camel.issues.ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest {
+public class ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest;
+import org.apache.camel.issues.ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest extends OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest {
+public class ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest extends ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest;
+import org.apache.camel.issues.ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest extends OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest {
+public class ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest extends ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionRouteScopedErrorHandlerRefIssueTest;
+import org.apache.camel.issues.ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionRouteScopedErrorHandlerRefIssueTest extends OnExceptionRouteScopedErrorHandlerRefIssueTest {
+public class ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest extends ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (from r1132588, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java Mon Jun  6 12:07:46 2011
@@ -17,17 +17,17 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.issues.OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest;
+import org.apache.camel.issues.ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
  *
  */
-public class SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest extends OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest {
+public class ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest extends ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml Mon Jun  6 12:07:46 2011
@@ -30,15 +30,16 @@
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>true</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route>
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>true</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml Mon Jun  6 12:07:46 2011
@@ -30,15 +30,16 @@
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>false</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route>
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>false</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml Mon Jun  6 12:07:46 2011
@@ -26,25 +26,30 @@
     <constructor-arg index="0" value="Damn"/>
   </bean>
 
+  <bean id="myIOFail" class="java.io.IOException">
+    <constructor-arg index="0" value="IO error"/>
+  </bean>
+
   <camelContext errorHandlerRef="myDLC" xmlns="http://camel.apache.org/schema/spring">
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>false</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route>
       <from uri="direct:foo"/>
       <to uri="mock:foo"/>
-      <throwException ref="myFail"/>
+      <throwException ref="myIOFail"/>
     </route>
 
     <route>
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>false</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml Mon Jun  6 12:07:46 2011
@@ -30,15 +30,16 @@
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>false</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route errorHandlerRef="myDLC">
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>false</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml Mon Jun  6 12:07:46 2011
@@ -26,25 +26,30 @@
     <constructor-arg index="0" value="Damn"/>
   </bean>
 
+  <bean id="myIOFail" class="java.io.IOException">
+    <constructor-arg index="0" value="IO error"/>
+  </bean>
+
   <camelContext xmlns="http://camel.apache.org/schema/spring">
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>false</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route errorHandlerRef="myDLC">
       <from uri="direct:foo"/>
       <to uri="mock:foo"/>
-      <throwException ref="myFail"/>
+      <throwException ref="myIOFail"/>
     </route>
 
     <route errorHandlerRef="myDLC">
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>false</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml Mon Jun  6 12:07:46 2011
@@ -30,15 +30,16 @@
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>true</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route errorHandlerRef="myDLC">
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>true</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml (from r1132588, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml&r1=1132588&r2=1132608&rev=1132608&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml Mon Jun  6 12:07:46 2011
@@ -26,25 +26,30 @@
     <constructor-arg index="0" value="Damn"/>
   </bean>
 
+  <bean id="myIOFail" class="java.io.IOException">
+    <constructor-arg index="0" value="IO error"/>
+  </bean>
+
   <camelContext xmlns="http://camel.apache.org/schema/spring">
 
     <errorHandler type="DeadLetterChannel" id="myDLC" deadLetterUri="mock:dead"/>
 
+    <onException>
+      <exception>java.lang.IllegalArgumentException</exception>
+      <handled>
+        <constant>true</constant>
+      </handled>
+      <to uri="mock:handled"/>
+    </onException>
+
     <route errorHandlerRef="myDLC">
       <from uri="direct:foo"/>
       <to uri="mock:foo"/>
-      <throwException ref="myFail"/>
+      <throwException ref="myIOFail"/>
     </route>
 
     <route errorHandlerRef="myDLC">
       <from uri="direct:start"/>
-      <onException>
-        <exception>java.lang.IllegalArgumentException</exception>
-        <handled>
-          <constant>true</constant>
-        </handled>
-        <to uri="mock:handled"/>
-      </onException>
       <to uri="mock:a"/>
       <throwException ref="myFail"/>
     </route>



Mime
View raw message