CAMEL-7753: xslt component - Store warning/errors etc as exchange properties so end users can get hold of those. Now works with camel-saxon also.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01ca0564 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01ca0564 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01ca0564 Branch: refs/heads/master Commit: 01ca0564de3b58ef9b67d4389157a0127fb4cf22 Parents: 1b38aad Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 27 14:07:07 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 27 14:07:07 2014 +0200 ---------------------------------------------------------------------- .../apache/camel/builder/xml/XsltBuilder.java | 8 ++- .../itest/osgi/saxon/SaxonXsltRouteTest.java | 70 ++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/01ca0564/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java index 8ccc9b6..7fdd1cf 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java @@ -339,8 +339,12 @@ public class XsltBuilder extends ServiceSupport implements Processor, CamelConte */ public void setTransformerSource(Source source) throws TransformerConfigurationException { TransformerFactory factory = converter.getTransformerFactory(); - // use a logger error listener so users can see from the logs what the error may be - factory.setErrorListener(new XsltErrorListener()); + if (errorListener != null) { + factory.setErrorListener(errorListener); + } else { + // use a logger error listener so users can see from the logs what the error may be + factory.setErrorListener(new XsltErrorListener()); + } if (getUriResolver() != null) { factory.setURIResolver(getUriResolver()); } http://git-wip-us.apache.org/repos/asf/camel/blob/01ca0564/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/saxon/SaxonXsltRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/saxon/SaxonXsltRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/saxon/SaxonXsltRouteTest.java new file mode 100644 index 0000000..ef5731f --- /dev/null +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/saxon/SaxonXsltRouteTest.java @@ -0,0 +1,70 @@ +/** + * 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.itest.osgi.saxon; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; + +import static org.ops4j.pax.exam.OptionUtils.combine; + + +@RunWith(PaxExam.class) +public class SaxonXsltRouteTest extends OSGiIntegrationTestSupport { + + @Test + public void testSaxonXsltRoute() throws Exception { + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedBodiesReceived("<?xml version=\"1.0\" encoding=\"UTF-8\"?><goodbye>world!</goodbye>"); + mock.message(0).body().isInstanceOf(String.class); + + template.sendBody("direct:start", "<hello>world!</hello>"); + + assertMockEndpointsSatisfied(); + } + + @Configuration + public static Option[] configure() { + Option[] options = combine( + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + loadCamelFeatures("camel-saxon")); + + return options; + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start") + .to("xslt:org/apache/camel/itest/osgi/core/xslt/example.xsl?saxon=true") + .to("log:result") + .to("mock:result"); + } + }; + } + + + +}
