Index: batik-1.9/build.xml
===================================================================
--- batik-1.9.orig/build.xml
+++ batik-1.9/build.xml
@@ -1729,14 +1729,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgpp.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1767,26 +1759,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.slideshow.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gui-uti-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1823,29 +1795,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
         <attribute name="Build-Id" value="${build.id}"/>
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-swing-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gui-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1888,8 +1837,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-squiggle-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-${project}-extension-${completeVersion}.ja" />
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
@@ -1935,28 +1882,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.rasterizer.Main" />
         <attribute name="Build-Id" value="${build.id}"/>
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}fop-transcoder-allinone-${fopVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar" />
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1996,8 +1921,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-extension-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-rasterizer-${jarVersion}.jar" />
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
@@ -2033,8 +1956,6 @@ JAVA=/usr/bin/java
       <attribute name="Implementation-Vendor" value="${vendor}"/>
       <attribute name="Build-Id" value="${build.id}"/>
       <attribute name="Main-Class" value="org.apache.batik.apps.ttf2svg.Main"/>
-      <attribute name="Class-Path" value="${jarsLibDir}${project}-svggen-${jarVersion}.jar" />
-      <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
     </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -2052,34 +1973,6 @@ JAVA=/usr/bin/java
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="lib/${project}-ext-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-dom-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-css-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-svg-dom-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-gvt-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-parser-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-script-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-bridge-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-swing-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-anim-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-transcoder-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-gui-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-awt-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-codec-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-svggen-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-xml-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-squiggle-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-rasterizer-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-svgpp-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/xercesImpl-2.9.1.jar" />
-        <attribute name="Class-Path" value="lib/xalan-2.7.2.jar" />
-        <attribute name="Class-Path" value="lib/xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="lib/xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="lib/js.jar" />
-        <attribute name="Class-Path" value="lib/fop-transcoder-allinone-${fopVersion}.jar" />
-        <attribute name="Class-Path" value="lib/xmlgraphics-commons-${xgcVersion}.jar" />
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
     </jar>
