xmlbeans (2.5.0-3) build-xml.patch

Description: build.xml: Fix build classpath
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2010-03-26
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -237,7 +237,7 @@
     <!-- oldxbean.jar target =========================================== -->
 
     <target name="oldxbean.jar">
-        <copy file="external/lib/oldxbean.jar" tofile="build/private/lib/oldxbean.jar"/>
+        <copy file="/usr/share/java/xmlbeans.jar" tofile="build/private/lib/oldxbean.jar"/>
     </target>
 
     <!-- bootstrap target ============================================== -->
@@ -483,7 +483,7 @@
                  typeimpl.classes, xmlcomp.classes,
                  store.classes, saaj_api.classes,
                  marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
-                 xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
+                 xmlinputstream.classes, xbean_xpath.jar,
                  piccolo.classes, tools.classes, jamsupport.classes">
         <jar jarfile="build/lib/xbean.jar" index="true">
             <fileset dir="build/classes/xmlpublic"
@@ -539,12 +539,12 @@
 
     <!-- xmlpublic target ============================================== -->
 
-    <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes, jsr173_1.0.jars">
+    <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes">
         <mkdir dir="build/classes/xmlpublic"/>
         <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
                 <pathelement location="build/classes/xmlinputstream"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
             </classpath>
         </javac>
 
@@ -581,7 +581,7 @@
         <mkdir dir="build/classes/typestore"/>
         <javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -592,11 +592,11 @@
 
     <!-- common target ============================================= -->
 
-    <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
+    <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes">
         <mkdir dir="build/classes/common"/>
         <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
             </classpath>
@@ -634,7 +634,7 @@
 
     <target name="typeimpl.classes" depends="dirs, store.classes,
         repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
-        configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
+        configschema.classes, toolschema.classes, jam.classes">
         <mkdir dir="build/classes/typeimpl"/>
         <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
@@ -650,7 +650,7 @@
                 <pathelement location="build/classes/xmlschema"/>
                 <pathelement location="build/classes/toolschema"/>
                 <pathelement location="build/classes/jam"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
             </classpath>
 
             <src path="src/typeimpl"/>
@@ -676,7 +676,7 @@
         <mkdir dir="build/classes/xmlcomp"/>
         <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -692,11 +692,11 @@
 
     <!-- marshal target =============================================== -->
 
-    <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
+    <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes">
         <mkdir dir="build/classes/marshal"/>
         <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
                 <pathelement location="build/classes/configschema"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
@@ -738,7 +738,7 @@
         <javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath id="store.compile.path">
                 <pathelement location="build/classes/typestore"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -757,7 +757,7 @@
         <javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath id="tools.compile.path">
                 <pathelement location="build/classes/typestore"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -779,13 +779,13 @@
 
     <path id="bootstrap.run.path">
         <pathelement location="build/private/lib/oldxbean.jar"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+        <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
         <pathelement location="build/classes/xmlpublic"/>
     </path>
 
     <path id="bootstrap.compile.path">
         <pathelement location="build/classes/xmlpublic"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+        <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
     </path>
 
     <property name="bootstrap.compile.path" refid="bootstrap.compile.path"/>
@@ -829,7 +829,7 @@
         </condition>
     </target>
 
-    <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar, jsr173_1.0.jars" unless="xmlschema.notRequired">
+    <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar" unless="xmlschema.notRequired">
         <delete dir="build/classes/xmlschema"/>
         <delete dir="build/src/xmlschema"/>
         <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
@@ -972,7 +972,7 @@
 
     <!-- xpath target ============================================= -->
 
-    <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes, saxon9.jar">
+    <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes">
         <mkdir dir="build/classes/xpath_xquery"/>
         <mkdir dir="build/classes/xpath_xquery/META-INF"/>
         <mkdir dir="build/classes/xpath_xquery/META-INF/services"/>
@@ -991,8 +991,8 @@
             <classpath id="xpath.compile.path">
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/store"/>
-                <pathelement location="${saxon_jar}"/>
-                <pathelement location="${saxon_dom_jar}"/>
+                <pathelement location="/usr/share/java/saxonb.jar"/>
+                <pathelement location="/usr/share/java/saxonb-dom.jar"/>
             </classpath>
         </javac>
     </target>
@@ -1053,19 +1053,19 @@
     <path id="test.compile.path">
         <pathelement location="build/classes/marshal"/>
         <pathelement location="build/classes/common"/>
-        <pathelement location="external/lib/junit.jar"/>
+        <pathelement location="/usr/share/java/junit.jar"/>
         <pathelement location="build/ar/xbean.jar"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+        <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
         <pathelement location="build/classes/xmlinputstream"/>
     </path>
 
     <path id="test.run.path">
         <pathelement location="build/ar/xbean.jar"/>
-        <pathelement location="external/lib/junit.jar"/>
+        <pathelement location="/usr/share/java/junit.jar"/>
     </path>
 
 
-    <target name="drt.classes" depends="dirs,jsr173_1.0.jars">
+    <target name="drt.classes" depends="dirs">
         <mkdir dir="build/private/classes/drt"/>
         <javac
             destdir="build/private/classes/drt"
@@ -1085,7 +1085,7 @@
 
     <path id="scomp.run.path">
         <pathelement location="build/lib/xbean.jar"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+        <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
     </path>
 
     <target name="stsschema.check">
@@ -1110,7 +1110,7 @@
         </uptodate>
     </target>
 
-    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_1.0.jars" unless="jam.classes.notRequired">
+    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes" unless="jam.classes.notRequired">
         <delete dir="build/private/jam"/>
         <mkdir dir="build/private/jam"/>
         <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
@@ -1133,7 +1133,7 @@
             debug="on">
             <src path="build/private/jam/src_repackage"/>
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+                <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
             </classpath>
         </javac>
     </target>