Updated command line support

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194080 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 59 insertions, 261 deletions

diff --git a/src/org/apache/fop/apps/Driver.java b/src/org/apache/fop/apps/Driver.java
index e9a86c9b4..0490b62df 100644
--- a/src/org/apache/fop/apps/Driver.java
+++ b/src/org/apache/fop/apps/Driver.java
@@ -1,54 +1,10 @@
-/*-- $Id$ --
-
- ============================================================================
-                   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 modifica-
- tion, 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  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
-
- 4. The names "FOP" 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 name,  without prior written permission  of the
-    Apache Software Foundation.
-
- 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 (INCLU-
- DING, 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 and was  originally created by
- James Tauber <jtauber@jtauber.com>. For more  information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
+/* 
+ * 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."
  */
 
+
 package org.apache.fop.apps;
 
 // FOP
@@ -138,12 +94,11 @@ public class Driver {
     /** create a new Driver */
     public Driver() {
         this.treeBuilder = new FOTreeBuilder();
-        this.loadStandardConfiguration();
     }
 
     /** Set the error dump option
-        * @param dump if true, full stacks will be reported to the error log
-        */
+         * @param dump if true, full stacks will be reported to the error log
+         */
     public void setErrorDump(boolean dump) {
         errorDump = dump;
     }
@@ -154,18 +109,18 @@ public class Driver {
     }
 
     /**
-        * set the class name of the Renderer to use as well as the
-        * producer string for those renderers that can make use of it
-        */
+         * set the class name of the Renderer to use as well as the
+         * producer string for those renderers that can make use of it
+         */
     public void setRenderer(String rendererClassName, String producer) {
         this.renderer = createRenderer(rendererClassName);
         this.renderer.setProducer(producer);
     }
 
     /**
-        * protected method used by setRenderer(String, String) to
-        * instantiate the Renderer class
-        */
+         * protected method used by setRenderer(String, String) to
+         * instantiate the Renderer class
+         */
     protected Renderer createRenderer(String rendererClassName) {
         MessageHandler.logln("using renderer " + rendererClassName);
 
@@ -189,26 +144,26 @@ public class Driver {
     }
 
     /**
-        * add the given element mapping.
-        *
-        * an element mapping maps element names to Java classes
-        */
+         * add the given element mapping.
+         *
+         * an element mapping maps element names to Java classes
+         */
     public void addElementMapping(ElementMapping mapping) {
         mapping.addToBuilder(this.treeBuilder);
     }
 
     /**
-        * add the element mapping with the given class name
-        */
+         * add the element mapping with the given class name
+         */
     public void addElementMapping(String mappingClassName) {
         createElementMapping(mappingClassName).addToBuilder(
           this.treeBuilder);
     }
 
     /**
-        * protected method used by addElementMapping(String) to
-        * instantiate element mapping class
-        */
+         * protected method used by addElementMapping(String) to
+         * instantiate element mapping class
+         */
     protected ElementMapping createElementMapping(
       String mappingClassName) {
         MessageHandler.logln("using element mapping " + mappingClassName);
@@ -237,16 +192,16 @@ public class Driver {
     }
 
     /**
-        * add the element mapping with the given class name
-        */
+         * add the element mapping with the given class name
+         */
     public void addPropertyList(String listClassName) {
         createPropertyList(listClassName).addToBuilder(this.treeBuilder);
     }
 
     /**
-        * protected method used by addPropertyList(String) to
-        * instantiate list mapping class
-        */
+         * protected method used by addPropertyList(String) to
+         * instantiate list mapping class
+         */
     protected PropertyListMapping createPropertyList(
       String listClassName) {
         MessageHandler.logln("using property list mapping " +
@@ -276,20 +231,20 @@ public class Driver {
     }
 
     /**
-        * return 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.
-        */
+         * return 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 this.treeBuilder;
     }
 
     /**
-        * build the formatting object tree using the given SAX Parser and
-        * SAX InputSource
-        */
+         * build the formatting object tree using the given SAX Parser and
+         * SAX InputSource
+         */
     public void buildFOTree(XMLReader parser,
                             InputSource source) throws FOPException {
 
@@ -312,8 +267,8 @@ public class Driver {
     }
 
     /**
-        * build the formatting object tree using the given DOM Document
-        */
+         * build the formatting object tree using the given DOM Document
+         */
     public void buildFOTree(Document document) throws FOPException {
 
         /* most of this code is modified from John Cowan's */
@@ -341,7 +296,7 @@ public class Driver {
                         int datalen = data.length();
                         if (array == null || array.length < datalen) {
                             /* if the array isn't big enough, make a new
-                                  one */
+                                   one */
                             array = new char[datalen];
                         }
                         data.getChars(0, datalen, array, 0);
@@ -403,8 +358,8 @@ public class Driver {
     }
 
     /**
-        * Dumps an error
-        */
+         * Dumps an error
+         */
     public void dumpError(Exception e) {
         if (errorDump) {
             if (e instanceof SAXException) {
@@ -420,16 +375,16 @@ public class Driver {
     }
 
     /**
-       * set the OutputStream to use to output the result of the Renderer
-       * (if applicable)
-       */
+        * set the OutputStream to use to output the result of the Renderer
+        * (if applicable)
+        */
     public void setOutputStream(OutputStream stream) {
         this.stream = stream;
     }
 
     /**
-        * format the formatting object tree into an area tree
-        */
+         * format the formatting object tree into an area tree
+         */
     public void format() throws FOPException {
         FontInfo fontInfo = new FontInfo();
         this.renderer.setupFontInfo(fontInfo);
@@ -441,79 +396,11 @@ public class Driver {
     }
 
     /**
-        * render the area tree to the output form
-        */
+         * render the area tree to the output form
+         */
     public void render() throws IOException, FOPException {
         this.renderer.render(areaTree, this.stream);
     }
 
-    /**
-       *  loads standard configuration file and a user file, if it has been specified
-       */
-    public void loadStandardConfiguration() {
-        String file = "config.xml";
-
-        // the entry /conf/config.xml refers to a directory conf which is a sibling of org
-        InputStream configfile =
-          ConfigurationReader.class.getResourceAsStream("/conf/"+
-                  file);
-        if (configfile == null) {
-            MessageHandler.errorln("Fatal error: can't find default configuration file");
-            System.exit(1);
-        }
-        if (errorDump) {
-            MessageHandler.logln("reading default configuration file");
-        }
-        ConfigurationReader reader =
-          new ConfigurationReader (new InputSource(configfile));
-        if (errorDump) {
-            reader.setDumpError(true);
-        }
-        try {
-            reader.start();
-        } catch (org.apache.fop.apps.FOPException error) {
-            MessageHandler.errorln("Fatal Error: Can't process default configuration file. \nProbably it is not well-formed.");
-            if (errorDump) {
-                reader.dumpError(error);
-            }
-            System.exit(1);
-        }
-    }
-
-    public void loadUserconfiguration(String userConfigFile) {
-        //read user configuration file
-        if (userConfigFile != null) {
-            MessageHandler.logln("reading user configuration file");
-            ConfigurationReader reader = new ConfigurationReader (
-                                           CommandLine.fileInputSource(userConfigFile));
-            if (errorDump) {
-                reader.setDumpError(true);
-            }
-            try {
-                reader.start();
-            } catch (org.apache.fop.apps.FOPException error) {
-                MessageHandler.errorln(
-                  "Can't find user configuration file " +
-                  userConfigFile);
-                MessageHandler.errorln("using default values");
-                if (errorDump) {
-                    reader.dumpError(error);
-                }
-            }
-        }
-    }
-
-    public void setBaseDir(String fofile) {
-        String baseDir = Configuration.getStringValue("baseDir");
-        if (baseDir == null) {
-            baseDir = new File(
-                        new File(fofile).getAbsolutePath()).getParent();
-            Configuration.put("baseDir",baseDir);
-        }
-        if (errorDump) {
-            MessageHandler.logln("base directory: " + baseDir);
-        }
-    }
-
 
 }
diff --git a/src/org/apache/fop/apps/FOPException.java b/src/org/apache/fop/apps/FOPException.java
index 6b64166de..d28d36052 100644
--- a/src/org/apache/fop/apps/FOPException.java
+++ b/src/org/apache/fop/apps/FOPException.java
@@ -1,53 +1,9 @@
-/*-- $Id$ -- 
-
- ============================================================================
-                   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 modifica-
- tion, 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  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Fop" 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 name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- 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 (INCLU-
- DING, 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 and was  originally created by
- James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
+/* 
+ * 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."
  */
+
 package org.apache.fop.apps;
 
 /**
@@ -61,6 +17,6 @@ public class FOPException extends Exception {
      * @param message descriptive message
      */
     public FOPException(String message) {
-	super(message);
+        super(message);
     }
 }
diff --git a/src/org/apache/fop/apps/Version.java b/src/org/apache/fop/apps/Version.java
index 1c38a61bd..cb4e86572 100644
--- a/src/org/apache/fop/apps/Version.java
+++ b/src/org/apache/fop/apps/Version.java
@@ -1,58 +1,13 @@
-/*-- $Id$ -- 
-
- ============================================================================
-                   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 modifica-
- tion, 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  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "FOP" 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 name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- 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 (INCLU-
- DING, 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 and was  originally created by
- James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
+/* 
+ * 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."
  */
 
 package org.apache.fop.apps;
 
 import org.apache.fop.configuration.Configuration;
-/** 
+/**
  * class representing the version of FOP.
  */
 public class Version {