From 8aa012856f348eb5138de60634712b7460420ad6 Mon Sep 17 00:00:00 2001 From: Kelly Campbell Date: Tue, 16 Jan 2001 08:00:50 +0000 Subject: Packaged build tasks into lib/buildtools.jar Added buildtools.xml for building the build tools jar file. Moved source for ant tasks into src/org/apache/fop/tools/anttasks Set up dual support for Xalan 1 native and Xalan 2 JAXP1.1 transform interfaces. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193970 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/fop/apps/XalanCommandLine.java | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/org/apache/fop/apps/XalanCommandLine.java') diff --git a/src/org/apache/fop/apps/XalanCommandLine.java b/src/org/apache/fop/apps/XalanCommandLine.java index a126e305c..e413a9229 100644 --- a/src/org/apache/fop/apps/XalanCommandLine.java +++ b/src/org/apache/fop/apps/XalanCommandLine.java @@ -63,17 +63,20 @@ import org.xml.sax.SAXParseException; import java.io.*; import java.net.URL; +/* // Xalan import org.apache.xalan.xpath.xml.XMLParserLiaison; import org.apache.xalan.xslt.XSLTInputSource; import org.apache.xalan.xslt.XSLTProcessor; import org.apache.xalan.xslt.XSLTProcessorFactory; import org.apache.xalan.xslt.XSLTResultTarget; +*/ // FOP import org.apache.fop.messaging.MessageHandler; import org.apache.fop.configuration.ConfigurationReader; import org.apache.fop.configuration.Configuration; +import org.apache.fop.tools.xslt.XSLTransform; /** * mainline class. @@ -261,24 +264,27 @@ public class XalanCommandLine { } // Use XSLTProcessorFactory to instantiate an XSLTProcessor. - XSLTProcessor processor = XSLTProcessorFactory.getProcessor(); + // XSLTProcessor processor = XSLTProcessorFactory.getProcessor(); // Create the 3 objects the XSLTProcessor needs to perform the transformation. // Fix up the args... - XMLParserLiaison xmlPL = processor.getXMLProcessorLiaison(); - URL urlTmp = xmlPL.getURLFromString(foFile, null); - MessageHandler.errorln("xml: " + urlTmp); - XSLTInputSource xmlSource = + // XMLParserLiaison xmlPL = processor.getXMLProcessorLiaison(); + // URL urlTmp = xmlPL.getURLFromString(foFile, null); + // MessageHandler.errorln("xml: " + urlTmp); + /* XSLTInputSource xmlSource = new XSLTInputSource (urlTmp.toString()); - urlTmp = xmlPL.getURLFromString(xsltFile, null); - MessageHandler.errorln("xslt: " + urlTmp); - XSLTInputSource xslSheet = + */ + // urlTmp = xmlPL.getURLFromString(xsltFile, null); + // MessageHandler.errorln("xslt: " + urlTmp); + /* XSLTInputSource xslSheet = new XSLTInputSource (urlTmp.toString()); XSLTResultTarget xmlResult = new XSLTResultTarget (writer); - + */ // Perform the transformation. - processor.process(xmlSource, xslSheet, xmlResult); + // processor.process(xmlSource, xslSheet, xmlResult); + + XSLTransform.transform(foFile, xsltFile, writer); if (usefile) { reader = new FileReader(pdfFile + ".tmp"); -- cgit v1.2.3