chrisg 02/03/01 04:44:40 Modified: . Tag: fop-0_20_2-maintain CHANGES build.bat build.sh build.xml fop.bat docs/design Tag: fop-0_20_2-maintain build.bat build.sh docs/examples Tag: fop-0_20_2-maintain runtests.bat runtests.sh docs/examples/embedding Tag: fop-0_20_2-maintain FopPrintServlet.java FopServlet.java docs/xml-docs Tag: fop-0_20_2-maintain makedoc.bat makedoc.sh test Tag: fop-0_20_2-maintain createpdf.sh Added: lib Tag: fop-0_20_2-maintain logkit-1.0.jar Removed: lib Tag: fop-0_20_2-maintain logkit-1.0b4.jar Log: updated logkit from 1.0b4 to 1.0 Revision Changes Path No revision No revision 1.10.2.8 +2 -1 xml-fop/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.7 retrieving revision 1.10.2.8 diff -u -r1.10.2.7 -r1.10.2.8 --- CHANGES 18 Feb 2002 18:27:36 -0000 1.10.2.7 +++ CHANGES 1 Mar 2002 12:44:39 -0000 1.10.2.8 @@ -22,6 +22,8 @@ Submitted by: Ralph LaChance <[EMAIL PROTECTED]> - Proper use of font encodings for "native" fonts Submitted by: Peter S. Housel ([EMAIL PROTECTED]) and Rainer Garus ([EMAIL PROTECTED]) +- fixed Marker (Christian Geisert) +- updated logkit from 1.0b4 to to 1.0 (Christian Geisert) *** Tables - Implement the proportional-column-width() function in table-column and @@ -79,7 +81,6 @@ Submitted by: Ralph LaChance <[EMAIL PROTECTED]> - Improved i18n support for AWT viewer (Japanese dialogs) Submitted by: Satoshi Ishigami ([EMAIL PROTECTED]) - *** TXTRenderer - Generated text is written in UTF-8 encoding instead of ISO-8859-1 1.14.2.2 +1 -1 xml-fop/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/xml-fop/build.bat,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -r1.14.2.1 -r1.14.2.2 --- build.bat 11 Feb 2002 00:43:43 -0000 1.14.2.1 +++ build.bat 1 Mar 2002 12:44:39 -0000 1.14.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%\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.0b4.jar;%LIBDIR%\avalon-framework-4.0.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0.jar;%LIBDIR%\avalon-framework-4.0.jar set ANT_HOME=%LIBDIR% 1.15.2.2 +1 -1 xml-fop/build.sh Index: build.sh =================================================================== RCS file: /home/cvs/xml-fop/build.sh,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -r1.15.2.1 -r1.15.2.2 --- build.sh 11 Feb 2002 00:43:43 -0000 1.15.2.1 +++ build.sh 1 Mar 2002 12:44:39 -0000 1.15.2.2 @@ -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.0b4.jar:$LIBDIR/avalon-framework-4.0.jar +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/logkit-1.0.jar:$LIBDIR/avalon-framework-4.0.jar ANT_HOME=$LIBDIR 1.44.2.6 +2 -2 xml-fop/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-fop/build.xml,v retrieving revision 1.44.2.5 retrieving revision 1.44.2.6 diff -u -r1.44.2.5 -r1.44.2.6 --- build.xml 20 Feb 2002 17:37:06 -0000 1.44.2.5 +++ build.xml 1 Mar 2002 12:44:39 -0000 1.44.2.6 @@ -138,7 +138,7 @@ <include name="lib/xalan.LICENSE.txt"/> <include name="lib/batik.jar"/> <include name="lib/batik.LICENSE.txt"/> - <include name="lib/logkit-1.0b4.jar"/> + <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.LICENSE.txt"/> @@ -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.2.3.jar lib/xalan-2.0.0.jar lib/xalanj1compat.jar lib/batik.jar lib/jimi-1.0.jar lib/logkit-1.0b4.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/logkit-1.0.jar lib/avalon-framework-4.0.jar"/> <filter filtersfile="${build.src}/codegen/filter"/> 1.4.2.1 +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.4.2.1 diff -u -r1.4 -r1.4.2.1 --- fop.bat 20 Aug 2001 21:11:02 -0000 1.4 +++ fop.bat 1 Mar 2002 12:44:39 -0000 1.4.2.1 @@ -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\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.1.2.1 +1 -1 xml-fop/docs/design/Attic/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/xml-fop/docs/design/Attic/build.bat,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- build.bat 11 Sep 2001 08:32:50 -0000 1.1 +++ build.bat 1 Mar 2002 12:44:39 -0000 1.1.2.1 @@ -8,7 +8,7 @@ if "%JAVA_HOME%" == "" goto error set LIBDIR=..\..\lib -set TARGET_CLASSPATH=%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\batik.jar;%LIBDIR%\ant.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\bsf.jar;..\..\build\fop.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\jimi-1.0.jar +set TARGET_CLASSPATH=%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\batik.jar;%LIBDIR%\ant.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\bsf.jar;..\..\build\fop.jar;%LIBDIR%\logkit-1.0.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\jimi-1.0.jar set TARGET_CLASSPATH=%TARGET_CLASSPATH%;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip set ANT_HOME=%LIBDIR% 1.3.2.1 +2 -2 xml-fop/docs/design/Attic/build.sh Index: build.sh =================================================================== RCS file: /home/cvs/xml-fop/docs/design/Attic/build.sh,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- build.sh 5 Oct 2001 11:06:02 -0000 1.3 +++ build.sh 1 Mar 2002 12:44:39 -0000 1.3.2.1 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: build.sh,v 1.3 2001/10/05 11:06:02 keiron Exp $ +# $Id: build.sh,v 1.3.2.1 2002/03/01 12:44:39 chrisg Exp $ LIBDIR=../../lib TARGET_CLASSPATH=$LIBDIR/ant.jar:\ @@ -8,7 +8,7 @@ $LIBDIR/xerces-1.2.3.jar:\ $LIBDIR/bsf.jar:\ ../../build/fop.jar:\ -$LIBDIR/logkit-1.0b4.jar:\ +$LIBDIR/logkit-1.0.jar:\ $LIBDIR/avalon-framework-4.0.jar:\ $LIBDIR/batik.jar:\ $LIBDIR/jimi-1.0.jar No revision No revision 1.11.2.1 +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 retrieving revision 1.11.2.1 diff -u -r1.11 -r1.11.2.1 --- runtests.bat 20 Aug 2001 16:16:46 -0000 1.11 +++ runtests.bat 1 Mar 2002 12:44:39 -0000 1.11.2.1 @@ -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.0b4.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-4.0.jar;%LIBDIR%\logkit-1.0.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar set ANT_HOME=%LIBDIR% echo Starting Tests ... 1.8.2.1 +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 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- runtests.sh 20 Aug 2001 16:16:46 -0000 1.8 +++ runtests.sh 1 Mar 2002 12:44:39 -0000 1.8.2.1 @@ -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.0b4.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-4.0.jar:$LIBDIR/logkit-1.0.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.2 +2 -2 xml-fop/docs/examples/embedding/Attic/FopPrintServlet.java Index: FopPrintServlet.java =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/embedding/Attic/FopPrintServlet.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FopPrintServlet.java 17 Feb 2002 23:22:31 -0000 1.1.2.1 +++ FopPrintServlet.java 1 Mar 2002 12:44:39 -0000 1.1.2.2 @@ -1,5 +1,5 @@ /* - * $Id: FopPrintServlet.java,v 1.1.2.1 2002/02/17 23:22:31 chrisg Exp $ + * $Id: FopPrintServlet.java,v 1.1.2.2 2002/03/01 12:44:39 chrisg Exp $ * Copyright (C) 2002 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -46,7 +46,7 @@ * - fop.jar * - batik.jar * - avalon-framework-4.0.jar - * - logkit-1.0b4.jar + * - logkit-1.0.jar * - xalan-2.0.0.jar */ 1.4.2.1 +2 -2 xml-fop/docs/examples/embedding/FopServlet.java Index: FopServlet.java =================================================================== RCS file: /home/cvs/xml-fop/docs/examples/embedding/FopServlet.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- FopServlet.java 25 Sep 2001 08:32:58 -0000 1.4 +++ FopServlet.java 1 Mar 2002 12:44:39 -0000 1.4.2.1 @@ -1,5 +1,5 @@ /* - * $Id: FopServlet.java,v 1.4 2001/09/25 08:32:58 keiron Exp $ + * $Id: FopServlet.java,v 1.4.2.1 2002/03/01 12:44:39 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. @@ -38,7 +38,7 @@ * - fop.jar * - batik.jar * - avalon-framework-4.0.jar - * - logkit-1.0b4.jar + * - logkit-1.0.jar * - xalan-2.0.0.jar */ public class FopServlet extends HttpServlet { No revision No revision 1.13.2.1 +1 -1 xml-fop/docs/xml-docs/Attic/makedoc.bat Index: makedoc.bat =================================================================== RCS file: /home/cvs/xml-fop/docs/xml-docs/Attic/makedoc.bat,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -r1.13 -r1.13.2.1 --- makedoc.bat 20 Aug 2001 21:11:02 -0000 1.13 +++ makedoc.bat 1 Mar 2002 12:44:39 -0000 1.13.2.1 @@ -8,7 +8,7 @@ if "%JAVA_HOME%" == "" goto error 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-1.2.2.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\stylebook.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-1.2.2.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\logkit-1.0.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\stylebook.jar;%LIBDIR%\..\build\fop.jar set ANT_HOME=%LIBDIR% 1.15.2.1 +1 -1 xml-fop/docs/xml-docs/Attic/makedoc.sh Index: makedoc.sh =================================================================== RCS file: /home/cvs/xml-fop/docs/xml-docs/Attic/makedoc.sh,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -r1.15 -r1.15.2.1 --- makedoc.sh 5 Oct 2001 09:44:31 -0000 1.15 +++ makedoc.sh 1 Mar 2002 12:44:39 -0000 1.15.2.1 @@ -16,7 +16,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.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-4.0.jar:$LIBDIR/logkit-1.0b4.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/stylebook.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/bsf.jar:$LIBDIR/avalon-framework-4.0.jar:$LIBDIR/logkit-1.0.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/stylebook.jar:$LIBDIR/../build/fop.jar ANT_HOME=$LIBDIR echo Building with classpath $LOCALCLASSPATH:$CLASSPATH No revision No revision 1.1.2.1 +0 -0 xml-fop/lib/logkit-1.0.jar <<Binary file>> No revision No revision 1.4.2.1 +2 -2 xml-fop/test/createpdf.sh Index: createpdf.sh =================================================================== RCS file: /home/cvs/xml-fop/test/createpdf.sh,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- createpdf.sh 20 Aug 2001 17:01:54 -0000 1.4 +++ createpdf.sh 1 Mar 2002 12:44:39 -0000 1.4.2.1 @@ -1,7 +1,7 @@ # this can be used to create pdf output of the testsuite files -$JAVA_HOME/bin/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.tools.TestConverter -pdf -b ./ basictests.xml +$JAVA_HOME/bin/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.tools.TestConverter -pdf -b ./ basictests.xml -$JAVA_HOME/bin/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.tools.TestConverter -pdf -b ./ bugtests.xml +$JAVA_HOME/bin/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.tools.TestConverter -pdf -b ./ bugtests.xml
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]