You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/15 16:08:32 UTC
svn commit: r595326 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/RouteBuilder.java
main/java/org/apache/camel/model/RoutesType.java
test/java/org/apache/camel/issues/AmahDeadLetterTest.java
Author: jstrachan
Date: Thu Nov 15 07:08:31 2007
New Revision: 595326
URL: http://svn.apache.org/viewvc?rev=595326&view=rev
Log:
added a test case from Amah along with a patch; see the discussion here: http://www.nabble.com/DeadLetterChannel-endpoint-configuration-tf4811039s22882.html#a13765211
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java (with props)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=595326&r1=595325&r2=595326&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Thu Nov 15 07:08:31 2007
@@ -161,6 +161,19 @@
return routes;
}
+ @Override
+ public void setInheritErrorHandler(boolean inheritErrorHandler) {
+ super.setInheritErrorHandler(inheritErrorHandler);
+ routeCollection.setInheritErrorHandlerFlag(inheritErrorHandler);
+
+ }
+
+ @Override
+ public void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder) {
+ super.setErrorHandlerBuilder(errorHandlerBuilder);
+ routeCollection.setErrorHandlerBuilder(getErrorHandlerBuilder());
+ }
+
// Implementation methods
// -----------------------------------------------------------------------
protected void checkInitialized() throws Exception {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java?rev=595326&r1=595325&r2=595326&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java Thu Nov 15 07:08:31 2007
@@ -30,6 +30,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Predicate;
import org.apache.camel.Route;
+import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.processor.DelegateProcessor;
/**
@@ -55,6 +56,8 @@
private List<ExceptionType> exceptions = new ArrayList<ExceptionType>();
@XmlTransient
private CamelContext camelContext;
+ @XmlTransient
+ private ErrorHandlerBuilder errorHandlerBuilder;
@Override
public String toString() {
@@ -109,6 +112,10 @@
this.camelContext = camelContext;
}
+ public boolean isInheritErrorHandler() {
+ return inheritErrorHandlerFlag != null && inheritErrorHandlerFlag.booleanValue();
+ }
+
public Boolean getInheritErrorHandlerFlag() {
return inheritErrorHandlerFlag;
}
@@ -117,6 +124,14 @@
this.inheritErrorHandlerFlag = inheritErrorHandlerFlag;
}
+ public ErrorHandlerBuilder getErrorHandlerBuilder() {
+ return errorHandlerBuilder;
+ }
+
+ public void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder) {
+ this.errorHandlerBuilder = errorHandlerBuilder;
+ }
+
// Fluent API
//-------------------------------------------------------------------------
@@ -187,6 +202,10 @@
// Implementation methods
//-------------------------------------------------------------------------
protected RouteType createRoute() {
- return new RouteType();
+ RouteType route = new RouteType();
+ if (isInheritErrorHandler()) {
+ route.setErrorHandlerBuilder(getErrorHandlerBuilder());
+ }
+ return route;
}
}
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java?rev=595326&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java Thu Nov 15 07:08:31 2007
@@ -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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class AmahDeadLetterTest extends ContextTestSupport {
+ public void testException() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:err");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("seda:a", "Test message");
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ errorHandler(deadLetterChannel("mock:err"));
+ from("seda:a").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ throw new Exception("Test exception");
+ }
+ });
+ }
+ };
+ }
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java
------------------------------------------------------------------------------
svn:eol-style = native