cvs commit: xml-fop/src/org/apache/fop/tools/anttasks Xslt.java
keiron 01/12/18 03:57:03 Modified:.build.xml Removed: src/org/apache/fop/tools/anttasks Xslt.java Log: updated to use style task and removed xslt task Revision ChangesPath 1.50 +32 -55xml-fop/build.xml Index: build.xml === RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- build.xml 2001/12/14 07:40:50 1.49 +++ build.xml 2001/12/18 11:57:03 1.50 @@ -15,7 +15,7 @@ FOP is the world's first print formatter driven by XSL formatting objects. It -is a Java 1.1 application that reads a formatting object tree and then turns +is a Java 1.2 application that reads a formatting object tree and then turns it into a PDF document. The formatting object tree, can be in the form of an XML document (output by an XSLT engine like Xalan) or can be passed in memory as a DOM Document or SAX events. @@ -70,7 +70,6 @@ tools (i.e. make or shell scripts) where a new JVM is started for each task. - Build targets = @@ -104,7 +103,6 @@ 2) I see a lot of warnings starting like this: "Warning: file modified in the future:" Sometimes ant gives out this warnings, but the build is finished without any problems - --> @@ -273,7 +271,6 @@ --> - @@ -405,62 +402,42 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - @@ -578,8 +555,8 @@ - - + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/tools/anttasks Xslt.java
klease 01/08/26 07:20:26 Modified:src/org/apache/fop/tools/anttasks Xslt.java Log: Only build the DOM if needed for mergefile. Otherwise pass input xml file directly to the Transformer so it can find the system ID Revision ChangesPath 1.4 +13 -3 xml-fop/src/org/apache/fop/tools/anttasks/Xslt.java Index: Xslt.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/anttasks/Xslt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Xslt.java 2001/07/30 20:29:35 1.3 +++ Xslt.java 2001/08/26 14:20:26 1.4 @@ -1,5 +1,5 @@ /* - * $Id: Xslt.java,v 1.3 2001/07/30 20:29:35 tore Exp $ + * $Id: Xslt.java,v 1.4 2001/08/26 14:20:26 klease Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -155,14 +155,24 @@ */ private void transform() { try { -org.w3c.dom.Document source = buildDocument(infile); + org.w3c.dom.Document source = null; + if (mergefile != null && !mergefile.equals("")) { + source = buildDocument(infile); + } // Perform the transformation. System.out.println(""); System.out.println("xslt \nin: " + infile + "\nstyle: " + xsltfile + "\nout: " + outfile); System.out.println(""); -org.apache.fop.tools.xslt.XSLTransform.transform(source, + if (source != null) { +org.apache.fop.tools.xslt.XSLTransform.transform(source, xsltfile, outfile); + } + else { + // Read the xml file directly + org.apache.fop.tools.xslt.XSLTransform.transform(infile, +xsltfile, outfile); + } } catch (org.xml.sax.SAXException saxerror) { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]