You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2002/09/04 10:36:37 UTC

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

keiron      2002/09/04 01:36:37

  Modified:    .        build.xml
               src/org/apache/fop/apps AWTStarter.java
                        CommandLineOptions.java CommandLineStarter.java
                        Driver.java Fop.java PrintStarter.java Starter.java
                        Version.java
               src/org/apache/fop/layout/hyphenation Hyphenator.java
               src/org/apache/fop/mif MIFHandler.java
               src/org/apache/fop/render PrintRenderer.java
               src/org/apache/fop/render/pdf FontReader.java
               src/org/apache/fop/render/ps PSRenderer.java
               src/org/apache/fop/render/xml XMLRenderer.java
               src/org/apache/fop/tools AreaTreeBuilder.java
                        TestConverter.java
               src/org/apache/fop/tools/anttasks Fop.java
  Removed:     conf     config.dtd config.xml userconfig.xml
               src/org/apache/fop/apps Options.java
               src/org/apache/fop/configuration Configuration.java
                        ConfigurationParser.java ConfigurationReader.java
  Log:
  removed old configuration
  
  Revision  Changes    Path
  1.60      +2 -6      xml-fop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	2 Sep 2002 17:40:54 -0000	1.59
  +++ build.xml	4 Sep 2002 08:36:34 -0000	1.60
  @@ -186,7 +186,7 @@
       <property name="build.compiler" value="classic"/>
       <property name="debug" value="on"/>
       <property name="optimize" value="off"/>
  -    <property name="deprecation" value="off"/>
  +    <property name="deprecation" value="on"/>
   
       <property name="textfontencoding" value="WinAnsiEncoding"/>
   
  @@ -308,11 +308,7 @@
       <mkdir dir="${build.src}/${properties.dir}"/>
       <mkdir dir="${build.src}/${fonts.dir}"/>
       <mkdir dir="${build.src}/${svg.dir}"/>
  -    <mkdir dir="${build.dest}/conf"/>
       <mkdir dir="${build.dest}/hyph"/>
  -    <copy todir="${build.dest}/conf" filtering="yes">
  -       <fileset dir="./conf"/>
  -    </copy>
     </target>
   
     <!-- =================================================================== -->
  @@ -548,7 +544,7 @@
       </pathconvert>
       <jar jarfile="${build.dir}/${name}.jar"
            basedir="${build.dest}"
  -         includes="org/**,conf/**,hyph/**">
  +         includes="org/**,hyph/**">
       <manifest>
           <attribute name="Main-Class" value="${main.class}"/>
           <attribute name="Class-Path" value="${manifest-classpath}"/>
  
  
  
  1.14      +1 -4      xml-fop/src/org/apache/fop/apps/AWTStarter.java
  
  Index: AWTStarter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AWTStarter.java	7 Aug 2002 16:54:56 -0000	1.13
  +++ AWTStarter.java	4 Sep 2002 08:36:35 -0000	1.14
  @@ -95,9 +95,6 @@
       public void run() throws FOPException {
           Driver driver = new Driver();
           setupLogger(driver);
  -        if (errorDump) {
  -            driver.setErrorDump(true);
  -        }
   
           // init parser
           frame.progress(resource.getString("Init parser") + " ...");
  
  
  
  1.19      +5 -17     xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
  
  Index: CommandLineOptions.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CommandLineOptions.java	7 Aug 2002 16:54:56 -0000	1.18
  +++ CommandLineOptions.java	4 Sep 2002 08:36:35 -0000	1.19
  @@ -13,7 +13,6 @@
   import java.io.FileNotFoundException;
   
   // FOP
  -import org.apache.fop.configuration.Configuration;
   import org.apache.fop.apps.FOPException;
   
   // Avalon
  @@ -52,8 +51,6 @@
       /* output: XML area tree */
       private static final int AREA_OUTPUT = 9;
   
  -    /* use debug mode */
  -    Boolean errorDump = Boolean.FALSE;
       /* show configuration information */
       Boolean dumpConfiguration = Boolean.FALSE;
       /* suppress any progress information */
  @@ -92,9 +89,6 @@
               optionsParsed = parseOptions(args);
               if (optionsParsed) {
                   checkSettings();
  -                if (errorDump != null && errorDump.booleanValue()) {
  -                    debug();
  -                }
               }
           } catch (FOPException e) {
               printUsage();
  @@ -106,6 +100,10 @@
   
       }
   
  +    public Logger getLogger() {
  +        return log;
  +    }
  +
       /**
        * parses the commandline arguments
        * @return true if parse was successful and procesing can continue, false if processing should stop
  @@ -114,7 +112,6 @@
       private boolean parseOptions(String args[]) throws FOPException {
           for (int i = 0; i < args.length; i++) {
               if (args[i].equals("-d") || args[i].equals("--full-error-dump")) {
  -                errorDump = Boolean.TRUE;
                   log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
               } else if (args[i].equals("-x")
                          || args[i].equals("--dump-config")) {
  @@ -452,10 +449,6 @@
           return dumpConfiguration;
       }
   
  -    public Boolean isDebugMode() {
  -        return errorDump;
  -    }
  -
       public Boolean isCoarseAreaXml() {
           return suppressLowLevelAreas;
       }
  @@ -597,11 +590,6 @@
                                    + userConfigFile.toString());
           } else {
               log.debug("no user configuration file is used [default]");
  -        }
  -        if (errorDump != null) {
  -            log.debug("debug mode on");
  -        } else {
  -            log.debug("debug mode off [default]");
           }
           if (dumpConfiguration != null) {
               log.debug("dump configuration");
  
  
  
  1.19      +1 -12     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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CommandLineStarter.java	7 Aug 2002 16:54:56 -0000	1.18
  +++ CommandLineStarter.java	4 Sep 2002 08:36:35 -0000	1.19
  @@ -18,9 +18,6 @@
   import java.net.URL;
   
   
  -// FOP
  -import org.apache.fop.configuration.Configuration;
  -
   /**
    * super class for all classes which start Fop from the commandline
    *
  @@ -29,14 +26,10 @@
   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());
       }
   
  @@ -55,10 +48,6 @@
           Driver driver = new Driver();
           setupLogger(driver);
           driver.initialize();
  -
  -        if (errorDump) {
  -            driver.setErrorDump(true);
  -        }
   
           try {
               driver.setRenderer(commandLineOptions.getRenderer());
  
  
  
  1.54      +7 -40     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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Driver.java	9 Aug 2002 06:51:17 -0000	1.53
  +++ Driver.java	4 Sep 2002 08:36:35 -0000	1.54
  @@ -12,8 +12,6 @@
   import org.apache.fop.fo.FOTreeBuilder;
   import org.apache.fop.fo.ElementMapping;
   import org.apache.fop.render.Renderer;
  -import org.apache.fop.configuration.ConfigurationReader;
  -import org.apache.fop.configuration.Configuration;
   import org.apache.fop.tools.DocumentInputSource;
   import org.apache.fop.tools.DocumentReader;
   
  @@ -167,11 +165,6 @@
       private XMLReader _reader;
   
       /**
  -     * If true, full error stacks are reported
  -     */
  -    private boolean _errorDump = false;
  -
  -    /**
        * the system resources that FOP will use
        */
       private Logger log = null;
  @@ -215,8 +208,7 @@
           if(userAgent == null) {
               userAgent = new FOUserAgent();
               userAgent.enableLogging(getLogger());
  -            String base = org.apache.fop.configuration.Configuration.getStringValue("baseDir");
  -            userAgent.setBaseURL(base);
  +            userAgent.setBaseURL("file:/.");
           }
           return userAgent;
       }
  @@ -256,14 +248,6 @@
       }
   
       /**
  -     * 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
  @@ -518,27 +502,6 @@
       }
   
       /**
  -     * Dumps an error
  -     */
  -    public void dumpError(Exception e) {
  -        if (_errorDump) {
  -            if (e instanceof SAXException) {
  -                getLogger().error("", e);
  -                if (((SAXException)e).getException() != null) {
  -                    getLogger().error("", ((SAXException)e).getException());
  -                }
  -            } else if (e instanceof FOPException) {
  -                e.printStackTrace();
  -                if (((FOPException)e).getException() != null) {
  -                    getLogger().error("", ((FOPException)e).getException());
  -                }
  -            } else {
  -                getLogger().error("", e);
  -            }
  -        }
  -    }
  -
  -    /**
        * Runs the formatting and renderering process using the previously set
        * inputsource and outputstream
        */
  @@ -553,7 +516,11 @@
   
           if (_reader == null) {
               if (!(_source instanceof DocumentInputSource)) {
  -                _reader = ConfigurationReader.createParser();
  +                try {
  +                _reader = javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser().getXMLReader();
  +                } catch(Exception e) {
  +                    throw new FOPException(e);
  +                }
               }
           }
   
  
  
  
  1.13      +3 -3      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Fop.java	6 Aug 2002 06:56:03 -0000	1.12
  +++ Fop.java	4 Sep 2002 08:36:35 -0000	1.13
  @@ -21,14 +21,14 @@
               } else {
                   System.err.println("" + e.getMessage());
               }
  -            if (options != null && options.isDebugMode().booleanValue()) {
  +            if (options != null && options.getLogger().isDebugEnabled()) {
                   e.printStackTrace();
               } else {
                   System.err.println("Turn on debugging for more information");
               }
           } catch (java.io.FileNotFoundException e) {
               System.err.println("" + e.getMessage());
  -            if (options != null && options.isDebugMode().booleanValue()) {
  +            if (options != null && options.getLogger().isDebugEnabled()) {
                   e.printStackTrace();
               } else {
                   System.err.println("Turn on debugging for more information");
  
  
  
  1.11      +1 -4      xml-fop/src/org/apache/fop/apps/PrintStarter.java
  
  Index: PrintStarter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/PrintStarter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PrintStarter.java	20 Jun 2002 09:14:11 -0000	1.10
  +++ PrintStarter.java	4 Sep 2002 08:36:35 -0000	1.11
  @@ -51,9 +51,6 @@
   
       public void run() throws FOPException {
           Driver driver = new Driver();
  -        if (errorDump) {
  -            driver.setErrorDump(true);
  -        }
   
           String version = Version.getVersion();
           //log.debug(version);
  
  
  
  1.10      +1 -3      xml-fop/src/org/apache/fop/apps/Starter.java
  
  Index: Starter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Starter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Starter.java	7 Aug 2002 16:54:56 -0000	1.9
  +++ Starter.java	4 Sep 2002 08:36:35 -0000	1.10
  @@ -25,11 +25,9 @@
    */
   public abstract class Starter extends AbstractLogEnabled {
   
  -    Options options;
       InputHandler inputHandler;
   
       public Starter() throws FOPException {
  -        options = new Options();
       }
   
       public void setInputHandler(InputHandler inputHandler) {
  
  
  
  1.17      +2 -4      xml-fop/src/org/apache/fop/apps/Version.java
  
  Index: Version.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Version.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Version.java	30 Jul 2001 20:29:18 -0000	1.16
  +++ Version.java	4 Sep 2002 08:36:35 -0000	1.17
  @@ -7,8 +7,6 @@
   
   package org.apache.fop.apps;
   
  -import org.apache.fop.configuration.Configuration;
  -
   /**
    * class representing the version of FOP.
    */
  @@ -20,7 +18,7 @@
        * @return the version string
        */
       public static String getVersion() {
  -        return Configuration.getStringValue("version");
  +        return "1.0dev";
       }
   
   }
  
  
  
  1.8       +2 -4      xml-fop/src/org/apache/fop/layout/hyphenation/Hyphenator.java
  
  Index: Hyphenator.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/hyphenation/Hyphenator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Hyphenator.java	2 Aug 2002 06:31:24 -0000	1.7
  +++ Hyphenator.java	4 Sep 2002 08:36:36 -0000	1.8
  @@ -9,7 +9,6 @@
   
   import java.io.*;
   import java.util.Hashtable;
  -import org.apache.fop.configuration.*;
   
   /**
    * This class is the main entry point to the hyphenation package.
  @@ -46,8 +45,7 @@
   
           HyphenationTree hTree = getFopHyphenationTree(key);
           if (hTree == null) {
  -            String hyphenDir =
  -                Configuration.getStringValue("hyphenation-dir");
  +            String hyphenDir = "/hyph";
               if (hyphenDir != null) {
                   hTree = getUserHyphenationTree(key, hyphenDir);
               }
  
  
  
  1.4       +2 -2      xml-fop/src/org/apache/fop/mif/MIFHandler.java
  
  Index: MIFHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/mif/MIFHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MIFHandler.java	31 Jul 2002 08:20:40 -0000	1.3
  +++ MIFHandler.java	4 Sep 2002 08:36:36 -0000	1.4
  @@ -42,7 +42,7 @@
       public MIFHandler(OutputStream os) {
           outStream = os;
           // use pdf fonts for now, this is only for resolving names
  -        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, org.apache.fop.configuration.Configuration.getFonts());
  +        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, null);
       }
   
       public FontInfo getFontInfo() {
  
  
  
  1.18      +2 -2      xml-fop/src/org/apache/fop/render/PrintRenderer.java
  
  Index: PrintRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/PrintRenderer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- PrintRenderer.java	31 Jul 2002 08:20:40 -0000	1.17
  +++ PrintRenderer.java	4 Sep 2002 08:36:36 -0000	1.18
  @@ -35,7 +35,7 @@
        */
       public void setupFontInfo(FontInfo fontInfo) {
           this.fontInfo = fontInfo;
  -        FontSetup.setup(fontInfo, org.apache.fop.configuration.Configuration.getFonts());
  +        FontSetup.setup(fontInfo, null);
       }
   
       /**
  
  
  
  1.6       +11 -7     xml-fop/src/org/apache/fop/render/pdf/FontReader.java
  
  Index: FontReader.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/FontReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FontReader.java	2 Nov 2001 11:06:08 -0000	1.5
  +++ FontReader.java	4 Sep 2002 08:36:36 -0000	1.6
  @@ -16,10 +16,9 @@
   import java.io.IOException;
   import java.util.Enumeration;
   import java.util.ArrayList;
  -import java.util.Hashtable;
  +import java.util.HashMap;
   import org.apache.fop.pdf.PDFWArray;
   import org.apache.fop.pdf.PDFCIDFont;
  -import org.apache.fop.configuration.ConfigurationReader;
   import org.apache.fop.apps.FOPException;
   
   /**
  @@ -38,18 +37,23 @@
       private MultiByteFont multiFont = null;
       private SingleByteFont singleFont = null;
       private Font returnFont = null;
  -    // private SingleByteFont singleFont = null;
       private String text = null;
   
       private ArrayList cidWidths = null;
       private int cidWidthIndex = 0;
   
  -    private Hashtable currentKerning = null;
  +    private HashMap currentKerning = null;
   
       private ArrayList bfranges = null;
   
       private void createFont(String path) throws FOPException {
  -        XMLReader parser = ConfigurationReader.createParser();
  +        XMLReader parser = null;
  +
  +        try {
  +            parser = javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser().getXMLReader();
  +        } catch (Exception e) {
  +            throw new FOPException(e);
  +        }
           if (parser == null)
               throw new FOPException("Unable to create SAX parser");
   
  @@ -147,7 +151,7 @@
               cidWidthIndex = getInt(attributes.getValue("start-index"));
               cidWidths = new ArrayList();
           } else if ("kerning".equals(localName)) {
  -            currentKerning = new Hashtable();
  +            currentKerning = new HashMap();
               if (isCID)
                   multiFont.kerning.put(new Integer(attributes.getValue("kpx1")),
                                         currentKerning);
  
  
  
  1.26      +2 -2      xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
  
  Index: PSRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- PSRenderer.java	7 Aug 2002 16:54:58 -0000	1.25
  +++ PSRenderer.java	4 Sep 2002 08:36:36 -0000	1.26
  @@ -229,7 +229,7 @@
        */
       public void setupFontInfo(FontInfo fontInfo) {
           /* use PDF's font setup to get PDF metrics */
  -        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, org.apache.fop.configuration.Configuration.getFonts());
  +        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, null);
           this.fontInfo = fontInfo;
       }
   
  
  
  
  1.42      +2 -2      xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java
  
  Index: XMLRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- XMLRenderer.java	22 Aug 2002 13:57:49 -0000	1.41
  +++ XMLRenderer.java	4 Sep 2002 08:36:36 -0000	1.42
  @@ -149,7 +149,7 @@
       public void setupFontInfo(FontInfo fontInfo) {
   
           /* use PDF's font setup to get PDF metrics */
  -        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, org.apache.fop.configuration.Configuration.getFonts());
  +        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, null);
       }
   
       private boolean isCoarseXml() {
  
  
  
  1.13      +1 -2      xml-fop/src/org/apache/fop/tools/AreaTreeBuilder.java
  
  Index: AreaTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/AreaTreeBuilder.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AreaTreeBuilder.java	22 Aug 2002 13:57:49 -0000	1.12
  +++ AreaTreeBuilder.java	4 Sep 2002 08:36:36 -0000	1.13
  @@ -8,7 +8,6 @@
   package org.apache.fop.tools;
   
   import org.apache.fop.apps.*;
  -import org.apache.fop.configuration.*;
   import org.apache.fop.area.*;
   import org.apache.fop.area.inline.*;
   import org.apache.fop.area.inline.Character;
  
  
  
  1.21      +7 -5      xml-fop/src/org/apache/fop/tools/TestConverter.java
  
  Index: TestConverter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/TestConverter.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TestConverter.java	7 Aug 2002 16:54:58 -0000	1.20
  +++ TestConverter.java	4 Sep 2002 08:36:36 -0000	1.21
  @@ -8,7 +8,7 @@
   package org.apache.fop.tools;
   
   import org.apache.fop.apps.*;
  -import org.apache.fop.configuration.*;
  +import org.apache.fop.fo.FOUserAgent;
   
   import org.apache.avalon.framework.logger.ConsoleLogger;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  @@ -198,10 +198,9 @@
   
           try {
               File xmlFile = new File(baseDir + "/" + xml);
  -
  +            String baseURL = null;
               try {
  -                Configuration.put("baseDir",
  -                                  xmlFile.getParentFile().toURL().toExternalForm());
  +                baseURL = xmlFile.getParentFile().toURL().toExternalForm();
               } catch (Exception e) {
                   getLogger().error("Error setting base directory");
               }
  @@ -221,6 +220,9 @@
               Driver driver = new Driver();
               setupLogger(driver, "fop");
               driver.initialize();
  +            FOUserAgent userAgent = new FOUserAgent();
  +            userAgent.setBaseURL(baseURL);
  +            driver.setUserAgent(userAgent);
               if (outputPDF) {
                   driver.setRenderer(Driver.RENDER_PDF);
               } else {
  
  
  
  1.20      +12 -18    xml-fop/src/org/apache/fop/tools/anttasks/Fop.java
  
  Index: Fop.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/anttasks/Fop.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Fop.java	7 Aug 2002 16:54:58 -0000	1.19
  +++ Fop.java	4 Sep 2002 08:36:37 -0000	1.20
  @@ -22,13 +22,12 @@
   import java.util.*;
   
   // FOP
  -import org.apache.fop.apps.Options;
   import org.apache.fop.apps.Starter;
   import org.apache.fop.apps.InputHandler;
   import org.apache.fop.apps.FOInputHandler;
   import org.apache.fop.apps.Driver;
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.configuration.Configuration;
  +import org.apache.fop.fo.FOUserAgent;
   
   // Avalon
   import org.apache.avalon.framework.logger.ConsoleLogger;
  @@ -189,6 +188,7 @@
   
   class FOPTaskStarter extends Starter {
       Fop task;
  +    String baseURL = null;
   
       FOPTaskStarter(Fop task) throws FOPException {
           this.task = task;
  @@ -255,21 +255,18 @@
   
       public void run() throws FOPException {
           if (task.userConfig != null) {
  -            new Options (task.userConfig);
           }
   
           try {
               if (task.getFofile() != null) {
  -                Configuration.put("baseDir",
  -                                  task.getFofile().getParentFile().toURL().
  -                                  toExternalForm());
  +                baseURL =  task.getFofile().getParentFile().toURL().
  +                                  toExternalForm();
               }
           } catch (Exception e) {
               getLogger().error("Error setting base directory", e);
           }
   
  -        task.log("Using base directory: " +
  -                 Configuration.getValue("baseDir"), Project.MSG_DEBUG);
  +        task.log("Using base URL: " + baseURL, Project.MSG_DEBUG);
   
           int rint = determineRenderer(task.getFormat());
           String newExtension = determineExtension(rint);
  @@ -304,12 +301,11 @@
                       outf = new File(task.getOutdir(), outf.getName());
                   }
                   try {
  -                    Configuration.put("baseDir",
  -                                      fs.getDir(task.getProject()).toURL().
  -                                      toExternalForm());
  +                    baseURL = fs.getDir(task.getProject()).toURL().
  +                                      toExternalForm();
   
                   } catch (Exception e) {
  -                    task.log("Error setting base directory",
  +                    task.log("Error setting base URL",
                                Project.MSG_DEBUG);
                   }
   
  @@ -344,12 +340,10 @@
           try {
               Driver driver = new Driver(inputHandler.getInputSource(), out);
               setupLogger(driver);
  +            FOUserAgent userAgent = new FOUserAgent();
  +            userAgent.setBaseURL(baseURL);
  +            driver.setUserAgent(userAgent);
               driver.setRenderer(renderer);
  -        if (renderer == Driver.RENDER_XML) {
  -        HashMap rendererOptions = new HashMap();
  -        rendererOptions.put("fineDetail", new Boolean(true));
  -        driver.getRenderer().setOptions(rendererOptions);
  -        }
               driver.setXMLReader(parser);
               driver.run();
               out.close();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org