camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1094123 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ 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/...
Date Sun, 17 Apr 2011 09:57:02 GMT
Author: davsclaus
Date: Sun Apr 17 09:57:02 2011
New Revision: 1094123

URL: http://svn.apache.org/viewvc?rev=1094123&view=rev
Log:
CAMEL-3877: Fixed adviceWith when using a context scoped error handler with XML DSL

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
  (with props)
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
  (with props)
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
  (with props)
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
  (with props)
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
  (with props)
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
      - copied, changed from r1094113, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
      - copied, changed from r1094113, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1094123&r1=1094122&r2=1094123&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Sun Apr
17 09:57:02 2011
@@ -218,12 +218,15 @@ public class RouteDefinition extends Pro
         log.debug("AdviceWith routes: {}", routes);
 
         // we can only advice with a route builder without any routes
-        if (!routes.getRoutes().isEmpty()) {
+        if (!builder.getRouteCollection().getRoutes().isEmpty()) {
             throw new IllegalArgumentException("You can only advice from a RouteBuilder which
has no existing routes."
                     + " Remove all routes from the route builder.");
         }
-        // we can not advice with error handlers
-        if (routes.getErrorHandlerBuilder() != null) {
+        // we can not advice with error handlers (if you added a new error handler in the
route builder)
+        // we must check the error handler on builder is not the same as on camel context,
as that would be the default
+        // context scoped error handler, in case no error handlers was configured
+        if (builder.getRouteCollection().getErrorHandlerBuilder() != null
+                && camelContext.getErrorHandlerBuilder() != builder.getRouteCollection().getErrorHandlerBuilder()
) {
             throw new IllegalArgumentException("You can not advice with error handlers. Remove
the error handlers from the route builder.");
         }
 

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java?rev=1094123&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
(added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
Sun Apr 17 09:57:02 2011
@@ -0,0 +1,59 @@
+/**
+ * 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.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class AdviceWithContextScopedErrorHandlerIssueTest extends ContextTestSupport {
+
+    public void testAdviceWith() throws Exception {
+        context.getRouteDefinition("route-a").adviceWith(context, new AdviceWithRouteBuilder()
{
+            @Override
+            public void configure() throws Exception {
+                interceptSendToEndpoint("direct:bar")
+                    .skipSendToOriginalEndpoint()
+                    .throwException(new IllegalArgumentException("Forced"));
+            }
+        });
+
+        getMockEndpoint("mock:error").expectedMessageCount(1);
+        getMockEndpoint("mock:bar").expectedMessageCount(0);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from("direct:start").routeId("route-a").to("direct:bar");
+
+                from("direct:bar").routeId("route-b").to("mock:bar");
+            }
+        };
+    }
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java?rev=1094123&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
(added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
Sun Apr 17 09:57:02 2011
@@ -0,0 +1,74 @@
+/**
+ * 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.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class AdviceWithInvalidConfiguredTest extends ContextTestSupport {
+
+    public void testNoErrorHandler() throws Exception {
+        try {
+            context.getRouteDefinition("route-a").adviceWith(context, new AdviceWithRouteBuilder()
{
+                @Override
+                public void configure() throws Exception {
+                    errorHandler(loggingErrorHandler());
+
+                    interceptSendToEndpoint("direct:bar")
+                        .skipSendToOriginalEndpoint()
+                        .throwException(new IllegalArgumentException("Forced"));
+                }
+            });
+            fail("Should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertEquals("You can not advice with error handlers. Remove the error handlers
from the route builder.", e.getMessage());
+        }
+    }
+
+    public void testNoExtraRoutes() throws Exception {
+        try {
+            context.getRouteDefinition("route-a").adviceWith(context, new AdviceWithRouteBuilder()
{
+                @Override
+                public void configure() throws Exception {
+                    from("direct:foo").to("mock:foo");
+
+                }
+            });
+            fail("Should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertEquals("You can only advice from a RouteBuilder which has no existing routes.
Remove all routes from the route builder.", e.getMessage());
+        }
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from("direct:start").routeId("route-a").to("direct:bar");
+
+                from("direct:bar").routeId("route-b").to("mock:bar");
+            }
+        };
+    }
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java?rev=1094123&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
(added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
Sun Apr 17 09:57:02 2011
@@ -0,0 +1,59 @@
+/**
+ * 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.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class AdviceWithRouteScopedErrorHandlerIssueTest extends ContextTestSupport {
+
+    public void testAdviceWith() throws Exception {
+        context.getRouteDefinition("route-a").adviceWith(context, new AdviceWithRouteBuilder()
{
+            @Override
+            public void configure() throws Exception {
+                interceptSendToEndpoint("direct:bar")
+                    .skipSendToOriginalEndpoint()
+                    .throwException(new IllegalArgumentException("Forced"));
+            }
+        });
+
+        getMockEndpoint("mock:error").expectedMessageCount(1);
+        getMockEndpoint("mock:bar").expectedMessageCount(0);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId("route-a")
+                        .errorHandler(deadLetterChannel("mock:error"))
+                        .to("direct:bar");
+
+                from("direct:bar").routeId("route-b").to("mock:bar");
+            }
+        };
+    }
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java?rev=1094123&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
(added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
Sun Apr 17 09:57:02 2011
@@ -0,0 +1,52 @@
+/**
+ * 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.spring.issues;
+
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ *
+ */
+public class SpringAdviceWithContextScopedErrorHandlerIssueTest extends SpringTestSupport
{
+
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        return new ClassPathXmlApplicationContext("org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml");
+    }
+
+    public void testAdviceWith() throws Exception {
+        context.getRouteDefinition("route-a").adviceWith(context, new AdviceWithRouteBuilder()
{
+            @Override
+            public void configure() throws Exception {
+                interceptSendToEndpoint("direct:bar")
+                    .skipSendToOriginalEndpoint()
+                    .throwException(new IllegalArgumentException("Forced"));
+            }
+        });
+
+        getMockEndpoint("mock:error").expectedMessageCount(1);
+        getMockEndpoint("mock:bar").expectedMessageCount(0);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+}

Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java?rev=1094123&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
(added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
Sun Apr 17 09:57:02 2011
@@ -0,0 +1,32 @@
+/**
+ * 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.spring.issues;
+
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ *
+ */
+public class SpringAdviceWithRouteScopedErrorHandlerIssueTest extends SpringAdviceWithContextScopedErrorHandlerIssueTest
{
+
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        return new ClassPathXmlApplicationContext("org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml");
+    }
+
+}

Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
(from r1094113, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml&r1=1094113&r2=1094123&rev=1094123&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
Sun Apr 17 09:57:02 2011
@@ -22,14 +22,22 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <camelContext xmlns="http://camel.apache.org/schema/spring">
-        <packageScan>
-            <package>org.apache.camel.spring.issues</package>
-            <excludes>**/*MyInjectionRouteBuilder*</excludes>
-            <excludes>**/*SampleInitializingRouteBuilder*</excludes>
-            <excludes>**/*MyCoolRoute*</excludes>
-            <excludes>*contextscan*</excludes>
-        </packageScan>
+    <!-- use a context scoped error handler -->
+    <camelContext errorHandlerRef="myDLC" xmlns="http://camel.apache.org/schema/spring">
+
+        <!-- dead letter channel -->
+        <errorHandler id="myDLC" deadLetterUri="mock:error" type="DeadLetterChannel"/>
+
+        <!-- routes -->
+        <route id="route-a">
+            <from uri="direct:start"/>
+            <to uri="direct:bar"/>
+        </route>
+
+        <route id="route-b">
+            <from uri="direct:bar"/>
+            <to uri="mock:bar"/>
+        </route>
     </camelContext>
 
 </beans>

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
(from r1094113, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml&r1=1094113&r2=1094123&rev=1094123&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
Sun Apr 17 09:57:02 2011
@@ -23,13 +23,21 @@
     ">
 
     <camelContext xmlns="http://camel.apache.org/schema/spring">
-        <packageScan>
-            <package>org.apache.camel.spring.issues</package>
-            <excludes>**/*MyInjectionRouteBuilder*</excludes>
-            <excludes>**/*SampleInitializingRouteBuilder*</excludes>
-            <excludes>**/*MyCoolRoute*</excludes>
-            <excludes>*contextscan*</excludes>
-        </packageScan>
+
+        <!-- dead letter channel -->
+        <errorHandler id="myDLC" deadLetterUri="mock:error" type="DeadLetterChannel"/>
+
+        <!-- routes -->
+        <!-- use a route scoped error handler -->
+        <route id="route-a" errorHandlerRef="myDLC">
+            <from uri="direct:start"/>
+            <to uri="direct:bar"/>
+        </route>
+
+        <route id="route-b">
+            <from uri="direct:bar"/>
+            <to uri="mock:bar"/>
+        </route>
     </camelContext>
 
 </beans>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml?rev=1094123&r1=1094122&r2=1094123&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
Sun Apr 17 09:57:02 2011
@@ -27,6 +27,8 @@
             <package>org.apache.camel.spring.issues</package>
             <excludes>**/*MyInjectionRouteBuilder*</excludes>
             <excludes>**/*SampleInitializingRouteBuilder*</excludes>
+            <excludes>**/*SpringAdviceWithContextScopedErrorHandlerIssueTest*</excludes>
+            <excludes>**/*SpringAdviceWithRouteScopedErrorHandlerIssueTest*</excludes>
             <excludes>**/*MyCoolRoute*</excludes>
             <excludes>*contextscan*</excludes>
         </packageScan>



Mime
View raw message