diff options
| -rwxr-xr-x | build.bat | 3 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | contrib/mathml/build.sh | 2 | ||||
| -rwxr-xr-x | contrib/plan/build.sh | 2 | ||||
| -rw-r--r-- | contrib/servlet/build.xml | 2 | ||||
| -rw-r--r-- | fop.bat | 2 | ||||
| -rw-r--r-- | status.xml | 7 |
7 files changed, 11 insertions, 9 deletions
@@ -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% @@ -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 27e478abe..76426a9d1 100755 --- 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 65f922a67..481da7369 100755 --- 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 86e525355..ccb4f8cde 100644 --- 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}"/> @@ -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 f86dc0a17..4ecb2e26d 100644 --- 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. |