svn commit: r595762 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/builder/xml/ components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/

[js...@apache.org]

Author: jstrachan
Date: Fri Nov 16 10:00:44 2007
New Revision: 595762

URL: http://svn.apache.org/viewvc?rev=595762&view=rev
Log:
added test case and patch for https://issues.apache.org/activemq/browse/CAMEL-224

Added:
    activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/
    activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java   (with props)
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=595762&r1=595761&r2=595762&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Fri Nov 16 10:00:44 2007
@@ -76,6 +76,7 @@
         Result result = resultHandler.getResult();
         transformer.transform(source, result);
         Message out = exchange.getOut(true);
+        out.copyFrom(exchange.getIn());
         resultHandler.setBody(out);
     }
 

Added: activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java?rev=595762&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java (added)
+++ activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java Fri Nov 16 10:00:44 2007
@@ -0,0 +1,79 @@
+/**
+ *
+ * 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.language.juel.issues;
+
+import javax.xml.transform.TransformerConfigurationException;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.builder.xml.XsltBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.jaxp.StringSource;
+import static org.apache.camel.language.juel.JuelExpression.el;
+
+/**
+ * @author Arjan Moraal
+ * @version $Revision: 1.1 $
+ */
+public class XsltLosesHeaderTest extends ContextTestSupport {
+    protected String xslt = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>"
+            + "<xsl:stylesheet version=\"2.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">"
+            + "<xsl:template match=\"/cats\">"
+            + "<b>dummy</b>"
+            + "</xsl:template>"
+            + "</xsl:stylesheet>";
+
+    public void testXsltLosesHeader() throws Exception {
+
+        MockEndpoint endpointAfter = getMockEndpoint("mock:After");
+        MockEndpoint endpointBefore = getMockEndpoint("mock:Before");
+
+        endpointBefore.expectedBodiesReceived("header:hello");
+        endpointAfter.expectedBodiesReceived("header:hello");
+
+        template.send("seda:xslttest", new Processor() {
+            public void process(Exchange exchange) {
+                Message in = exchange.getIn();
+                in.setBody("dummy");
+            }
+        });
+
+        endpointBefore.assertIsSatisfied();
+        endpointAfter.assertIsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws TransformerConfigurationException {
+                from("seda:xslttest")
+                        .setHeader("testheader", el("hello"))
+                        .setBody(el("header:${in.headers.testheader}"))
+                        .to("mock:Before")
+                        .setBody(el("<cats><cat id=\"1\"/><cat id=\"2\"/></cats>"))
+                        .process(XsltBuilder.xslt(new StringSource(xslt)))
+                        .setBody(el("header:${in.headers.testheader}"))
+                        .to("mock:After");
+            }
+        };
+    }
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/issues/XsltLosesHeaderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native