Adjust for new Avalon Framework JAR

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

diff --git a/build.bat b/build.bat
index 64672dd2975ae470ed5060ff3336395108c9b635..86cf9d1cab241f01f91c68e120b978b4c1cfac7d 100755 (executable)
--- a/build.bat
+++ b/build.bat
@@ -6,8 +6,7 @@ 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.4.3.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\xml-apis.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xercesImpl-2.0.1.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\xml-apis.jar
 
 set ANT_HOME=%LIBDIR%
 

diff --git a/build.sh b/build.sh
index 4b2dac2c63f6e7a72477a2b9071f6052922501b1..3709f1c73f61dd7705dbb0026ada9b00b48a4ca9 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -27,7 +27,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/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
 
 ANT_HOME=$LIBDIR
 # antRun must be executable (can't do this in build.xml because Ant uses antRun

diff --git a/contrib/mathml/build.sh b/contrib/mathml/build.sh
index 27e478abef47dfddaa10f4826050d072a14fa256..76426a9d1ffb3de81ca4fa81ab6ab3ea4dd67b50 100755 (executable)
--- a/contrib/mathml/build.sh
+++ b/contrib/mathml/build.sh
@@ -12,7 +12,7 @@ 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.4.3.jar:$LIBDIR/xalan-2.2D11.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020315.jar:lib/jeuclid.jar
+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:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar:lib/jeuclid.jar
 ANT_HOME=$LIBDIR
 
 echo

diff --git a/contrib/plan/build.sh b/contrib/plan/build.sh
index 65f922a6744453afc907b405057e9bac61f3cdd5..481da7369f52249f2d9bcccc93c99203c3e6a6ea 100755 (executable)
--- a/contrib/plan/build.sh
+++ b/contrib/plan/build.sh
@@ -12,7 +12,7 @@ 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.4.3.jar:$LIBDIR/xalan-2.2D11.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
+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:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
 ANT_HOME=$LIBDIR
 
 echo

diff --git a/contrib/servlet/build.xml b/contrib/servlet/build.xml
index 86e525355c9ee643c41779cc7f818acad9efc675..ccb4f8cde2096d6fb93136f85ee54b509898fc4a 100644 (file)
--- a/contrib/servlet/build.xml
+++ b/contrib/servlet/build.xml
@@ -19,7 +19,7 @@
        <property name="build.war" value="./build/war"/>
        <!-- stuff -->
        <property name="servlet.jar" value="servlet.jar"/>
-       <property name="avalon-framework.jar" value="avalon-framework-cvs-20020315.jar"/>
+       <property name="avalon-framework.jar" value="avalon-framework-cvs-20020806.jar"/>
        <path id="project.class.path">
                <pathelement location="${lib.dir}/${servlet.jar}"/>
                <pathelement location="${fop.lib.dir}/${avalon-framework.jar}"/>

diff --git a/fop.bat b/fop.bat
index d3615ad3feeccfbf640088ae9b3d08e82ea3a1bc..648168740a08144129b1d33cd15705c0dab73fd1 100644 (file)
--- a/fop.bat
+++ b/fop.bat
@@ -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\avalon-framework-cvs-20020315.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\xml-apis.jar;lib\xalan-2.3.1.jar;lib\xercesImpl-2.0.1.jar;lib\avalon-framework-4.0.jar;lib\avalon-framework-cvs-20020806.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8

diff --git a/status.xml b/status.xml
index f86dc0a17331bb392a56cb134c13f06ab8a4e936..4ecb2e26ddaa748b5194eea38d8426540a4898a3 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <status>
 
   <developers>
@@ -55,7 +55,7 @@ inactive??
      Design FOP API interfaces.
     </action>
     <action context="design" dev="open">
-     Integrate with avalon logging, URI reslover,
+     Integrate with Jakarta Avalon: logging, configuration, URI resolver,
      component management, image caching etc.
     </action>
    </actions>
@@ -76,6 +76,9 @@ inactive??
 
   <changes>
    <release version="?" date="2002">
+    <action dev="JM" type="update" context="build">
+      Updated Avalon Framework JAR (with Log4J support, Bug 11274)
+    </action>
     <action dev="KLL" type="update" context="docs"
             due-to="Victor Mote" due-to-email="vic@outfitr.com">
       Copies across overview for javadocs build.