fixed classpath for batik jar

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

16 files changed, 19 insertions, 19 deletions

diff --git a/build.bat b/build.bat
index 2a818cec4..1d3a44512 100755
--- a/build.bat
+++ b/build.bat
@@ -6,10 +6,10 @@ 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%\w3c.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;%LIBDIR%\jimi-1.0.jar
 set ANT_HOME=%LIBDIR%
 
-echo Building with classpath %LOCALCLASSPATH%
+echo Building with classpath %LOCALCLASSPATH%;%CLASSPATH%
 
 echo Starting Ant...
 
diff --git a/build.xml b/build.xml
index 3a8b57b1b..e7ae15fa4 100644
--- a/build.xml
+++ b/build.xml
@@ -132,7 +132,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
        <include name="lib/xerces-1.2.3.jar"/>
        <include name="lib/xalan-2.0.0.jar"/>
        <include name="lib/xalanj1compat.jar"/>
-       <include name="lib/w3c.jar"/>
+       <include name="lib/batik.jar"/>
        <include name="lib/jimi*"/>
     </fileset>
 
@@ -275,7 +275,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/w3c.jar lib/jimi-1.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"/>
    
     <filter filtersfile="${build.src}/codegen/filter"/>
 
diff --git a/docs/bugtests/runtests.bat b/docs/bugtests/runtests.bat
index 8fe5ea89d..4fdde3298 100755
--- a/docs/bugtests/runtests.bat
+++ b/docs/bugtests/runtests.bat
@@ -6,7 +6,7 @@ echo ----------------
 if "%JAVA_HOME%" == "" goto error
 
 
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\buildtools.jar;..\..\lib\w3c.jar;..\..\build\fop.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\buildtools.jar;..\..\lib\batik.jar;..\..\build\fop.jar
 set ANT_HOME=..\..\lib
 
 echo Starting Tests ...
diff --git a/docs/bugtests/runtests.sh b/docs/bugtests/runtests.sh
index 98f812039..b7c462726 100755
--- a/docs/bugtests/runtests.sh
+++ b/docs/bugtests/runtests.sh
@@ -14,7 +14,7 @@ if [ "$JAVA_HOME" = "" ] ; then
 fi
 
 LIBDIR=../../lib/
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/w3c.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
+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
 ANT_HOME=$LIBDIR
 
 echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
diff --git a/docs/examples/advanced/cid-fonts.fo b/docs/examples/advanced/cid-fonts.fo
index ad123d37e..bc42d6e68 100644
--- a/docs/examples/advanced/cid-fonts.fo
+++ b/docs/examples/advanced/cid-fonts.fo
@@ -283,7 +283,7 @@
      <fo:block font-family="Courier" font-size="10pt" 
       space-before.optimum="6pt"
       white-space-collapse="false" margin-left="6pt" text-align="start">
-C:\Fop-0.18.1> set CLASSPATH=fop.jar;lib\xerces-1.2.3.jar;lib\xalan-2.0.0.jar;lib\w3c.jar
+C:\Fop-0.18.1> set CLASSPATH=fop.jar;lib\xerces-1.2.3.jar;lib\xalan-2.0.0.jar;lib\batik.jar
      </fo:block>
 
 
diff --git a/docs/examples/runtests.bat b/docs/examples/runtests.bat
index 089c0b454..974ba4ead 100755
--- a/docs/examples/runtests.bat
+++ b/docs/examples/runtests.bat
@@ -7,7 +7,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%\w3c.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%\..\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%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
 set ANT_HOME=%LIBDIR%
 
 echo Starting Tests ...
diff --git a/docs/examples/runtests.sh b/docs/examples/runtests.sh
index 415fadcdf..c8d75f3c3 100755
--- a/docs/examples/runtests.sh
+++ b/docs/examples/runtests.sh
@@ -13,7 +13,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/w3c.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/../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/jimi-1.0.jar:$LIBDIR/../build/fop.jar
 ANT_HOME=$LIBDIR
 
 echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
diff --git a/docs/examples/svg/makedoc.bat b/docs/examples/svg/makedoc.bat
index d00c09af7..b39bbd45d 100755
--- a/docs/examples/svg/makedoc.bat
+++ b/docs/examples/svg/makedoc.bat
@@ -6,7 +6,7 @@ echo ----------------
 if "%JAVA_HOME%" == "" goto error
 set LIBDIR=..\..\..\lib
 set LIBDIR=lib
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\w3c.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%\..\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%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
 set ANT_HOME=%LIBDIR%
 
 
diff --git a/docs/xml-docs/fop/compiling.xml b/docs/xml-docs/fop/compiling.xml
index 748b0b7a2..faeddb774 100644
--- a/docs/xml-docs/fop/compiling.xml
+++ b/docs/xml-docs/fop/compiling.xml
@@ -27,7 +27,7 @@
     <p>If you have problems compiling Fop, please try this first: </p>
     <ul>
       <li>delete the build directory completely and try a new build from scratch</li>
-      <li>check, whether you have an older version of xerces.jar, xalan.jar, w3c.jar somewhere in 
+      <li>check, whether you have an older version of xerces.jar, xalan.jar, batik.jar somewhere in 
           you classpath.</li>
       </ul>
       <p>If you still have problems, please look at the
diff --git a/docs/xml-docs/fop/fonts.xml b/docs/xml-docs/fop/fonts.xml
index 8294808f5..2e8832e65 100644
--- a/docs/xml-docs/fop/fonts.xml
+++ b/docs/xml-docs/fop/fonts.xml
@@ -18,7 +18,7 @@
 			<p>	Run the class org.apache.fop.fonts.apps.PFMReader to generate the XML file.
 			</p>
 			<p>
-				<code>java -cp fop.jar;xerces.jar;xalan.jar;w3c.jar</code>
+				<code>java -cp fop.jar;xerces.jar;xalan.jar;batik.jar</code>
 			</p>
 			<p>
 				<code>org.apache.fop.fonts.apps.PFMReader pfm-file xml-file</code>
diff --git a/docs/xml-docs/fop/running.xml b/docs/xml-docs/fop/running.xml
index 2a57b70bb..d0f5890a8 100644
--- a/docs/xml-docs/fop/running.xml
+++ b/docs/xml-docs/fop/running.xml
@@ -17,7 +17,7 @@
             </li>
             <li>An XSLT processor 
             </li>
-            <li>The SVG library w3c.jar corresponding to the SVG Candidate Recommendation (02 November 2000).
+            <li>The SVG library batik.jar is the library from the batik project at xml.apache.org.
             </li>
             <li>The imaging library Jimi from Sun
             </li>
diff --git a/docs/xml-docs/makedoc.bat b/docs/xml-docs/makedoc.bat
index 7ce915ceb..daefa79c5 100755
--- a/docs/xml-docs/makedoc.bat
+++ b/docs/xml-docs/makedoc.bat
@@ -8,7 +8,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%\w3c.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-1.2.2.jar;%LIBDIR%\bsf.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%\jimi-1.0.jar;%LIBDIR%\stylebook.jar;%LIBDIR%\..\build\fop.jar
 set ANT_HOME=%LIBDIR%
 
 
diff --git a/docs/xml-docs/makedoc.sh b/docs/xml-docs/makedoc.sh
index 195af9681..0a805e34f 100755
--- a/docs/xml-docs/makedoc.sh
+++ b/docs/xml-docs/makedoc.sh
@@ -16,7 +16,7 @@ if [ "$JAVA_HOME" = "" ] ; then
 fi
 
 LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/w3c.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-1.2.2.jar:$LIBDIR/bsf.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-1.2.2.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/stylebook.jar:$LIBDIR/../build/fop.jar
 ANT_HOME=$LIBDIR
 
 echo Building with classpath $LOCALCLASSPATH:$CLASSPATH
diff --git a/fop.bat b/fop.bat
index 71fafbd4a..6ff95b5ec 100644
--- a/fop.bat
+++ b/fop.bat
@@ -1 +1 @@
-java -cp fop.jar;lib\w3c.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+java -cp fop.jar;lib\batik.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
diff --git a/lib/readme b/lib/readme
index 6b059a267..a0508c603 100644
--- a/lib/readme
+++ b/lib/readme
@@ -4,7 +4,7 @@ for compiling, running or testing Fop.
 ant.jar         Ant is the scripting tool which is used to build Fop or to run 
                 the test scripts. see build.xml in root for more information
 
-w3c.jar         the svg library from the w3 consortium
+batik.jar       the svg library from Batik at xml.apache.org
 
 
 buildtools.jar  Ant tasks required for building FOP. Rebuild with 
@@ -13,4 +13,4 @@ buildtools.jar  Ant tasks required for building FOP. Rebuild with
 		buildtools.jar, make sure you have both Xalan 1 and
 		Xalan 2 in the classpath when building it.)
 
-stylebook.jar	Jar used for creating the FOP website
\ No newline at end of file
+stylebook.jar	Jar used for creating the FOP website
diff --git a/test/createpdf.sh b/test/createpdf.sh
index c88ec7970..eb33d1100 100755
--- a/test/createpdf.sh
+++ b/test/createpdf.sh
@@ -1,3 +1,3 @@
 # this can be used to create pdf output of the testsuite files
 
-$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/w3c.jar:../lib/xalan-2.0.0.jar:../lib/xerces-1.2.3.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/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ basictests.xml