Guys,
Attached is a patch for the trunk to convert it over to using Avalon Loggers, instead of the Logkit. This is AFAIK the last of the conversion work required. In addition to applying the patch, lib/avalon-framework-cvs-20020315.jar and it's license file will need to be added (a copy exists in the maintanence branch) and lib/logkit-1.0.LICENSE.txt and lib/logkit-1.0.jar must be removed. Can someone please review the patch and commit when they are happy? Thanks, Mike. -- Michael Gratton <[EMAIL PROTECTED]> Recall Design <http://www.recalldesign.com/> s: 53 Gilbert Street Adelaide SA 5000 Australia t: +61 8 8217 0500 f: +61 8 8217 0555
Index: build.bat
===================================================================
RCS file: /home/cvspublic/xml-fop/build.bat,v
retrieving revision 1.15
diff -u -r1.15 build.bat
--- build.bat 30 Oct 2001 07:21:33 -0000 1.15
+++ build.bat 11 Apr 2002 08:48:22 -0000
@@ -7,7 +7,7 @@
set LIBDIR=lib
set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.2D11.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0.jar
+set
+LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar
set ANT_HOME=%LIBDIR%
Index: build.sh
===================================================================
RCS file: /home/cvspublic/xml-fop/build.sh,v
retrieving revision 1.16
diff -u -r1.16 build.sh
--- build.sh 30 Oct 2001 07:21:33 -0000 1.16
+++ build.sh 11 Apr 2002 08:48:22 -0000
@@ -14,7 +14,7 @@
fi
LIBDIR=lib
LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/logkit-1.0.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
ANT_HOME=$LIBDIR
Index: build.xml
===================================================================
RCS file: /home/cvspublic/xml-fop/build.xml,v
retrieving revision 1.52
diff -u -r1.52 build.xml
--- build.xml 18 Mar 2002 08:58:05 -0000 1.52
+++ build.xml 11 Apr 2002 08:48:23 -0000
@@ -128,7 +128,7 @@
<include name="lib/xerces-1.4.3.jar"/>
<include name="lib/xalan-2.2D11.jar"/>
<include name="lib/batik.jar"/>
- <include name="lib/logkit-1.0.jar"/>
+ <include name="lib/avalon-framework-cvs-20020315.jar"/>
<include name="lib/jimi*"/>
</fileset>
@@ -275,7 +275,7 @@
<taskdef name="runTest" classname="org.apache.fop.tools.anttasks.RunTest"/>
<property name="main.class" value="org.apache.fop.apps.Fop"/>
- <property name="runtime.classpath" value="lib/xerces-1.4.3.jar
lib/xalan-2.2D11.jar lib/batik.jar lib/jimi-1.0.jar lib/logkit-1.0.jar"/>
+ <property name="runtime.classpath" value="lib/xerces-1.4.3.jar
+lib/xalan-2.2D11.jar lib/batik.jar lib/jimi-1.0.jar
+lib/avalon-framework-cvs-20020315.jar"/>
<filter filtersfile="${build.src}/codegen/filter"/>
Index: fop.bat
===================================================================
RCS file: /home/cvspublic/xml-fop/fop.bat,v
retrieving revision 1.4
diff -u -r1.4 fop.bat
--- fop.bat 20 Aug 2001 21:11:02 -0000 1.4
+++ fop.bat 11 Apr 2002 08:48:23 -0000
@@ -1 +1 @@
-java -cp
build\fop.jar;lib\batik.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\avalon-framework-4.0.jar;lib\logkit-1.0b4.jar;lib\jimi-1.0.jar
org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+java -cp
+build\fop.jar;lib\batik.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\avalon-framework-4.0.jar;lib\avalon-framework-cvs-20020315.jar;lib\jimi-1.0.jar
+ org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
Index: docs/xml-docs/fop/embedding.xml
===================================================================
RCS file: /home/cvspublic/xml-fop/docs/xml-docs/fop/embedding.xml,v
retrieving revision 1.16
diff -u -r1.16 embedding.xml
--- docs/xml-docs/fop/embedding.xml 17 Mar 2002 17:43:55 -0000 1.16
+++ docs/xml-docs/fop/embedding.xml 11 Apr 2002 08:48:23 -0000
@@ -37,6 +37,18 @@
driver.setRenderer(RENDER_PDF);
driver.run();]]></source>
+ <p>You also need to set up logging. Global logging for all FOP
+ processes is managed by MessageHandler. Per-instance logging
+ is handled by Driver. You want to set both using an implementation
+ of org.apache.avalon.framework.logger.Logger. See
+ <jump href="http://jakarta.apache.org/avalon/framework/";>Jakarta
+ Avalon Framework</jump> for more information.
+ </p>
+ <source><![CDATA[
+ Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
+ MessageHandler.setScreenLogger(logger);
+ driver.setLogger(logger);]]></source>
+
<p>To setup the user config file you can do the following
</p>
<source><![CDATA[
Index: src/org/apache/fop/apps/CommandLineOptions.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.15
diff -u -r1.15 CommandLineOptions.java
--- src/org/apache/fop/apps/CommandLineOptions.java 22 Oct 2001 09:30:30 -0000
1.15
+++ src/org/apache/fop/apps/CommandLineOptions.java 11 Apr 2002 08:48:23 -0000
@@ -16,10 +16,9 @@
import org.apache.fop.configuration.Configuration;
import org.apache.fop.apps.FOPException;
-import org.apache.log.*;
-import org.apache.log.format.*;
-import org.apache.log.output.io.*;
-import org.apache.log.output.*;
+// Avalon
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
import java.io.*;
@@ -93,24 +92,7 @@
public CommandLineOptions(String[] args)
throws FOPException, FileNotFoundException {
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- PatternFormatter formatter = new PatternFormatter(
- "[%{priority}]: %{message}\n%{throwable}" );
-
- LogTarget target = null;
- boolean doConsoleLogging = true;
- if (doConsoleLogging) {
- target = new StreamTarget(System.out, formatter);
- } else {
- try {
- File f = new File("fop.log");
- target = new FileTarget(f, false, formatter);
- } catch (IOException e) {}
- }
-
- hierarchy.setDefaultLogTarget(target);
- log = hierarchy.getLoggerFor("fop");
- log.setPriority(Priority.INFO);
+ log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
boolean optionsParsed = true;
rendererOptions = new java.util.HashMap();
@@ -141,13 +123,13 @@
for (int i = 0; i < args.length; i++) {
if (args[i].equals("-d") || args[i].equals("--full-error-dump")) {
errorDump = new Boolean(true);
- log.setPriority(Priority.DEBUG);
+ log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
} else if (args[i].equals("-x")
|| args[i].equals("--dump-config")) {
dumpConfiguration = new Boolean(true);
} else if (args[i].equals("-q") || args[i].equals("--quiet")) {
quiet = new Boolean(true);
- log.setPriority(Priority.ERROR);
+ log = new ConsoleLogger(ConsoleLogger.LEVEL_ERROR);
} else if (args[i].equals("-c")) {
if ((i + 1 == args.length)
|| (args[i + 1].charAt(0) == '-')) {
Index: src/org/apache/fop/apps/CommandLineStarter.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.13
diff -u -r1.13 CommandLineStarter.java
--- src/org/apache/fop/apps/CommandLineStarter.java 21 Mar 2002 09:31:02 -0000
1.13
+++ src/org/apache/fop/apps/CommandLineStarter.java 11 Apr 2002 08:48:23 -0000
@@ -13,8 +13,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.apache.log.*;
-
// Java
import java.io.*;
import java.net.URL;
Index: src/org/apache/fop/apps/Driver.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.45
diff -u -r1.45 Driver.java
--- src/org/apache/fop/apps/Driver.java 21 Mar 2002 09:31:02 -0000 1.45
+++ src/org/apache/fop/apps/Driver.java 11 Apr 2002 08:48:23 -0000
@@ -20,10 +20,9 @@
import org.apache.fop.render.pdf.PDFRenderer;
-import org.apache.log.*;
-import org.apache.log.format.*;
-import org.apache.log.output.io.*;
-import org.apache.log.output.*;
+// Avalon
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
// DOM
import org.w3c.dom.Document;
@@ -227,18 +226,10 @@
private Logger getLogger() {
if(log == null) {
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- PatternFormatter formatter = new PatternFormatter(
- "[%{priority}]: %{message}\n%{throwable}" );
-
- LogTarget target = null;
- target = new StreamTarget(System.out, formatter);
-
- hierarchy.setDefaultLogTarget(target);
- log = hierarchy.getLoggerFor("fop");
- log.setPriority(Priority.INFO);
- log.error("Logger not set");
- }
+ log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
+ log.error("Logger not set");
+ }
+
return log;
}
Index: src/org/apache/fop/apps/Starter.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/apps/Starter.java,v
retrieving revision 1.7
diff -u -r1.7 Starter.java
--- src/org/apache/fop/apps/Starter.java 12 Nov 2001 07:35:17 -0000 1.7
+++ src/org/apache/fop/apps/Starter.java 11 Apr 2002 08:48:23 -0000
@@ -7,7 +7,8 @@
package org.apache.fop.apps;
-import org.apache.log.*;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// SAX
import org.xml.sax.XMLReader;
Index: src/org/apache/fop/apps/StreamRenderer.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/apps/StreamRenderer.java,v
retrieving revision 1.10
diff -u -r1.10 StreamRenderer.java
--- src/org/apache/fop/apps/StreamRenderer.java 11 Nov 2001 22:18:06 -0000 1.10
+++ src/org/apache/fop/apps/StreamRenderer.java 11 Apr 2002 08:48:23 -0000
@@ -16,7 +16,7 @@
import org.apache.fop.extensions.ExtensionObj;
import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
This class acts as a bridge between the XML:FO parser
Index: src/org/apache/fop/datatypes/ToBeImplementedProperty.java
===================================================================
RCS file:
/home/cvspublic/xml-fop/src/org/apache/fop/datatypes/ToBeImplementedProperty.java,v
retrieving revision 1.3
diff -u -r1.3 ToBeImplementedProperty.java
--- src/org/apache/fop/datatypes/ToBeImplementedProperty.java 20 Aug 2001 11:19:22
-0000 1.3
+++ src/org/apache/fop/datatypes/ToBeImplementedProperty.java 11 Apr 2002 08:48:23
+-0000
@@ -9,8 +9,6 @@
import org.apache.fop.fo.*;
-import org.apache.log.*;
-
public class ToBeImplementedProperty extends Property {
public static class Maker extends Property.Maker {
@@ -31,9 +29,17 @@
}
public ToBeImplementedProperty(String propName) {
- Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor("fop");
- log.warn("property - \"" + propName
- + "\" is not implemented yet.");
+
+ // XXX: ([EMAIL PROTECTED]) This is a bit of a kluge, perhaps an
+ // UnimplementedPropertyException or something similar should
+ // get thrown here instead.
+ //
+ // This was solved on the maintenance branch by using
+ // MessageHandler, btu that doesn't exist on the trunk
+
+// Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor("fop");
+// log.warn("property - \"" + propName
+// + "\" is not implemented yet.");
}
}
Index: src/org/apache/fop/fo/FONode.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.26
diff -u -r1.26 FONode.java
--- src/org/apache/fop/fo/FONode.java 26 Feb 2002 12:43:09 -0000 1.26
+++ src/org/apache/fop/fo/FONode.java 11 Apr 2002 08:48:23 -0000
@@ -13,7 +13,8 @@
import org.apache.fop.layout.Area;
import org.apache.fop.util.CharUtilities;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
import org.xml.sax.Attributes;
Index: src/org/apache/fop/fo/FOTreeBuilder.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.35
diff -u -r1.35 FOTreeBuilder.java
--- src/org/apache/fop/fo/FOTreeBuilder.java 18 Mar 2002 12:30:46 -0000 1.35
+++ src/org/apache/fop/fo/FOTreeBuilder.java 11 Apr 2002 08:48:23 -0000
@@ -15,7 +15,8 @@
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.extensions.ExtensionObj;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// SAX
import org.xml.sax.helpers.DefaultHandler;
Index: src/org/apache/fop/fo/FOUserAgent.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/fo/FOUserAgent.java,v
retrieving revision 1.7
diff -u -r1.7 FOUserAgent.java
--- src/org/apache/fop/fo/FOUserAgent.java 21 Mar 2002 09:37:14 -0000 1.7
+++ src/org/apache/fop/fo/FOUserAgent.java 11 Apr 2002 08:48:23 -0000
@@ -9,7 +9,8 @@
import org.apache.fop.render.XMLHandler;
import org.apache.fop.render.RendererContext;
-import org.apache.log.Logger;
+
+import org.apache.avalon.framework.logger.Logger;
import org.w3c.dom.*;
Index: src/org/apache/fop/fo/Property.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/fo/Property.java,v
retrieving revision 1.19
diff -u -r1.19 Property.java
--- src/org/apache/fop/fo/Property.java 22 Nov 2001 07:11:39 -0000 1.19
+++ src/org/apache/fop/fo/Property.java 11 Apr 2002 08:48:23 -0000
@@ -15,7 +15,7 @@
import org.apache.fop.apps.FOPException;
import java.util.Vector;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
public class Property {
Index: src/org/apache/fop/fo/pagination/PageNumberGenerator.java
===================================================================
RCS file:
/home/cvspublic/xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 PageNumberGenerator.java
--- src/org/apache/fop/fo/pagination/PageNumberGenerator.java 20 Aug 2001 11:19:24
-0000 1.3
+++ src/org/apache/fop/fo/pagination/PageNumberGenerator.java 11 Apr 2002 08:48:23
+-0000
@@ -7,9 +7,11 @@
package org.apache.fop.fo.pagination;
+// FOP
import org.apache.fop.fo.properties.*;
-import org.apache.log.*;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.util.*;
Index: src/org/apache/fop/image/ImageCache.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/image/ImageCache.java,v
retrieving revision 1.1
diff -u -r1.1 ImageCache.java
--- src/org/apache/fop/image/ImageCache.java 21 Feb 2002 09:54:27 -0000 1.1
+++ src/org/apache/fop/image/ImageCache.java 11 Apr 2002 08:48:23 -0000
@@ -10,8 +10,6 @@
// FOP
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.Logger;
-
public interface ImageCache {
public FopImage getImage(String url, FOUserAgent context);
public void releaseImage(String url, FOUserAgent context);
Index: src/org/apache/fop/image/ImageFactory.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/image/ImageFactory.java,v
retrieving revision 1.4
diff -u -r1.4 ImageFactory.java
--- src/org/apache/fop/image/ImageFactory.java 8 Mar 2002 11:00:18 -0000 1.4
+++ src/org/apache/fop/image/ImageFactory.java 11 Apr 2002 08:48:23 -0000
@@ -27,7 +27,8 @@
import org.apache.fop.image.analyser.ImageReader;
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
/*
handle context: base dir, logger, caching
Index: src/org/apache/fop/render/AbstractRenderer.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.13
diff -u -r1.13 AbstractRenderer.java
--- src/org/apache/fop/render/AbstractRenderer.java 2 Apr 2002 11:50:58 -0000
1.13
+++ src/org/apache/fop/render/AbstractRenderer.java 11 Apr 2002 08:48:23 -0000
@@ -16,7 +16,8 @@
import org.apache.fop.area.inline.Space;
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.awt.geom.Rectangle2D;
Index: src/org/apache/fop/render/Renderer.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/Renderer.java,v
retrieving revision 1.23
diff -u -r1.23 Renderer.java
--- src/org/apache/fop/render/Renderer.java 26 Feb 2002 12:43:09 -0000 1.23
+++ src/org/apache/fop/render/Renderer.java 11 Apr 2002 08:48:23 -0000
@@ -13,7 +13,8 @@
import org.apache.fop.layout.FontInfo;
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.io.OutputStream;
Index: src/org/apache/fop/render/RendererContext.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/RendererContext.java,v
retrieving revision 1.3
diff -u -r1.3 RendererContext.java
--- src/org/apache/fop/render/RendererContext.java 21 Mar 2002 09:37:15 -0000
1.3
+++ src/org/apache/fop/render/RendererContext.java 11 Apr 2002 08:48:23 -0000
@@ -8,8 +8,6 @@
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.Logger;
-
import java.util.HashMap;
/**
Index: src/org/apache/fop/render/XMLHandler.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/XMLHandler.java,v
retrieving revision 1.1
diff -u -r1.1 XMLHandler.java
--- src/org/apache/fop/render/XMLHandler.java 26 Oct 2001 09:27:00 -0000 1.1
+++ src/org/apache/fop/render/XMLHandler.java 11 Apr 2002 08:48:23 -0000
@@ -7,8 +7,6 @@
package org.apache.fop.render;
-import org.apache.log.Logger;
-
import org.w3c.dom.Document;
/**
Index: src/org/apache/fop/render/pdf/PDFXMLHandler.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/pdf/PDFXMLHandler.java,v
retrieving revision 1.3
diff -u -r1.3 PDFXMLHandler.java
--- src/org/apache/fop/render/pdf/PDFXMLHandler.java 21 Mar 2002 09:37:15 -0000
1.3
+++ src/org/apache/fop/render/pdf/PDFXMLHandler.java 11 Apr 2002 08:48:23 -0000
@@ -15,8 +15,6 @@
import org.apache.fop.svg.SVGUserAgent;
import org.apache.fop.layout.FontState;
-import org.apache.log.Logger;
-
import org.apache.batik.dom.util.DOMUtilities;
import org.w3c.dom.Document;
Index: src/org/apache/fop/render/ps/PSRenderer.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.20
diff -u -r1.20 PSRenderer.java
--- src/org/apache/fop/render/ps/PSRenderer.java 26 Feb 2002 12:43:10 -0000
1.20
+++ src/org/apache/fop/render/ps/PSRenderer.java 11 Apr 2002 08:48:23 -0000
@@ -26,8 +26,6 @@
import org.apache.batik.gvt.filter.*;
import org.apache.batik.gvt.event.*;
-import org.apache.log.Logger;
-
// SVG
import org.w3c.dom.svg.SVGSVGElement;
import org.w3c.dom.svg.SVGDocument;
Index: src/org/apache/fop/render/xml/XMLRenderer.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.35
diff -u -r1.35 XMLRenderer.java
--- src/org/apache/fop/render/xml/XMLRenderer.java 21 Mar 2002 09:34:19 -0000
1.35
+++ src/org/apache/fop/render/xml/XMLRenderer.java 11 Apr 2002 08:48:23 -0000
@@ -21,7 +21,8 @@
import org.apache.fop.layout.FontInfo;
import org.apache.fop.apps.FOPException;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.io.IOException;
Index: src/org/apache/fop/render/xml/XMLXMLHandler.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/render/xml/XMLXMLHandler.java,v
retrieving revision 1.1
diff -u -r1.1 XMLXMLHandler.java
--- src/org/apache/fop/render/xml/XMLXMLHandler.java 26 Oct 2001 09:27:00 -0000
1.1
+++ src/org/apache/fop/render/xml/XMLXMLHandler.java 11 Apr 2002 08:48:23 -0000
@@ -11,8 +11,6 @@
import org.apache.fop.render.XMLHandler;
import org.apache.fop.render.RendererContext;
-import org.apache.log.Logger;
-
import org.apache.batik.dom.util.DOMUtilities;
import org.w3c.dom.Document;
Index: src/org/apache/fop/svg/SVGUserAgent.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/svg/SVGUserAgent.java,v
retrieving revision 1.8
diff -u -r1.8 SVGUserAgent.java
--- src/org/apache/fop/svg/SVGUserAgent.java 21 Mar 2002 09:28:43 -0000 1.8
+++ src/org/apache/fop/svg/SVGUserAgent.java 11 Apr 2002 08:48:23 -0000
@@ -9,8 +9,6 @@
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.Logger;
-
import org.apache.batik.bridge.*;
import org.apache.batik.swing.svg.*;
import org.apache.batik.swing.gvt.*;
@@ -18,6 +16,8 @@
import org.apache.batik.gvt.renderer.*;
import org.apache.batik.gvt.filter.*;
import org.apache.batik.gvt.event.*;
+
+import org.apache.avalon.framework.logger.Logger;
import org.w3c.dom.*;
import org.w3c.dom.svg.*;
Index: src/org/apache/fop/tools/AreaTreeBuilder.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.6
diff -u -r1.6 AreaTreeBuilder.java
--- src/org/apache/fop/tools/AreaTreeBuilder.java 21 Mar 2002 09:34:19 -0000
1.6
+++ src/org/apache/fop/tools/AreaTreeBuilder.java 11 Apr 2002 08:48:23 -0000
@@ -20,10 +20,8 @@
import org.apache.fop.layout.FontState;
import org.apache.fop.fo.FOUserAgent;
-import org.apache.log.*;
-import org.apache.log.format.*;
-import org.apache.log.output.io.*;
-import org.apache.log.output.*;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
import java.io.*;
import java.util.*;
@@ -51,7 +49,7 @@
* out of order rendering
*/
public class AreaTreeBuilder {
- private Logger log;
+ private Logger log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
/**
*/
@@ -60,22 +58,6 @@
atb.runTests(args[0], args[1], args[2]);
System.exit(0);
- }
-
- public AreaTreeBuilder() {
- setupLogging();
- }
-
- private void setupLogging() {
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- PatternFormatter formatter = new PatternFormatter("[%{priority}]:
%{message}\n%{throwable}");
-
- LogTarget target = null;
- target = new StreamTarget(System.out, formatter);
-
- hierarchy.setDefaultLogTarget(target);
- log = hierarchy.getLoggerFor("test");
- log.setPriority(Priority.DEBUG);
}
/**
Index: src/org/apache/fop/tools/TestConverter.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.17
diff -u -r1.17 TestConverter.java
--- src/org/apache/fop/tools/TestConverter.java 8 Jan 2002 09:52:17 -0000 1.17
+++ src/org/apache/fop/tools/TestConverter.java 11 Apr 2002 08:48:23 -0000
@@ -10,10 +10,8 @@
import org.apache.fop.apps.*;
import org.apache.fop.configuration.*;
-import org.apache.log.*;
-import org.apache.log.format.*;
-import org.apache.log.output.io.*;
-import org.apache.log.output.*;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
import java.io.*;
import java.util.*;
@@ -88,16 +86,7 @@
}
private void setupLogging() {
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- PatternFormatter formatter = new PatternFormatter(
- "[%{priority}]: %{message}\n%{throwable}" );
-
- LogTarget target = null;
- target = new StreamTarget(System.out, formatter);
-
- hierarchy.setDefaultLogTarget(target);
- log = hierarchy.getLoggerFor("test");
- log.setPriority(Priority.ERROR);
+ log = new ConsoleLogger(ConsoleLogger.LEVEL_ERROR);
}
public void setOutputPDF(boolean pdf) {
Index: src/org/apache/fop/tools/anttasks/Fop.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.17
diff -u -r1.17 Fop.java
--- src/org/apache/fop/tools/anttasks/Fop.java 22 Nov 2001 08:30:36 -0000 1.17
+++ src/org/apache/fop/tools/anttasks/Fop.java 11 Apr 2002 08:48:23 -0000
@@ -11,11 +11,6 @@
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.FileSet;
-import org.apache.log.*;
-import org.apache.log.format.*;
-import org.apache.log.output.io.*;
-import org.apache.log.output.*;
-
// SAX
import org.xml.sax.XMLReader;
import org.xml.sax.InputSource;
@@ -35,6 +30,10 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.configuration.Configuration;
+// Avalon
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+
/**
* Wrapper for Fop which allows it to be accessed from within an Ant task.
* Accepts the inputs:
@@ -194,25 +193,7 @@
FOPTaskStarter(Fop task) throws FOPException {
this.task = task;
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- // PatternFormatter formatter = new PatternFormatter(
- // "[%{priority}] %{category}: %{message}\n%{throwable}" );
- PatternFormatter formatter = new PatternFormatter("%{message}\n%{throwable}");
-
- LogTarget target = null;
- boolean doConsoleLogging = true;
- if (doConsoleLogging) {
- target = new StreamTarget(System.out, formatter);
- } else {
- try {
- File f = new File("fop.log");
- target = new FileTarget(f, false, formatter);
- } catch (IOException e) {}
- }
-
- hierarchy.setDefaultLogTarget(target);
- log = hierarchy.getLoggerFor("fop");
- log.setPriority(Priority.INFO);
+ log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
}
private int determineRenderer(String format) {
smime.p7s
Description: S/MIME Cryptographic Signature
