keiron 02/04/11 02:33:31
Modified: . build.bat build.sh build.xml fop.bat
docs/xml-docs/fop embedding.xml
src/org/apache/fop/apps CommandLineOptions.java
CommandLineStarter.java Driver.java Starter.java
StreamRenderer.java
src/org/apache/fop/datatypes ToBeImplementedProperty.java
src/org/apache/fop/fo FONode.java FOTreeBuilder.java
FOUserAgent.java Property.java
src/org/apache/fop/fo/pagination PageNumberGenerator.java
src/org/apache/fop/image ImageCache.java ImageFactory.java
src/org/apache/fop/render AbstractRenderer.java
Renderer.java RendererContext.java XMLHandler.java
src/org/apache/fop/render/pdf PDFXMLHandler.java
src/org/apache/fop/render/ps PSRenderer.java
src/org/apache/fop/render/xml XMLRenderer.java
XMLXMLHandler.java
src/org/apache/fop/svg SVGUserAgent.java
src/org/apache/fop/tools AreaTreeBuilder.java
TestConverter.java
src/org/apache/fop/tools/anttasks Fop.java
Added: lib avalon-framework-cvs-20020315.jar
avalon.LICENSE.txt
Removed: lib logkit-1.0.LICENSE.txt logkit-1.0.jar
Log:
replaced logkit logger with the logger interface in avalon framework
Submitted by: Michael Gratton <[EMAIL PROTECTED]>
Revision Changes Path
1.16 +1 -1 xml-fop/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/build.bat,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.bat 30 Oct 2001 07:21:33 -0000 1.15
+++ build.bat 11 Apr 2002 09:33:21 -0000 1.16
@@ -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%
1.17 +1 -1 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.sh 30 Oct 2001 07:21:33 -0000 1.16
+++ build.sh 11 Apr 2002 09:33:23 -0000 1.17
@@ -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
1.53 +2 -2 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.xml 18 Mar 2002 08:58:05 -0000 1.52
+++ build.xml 11 Apr 2002 09:33:24 -0000 1.53
@@ -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"/>
1.5 +1 -1 xml-fop/fop.bat
Index: fop.bat
===================================================================
RCS file: /home/cvs/xml-fop/fop.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fop.bat 20 Aug 2001 21:11:02 -0000 1.4
+++ fop.bat 11 Apr 2002 09:33:24 -0000 1.5
@@ -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
1.17 +12 -0 xml-fop/docs/xml-docs/fop/embedding.xml
Index: embedding.xml
===================================================================
RCS file: /home/cvs/xml-fop/docs/xml-docs/fop/embedding.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- embedding.xml 17 Mar 2002 17:43:55 -0000 1.16
+++ embedding.xml 11 Apr 2002 09:33:24 -0000 1.17
@@ -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[
1.2 +227 -0 xml-fop/lib/avalon-framework-cvs-20020315.jar
<<Binary file>>
1.2 +50 -0 xml-fop/lib/avalon.LICENSE.txt
1.16 +7 -25 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CommandLineOptions.java 22 Oct 2001 09:30:30 -0000 1.15
+++ CommandLineOptions.java 11 Apr 2002 09:33:26 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineOptions.java,v 1.15 2001/10/22 09:30:30 keiron Exp $
+ * $Id: CommandLineOptions.java,v 1.16 2002/04/11 09:33:26 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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) == '-')) {
1.14 +1 -3 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CommandLineStarter.java 21 Mar 2002 09:31:02 -0000 1.13
+++ CommandLineStarter.java 11 Apr 2002 09:33:26 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineStarter.java,v 1.13 2002/03/21 09:31:02 keiron Exp $
+ * $Id: CommandLineStarter.java,v 1.14 2002/04/11 09:33:26 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -12,8 +12,6 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-
-import org.apache.log.*;
// Java
import java.io.*;
1.46 +8 -17 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Driver.java 21 Mar 2002 09:31:02 -0000 1.45
+++ Driver.java 11 Apr 2002 09:33:26 -0000 1.46
@@ -1,5 +1,5 @@
/*
- * $Id: Driver.java,v 1.45 2002/03/21 09:31:02 keiron Exp $
+ * $Id: Driver.java,v 1.46 2002/04/11 09:33:26 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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;
}
1.8 +3 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Starter.java 12 Nov 2001 07:35:17 -0000 1.7
+++ Starter.java 11 Apr 2002 09:33:28 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: Starter.java,v 1.7 2001/11/12 07:35:17 keiron Exp $
+ * $Id: Starter.java,v 1.8 2002/04/11 09:33:28 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -7,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;
1.11 +1 -1 xml-fop/src/org/apache/fop/apps/StreamRenderer.java
Index: StreamRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/StreamRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StreamRenderer.java 11 Nov 2001 22:18:06 -0000 1.10
+++ StreamRenderer.java 11 Apr 2002 09:33:28 -0000 1.11
@@ -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
1.4 +12 -6
xml-fop/src/org/apache/fop/datatypes/ToBeImplementedProperty.java
Index: ToBeImplementedProperty.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/ToBeImplementedProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ToBeImplementedProperty.java 20 Aug 2001 11:19:22 -0000 1.3
+++ ToBeImplementedProperty.java 11 Apr 2002 09:33:29 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: ToBeImplementedProperty.java,v 1.3 2001/08/20 11:19:22 keiron Exp $ --
+ * $Id: ToBeImplementedProperty.java,v 1.4 2002/04/11 09:33:29 keiron Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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.");
}
}
1.27 +3 -2 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FONode.java 26 Feb 2002 12:43:09 -0000 1.26
+++ FONode.java 11 Apr 2002 09:33:29 -0000 1.27
@@ -1,5 +1,5 @@
/*
- * $Id: FONode.java,v 1.26 2002/02/26 12:43:09 keiron Exp $
+ * $Id: FONode.java,v 1.27 2002/04/11 09:33:29 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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;
1.36 +3 -2 xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- FOTreeBuilder.java 18 Mar 2002 12:30:46 -0000 1.35
+++ FOTreeBuilder.java 11 Apr 2002 09:33:30 -0000 1.36
@@ -1,5 +1,5 @@
/*
- * $Id: FOTreeBuilder.java,v 1.35 2002/03/18 12:30:46 keiron Exp $
+ * $Id: FOTreeBuilder.java,v 1.36 2002/04/11 09:33:30 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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;
1.8 +3 -2 xml-fop/src/org/apache/fop/fo/FOUserAgent.java
Index: FOUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOUserAgent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FOUserAgent.java 21 Mar 2002 09:37:14 -0000 1.7
+++ FOUserAgent.java 11 Apr 2002 09:33:30 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: FOUserAgent.java,v 1.7 2002/03/21 09:37:14 keiron Exp $
+ * $Id: FOUserAgent.java,v 1.8 2002/04/11 09:33:30 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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.*;
1.20 +2 -2 xml-fop/src/org/apache/fop/fo/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Property.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Property.java 22 Nov 2001 07:11:39 -0000 1.19
+++ Property.java 11 Apr 2002 09:33:30 -0000 1.20
@@ -1,5 +1,5 @@
/*
- * $Id: Property.java,v 1.19 2001/11/22 07:11:39 keiron Exp $
+ * $Id: Property.java,v 1.20 2002/04/11 09:33:30 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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 {
1.4 +4 -2
xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java
Index: PageNumberGenerator.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PageNumberGenerator.java 20 Aug 2001 11:19:24 -0000 1.3
+++ PageNumberGenerator.java 11 Apr 2002 09:33:30 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumberGenerator.java,v 1.3 2001/08/20 11:19:24 keiron Exp $
+ * $Id: PageNumberGenerator.java,v 1.4 2002/04/11 09:33:30 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -7,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.*;
1.2 +1 -3 xml-fop/src/org/apache/fop/image/ImageCache.java
Index: ImageCache.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/ImageCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageCache.java 21 Feb 2002 09:54:27 -0000 1.1
+++ ImageCache.java 11 Apr 2002 09:33:31 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: ImageCache.java,v 1.1 2002/02/21 09:54:27 keiron Exp $
+ * $Id: ImageCache.java,v 1.2 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -9,8 +9,6 @@
// FOP
import org.apache.fop.fo.FOUserAgent;
-
-import org.apache.log.Logger;
public interface ImageCache {
public FopImage getImage(String url, FOUserAgent context);
1.5 +3 -2 xml-fop/src/org/apache/fop/image/ImageFactory.java
Index: ImageFactory.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/ImageFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ImageFactory.java 8 Mar 2002 11:00:18 -0000 1.4
+++ ImageFactory.java 11 Apr 2002 09:33:31 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: ImageFactory.java,v 1.4 2002/03/08 11:00:18 keiron Exp $
+ * $Id: ImageFactory.java,v 1.5 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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
1.14 +3 -2 xml-fop/src/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractRenderer.java 2 Apr 2002 11:50:58 -0000 1.13
+++ AbstractRenderer.java 11 Apr 2002 09:33:31 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: AbstractRenderer.java,v 1.13 2002/04/02 11:50:58 keiron Exp $
+ * $Id: AbstractRenderer.java,v 1.14 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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;
1.24 +3 -2 xml-fop/src/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/Renderer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Renderer.java 26 Feb 2002 12:43:09 -0000 1.23
+++ Renderer.java 11 Apr 2002 09:33:31 -0000 1.24
@@ -1,5 +1,5 @@
/*
- * $Id: Renderer.java,v 1.23 2002/02/26 12:43:09 keiron Exp $
+ * $Id: Renderer.java,v 1.24 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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;
1.4 +1 -3 xml-fop/src/org/apache/fop/render/RendererContext.java
Index: RendererContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/RendererContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RendererContext.java 21 Mar 2002 09:37:15 -0000 1.3
+++ RendererContext.java 11 Apr 2002 09:33:31 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: RendererContext.java,v 1.3 2002/03/21 09:37:15 keiron Exp $
+ * $Id: RendererContext.java,v 1.4 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -7,8 +7,6 @@
package org.apache.fop.render;
import org.apache.fop.fo.FOUserAgent;
-
-import org.apache.log.Logger;
import java.util.HashMap;
1.2 +1 -3 xml-fop/src/org/apache/fop/render/XMLHandler.java
Index: XMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/XMLHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLHandler.java 26 Oct 2001 09:27:00 -0000 1.1
+++ XMLHandler.java 11 Apr 2002 09:33:31 -0000 1.2
@@ -1,13 +1,11 @@
/*
- * $Id: XMLHandler.java,v 1.1 2001/10/26 09:27:00 keiron Exp $
+ * $Id: XMLHandler.java,v 1.2 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
*/
package org.apache.fop.render;
-
-import org.apache.log.Logger;
import org.w3c.dom.Document;
1.4 +1 -3 xml-fop/src/org/apache/fop/render/pdf/PDFXMLHandler.java
Index: PDFXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFXMLHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PDFXMLHandler.java 21 Mar 2002 09:37:15 -0000 1.3
+++ PDFXMLHandler.java 11 Apr 2002 09:33:31 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: PDFXMLHandler.java,v 1.3 2002/03/21 09:37:15 keiron Exp $
+ * $Id: PDFXMLHandler.java,v 1.4 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -14,8 +14,6 @@
import org.apache.fop.svg.*;
import org.apache.fop.svg.SVGUserAgent;
import org.apache.fop.layout.FontState;
-
-import org.apache.log.Logger;
import org.apache.batik.dom.util.DOMUtilities;
1.21 +1 -3 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PSRenderer.java 26 Feb 2002 12:43:10 -0000 1.20
+++ PSRenderer.java 11 Apr 2002 09:33:31 -0000 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: PSRenderer.java,v 1.20 2002/02/26 12:43:10 keiron Exp $
+ * $Id: PSRenderer.java,v 1.21 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -25,8 +25,6 @@
import org.apache.batik.gvt.renderer.*;
import org.apache.batik.gvt.filter.*;
import org.apache.batik.gvt.event.*;
-
-import org.apache.log.Logger;
// SVG
import org.w3c.dom.svg.SVGSVGElement;
1.36 +3 -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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XMLRenderer.java 21 Mar 2002 09:34:19 -0000 1.35
+++ XMLRenderer.java 11 Apr 2002 09:33:31 -0000 1.36
@@ -1,5 +1,5 @@
/*
- * $Id: XMLRenderer.java,v 1.35 2002/03/21 09:34:19 keiron Exp $
+ * $Id: XMLRenderer.java,v 1.36 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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;
1.2 +1 -3 xml-fop/src/org/apache/fop/render/xml/XMLXMLHandler.java
Index: XMLXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLXMLHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLXMLHandler.java 26 Oct 2001 09:27:00 -0000 1.1
+++ XMLXMLHandler.java 11 Apr 2002 09:33:31 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: XMLXMLHandler.java,v 1.1 2001/10/26 09:27:00 keiron Exp $
+ * $Id: XMLXMLHandler.java,v 1.2 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -10,8 +10,6 @@
import org.apache.fop.fo.FOUserAgent;
import org.apache.fop.render.XMLHandler;
import org.apache.fop.render.RendererContext;
-
-import org.apache.log.Logger;
import org.apache.batik.dom.util.DOMUtilities;
1.9 +3 -3 xml-fop/src/org/apache/fop/svg/SVGUserAgent.java
Index: SVGUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGUserAgent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGUserAgent.java 21 Mar 2002 09:28:43 -0000 1.8
+++ SVGUserAgent.java 11 Apr 2002 09:33:31 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: SVGUserAgent.java,v 1.8 2002/03/21 09:28:43 keiron Exp $
+ * $Id: SVGUserAgent.java,v 1.9 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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.*;
1.7 +4 -22 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AreaTreeBuilder.java 21 Mar 2002 09:34:19 -0000 1.6
+++ AreaTreeBuilder.java 11 Apr 2002 09:33:31 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: AreaTreeBuilder.java,v 1.6 2002/03/21 09:34:19 keiron Exp $
+ * $Id: AreaTreeBuilder.java,v 1.7 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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);
}
/**
1.18 +4 -15 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestConverter.java 8 Jan 2002 09:52:17 -0000 1.17
+++ TestConverter.java 11 Apr 2002 09:33:31 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * $Id: TestConverter.java,v 1.17 2002/01/08 09:52:17 keiron Exp $
+ * $Id: TestConverter.java,v 1.18 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -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) {
1.18 +6 -25 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Fop.java 22 Nov 2001 08:30:36 -0000 1.17
+++ Fop.java 11 Apr 2002 09:33:31 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * $Id: Fop.java,v 1.17 2001/11/22 08:30:36 keiron Exp $
+ * $Id: Fop.java,v 1.18 2002/04/11 09:33:31 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -11,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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
