svn commit: r925190 - in /servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src: main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java

[ge...@apache.org]

Author: gertv
Date: Fri Mar 19 12:00:13 2010
New Revision: 925190

URL: http://svn.apache.org/viewvc?rev=925190&view=rev
Log:
SMXCOMP-719: CamelProviderEndpoint does not copy 'fault' message headers from Camel to JBI

Added:
    servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
Modified:
    servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java

Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java?rev=925190&r1=925189&r2=925190&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java Fri Mar 19 12:00:13 2010
@@ -24,7 +24,6 @@ import javax.jbi.messaging.MessageExchan
 import javax.jbi.messaging.MessagingException;
 import javax.jbi.messaging.RobustInOnly;
 import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -123,7 +122,7 @@ public class CamelProviderEndpoint exten
             fail(exchange, binding.extractException(camelExchange));
         } else {
             Fault fault = exchange.createFault();
-            fault.setContent(camelExchange.getFault().getBody(Source.class));
+            binding.copyFromCamelToJbi(camelExchange.getFault(), fault);
             if (isFaultCapable(exchange)) {
                 exchange.setFault(fault);
                 doSend(exchange);

Added: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java?rev=925190&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java (added)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java Fri Mar 19 12:00:13 2010
@@ -0,0 +1,76 @@
+/*
+ * 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 javax.jbi.messaging.Fault;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.xml.namespace.QName;
+
+import org.apache.servicemix.client.ServiceMixClient;
+import org.apache.servicemix.jbi.FaultException;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class JbiInOutFaultTest extends NonJbiCamelEndpointsIntegrationTest {
+
+    private static final String KEY = "fault.key";
+    private static final String VALUE = "fault.value";
+
+    /*
+     * @see TestCase#setUp()
+     */
+    @Override
+    protected void setUp() throws Exception {
+        suName = "su5";
+        super.setUp();
+
+        MyEchoComponent echo = new MyEchoComponent() {
+            protected boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws MessagingException {
+                Fault f = exchange.createFault();
+                f.setContent(new StringSource("<fault/>"));
+                f.setProperty(KEY, VALUE);
+                throw new FaultException("Error", exchange, f);
+            }
+        };
+        echo.setService(new QName("namespace", "echo"));
+        echo.setEndpoint("endpoint");
+        container.activateComponent(echo, "echo");
+    }
+
+    @Override
+    protected void configureExchange(ServiceMixClient client,
+            MessageExchange exchange) {
+        ServiceEndpoint endpoint = client.getContext().getEndpoint(
+                CamelProviderEndpoint.SERVICE_NAME, "cheese");
+        assertNotNull("Should have a Camel endpoint exposed in JBI!", endpoint);
+        exchange.setEndpoint(endpoint);
+    }
+
+    @Override
+    protected void checkResult(MessageExchange exchange) {
+        NormalizedMessage fault = exchange.getMessage("fault");
+
+        assertNotNull(fault);
+        assertNotNull(fault.getContent());
+        assertEquals(VALUE, fault.getProperty(KEY));
+    }
+}