svn commit: r1173173 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/builder/xml/ test/java/org/apache/camel/builder/xml/ test/resources/org/apache/camel/builder/xml/

[da...@apache.org]

Author: davsclaus
Date: Tue Sep 20 14:49:20 2011
New Revision: 1173173

URL: http://svn.apache.org/viewvc?rev=1173173&view=rev
Log:
CAMEL-4312: Added error listener to xslt builder so you can see details about stylesheet compilation error. Thanks to Ioannis for the patch.

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltErrorListener.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
    camel/trunk/camel-core/src/test/resources/org/apache/camel/builder/xml/example-with-errors.xsl
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1173173&r1=1173172&r2=1173173&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Tue Sep 20 14:49:20 2011
@@ -24,11 +24,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
@@ -63,6 +65,7 @@ public class XsltBuilder implements Proc
     private boolean failOnNullBody = true;
     private URIResolver uriResolver;
     private boolean deleteOutputFile;
+    private ErrorListener errorListener = new XsltErrorListener();
 
     public XsltBuilder() {
     }
@@ -243,6 +246,7 @@ public class XsltBuilder implements Proc
      */
     public void setTransformerSource(Source source) throws TransformerConfigurationException {
         TransformerFactory factory = converter.getTransformerFactory();
+        factory.setErrorListener(errorListener);
         if (getUriResolver() != null) {
             factory.setURIResolver(getUriResolver());
         }
@@ -307,6 +311,14 @@ public class XsltBuilder implements Proc
         this.deleteOutputFile = deleteOutputFile;
     }
 
+    public ErrorListener getErrorListener() {
+        return errorListener;
+    }
+
+    public void setErrorListener(ErrorListener errorListener) {
+        this.errorListener = errorListener;
+    }
+
     // Implementation methods
     // -------------------------------------------------------------------------
 

Added: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltErrorListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltErrorListener.java?rev=1173173&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltErrorListener.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltErrorListener.java Tue Sep 20 14:49:20 2011
@@ -0,0 +1,46 @@
+/**
+ * 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.builder.xml;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * {@link ErrorListener} which logs the errors.
+ */
+public class XsltErrorListener implements ErrorListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(XsltErrorListener.class);
+
+    @Override
+    public void warning(TransformerException e) throws TransformerException {
+        LOG.warn(e.getMessageAndLocation());
+    }
+
+    @Override
+    public void error(TransformerException e) throws TransformerException {
+        LOG.error(e.getMessageAndLocation(), e);
+    }
+
+    @Override
+    public void fatalError(TransformerException e) throws TransformerException {
+        LOG.error(e.getMessageAndLocation(), e);
+    }
+}

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java?rev=1173173&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java Tue Sep 20 14:49:20 2011
@@ -0,0 +1,54 @@
+/**
+ * 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.builder.xml;
+
+import java.net.URL;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
+public class XsltTestErrorListenerTest extends TestCase {
+
+    private XsltBuilder xsltBuilder = new XsltBuilder();
+    private ErrorListener errorListener = createMock(ErrorListener.class);
+
+    public void testErrorListener() throws Exception {
+        errorListener.error(EasyMock.<TransformerException>anyObject());
+        expectLastCall().atLeastOnce();
+
+        errorListener.fatalError(EasyMock.<TransformerException>anyObject());
+        expectLastCall().once();
+        replay(errorListener);
+
+        URL styleSheet = getClass().getResource("example-with-errors.xsl");
+        try {
+            xsltBuilder.setErrorListener(errorListener);
+            xsltBuilder.setTransformerURL(styleSheet);
+            fail("Should throw exception");
+        } catch (Exception ex) {
+            // expected
+        }
+        verify(errorListener);
+    }
+}

Added: camel/trunk/camel-core/src/test/resources/org/apache/camel/builder/xml/example-with-errors.xsl
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/builder/xml/example-with-errors.xsl?rev=1173173&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/builder/xml/example-with-errors.xsl (added)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/builder/xml/example-with-errors.xsl Tue Sep 20 14:49:20 2011
@@ -0,0 +1,26 @@
+<?xml version = "1.0"?>
+<!--
+  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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:template match="/">
+    <goodbye>
+      <xsl:value-of slect="/hello"/>
+    </goodbye>
+  </xsl:template>
+
+</xsl:stylesheet>