Switch to java.util.logging

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197253 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index 21cb8aa2177b77e0cf1922e52802a36ec5d4a1be..d414f9f447bc8b2bdeee183f064044ba1a4bfe7b 100644 (file)
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -52,7 +52,6 @@
 
 package org.apache.fop.apps;
 
-// FOP
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -60,7 +59,6 @@ import org.xml.sax.XMLReader;
 import org.apache.fop.configuration.Configuration;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.layout.AreaTree;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.version.Version;
 import org.apache.fop.xml.FoXmlSerialHandler;
 import org.apache.fop.xml.Namespaces;
@@ -77,7 +75,7 @@ import org.apache.fop.xml.XmlEventReader;
 public class Driver {
     /** If true, full error stacks are reported */
     private static boolean _errorDump = false;
-
+    
     private InputHandler inputHandler;
     private XMLReader parser;
     private InputSource saxSource;
@@ -103,7 +101,7 @@ public class Driver {
         _errorDump =
                 Configuration.getBooleanValue("debugMode").booleanValue();
         String version = Version.getVersion();
-        MessageHandler.logln(version);
+        Fop.logger.config(version);
     }
 
     /**

diff --git a/src/java/org/apache/fop/apps/Fop.java b/src/java/org/apache/fop/apps/Fop.java
index 6e132b3bf27af243ebc79cebf0afea6a33c31bab..7aae63269308a8f4e19d9c4da60f11cb62227024 100644 (file)
--- a/src/java/org/apache/fop/apps/Fop.java
+++ b/src/java/org/apache/fop/apps/Fop.java
@@ -52,7 +52,7 @@
 
 package org.apache.fop.apps;
 
-import org.apache.fop.messaging.MessageHandler;
+import java.util.logging.Logger;
 
 public class Fop {
 
@@ -62,6 +62,8 @@ public class Fop {
     public static long startTime;
     public static long startPCi;
     public static long endPCi;
+    
+    protected static final Logger logger = Logger.getLogger("org.apache.fop");
 
     public static void main(String[] args) {
 
@@ -109,13 +111,13 @@ public class Fop {
             //System.out.println("PC time     : " + (endPCi - startPCi));
             
         } catch (FOPException e) {
-            MessageHandler.errorln("ERROR: " + e.getMessage());
+            logger.warning(e.getMessage());
             if ((bool = Options.isDebugMode()) != null
                     && bool.booleanValue()) {
                 e.printStackTrace();
             }
         } catch (java.io.FileNotFoundException e) {
-            MessageHandler.errorln("ERROR: " + e.getMessage());
+            logger.warning(e.getMessage());
             if ((bool = Options.isDebugMode()) != null
                     && bool.booleanValue()) {
                 e.printStackTrace();

diff --git a/src/java/org/apache/fop/apps/InputHandler.java b/src/java/org/apache/fop/apps/InputHandler.java
index 7dfe138cfae674457e30496ef48dc0aeb1eee22f..b9e1f8d0f1678e9da26e9bb90e18d2a12112830e 100644 (file)
--- a/src/java/org/apache/fop/apps/InputHandler.java
+++ b/src/java/org/apache/fop/apps/InputHandler.java
@@ -59,8 +59,6 @@ import java.net.URL;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-import org.apache.fop.messaging.MessageHandler;
-
 
 abstract public class InputHandler {
 
@@ -68,7 +66,6 @@ abstract public class InputHandler {
     abstract public InputSource getInputSource();
     abstract public XMLReader getParser() throws FOPException;
 
-
     /**
      * create an InputSource from a File
      *
@@ -101,7 +98,7 @@ abstract public class InputHandler {
         if (parserClassName == null) {
             parserClassName = "org.apache.xerces.parsers.SAXParser";
         }
-        MessageHandler.logln("using SAX parser " + parserClassName);
+        Fop.logger.config("using SAX parser " + parserClassName);
 
         try {
             return (XMLReader)Class.forName(parserClassName).newInstance();

diff --git a/src/java/org/apache/fop/apps/Options.java b/src/java/org/apache/fop/apps/Options.java
index b786c3ddcec03c2ab1028b00455783ed1c12720f..770d6c3eee1f1fe373d2e3a632759fe009f14510 100644 (file)
--- a/src/java/org/apache/fop/apps/Options.java
+++ b/src/java/org/apache/fop/apps/Options.java
@@ -62,9 +62,8 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Set;
 import java.util.Iterator;
-
+import java.util.logging.Level;
 // fop
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.configuration.Configuration;
 import org.apache.fop.configuration.ConfigurationReader;
 
@@ -93,6 +92,7 @@ public class Options {
 
     private static final String defaultConfigFile = "config.xml";
     private static final String defaultUserConfigFile = "userconfig.xml";
+    
     /**
      * An array of String indexed by the integer constants representing
      * the various input modes.  Provided so that integer modes can be
@@ -319,7 +319,7 @@ public class Options {
             } catch (Exception e) {}
         }
         if (debug) {
-            MessageHandler.logln("base directory: " + baseDir);
+            Fop.logger.config("base directory: " + baseDir);
         }
 
         if (dumpConfig) {
@@ -330,7 +330,9 @@ public class Options {
         // quiet mode - this is the last setting, so there is no way to
         // supress the logging of messages during options processing
         if ((bool = isQuiet()) != null) {
-            MessageHandler.setQuiet(bool.booleanValue());
+            if (bool.booleanValue()) {
+                Fop.logger.setLevel(Level.OFF);
+            }
         }
 
     }
@@ -411,7 +413,7 @@ public class Options {
                 getConfResourceFile(fname, ConfigurationReader.class);
 
         if (debug) {
-            MessageHandler.logln(
+            Fop.logger.config(
                     "reading configuration file " + fname);
         }
         ConfigurationReader reader =
@@ -436,7 +438,7 @@ public class Options {
         boolean readOk = true;
         userConfigFile = new File(userConfigFileName);
         if (userConfigFile != null) {
-            MessageHandler.logln(
+            Fop.logger.config(
                     "reading user configuration file " + userConfigFileName);
             ConfigurationReader reader = new ConfigurationReader(
                                 InputHandler.fileInputSource(userConfigFile));
@@ -446,7 +448,7 @@ public class Options {
             try {
                 reader.start();
             } catch (org.apache.fop.apps.FOPException error) {
-                MessageHandler.logln(
+                Fop.logger.config(
                         "Can't find user configuration file "
                         + userConfigFile + " in user locations");
                 if (debug) {
@@ -459,7 +461,7 @@ public class Options {
                     // Try reading the file using loadConfig()
                     loadConfiguration(userConfigFileName);
                 } catch (FOPException ex) {
-                    MessageHandler.logln("Can't find user configuration file "
+                    Fop.logger.warning("Can't find user configuration file "
                     + userConfigFile + " in system locations");
                     if (debug) {
                         reader.dumpError(ex);
@@ -620,9 +622,8 @@ public class Options {
 
             // warning if foFile has been set in xslt mode
             if (foFile != null) {
-                MessageHandler.errorln(
-                    "WARNING: "
-                    + "Can't use fo file with transform mode! Ignoring.\n"
+                Fop.logger.warning(
+                    "Can't use fo file with transform mode! Ignoring.\n"
                                        + "Your input is " + "\n xmlFile: "
                                        + xmlFile.getAbsolutePath()
                                        + "\nxsltFile: "
@@ -643,11 +644,11 @@ public class Options {
 
         } else if (inputmode == FO_INPUT) {
             if (xmlFile != null || xsltFile != null) {
-                MessageHandler.errorln(
-                    "WARNING: fo input mode, but xmlFile or xslt file are set:"
+                Fop.logger.warning(
+                    "fo input mode, but xmlFile or xslt file are set:"
                 );
-                MessageHandler.errorln("xml file: " + xmlFile.toString());
-                MessageHandler.errorln("xslt file: " + xsltFile.toString());
+                Fop.logger.warning("xml file: " + xmlFile.toString());
+                Fop.logger.warning("xslt file: " + xsltFile.toString());
             }
             if (!foFile.exists()) {
                 throw new FileNotFoundException("fo file "
@@ -797,7 +798,7 @@ public class Options {
      * options and some examples
      */
     public static void printUsage() {
-        MessageHandler.errorln(
+        Fop.logger.info(
             "\nUSAGE\n"
             + "Fop [options] [-fo|-xml] infile [-xsl file] "
             + "[-awt|-pdf|-mif|-pcl|-ps|-txt|-at|-print] [outputFile]\n"
@@ -847,7 +848,7 @@ public class Options {
      * shows the options for print output
      */
     public static void printUsagePrintOutput() {
-        MessageHandler.errorln(
+        Fop.logger.info(
             "USAGE:"
             + " -print [-Dstart=i] [-Dend=i] [-Dcopies=i] [-Deven=true|false]"
             + " org.apache.fop.apps.Fop (..) -print \n"
@@ -867,56 +868,56 @@ public class Options {
         System.out.print("Input mode: ");
         switch (inputmode) {
         case NOT_SET:
-            MessageHandler.logln("not set");
+            Fop.logger.config("not set");
             break;
         case FO_INPUT:
-            MessageHandler.logln("fo ");
-            MessageHandler.logln("fo input file: " + foFile.toString());
+            Fop.logger.config("fo ");
+            Fop.logger.config("fo input file: " + foFile.toString());
             break;
         default:
-            MessageHandler.logln("unknown input type");
+            Fop.logger.config("unknown input type");
         }
         System.out.print("Output mode: ");
         switch (outputmode) {
         case NOT_SET:
-            MessageHandler.logln("not set");
+            Fop.logger.config("not set");
             break;
         case PDF_OUTPUT:
-            MessageHandler.logln("pdf");
-            MessageHandler.logln("output file: " + outputFile.toString());
+            Fop.logger.config("pdf");
+            Fop.logger.config("output file: " + outputFile.toString());
             break;
         default:
-            MessageHandler.logln("unknown input type");
+            Fop.logger.config("unknown input type");
         }
 
 
-        MessageHandler.logln("OPTIONS");
+        Fop.logger.config("OPTIONS");
         if (userConfigFile != null) {
-            MessageHandler.logln("user configuration file: "
+            Fop.logger.config("user configuration file: "
                                  + userConfigFile.toString());
         } else {
-            MessageHandler.logln(
+            Fop.logger.config(
                             "no user configuration file is used [default]");
         }
         if ((bool = isDebugMode()) != null && bool.booleanValue()) {
-            MessageHandler.logln("debug mode on");
+            Fop.logger.config("debug mode on");
         } else {
-            MessageHandler.logln("debug mode off [default]");
+            Fop.logger.config("debug mode off [default]");
         }
         if ((bool = doDumpConfiguration()) != null && bool.booleanValue()) {
-            MessageHandler.logln("dump configuration");
+            Fop.logger.config("dump configuration");
         } else {
-            MessageHandler.logln("don't dump configuration [default]");
+            Fop.logger.config("don't dump configuration [default]");
         }
         if ((bool = isCoarseAreaXml()) != null && bool.booleanValue()) {
-            MessageHandler.logln("no low level areas");
+            Fop.logger.config("no low level areas");
         } else {
-            MessageHandler.logln("low level areas generated[default]");
+            Fop.logger.config("low level areas generated[default]");
         }
         if ((bool = isQuiet()) != null && bool.booleanValue()) {
-            MessageHandler.logln("quiet mode on");
+            Fop.logger.config("quiet mode on");
         } else {
-            MessageHandler.logln("quiet mode off [default]");
+            Fop.logger.config("quiet mode off [default]");
         }
 
     }

diff --git a/src/java/org/apache/fop/configuration/Configuration.java b/src/java/org/apache/fop/configuration/Configuration.java
index 6e674b9869981cc50f2bc53b7caa4a308d8d9489..f4f74faf3e41d279d1d4e951b3a7faf48f5a9389 100644 (file)
--- a/src/java/org/apache/fop/configuration/Configuration.java
+++ b/src/java/org/apache/fop/configuration/Configuration.java
@@ -55,7 +55,7 @@ package org.apache.fop.configuration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import org.apache.fop.messaging.MessageHandler;
+import java.util.logging.Logger;
 
 /**
  * a configuration class for all general configuration aspects except those
@@ -66,6 +66,7 @@ import org.apache.fop.messaging.MessageHandler;
  */
 public class Configuration {
 
+    protected static final Logger logger = Logger.getLogger("org.apache.fop");
     /**
      * defines role types
      */
@@ -348,7 +349,7 @@ public class Configuration {
             awtConfiguration = config;
             break;
         default:
-            MessageHandler.errorln(
+            logger.warning(
             "Can't setup configuration. Unknown configuration role/target"
             );
         }
@@ -375,7 +376,7 @@ public class Configuration {
             break;
         default:
             standardConfiguration.put(key, value);
-            MessageHandler.errorln("Unknown role for new configuration entry."
+            logger.warning("Unknown role for new configuration entry."
                                    + " Putting key:" + key + " - value:"
                                    + value + " into standard configuration.");
         }
@@ -410,38 +411,38 @@ public class Configuration {
             standardConfiguration, pdfConfiguration, awtConfiguration
         };
         for (int i = 0; i < configs.length; i++) {
-            MessageHandler.logln("----------------------");
+            logger.config("----------------------");
             configuration = configs[i];
             Iterator iter = configuration.keySet().iterator();
             while (iter.hasNext()) {
                 key = (String)iter.next();
-                MessageHandler.logln("key: " + key);
+                logger.config("key: " + key);
                 value = configuration.get(key);
                 if (value instanceof String) {
-                    MessageHandler.logln("   value: " + value);
+                    logger.config("   value: " + value);
                 } else if (value instanceof Boolean) {
-                    MessageHandler.logln
+                    logger.config
                             ("   value: " + ((Boolean)value).booleanValue());
                 } else if (value instanceof Integer) {
-                    MessageHandler.logln
+                    logger.config
                                 ("   value: " + ((Integer)value).intValue());
                 } else if (value instanceof ArrayList) {
                     list = (ArrayList)value;
                     iterator = list.iterator();
-                    MessageHandler.log("   values: ");
+                    StringBuffer msg = new StringBuffer("   values: ");
                     while (iterator.hasNext()) {
-                        MessageHandler.log(iterator.next() + " - ");
+                        msg.append(iterator.next() + " - ");
                     }
-                    MessageHandler.logln("");
+                    logger.config(msg.toString());
                 } else if (value instanceof HashMap) {
                     map = (HashMap)value;
                     iterator = map.keySet().iterator();
-                    MessageHandler.log("   values: ");
+                    StringBuffer msg = new StringBuffer("   values: ");
                     while (iterator.hasNext()) {
                         tmp = (String)iterator.next();
-                        MessageHandler.log(" " + tmp + ":" + map.get(tmp));
+                        msg.append(" " + tmp + ":" + map.get(tmp));
                     }
-                    MessageHandler.logln("");
+                    logger.config(msg.toString());
                 }
             }
         }

diff --git a/src/java/org/apache/fop/configuration/ConfigurationParser.java b/src/java/org/apache/fop/configuration/ConfigurationParser.java
index 2fb76124bee4b0697c2f5019510744e54af106f3..b285707cddfd02ccafacb59dca3cef3895116fd4 100644 (file)
--- a/src/java/org/apache/fop/configuration/ConfigurationParser.java
+++ b/src/java/org/apache/fop/configuration/ConfigurationParser.java
@@ -62,9 +62,6 @@ import org.xml.sax.Locator;
 import java.util.HashMap;
 import java.util.ArrayList;
 
-// fop
-import org.apache.fop.messaging.MessageHandler;
-
 
 /**
  * SAX2 Handler which retrieves the configuration information and stores them in Configuration.
@@ -190,7 +187,7 @@ public class ConfigurationParser extends DefaultHandler {
             fontTriplets.add(fontTriplet);
         } else {
             // to make sure that user knows about false tag
-            MessageHandler.errorln("Unknown tag in configuration file: "
+            Configuration.logger.warning("Unknown tag in configuration file: "
                                    + localName);
         }
     }                                            // end startElement
@@ -297,7 +294,7 @@ public class ConfigurationParser extends DefaultHandler {
         if (activeConfiguration != null) {
             activeConfiguration.put(key, value);
         } else {
-            MessageHandler.errorln("Unknown role >" + role
+            Configuration.logger.warning("Unknown role >" + role
                                    + "< for new configuration entry. \n"
                                    + "Putting configuration with key:" + key
                                    + " into standard configuration.");

diff --git a/src/java/org/apache/fop/configuration/ConfigurationReader.java b/src/java/org/apache/fop/configuration/ConfigurationReader.java
index 91e139d2d1030e7096ffd91974bbf48bdb55485a..39223e4db5f27918a0c11d39d0cd6305d0a15497 100644 (file)
--- a/src/java/org/apache/fop/configuration/ConfigurationReader.java
+++ b/src/java/org/apache/fop/configuration/ConfigurationReader.java
@@ -59,7 +59,6 @@ import org.xml.sax.InputSource;
 
 // fop
 import org.apache.fop.apps.Driver;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -136,7 +135,8 @@ public class ConfigurationReader {
     public static XMLReader createParser() throws FOPException {
         String parserClassName = Driver.getParserClassName();
         if (errorDump) {
-            MessageHandler.logln("configuration reader using SAX parser "
+            Configuration.logger.config(
+                    "configuration reader using SAX parser "
                                  + parserClassName);
         }