pbwest 02/05/06 21:51:00
Modified: src/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
CommandLineStarter.java Driver.java Fop.java
Log:
Initial commit for minimalist experimental development environment
Revision Changes Path
No revision
No revision
1.9.2.1 +3 -64 xml-fop/src/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- CommandLineStarter.java 1 Aug 2001 23:08:54 -0000 1.9
+++ CommandLineStarter.java 7 May 2002 04:51:00 -0000 1.9.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineStarter.java,v 1.9 2001/08/01 23:08:54 gears Exp $
+ * $Id: CommandLineStarter.java,v 1.9.2.1 2002/05/07 04:51:00 pbwest 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.
@@ -7,70 +7,9 @@
package org.apache.fop.apps;
-// SAX
-import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+public class CommandLineStarter {
-// Java
-import java.io.*;
-import java.net.URL;
-
-
-// FOP
-import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.configuration.Configuration;
-
-/**
- * super class for all classes which start Fop from the commandline
- *
- * Modified to use new streaming API by Mark Lillywhite, [EMAIL PROTECTED]
- */
-
-public class CommandLineStarter extends Starter {
-
- CommandLineOptions commandLineOptions;
- boolean errorDump;
-
- public CommandLineStarter(CommandLineOptions commandLineOptions)
- throws FOPException {
- this.commandLineOptions = commandLineOptions;
- options.setCommandLineOptions(commandLineOptions);
- errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
- super.setInputHandler(commandLineOptions.getInputHandler());
- }
-
- /**
- * Run the format.
- * @exception FOPException if there is an error during processing
- */
- public void run() throws FOPException {
- String version = Version.getVersion();
- MessageHandler.logln(version);
-
- XMLReader parser = inputHandler.getParser();
- setParserFeatures(parser);
-
- Driver driver = new Driver();
- driver.setBufferFile(commandLineOptions.getBufferFile());
-
- if (errorDump) {
- driver.setErrorDump(true);
- }
-
- try {
- driver.setRenderer(commandLineOptions.getRenderer());
- driver.setOutputStream(new
FileOutputStream(commandLineOptions.getOutputFile()));
-
driver.getRenderer().setOptions(commandLineOptions.getRendererOptions());
- driver.render(parser, inputHandler.getInputSource());
- System.exit(0);
- } catch (Exception e) {
- if (e instanceof FOPException) {
- throw (FOPException)e;
- }
- throw new FOPException(e);
- }
+ public CommandLineStarter() throws FOPException {
}
}
1.31.2.1 +77 -519 xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- Driver.java 1 Aug 2001 23:08:54 -0000 1.31
+++ Driver.java 7 May 2002 04:51:00 -0000 1.31.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Driver.java,v 1.31 2001/08/01 23:08:54 gears Exp $
+ * $Id: Driver.java,v 1.31.2.1 2002/05/07 04:51:00 pbwest 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.
@@ -8,163 +8,93 @@
package org.apache.fop.apps;
// FOP
-import org.apache.fop.fo.FOTreeBuilder;
-import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.fo.FOTree;
+import org.apache.fop.datastructs.SyncedCircularBuffer;
import org.apache.fop.layout.AreaTree;
-import org.apache.fop.render.Renderer;
-import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.configuration.ConfigurationReader;
+import org.apache.fop.xml.XMLSerialHandler;
import org.apache.fop.configuration.Configuration;
-import org.apache.fop.tools.DocumentInputSource;
-import org.apache.fop.tools.DocumentReader;
-
-import org.apache.fop.render.pdf.PDFRenderer;
-
-import org.apache.fop.system.BufferManager;
+import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.expr.PropertyException;
// DOM
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Attr;
// SAX
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
// Java
import java.io.*;
import java.util.*;
-/**
- * Primary class that drives overall FOP process.
- * <P>
- * The simplest way to use this is to instantiate it with the
- * InputSource and OutputStream, then set the renderer desired, and
- * calling run();
- * <P>
- * Here is an example use of Driver which outputs PDF:
- *
- * <PRE>
- * Driver driver = new Driver(new InputSource (args[0]),
- * new FileOutputStream(args[1]));
- * driver.setRenderer(RENDER_PDF);
- * driver.run();
- * </PRE>
- * If neccessary, calling classes can call into the lower level
- * methods to setup and
- * render. Methods can be called to set the
- * Renderer to use, the (possibly multiple) ElementMapping(s) to
- * use and the OutputStream to use to output the results of the
- * rendering (where applicable). In the case of the Renderer and
- * ElementMapping(s), the Driver may be supplied either with the
- * object itself, or the name of the class, in which case Driver will
- * instantiate the class itself. The advantage of the latter is it
- * enables runtime determination of Renderer and ElementMapping(s).
- * <P>
- * Once the Driver is set up, the render method
- * is called. Depending on whether DOM or SAX is being used, the
- * invocation of the method is either render(Document) or
- * buildFOTree(Parser, InputSource) respectively.
- * <P>
- * A third possibility may be used to build the FO Tree, namely
- * calling getContentHandler() and firing the SAX events yourself.
- * <P>
- * Once the FO Tree is built, the format() and render() methods may be
- * called in that order.
- * <P>
- * Here is an example use of Driver which outputs to AWT:
- *
- * <PRE>
- * Driver driver = new Driver();
- * driver.setRenderer(new org.apache.fop.render.awt.AWTRenderer(translator));
- * driver.render(parser, fileInputSource(args[0]));
- * </PRE>
- */
public class Driver {
-
- /**
- * Render to PDF. OutputStream must be set
- */
- public static final int RENDER_PDF = 1;
-
- /**
- * Render to a GUI window. No OutputStream neccessary
- */
- public static final int RENDER_AWT = 2;
-
- /**
- * Render to MIF. OutputStream must be set
- */
- public static final int RENDER_MIF = 3;
-
- /**
- * Render to XML. OutputStream must be set
- */
- public static final int RENDER_XML = 4;
-
- /**
- * Render to PRINT. No OutputStream neccessary
- */
- public static final int RENDER_PRINT = 5;
-
/**
- * Render to PCL. OutputStream must be set
- */
- public static final int RENDER_PCL = 6;
-
- /**
- * Render to Postscript. OutputStream must be set
- */
- public static final int RENDER_PS = 7;
-
- /**
- * Render to Text. OutputStream must be set
- */
- public static final int RENDER_TXT = 8;
-
- /**
- * the FO tree builder
- */
- private FOTreeBuilder _treeBuilder;
-
- /**
- * the area tree that is the result of formatting the FO tree
+ * If true, full error stacks are reported
*/
- private AreaTree _areaTree;
+ private static boolean _errorDump = false;
- /**
- * the renderer to use to output the area tree
- */
- private Renderer _renderer;
+ private InputHandler inputHandler;
+ private XMLReader parser;
+ private InputSource source;
+
+ private XMLSerialHandler xmlhandler;
+ private SyncedCircularBuffer xmlevents;
+ private FOTree foTree;
+ private AreaTree areaTree = new AreaTree();
+
+ private Thread driverThread;
+ private Thread parserThread;
+ private Thread foThread;
+ private Thread areaThread;
+ private Thread renderThread;
- /**
- * the source of the FO file
- */
- private InputSource _source;
/**
- * the stream to use to output the results of the renderer
- */
- private OutputStream _stream;
-
- /**
- * The XML parser to use when building the FO tree
- */
- private XMLReader _reader;
-
- /**
- * If true, full error stacks are reported
- */
- private boolean _errorDump = false;
+ * What does the Driver do?
+ * When it has all of the ancillary requirements, it sets up the
+ * serialized components:
+ * XMLEventSource <=> FOTree <=> AreaTree ...
+ */
+ public Driver() throws FOPException {
+ _errorDump =
+ Configuration.getBooleanValue("debugMode").booleanValue();
+ String version = Version.getVersion();
+ MessageHandler.logln(version);
+ }
+
+ public void run () throws FOPException {
+ setInputHandler(Options.getInputHandler());
+ parser = inputHandler.getParser();
+ source = inputHandler.getInputSource();
+ setParserFeatures(parser);
+
+ xmlevents = new SyncedCircularBuffer();
+ xmlhandler = new XMLSerialHandler(xmlevents, parser, source);
+ foTree = new FOTree(xmlevents);
+
+ driverThread = Thread.currentThread();
+ foThread = new Thread(foTree, "FOTreeBuilder");
+ foThread.setDaemon(true);
+ parserThread = new Thread(xmlhandler, "XMLSerialHandler");
+ parserThread.setDaemon(true);
+
+ xmlhandler.setFoThread(foThread);
+ foTree.setParserThread(parserThread);
+
+ System.out.println("Starting parserThread");
+ parserThread.start();
+ System.out.println("parserThread started");
+ foThread.start();
+ System.out.println("foThread started");
+ try {
+ parserThread.join();
+ } catch (InterruptedException e) {}
+ try {
+ foThread.join();
+ } catch (InterruptedException e) {}
- /**
- * the system resources that FOP will use
- */
- private BufferManager _bufferManager;
+ }
public static final String getParserClassName() {
String parserClassName = null;
@@ -178,288 +108,26 @@
return parserClassName;
}
- /**
- * create a new Driver
- */
- public Driver() {
- _stream = null;
- _bufferManager = new BufferManager();
- _treeBuilder = new FOTreeBuilder();
- _treeBuilder.setBufferManager(_bufferManager);
- setupDefaultMappings();
- }
-
- public Driver(InputSource source, OutputStream stream) {
- this();
- _source = source;
- _stream = stream;
- }
-
- /**
- * Resets the Driver so it can be reused. Property and element
- * mappings are reset to defaults.
- * The output stream is cleared. The renderer is cleared.
- */
- public synchronized void reset() {
- _areaTree = null;
- _treeBuilder.reset();
- }
-
- public boolean hasData() {
- return (_treeBuilder.hasData());
- }
-
- /**
- * Set the error dump option
- * @param dump if true, full stacks will be reported to the error log
- */
- public void setErrorDump(boolean dump) {
- _errorDump = dump;
- }
-
- /**
- * Set the OutputStream to use to output the result of the Renderer
- * (if applicable)
- * @param stream the stream to output the result of rendering to
- *
- */
- public void setOutputStream(OutputStream stream) {
- _stream = stream;
- }
-
- /**
- * Set the source for the FO document. This can be a normal SAX
- * InputSource, or an DocumentInputSource containing a DOM document.
- * @see DocumentInputSource
- */
- public void setInputSource(InputSource source) {
- _source = source;
- }
-
- /**
- * Sets the reader used when reading in the source. If not set,
- * this defaults to a basic SAX parser.
- */
- public void setXMLReader(XMLReader reader) {
- _reader = reader;
- }
-
- /**
- * Sets all the element and property list mappings to their default values.
- *
- */
- public void setupDefaultMappings() {
- addElementMapping("org.apache.fop.fo.StandardElementMapping");
- addElementMapping("org.apache.fop.svg.SVGElementMapping");
- addElementMapping("org.apache.fop.extensions.ExtensionElementMapping");
-
- // add mappings from available services
- Enumeration providers =
- Service.providers(org.apache.fop.fo.ElementMapping.class);
- if (providers != null) {
- while (providers.hasMoreElements()) {
- String str = (String)providers.nextElement();
- try {
- addElementMapping(str);
- } catch (IllegalArgumentException e) {}
-
- }
- }
+ public void setInputHandler(InputHandler inputHandler) {
+ this.inputHandler = inputHandler;
}
- /**
- * Set the rendering type to use. Must be one of
- * <ul>
- * <li>RENDER_PDF
- * <li>RENDER_AWT
- * <li>RENDER_MIF
- * <li>RENDER_XML
- * <li>RENDER_PCL
- * <li>RENDER_PS
- * <li>RENDER_TXT
- * </ul>
- * @param renderer the type of renderer to use
- */
- public void setRenderer(int renderer) throws IllegalArgumentException {
- switch (renderer) {
- case RENDER_PDF:
- setRenderer(new org.apache.fop.render.pdf.PDFRenderer());
- break;
- case RENDER_AWT:
- throw new IllegalArgumentException("Use renderer form of setRenderer()
for AWT");
- case RENDER_PRINT:
- throw new IllegalArgumentException("Use renderer form of setRenderer()
for PRINT");
- case RENDER_PCL:
- setRenderer(new org.apache.fop.render.pcl.PCLRenderer());
- break;
- case RENDER_PS:
- setRenderer(new org.apache.fop.render.ps.PSRenderer());
- break;
- case RENDER_TXT:
- setRenderer(new org.apache.fop.render.txt.TXTRenderer());
- break;
- case RENDER_MIF:
- setRenderer(new org.apache.fop.render.mif.MIFRenderer());
- break;
- case RENDER_XML:
- setRenderer(new org.apache.fop.render.xml.XMLRenderer());
- break;
- default:
- throw new IllegalArgumentException("Unknown renderer type");
- }
-
- }
-
- /**
- * Set the Renderer to use
- * @param renderer the renderer instance to use
- */
- public void setRenderer(Renderer renderer) {
- _renderer = renderer;
- }
-
- public Renderer getRenderer() {
- return _renderer;
- }
-
- /**
- * @deprecated use renderer.setProducer(version) + setRenderer(renderer) or
just setRenderer(renderer_type) which will use the default producer string.
- * @see #setRenderer(int)
- * @see #setRenderer(Renderer)
- */
- public void setRenderer(String rendererClassName, String version) {
- setRenderer(rendererClassName);
- }
-
- /**
- * Set the class name of the Renderer to use as well as the
- * producer string for those renderers that can make use of it.
- * @param rendererClassName classname of the renderer to use such as
- * "org.apache.fop.render.pdf.PDFRenderer"
- * @exception IllegalArgumentException if the classname was invalid.
- * @see #setRenderer(int)
- */
- public void setRenderer(String rendererClassName)
- throws IllegalArgumentException {
- try {
- _renderer =
- (Renderer)Class.forName(rendererClassName).newInstance();
- _renderer.setProducer(Version.getVersion());
- } catch (ClassNotFoundException e) {
- throw new IllegalArgumentException("Could not find "
- + rendererClassName);
- }
- catch (InstantiationException e) {
- throw new IllegalArgumentException("Could not instantiate "
- + rendererClassName);
- }
- catch (IllegalAccessException e) {
- throw new IllegalArgumentException("Could not access "
- + rendererClassName);
- }
- catch (ClassCastException e) {
- throw new IllegalArgumentException(rendererClassName
- + " is not a renderer");
- }
- }
-
- /**
- * Add the given element mapping.
- * An element mapping maps element names to Java classes.
- *
- * @param mapping the element mappingto add
- */
- public void addElementMapping(ElementMapping mapping) {
- mapping.addToBuilder(_treeBuilder);
- }
-
- /**
- * add the element mapping with the given class name
- */
- public void addElementMapping(String mappingClassName)
- throws IllegalArgumentException {
- try {
- ElementMapping mapping =
- (ElementMapping)Class.forName(mappingClassName).newInstance();
- addElementMapping(mapping);
- } catch (ClassNotFoundException e) {
- throw new IllegalArgumentException("Could not find "
- + mappingClassName);
- }
- catch (InstantiationException e) {
- throw new IllegalArgumentException("Could not instantiate "
- + mappingClassName);
- }
- catch (IllegalAccessException e) {
- throw new IllegalArgumentException("Could not access "
- + mappingClassName);
- }
- catch (ClassCastException e) {
- throw new IllegalArgumentException(mappingClassName
- + " is not an ElementMapping");
- }
- }
-
- /**
- * Returns the tree builder (a SAX ContentHandler).
- *
- * Used in situations where SAX is used but not via a FOP-invoked
- * SAX parser. A good example is an XSLT engine that fires SAX
- * events but isn't a SAX Parser itself.
- */
- public ContentHandler getContentHandler() {
- return _treeBuilder;
- }
-
- /**
- * Build the formatting object tree using the given SAX Parser and
- * SAX InputSource
- */
- public synchronized void render(XMLReader parser, InputSource source)
- throws FOPException {
- StreamRenderer streamRenderer = new StreamRenderer(_stream, _renderer);
- _treeBuilder.setStreamRenderer(streamRenderer);
- parser.setContentHandler(_treeBuilder);
- try {
- parser.parse(source);
- } catch (SAXException e) {
- if (e.getException() instanceof FOPException) {
- throw (FOPException)e.getException();
- } else {
- throw new FOPException(e);
- }
- }
- catch (IOException e) {
- throw new FOPException(e);
- }
- }
-
- /**
- * Build the formatting object tree using the given DOM Document
- */
- public synchronized void render(Document document)
- throws FOPException {
- StreamRenderer streamRenderer = new StreamRenderer(_stream, _renderer);
- _treeBuilder.setStreamRenderer(streamRenderer);
-
+ // setting the parser features
+ public void setParserFeatures(XMLReader parser) throws FOPException {
try {
- DocumentInputSource source = new DocumentInputSource(document);
- DocumentReader reader = new DocumentReader();
- reader.setContentHandler(_treeBuilder);
- reader.parse(source);
+ parser.setFeature("http://xml.org/sax/features/namespace-prefixes";,
+ true);
} catch (SAXException e) {
- throw new FOPException(e);
- }
- catch (IOException e) {
- throw new FOPException(e);
+ throw new FOPException(
+ "Error in setting up parser feature namespace-prefixes\n"
+ + "You need a parser which supports SAX version 2", e);
}
-
}
/**
* Dumps an error
*/
- public void dumpError(Exception e) {
+ public static void dumpError(Exception e) {
if (_errorDump) {
if (e instanceof SAXException) {
e.printStackTrace();
@@ -475,116 +143,6 @@
e.printStackTrace();
}
}
- }
-
- /* Set up the system buffers */
-
- public void setBufferFile(File bufferFile) {
- this._bufferManager.addBufferFile(bufferFile);
- }
-
- /**
- * Runs the formatting and renderering process using the previously set
- * inputsource and outputstream
- */
- public synchronized void run() throws IOException, FOPException {
- if (_renderer == null) {
- setRenderer(RENDER_PDF);
- }
-
- if (_source == null) {
- throw new FOPException("InputSource is not set.");
- }
-
- if (_reader == null) {
- if (!(_source instanceof DocumentInputSource)) {
- _reader = ConfigurationReader.createParser();
- }
- }
-
- if (_source instanceof DocumentInputSource) {
- render(((DocumentInputSource)_source).getDocument());
- } else {
- render(_reader, _source);
- }
- }
-
-}
-
-// code stolen from org.apache.batik.util and modified slightly
-// does what sun.misc.Service probably does, but it cannot be relied on.
-// hopefully will be part of standard jdk sometime.
-
-/**
- * This class loads services present in the class path.
- */
-class Service {
-
- static Hashtable providerMap = new Hashtable();
-
- public static synchronized Enumeration providers(Class cls) {
- ClassLoader cl = cls.getClassLoader();
- String serviceFile = "META-INF/services/" + cls.getName();
-
- // System.out.println("File: " + serviceFile);
-
- Vector v = (Vector)providerMap.get(serviceFile);
- if (v != null)
- return v.elements();
-
- v = new Vector();
- providerMap.put(serviceFile, v);
-
- Enumeration e;
- try {
- e = cl.getResources(serviceFile);
- } catch (IOException ioe) {
- return v.elements();
- }
-
- while (e.hasMoreElements()) {
- try {
- java.net.URL u = (java.net.URL)e.nextElement();
- // System.out.println("URL: " + u);
-
- InputStream is = u.openStream();
- Reader r = new InputStreamReader(is, "UTF-8");
- BufferedReader br = new BufferedReader(r);
-
- String line = br.readLine();
- while (line != null) {
- try {
- // First strip any comment...
- int idx = line.indexOf('#');
- if (idx != -1)
- line = line.substring(0, idx);
-
- // Trim whitespace.
- line = line.trim();
-
- // If nothing left then loop around...
- if (line.length() == 0) {
- line = br.readLine();
- continue;
- }
- // System.out.println("Line: " + line);
-
- // Try and load the class
- // Object obj = cl.loadClass(line).newInstance();
- // stick it into our vector...
- v.add(line);
- } catch (Exception ex) {
- // Just try the next line
- }
-
- line = br.readLine();
- }
- } catch (Exception ex) {
- // Just try the next file...
- }
-
- }
- return v.elements();
}
}
1.6.2.1 +13 -7 xml-fop/src/org/apache/fop/apps/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Fop.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Fop.java 30 Jul 2001 20:29:18 -0000 1.6
+++ Fop.java 7 May 2002 04:51:00 -0000 1.6.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Fop.java,v 1.6 2001/07/30 20:29:18 tore Exp $
+ * $Id: Fop.java,v 1.6.2.1 2002/05/07 04:51:00 pbwest 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.
@@ -11,20 +11,26 @@
public class Fop {
public static void main(String[] args) {
- CommandLineOptions options = null;
+
+ Driver driver;
+ Boolean bool = null;
try {
- options = new CommandLineOptions(args);
- Starter starter = options.getStarter();
- starter.run();
+ Options.configure(args);
+ driver = new Driver();
+ driver.run();
+ System.out.println("Back from driver.run()");
+
} catch (FOPException e) {
MessageHandler.errorln("ERROR: " + e.getMessage());
- if (options != null && options.isDebugMode().booleanValue()) {
+ if ((bool = Options.isDebugMode()) != null
+ && bool.booleanValue()) {
e.printStackTrace();
}
} catch (java.io.FileNotFoundException e) {
MessageHandler.errorln("ERROR: " + e.getMessage());
- if (options != null && options.isDebugMode().booleanValue()) {
+ if ((bool = Options.isDebugMode()) != null
+ && bool.booleanValue()) {
e.printStackTrace();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
