diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 11deabe79..93e1a9dd4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -130,16 +130,20 @@ public class XSLTProcess extends MatchingTask {
scanner = getDirectoryScanner(baseDir);
log("Transforming into "+destDir, Project.MSG_INFO);
- // if processor wasn't specified, default it to xslp or xalan,
- // depending on which is in the classpath
+ // if processor wasn't specified, see if TraX is available. If not,
+ // default it to xslp or xalan, depending on which is in the classpath
if (liaison == null) {
try {
- setProcessor("xslp");
+ setProcessor("trax");
} catch (Throwable e1) {
try {
- setProcessor("xalan");
+ setProcessor("xslp");
} catch (Throwable e2) {
- throw new BuildException(e2);
+ try {
+ setProcessor("xalan");
+ } catch (Throwable e3) {
+ throw new BuildException(e1);
+ }
}
}
}
@@ -220,8 +224,13 @@ public class XSLTProcess extends MatchingTask {
* Sets the file to use for styling relative to the base directory.
*/
public void setProcessor(String processor) throws Exception {
+System.out.println("trying " + processor);
- if (processor.equals("xslp")) {
+ if (processor.equals("trax")) {
+ final Class clazz =
+ Class.forName("org.apache.tools.ant.taskdefs.optional.TraXLiaison");
+ liaison = (XSLTLiaison)clazz.newInstance();
+ } else if (processor.equals("xslp")) {
final Class clazz =
Class.forName("org.apache.tools.ant.taskdefs.optional.XslpLiaison");
liaison = (XSLTLiaison) clazz.newInstance();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
new file mode 100644
index 000000000..df0bd2f1c
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -0,0 +1,109 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 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
+ * .
+ */
+
+package org.apache.tools.ant.taskdefs.optional;
+
+import java.io.FileOutputStream;
+
+import org.apache.tools.ant.taskdefs.XSLTLiaison;
+
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.Templates;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ *
+ * @author Sam Ruby
+ * @author Davanum Srinivas
+ * @version $Revision$ $Date$
+ */
+public class TraXLiaison implements XSLTLiaison {
+
+ protected final static String FILEURL = "file:";
+
+ /** The trax TransformerFactory */
+ private TransformerFactory tfactory = null;
+
+ /** Stylesheet template */
+ private Templates templates = null;
+
+ /** The trax Transformer itself */
+ private Transformer transformer;
+
+ public TraXLiaison() throws Exception {
+ tfactory = TransformerFactory.newInstance();
+ }
+
+ public void setStylesheet(String fileName) throws Exception {
+ templates = tfactory.newTemplates(new StreamSource(normalize(fileName)));
+ transformer = templates.newTransformer();
+ };
+
+ public void transform(String infile, String outfile) throws Exception {
+ transformer.transform(new StreamSource(normalize(infile)), new StreamResult(new FileOutputStream(outfile)));
+ }
+
+ protected String normalize(String fileName) {
+ if(fileName != null && !fileName.startsWith(FILEURL)) {
+ return FILEURL + fileName;
+ }
+ return fileName;
+ }
+
+ public void addParam(String name, String value){
+ transformer.setParameter(name, value);
+ }
+} //-- TraXLiaison