cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java

2004-02-10 Thread gmazza 
gmazza  2004/02/10 15:51:26

  Modified:.fop.bat
   src/java/org/apache/fop/apps CommandLineOptions.java
XSLTInputHandler.java
   src/java/org/apache/fop/servlet FopPrintServlet.java
   src/java/org/apache/fop/tools TestConverter.java
  Log:
  1.)  Deprecation of most constructors in XSLTInputHandler in favor of JAXP.
  2.)  Removal of unused transformer member variable in XSLTInputHandler.
  3.)  Partial modifications -- code from Xalan project -- in order to be
   able to handle command line parameters for XSLT stylesheet.  (Changes
   still needed in XSLTInputHandler.getXMLFilter() -- unsure how to set
   parameters to an XMLFilter.
  
  Revision  ChangesPath
  1.16  +3 -1  xml-fop/fop.bat
  
  Index: fop.bat
  ===
  RCS file: /home/cvs/xml-fop/fop.bat,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- fop.bat   10 Feb 2004 22:27:42 -  1.15
  +++ fop.bat   10 Feb 2004 23:51:25 -  1.16
  @@ -15,5 +15,7 @@
   set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
   set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
   set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
  -java -cp "%LOCALCLASSPATH%" org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
  +rem 'shift' removes %0 (i.e., the fop.bat filename)
  +shift
  +java -cp "%LOCALCLASSPATH%" org.apache.fop.apps.Fop %*
   
  
  
  
  1.14  +18 -1 xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java
  
  Index: CommandLineOptions.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CommandLineOptions.java   1 Sep 2003 13:31:24 -   1.13
  +++ CommandLineOptions.java   10 Feb 2004 23:51:26 -  1.14
  @@ -54,6 +54,7 @@
   import java.io.File;
   import java.io.FileNotFoundException;
   import java.util.Locale;
  +import java.util.Vector;
   
   // Avalon
   import org.apache.avalon.framework.logger.ConsoleLogger;
  @@ -116,6 +117,8 @@
   
   private Logger log;
   
  +private Vector xsltParams = null;
  +
   /**
* Construct a command line option object from command line arguments
* @param args command line parameters
  @@ -208,6 +211,18 @@
   i = i + parseUnknownOption(args, i);
   } else if (args[i].equals("-at")) {
   i = i + parseAreaTreeOption(args, i);
  +} else if (args[i].equals("-param")) {
  +  if (i + 2 < args.length) {
  +  if (xsltParams == null) {
  +  xsltParams = new Vector();
  +  }
  +  String name = args[++i];
  +  xsltParams.addElement(name);
  +  String expression = args[++i];
  +  xsltParams.addElement(expression);
  +  } else {
  +throw new FOPException("invalid param usage: use -param  
");
  +  }
   } else {
   printUsage();
   return false;
  @@ -493,7 +508,7 @@
   case FO_INPUT:
   return new FOFileHandler(fofile);
   case XSLT_INPUT:
  -return new XSLTInputHandler(xmlfile, xsltfile);
  +return new XSLTInputHandler(xmlfile, xsltfile, xsltParams);
   default:
   throw new FOPException("Invalid inputmode setting!");
   }
  @@ -621,6 +636,8 @@
   + "  -fo  infile   xsl:fo input file  \n"
   + "  -xml infile   xml input file, must be used together with -xsl 
\n"
   + "  -xsl stylesheet   xslt stylesheet \n \n"
  +/*+ "  -param name value  to use for parameter  in xslt 
stylesheet\n"
  ++ "(repeat '-param name value' for each 
parameter)\n \n" */
   + " [OUTPUT] \n"
   + "  outfile   input will be rendered as pdf file into outfile 
\n"
   + "  -pdf outfile  input will be rendered as pdf file (outfile 
req'd) \n"
  
  
  
  1.11  +34 -17xml-fop/src/java/org/apache/fop/apps/XSLTInputHandler.java
  
  Index: XSLTInputHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/XSLTInputHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XSLTInputHandler.java 7 Oct 2003 20:06:17 -   1.10
  +++ XSLTInputHandler.java 10 Feb 2004 23:51:26 -  1.11
  @@ -52,6 +52,7 @@
   
   // Imported java.io classes
   import java.io.File;
  +import java.util.Vector;
   
   // Imported TraX classes
   import jav

cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java

2004-02-10 Thread bckfnn 
bckfnn  2004/02/10 09:42:03

  Modified:src/java/org/apache/fop/tools TestConverter.java
  Log:
  Added '-results' options to set the result ouput directory.
  
  Revision  ChangesPath
  1.9   +4 -1  xml-fop/src/java/org/apache/fop/tools/TestConverter.java
  
  Index: TestConverter.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestConverter.java20 Jan 2004 11:45:48 -  1.8
  +++ TestConverter.java10 Feb 2004 17:42:03 -  1.9
  @@ -108,6 +108,7 @@
   }
   TestConverter tc = new TestConverter();
   
  +String results = "results";
   String testFile = null;
   for (int count = 0; count < args.length; count++) {
   if (args[count].equals("-failOnly")) {
  @@ -118,6 +119,8 @@
   tc.setDebug(true);
   } else if (args[count].equals("-b")) {
   tc.setBaseDir(args[++count]);
  +} else if (args[count].equals("-results")) {
  +results = args[++count];
   } else {
   testFile = args[count];
   }
  @@ -126,7 +129,7 @@
   System.out.println("test suite file name required");
   }
   
  -tc.runTests(testFile, "results", null);
  +tc.runTests(testFile, results, null);
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java

2004-01-20 Thread bckfnn 
bckfnn  2004/01/20 03:45:49

  Modified:src/java/org/apache/fop/tools TestConverter.java
  Log:
  Fix a NPE caused by avalonization of logging.
  Support for 'results' attribute on 'test' element, used by NIST suite.
  Explicit close the output file, otherwise the file has a length of 0
  when the files are compared (on windows).
  Added -d option to enable debug output.
  
  PR: 25691
  
  Revision  ChangesPath
  1.8   +39 -9 xml-fop/src/java/org/apache/fop/tools/TestConverter.java
  
  Index: TestConverter.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestConverter.java15 Sep 2003 18:29:15 -  1.7
  +++ TestConverter.java20 Jan 2004 11:45:48 -  1.8
  @@ -52,6 +52,7 @@
   
   import java.io.File;
   import java.io.InputStream;
  +import java.io.OutputStream;
   import java.util.Map;
   
   import javax.xml.parsers.DocumentBuilder;
  @@ -106,7 +107,6 @@
   System.out.println("test suite file name required");
   }
   TestConverter tc = new TestConverter();
  -tc.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_ERROR));
   
   String testFile = null;
   for (int count = 0; count < args.length; count++) {
  @@ -114,8 +114,10 @@
   tc.setFailOnly(true);
   } else if (args[count].equals("-pdf")) {
   tc.setOutputPDF(true);
  +} else if (args[count].equals("-d")) {
  +tc.setDebug(true);
   } else if (args[count].equals("-b")) {
  -tc.setBaseDir(args[count + 1]);
  +tc.setBaseDir(args[++count]);
   } else {
   testFile = args[count];
   }
  @@ -128,6 +130,13 @@
   }
   
   /**
  + * Construct a new TestConverter
  + */
  +public TestConverter() {
  +enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_ERROR));
  +}
  +
  +/**
* Controls whether to generate PDF or XML.
* @param pdf If True, PDF is generated, Area Tree XML otherwise.
*/
  @@ -153,6 +162,16 @@
   }
   
   /**
  + * Controls whether to generate PDF or XML.
  + * @param pdf If True, PDF is generated, Area Tree XML otherwise.
  + */
  +public void setDebug(boolean debug) {
  +if (debug) {
  +enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG));
  +}
  +}
  +
  +/**
* Run the Tests.
* This runs the tests specified in the xml file fname.
* The document is read as a dom and each testcase is covered.
  @@ -264,6 +283,11 @@
   getLogger().debug("converting xml:" + xml + " and xsl:" 
 + xsl + " to area tree");
   
  +String res = xml;
  +Node resNode =  test.getAttributes().getNamedItem("results");
  +if (resNode != null) {
  +res = resNode.getNodeValue();
  +}
   try {
   File xmlFile = new File(baseDir + "/" + xml);
   String baseURL = null;
  @@ -283,8 +307,8 @@
   }
   
   Driver driver = new Driver();
  -setupLogger(driver, "fop");
   FOUserAgent userAgent = new FOUserAgent();
  +setupLogger(userAgent, "fop");
   userAgent.setBaseURL(baseURL);
   driver.setUserAgent(userAgent);
   if (outputPDF) {
  @@ -299,15 +323,21 @@
   driver.getRenderer().setOptions(rendererOptions);
   driver.getRenderer().setProducer("Testsuite Converter");
   
  -String outname = xmlFile.getName();
  -if (outname.endsWith(".xml")) {
  +String outname = res;
  +if (outname.endsWith(".xml") || outname.endsWith(".pdf")) {
   outname = outname.substring(0, outname.length() - 4);
   }
  -driver.setOutputStream(new java.io.BufferedOutputStream(
  -   new java.io.FileOutputStream(new 
File(destdir,
  -   outname + (outputPDF ? ".pdf" : 
".at.xml");
  -getLogger().debug("ddir:" + destdir + " on:" + outname + ".pdf");
  +File outputFile = new File(destdir,
  + outname + (outputPDF ? ".pdf" : ".at.xml"));
  +
  +outputFile.getParentFile().mkdirs();
  +OutputStream outStream = new java.io.BufferedOutputStream(
  + new java.io.FileOutputStream(outputFile));
  +driver.setOutputStream(outStream);
  +getLogger().debug("ddir:" + destdir + " on:" + 
  +  outputFile.getName());
   driver.render(inputHandler);
  +outStream.close();

cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java

2003-09-15 Thread pietsch 
pietsch 2003/09/15 11:29:15

  Modified:src/java/org/apache/fop/tools TestConverter.java
  Log:
  Removed apparent patching problem
  
  Revision  ChangesPath
  1.7   +7 -10 xml-fop/src/java/org/apache/fop/tools/TestConverter.java
  
  Index: TestConverter.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestConverter.java22 Aug 2003 17:42:42 -  1.6
  +++ TestConverter.java15 Sep 2003 18:29:15 -  1.7
  @@ -50,16 +50,6 @@
*/ 
   package org.apache.fop.tools;
   
  -import org.apache.fop.apps.Driver;
  -import org.apache.fop.apps.FOFileHandler;
  -import org.apache.fop.apps.FOPException;
  -import org.apache.fop.apps.InputHandler;
  -import org.apache.fop.apps.XSLTInputHandler;
  -import org.apache.fop.apps.FOUserAgent;
  -
  -import org.apache.avalon.framework.logger.ConsoleLogger;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -
   import java.io.File;
   import java.io.InputStream;
   import java.util.Map;
  @@ -67,6 +57,13 @@
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
   
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.logger.ConsoleLogger;
  +import org.apache.fop.apps.Driver;
  +import org.apache.fop.apps.FOFileHandler;
  +import org.apache.fop.apps.FOUserAgent;
  +import org.apache.fop.apps.InputHandler;
  +import org.apache.fop.apps.XSLTInputHandler;
   import org.w3c.dom.Document;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]