adjusted classpath libs for logging

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194431 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 10 insertions, 5 deletions

diff --git a/build.bat b/build.bat
index c88f8c1b2..1aa4d6728 100755
--- a/build.bat
+++ b/build.bat
@@ -6,7 +6,9 @@ echo ----------------
 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-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.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
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR&\logkit-1.0b4.jar;%LIBDIR%\avalon-framework-4.0.jar
+
 set ANT_HOME=%LIBDIR%
 
 echo Building with classpath %LOCALCLASSPATH%
diff --git a/build.sh b/build.sh
index 69a3207b8..be7f1b03a 100755
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,9 @@ if [ "$JAVA_HOME" = "" ] ; then
   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/jimi-1.0.jar:$LIBDIR/logkit-1.0b4.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
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/logkit-1.0b4.jar:$LIBDIR/avalon-framework-4.0.jar
+
 ANT_HOME=$LIBDIR
 
 echo
diff --git a/build.xml b/build.xml
index f4e34ae7b..3ccfc3a98 100644
--- a/build.xml
+++ b/build.xml
@@ -136,6 +136,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
        <include name="lib/xalanj1compat.jar"/>
        <include name="lib/batik.jar"/>
        <include name="lib/logkit-1.0b4.jar"/>
+       <include name="lib/avalon-framework-4.0.jar"/>
        <include name="lib/jimi*"/>
     </fileset>
 
@@ -278,7 +279,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <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"/>
+    <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"/>
    
     <filter filtersfile="${build.src}/codegen/filter"/>
 
@@ -576,9 +577,9 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <target name="test" depends="package">
     <echo message="Testing build in jar file ${build.dir}/${name}.jar against reference"/>
     <runTest testSuite="basictests.xml" basedir="test/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 0.20.1"/>
     <runTest testSuite="bugtests.xml" basedir="test/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 0.20.1"/>
 <!--
     <runTest testSuite="testsuite.xml" basedir="TestSuite/NIST/" reference="test/reference/fop.jar"
          refVersion="FOP 0.19.0-CVS"/>
diff --git a/lib/avalon-framework-4.0.jar b/lib/avalon-framework-4.0.jar
new file mode 100644
index 000000000..69f4b131f
--- /dev/null
+++ b/lib/avalon-framework-4.0.jar