You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/03/31 16:56:18 UTC
svn commit: r929562 - in /servicemix/smx3/branches/servicemix-3.2:
deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
pom.xml
Author: gertv
Date: Wed Mar 31 14:56:18 2010
New Revision: 929562
URL: http://svn.apache.org/viewvc?rev=929562&view=rev
Log:
SMXCOMP-731: Using a JBI endpoint in the Camel DLC breaks the exchange flow
Added:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
Modified:
servicemix/smx3/branches/servicemix-3.2/pom.xml
Added: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java?rev=929562&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java (added)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiDlcForCamelRouteTest.java Wed Mar 31 14:56:18 2010
@@ -0,0 +1,90 @@
+/*
+ * 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.servicemix.camel;
+
+import java.util.List;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.xml.namespace.QName;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.processor.DeadLetterChannel;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+import org.apache.servicemix.tck.ReceiverComponent;
+
+/**
+ * Tests on a JBI DLC endpoint handling an error in the Camel route
+ */
+public class JbiDlcForCamelRouteTest extends JbiTestSupport {
+
+ private static final String MESSAGE = "<just><a>test</a></just>";
+
+ public void testErrorHandlingByJbiEndpointInCamelRoute() throws Exception {
+ InOnly exchange = getServicemixClient().createInOnlyExchange();
+ exchange.setService(new QName("urn:test", "exception"));
+ exchange.getInMessage().setContent(new StringSource(MESSAGE));
+
+ getServicemixClient().sendSync(exchange);
+
+ // Camel 1.x DLC does not mark the Exchange handled
+ assertEquals("Exchange should have failed",
+ ExchangeStatus.ERROR, exchange.getStatus());
+ assertTrue("Exception should be the original RuntimeException from the Processor",
+ exchange.getError() instanceof RuntimeException);
+ }
+
+ @Override
+ protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
+ // no additional activation specs required
+ activationSpecList.add(createActivationSpec(new ReceiverComponent() {
+ @Override
+ public void onMessageExchange(MessageExchange exchange) throws MessagingException {
+ if (exchange.getMessage("in").getProperty(DeadLetterChannel.CAUGHT_EXCEPTION_HEADER) == null) {
+ fail(exchange, new IllegalStateException("Caught exception header not set"));
+ } else {
+ super.onMessageExchange(exchange);
+ }
+ }
+ }, new QName("urn:test", "assert-handled-exception")));
+ }
+
+ @Override
+ protected RouteBuilder createRoutes() {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ errorHandler(deadLetterChannel("jbi:service:urn:test:assert-handled-exception").maximumRedeliveries(0));
+
+ from("jbi:endpoint:urn:test:exception:endpoint")
+ .to("log:test")
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.setException(new RuntimeException("Can you handle me, JBI endpoint?"));
+ }
+ });
+ }
+
+ };
+ }
+}
Modified: servicemix/smx3/branches/servicemix-3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=929562&r1=929561&r2=929562&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Wed Mar 31 14:56:18 2010
@@ -207,7 +207,7 @@
<activemq-version>4.1.1</activemq-version>
<activeio-version>3.0.0-incubator</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
- <camel-version>1.6.2</camel-version>
+ <camel-version>1.6.3-SNAPSHOT</camel-version>
<jencks-version>2.1</jencks-version>
<jetty-version>6.1.12</jetty-version>
<geronimo-version>2.0.1</geronimo-version>