register style task as error listener to the Trax transformer and

factory so messages will get back to Ant's logging system.

Submitted by:	David Leuschner <leuschner-list@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270089 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/XSLTLogger.java

@@ -0,0 +1,62 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+public interface XSLTLogger {
+    /**
+     * Log a message.
+     */
+    void log(String msg);
+}

src/main/org/apache/tools/ant/taskdefs/XSLTLoggerAware.java

@@ -0,0 +1,59 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+public interface XSLTLoggerAware {
+    void setLogger(XSLTLogger l);
+}

src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java

@@ -92,7 +92,8 @@ import org.apache.tools.ant.util.FileUtils;
  * @author <a href="mailto:russgold@acm.org">Russell Gold</a>
  * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-public class XSLTProcess extends MatchingTask {
+
+public class XSLTProcess extends MatchingTask implements XSLTLogger {
 
     private File destDir = null;
 
@@ -143,6 +144,12 @@ public class XSLTProcess extends MatchingTask {
         }
 
         liaison = getLiaison();
+
+        // check if liaison wants to log errors using us as logger
+        if(liaison instanceof XSLTLoggerAware) {
+            ((XSLTLoggerAware)liaison).setLogger(this);
+        }
+
         log("Using "+liaison.getClass().toString(), Project.MSG_VERBOSE);
 
         File stylesheet = project.resolveFile(xslFile);

src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java

@@ -60,11 +60,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import org.apache.tools.ant.taskdefs.XSLTLiaison;
+import org.apache.tools.ant.taskdefs.XSLTLoggerAware;
+import org.apache.tools.ant.taskdefs.XSLTLogger;
 
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.Templates;
-
+import javax.xml.transform.Source;
+import javax.xml.transform.ErrorListener;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.transform.OutputKeys;
@@ -76,7 +80,7 @@ import javax.xml.transform.OutputKeys;
  * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
  */
-public class TraXLiaison implements XSLTLiaison {
+public class TraXLiaison implements XSLTLiaison, ErrorListener, XSLTLoggerAware {
 
     /** The trax TransformerFactory */
     private TransformerFactory tfactory = null;
@@ -90,9 +94,13 @@ public class TraXLiaison implements XSLTLiaison {
     /** transformer */
     private Transformer transformer = null;
 
+    private XSLTLogger logger;
+
     public TraXLiaison() throws Exception {
         tfactory = TransformerFactory.newInstance();
+        tfactory.setErrorListener(this);
     }
+
 //------------------- IMPORTANT
     // 1) Don't use the StreamSource(File) ctor. It won't work with
     // xalan prior to 2.2 because of systemid bugs.
@@ -111,6 +119,7 @@ public class TraXLiaison implements XSLTLiaison {
         src.setSystemId(getSystemId(stylesheet));
         templates = tfactory.newTemplates(src);
         transformer = templates.newTransformer();
+        transformer.setErrorListener(this);
     }
 
     public void transform(File infile, File outfile) throws Exception {
@@ -165,4 +174,47 @@ public class TraXLiaison implements XSLTLiaison {
     public void setOutputtype(String type) throws Exception {
         transformer.setOutputProperty(OutputKeys.METHOD, type);
     }
+
+    public void setLogger(XSLTLogger l) {
+        logger = l;
+    }
+    
+    public void error(TransformerException e)  {
+        logError(e, "Error");
+    }
+    
+    public void fatalError(TransformerException e)  {
+        logError(e, "Fatal Error");
+    }
+    
+    public void warning(TransformerException e)  {
+        logError(e, "Warning");
+    }
+    
+    private void logError(TransformerException e, String type) {
+        StringBuffer msg = new StringBuffer();
+        if(e.getLocator() != null) {
+            if(e.getLocator().getSystemId() != null) {
+                String url = e.getLocator().getSystemId();
+                if(url.startsWith("file:///")) url = url.substring(8);
+                msg.append(url);
+            } else {
+                msg.append("Unknown file");
+            }
+            if(e.getLocator().getLineNumber() != -1) {                          
+                msg.append(":"+e.getLocator().getLineNumber());
+                if(e.getLocator().getColumnNumber() != -1) {
+                    msg.append(":"+e.getLocator().getColumnNumber());
+                }
+            }
+        }
+        msg.append(": "+type+"! ");
+        msg.append(e.getMessage());
+        if(e.getCause() != null) {
+            msg.append(" Cause: "+e.getCause());
+        }
+
+        logger.log(msg.toString());
+    }
+
 } //-- TraXLiaison