chrisg 02/03/17 15:37:08
Modified: . Tag: fop-0_20_2-maintain CHANGES build.bat build.sh
build.xml fop.bat
docs/examples Tag: fop-0_20_2-maintain runtests.bat
runtests.sh
src/org/apache/fop/apps Tag: fop-0_20_2-maintain
CommandLineOptions.java CommandLineStarter.java
Driver.java Starter.java StreamRenderer.java
src/org/apache/fop/datatypes Tag: fop-0_20_2-maintain
ToBeImplementedProperty.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java
FOTreeBuilder.java Property.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
PageNumberGenerator.java
src/org/apache/fop/messaging Tag: fop-0_20_2-maintain
MessageHandler.java
src/org/apache/fop/render Tag: fop-0_20_2-maintain
AbstractRenderer.java Renderer.java
src/org/apache/fop/render/ps Tag: fop-0_20_2-maintain
PSRenderer.java
src/org/apache/fop/render/xml Tag: fop-0_20_2-maintain
XMLRenderer.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain
SVGUserAgent.java
src/org/apache/fop/tools Tag: fop-0_20_2-maintain
TestConverter.java
src/org/apache/fop/tools/anttasks Tag: fop-0_20_2-maintain
Fop.java
Added: lib Tag: fop-0_20_2-maintain
avalon-framework-cvs-20020315.jar
Removed: lib Tag: fop-0_20_2-maintain avalon-framework-4.0.jar
logkit-1.0.jar logkit.LICENSE.txt
Log:
Moved from org.apache.log.Logger to org.apache.avalon.framework.logger.Logger
(this removes dependency from logkit)
Submitted by: Michael Gratton <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.10.2.9 +7 -0 xml-fop/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -r1.10.2.8 -r1.10.2.9
--- CHANGES 1 Mar 2002 12:44:39 -0000 1.10.2.8
+++ CHANGES 17 Mar 2002 23:37:06 -0000 1.10.2.9
@@ -1,4 +1,11 @@
==============================================================================
+Done since 0.20.3 release
+
+- Moved from org.apache.log.Logger to org.apache.avalon.framework.logger.Logger
+ (this removes dependency from logkit)
+ Submitted by: Michael Gratton <[EMAIL PROTECTED]>
+
+==============================================================================
Done since 0.20.2 release
*** General
- Added correct metrics for euro sign in standard fonts
1.14.2.3 +1 -1 xml-fop/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/build.bat,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- build.bat 1 Mar 2002 12:44:39 -0000 1.14.2.2
+++ build.bat 17 Mar 2002 23:37:06 -0000 1.14.2.3
@@ -7,7 +7,7 @@
set LIBDIR=lib
set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\ant-1.3-optional.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar
-set
LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0.jar;%LIBDIR%\avalon-framework-4.0.jar
+set
LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar
set ANT_HOME=%LIBDIR%
1.15.2.3 +1 -1 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- build.sh 1 Mar 2002 12:44:39 -0000 1.15.2.2
+++ build.sh 17 Mar 2002 23:37:06 -0000 1.15.2.3
@@ -14,7 +14,7 @@
fi
LIBDIR=lib
LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/ant-1.3-optional.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/logkit-1.0.jar:$LIBDIR/avalon-framework-4.0.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
ANT_HOME=$LIBDIR
1.44.2.9 +3 -5 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.44.2.8
retrieving revision 1.44.2.9
diff -u -r1.44.2.8 -r1.44.2.9
--- build.xml 3 Mar 2002 00:16:11 -0000 1.44.2.8
+++ build.xml 17 Mar 2002 23:37:06 -0000 1.44.2.9
@@ -139,9 +139,7 @@
<include name="lib/xalan.LICENSE.txt"/>
<include name="lib/batik.jar"/>
<include name="lib/batik.LICENSE.txt"/>
- <include name="lib/logkit-1.0.jar"/>
- <include name="lib/logkit.LICENSE.txt"/>
- <include name="lib/avalon-framework-4.0.jar"/>
+ <include name="lib/avalon-framework-cvs-20020315.jar"/>
<include name="lib/avalon.LICENSE.txt"/>
<include name="lib/ant.jar"/>
<include name="lib/ant.license.txt"/>
@@ -182,7 +180,7 @@
<tstamp/>
<property name="Name" value="Fop"/>
<property name="name" value="fop"/>
- <property name="version" value="0.20.3"/>
+ <property name="version" value="0.20.4cvs"/>
<filter token="version" value="${version}"/>
<property name="year" value="1999-2002"/>
@@ -288,7 +286,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.2.3.jar
lib/xalan-2.0.0.jar lib/xalanj1compat.jar lib/batik.jar lib/jimi-1.0.jar
lib/logkit-1.0.jar lib/avalon-framework-4.0.jar"/>
+ <property name="runtime.classpath" value="lib/xerces-1.2.3.jar
lib/xalan-2.0.0.jar lib/xalanj1compat.jar lib/batik.jar lib/jimi-1.0.jar
lib/avalon-framework-cvs-20020315.jar"/>
<filter filtersfile="${build.src}/codegen/filter"/>
1.4.2.2 +2 -1 xml-fop/fop.bat
Index: fop.bat
===================================================================
RCS file: /home/cvs/xml-fop/fop.bat,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- fop.bat 1 Mar 2002 12:44:39 -0000 1.4.2.1
+++ fop.bat 17 Mar 2002 23:37:06 -0000 1.4.2.2
@@ -1 +1,2 @@
-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.0.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-cvs-20020315.jar;lib\logkit-1.0.jar;lib\jimi-1.0.jar
org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+
No revision
No revision
1.11.2.2 +1 -1 xml-fop/docs/examples/runtests.bat
Index: runtests.bat
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/runtests.bat,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- runtests.bat 1 Mar 2002 12:44:39 -0000 1.11.2.1
+++ runtests.bat 17 Mar 2002 23:37:06 -0000 1.11.2.2
@@ -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.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\logkit-1.0.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
+set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
set ANT_HOME=%LIBDIR%
echo Starting Tests ...
1.8.2.2 +1 -1 xml-fop/docs/examples/runtests.sh
Index: runtests.sh
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/runtests.sh,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- runtests.sh 1 Mar 2002 12:44:39 -0000 1.8.2.1
+++ runtests.sh 17 Mar 2002 23:37:06 -0000 1.8.2.2
@@ -13,7 +13,7 @@
exit 1
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.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-4.0.jar:$LIBDIR/logkit-1.0.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-cvs-20020315.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
ANT_HOME=$LIBDIR
echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
No revision
No revision
1.1.2.1 +227 -0 xml-fop/lib/Attic/avalon-framework-cvs-20020315.jar
<<Binary file>>
No revision
No revision
1.14.2.1 +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.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- CommandLineOptions.java 5 Oct 2001 09:49:21 -0000 1.14
+++ CommandLineOptions.java 17 Mar 2002 23:37:06 -0000 1.14.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineOptions.java,v 1.14 2001/10/05 09:49:21 keiron Exp $
+ * $Id: CommandLineOptions.java,v 1.14.2.1 2002/03/17 23:37:06 chrisg 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.Hashtable();
@@ -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.11.2.1 +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.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- CommandLineStarter.java 21 Aug 2001 06:18:54 -0000 1.11
+++ CommandLineStarter.java 17 Mar 2002 23:37:06 -0000 1.11.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineStarter.java,v 1.11 2001/08/21 06:18:54 keiron Exp $
+ * $Id: CommandLineStarter.java,v 1.11.2.1 2002/03/17 23:37:06 chrisg 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.36.2.2 +9 -19 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.36.2.1
retrieving revision 1.36.2.2
diff -u -r1.36.2.1 -r1.36.2.2
--- Driver.java 3 Jan 2002 10:39:56 -0000 1.36.2.1
+++ Driver.java 17 Mar 2002 23:37:06 -0000 1.36.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: Driver.java,v 1.36.2.1 2002/01/03 10:39:56 keiron Exp $
+ * $Id: Driver.java,v 1.36.2.2 2002/03/17 23:37:06 chrisg 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,11 +21,9 @@
import org.apache.fop.system.BufferManager;
-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.Loggable;
+// Avalon
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
// DOM
import org.w3c.dom.Document;
@@ -89,7 +87,7 @@
* driver.render(parser, fileInputSource(args[0]));
* </PRE>
*/
-public class Driver implements Loggable {
+public class Driver {
/**
* Render to PDF. OutputStream must be set
@@ -213,18 +211,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.6.2.1 +5 -4 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.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Starter.java 21 Aug 2001 06:18:54 -0000 1.6
+++ Starter.java 17 Mar 2002 23:37:06 -0000 1.6.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Starter.java,v 1.6 2001/08/21 06:18:54 keiron Exp $
+ * $Id: Starter.java,v 1.6.2.1 2002/03/17 23:37:06 chrisg 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;
@@ -32,8 +33,8 @@
options = new Options();
}
- public void setLogger(Logger logger) {
- log = logger;
+ public void setLogger(Logger handler) {
+ log = handler;
}
public void setInputHandler(InputHandler inputHandler) {
1.6.2.2 +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.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- StreamRenderer.java 3 Jan 2002 10:39:56 -0000 1.6.2.1
+++ StreamRenderer.java 17 Mar 2002 23:37:06 -0000 1.6.2.2
@@ -15,7 +15,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
No revision
No revision
1.3.2.1 +9 -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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ToBeImplementedProperty.java 20 Aug 2001 11:19:22 -0000 1.3
+++ ToBeImplementedProperty.java 17 Mar 2002 23:37:07 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: ToBeImplementedProperty.java,v 1.3 2001/08/20 11:19:22 keiron Exp $ --
+ * $Id: ToBeImplementedProperty.java,v 1.3.2.1 2002/03/17 23:37:07 chrisg 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,14 @@
}
public ToBeImplementedProperty(String propName) {
- Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor("fop");
- log.warn("property - \"" + propName
- + "\" is not implemented yet.");
+
+ // XXX (mjg) This is a bit of a kluge, perhaps an
+ // UnimplementedPropertyException or similar should
+ // get thrown here instead.
+
+// Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor("fop");
+// log.warn("property - \"" + propName
+// + "\" is not implemented yet.");
}
}
No revision
No revision
1.21.2.1 +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.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- FONode.java 21 Sep 2001 09:08:38 -0000 1.21
+++ FONode.java 17 Mar 2002 23:37:07 -0000 1.21.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: FONode.java,v 1.21 2001/09/21 09:08:38 keiron Exp $
+ * $Id: FONode.java,v 1.21.2.1 2002/03/17 23:37:07 chrisg 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.system.BufferManager;
import org.apache.fop.fo.flow.Marker;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.util.Vector;
1.30.2.2 +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.30.2.1
retrieving revision 1.30.2.2
diff -u -r1.30.2.1 -r1.30.2.2
--- FOTreeBuilder.java 3 Jan 2002 10:39:56 -0000 1.30.2.1
+++ FOTreeBuilder.java 17 Mar 2002 23:37:07 -0000 1.30.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: FOTreeBuilder.java,v 1.30.2.1 2002/01/03 10:39:56 keiron Exp $
+ * $Id: FOTreeBuilder.java,v 1.30.2.2 2002/03/17 23:37:07 chrisg 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.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.18.2.1 +7 -3 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.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- Property.java 14 Oct 2001 20:37:10 -0000 1.18
+++ Property.java 17 Mar 2002 23:37:07 -0000 1.18.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Property.java,v 1.18 2001/10/14 20:37:10 klease Exp $
+ * $Id: Property.java,v 1.18.2.1 2002/03/17 23:37:07 chrisg 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,15 +7,19 @@
package org.apache.fop.fo;
+// FOP
import org.apache.fop.datatypes.*;
import org.apache.fop.fo.expr.Numeric;
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.expr.PropertyInfo;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.apps.FOPException;
-import java.util.Vector;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
+
+// Java
+import java.util.Vector;
public class Property {
No revision
No revision
1.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- PageNumberGenerator.java 20 Aug 2001 11:19:24 -0000 1.3
+++ PageNumberGenerator.java 17 Mar 2002 23:37:07 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumberGenerator.java,v 1.3 2001/08/20 11:19:24 keiron Exp $
+ * $Id: PageNumberGenerator.java,v 1.3.2.1 2002/03/17 23:37:07 chrisg 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.*;
No revision
No revision
1.6.2.1 +5 -4 xml-fop/src/org/apache/fop/messaging/Attic/MessageHandler.java
Index: MessageHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/messaging/Attic/MessageHandler.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- MessageHandler.java 20 Aug 2001 11:19:24 -0000 1.6
+++ MessageHandler.java 17 Mar 2002 23:37:07 -0000 1.6.2.1
@@ -7,11 +7,12 @@
package org.apache.fop.messaging;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+
import java.io.*;
import java.util.*;
-import org.apache.log.*;
-
/**
* The class MessageHandler contains the static methods log and error which
* should be used for any end user information instead of System.out.print() or
@@ -90,7 +91,7 @@
public static void log(String message) {
if (!quiet) {
if(logger == null) {
- logger = Hierarchy.getDefaultHierarchy().getLoggerFor("fop");
+ logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
}
setMessage(message);
switch (outputMethod) {
@@ -138,7 +139,7 @@
public static void error(String errorMessage) {
if(logger == null) {
- logger = Hierarchy.getDefaultHierarchy().getLoggerFor("fop");
+ logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
}
setMessage(errorMessage);
switch (outputMethod) {
No revision
No revision
1.4.2.1 +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.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- AbstractRenderer.java 18 Sep 2001 13:06:07 -0000 1.4
+++ AbstractRenderer.java 17 Mar 2002 23:37:07 -0000 1.4.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: AbstractRenderer.java,v 1.4 2001/09/18 13:06:07 keiron Exp $
+ * $Id: AbstractRenderer.java,v 1.4.2.1 2002/03/17 23:37:07 chrisg 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.
@@ -18,7 +18,8 @@
import org.apache.fop.datatypes.*;
import org.apache.fop.render.pdf.FontSetup;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.io.IOException;
1.19.2.1 +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.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- Renderer.java 21 Aug 2001 06:18:55 -0000 1.19
+++ Renderer.java 17 Mar 2002 23:37:07 -0000 1.19.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Renderer.java,v 1.19 2001/08/21 06:18:55 keiron Exp $
+ * $Id: Renderer.java,v 1.19.2.1 2002/03/17 23:37:07 chrisg 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.*;
import org.apache.fop.layout.inline.*;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.io.OutputStream;
No revision
No revision
1.15.2.2 +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.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- PSRenderer.java 2 Dec 2001 22:17:30 -0000 1.15.2.1
+++ PSRenderer.java 17 Mar 2002 23:37:07 -0000 1.15.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: PSRenderer.java,v 1.15.2.1 2001/12/02 22:17:30 tore Exp $
+ * $Id: PSRenderer.java,v 1.15.2.2 2002/03/17 23:37:07 chrisg 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.
@@ -29,8 +29,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;
No revision
No revision
1.27.2.1 +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.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- XMLRenderer.java 18 Sep 2001 13:06:08 -0000 1.27
+++ XMLRenderer.java 17 Mar 2002 23:37:07 -0000 1.27.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: XMLRenderer.java,v 1.27 2001/09/18 13:06:08 keiron Exp $
+ * $Id: XMLRenderer.java,v 1.27.2.1 2002/03/17 23:37:07 chrisg 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.
@@ -17,7 +17,8 @@
import org.apache.fop.pdf.*;
import org.apache.fop.fo.properties.LeaderPattern;
-import org.apache.log.Logger;
+// Avalon
+import org.apache.avalon.framework.logger.Logger;
// Java
import java.io.IOException;
No revision
No revision
1.2.2.2 +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.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- SVGUserAgent.java 3 Dec 2001 07:40:17 -0000 1.2.2.1
+++ SVGUserAgent.java 17 Mar 2002 23:37:08 -0000 1.2.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: SVGUserAgent.java,v 1.2.2.1 2001/12/03 07:40:17 keiron Exp $
+ * $Id: SVGUserAgent.java,v 1.2.2.2 2002/03/17 23:37:08 chrisg 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.svg;
-import org.apache.log.Logger;
-
import org.apache.batik.bridge.*;
import org.apache.batik.swing.svg.*;
import org.apache.batik.swing.gvt.*;
@@ -16,6 +14,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.*;
No revision
No revision
1.15.2.1 +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.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- TestConverter.java 24 Sep 2001 09:17:12 -0000 1.15
+++ TestConverter.java 17 Mar 2002 23:37:08 -0000 1.15.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: TestConverter.java,v 1.15 2001/09/24 09:17:12 keiron Exp $
+ * $Id: TestConverter.java,v 1.15.2.1 2002/03/17 23:37:08 chrisg 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) {
No revision
No revision
1.14.2.1 +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.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- Fop.java 14 Oct 2001 21:27:12 -0000 1.14
+++ Fop.java 17 Mar 2002 23:37:08 -0000 1.14.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Fop.java,v 1.14 2001/10/14 21:27:12 klease Exp $
+ * $Id: Fop.java,v 1.14.2.1 2002/03/17 23:37:08 chrisg 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;
@@ -36,6 +31,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:
@@ -195,25 +194,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]
