--- build.xml.orig	2004-02-21 06:58:14 +1200

+++ build.xml	2005-04-17 17:30:08 +1300

@@ -18,9 +18,6 @@

 <project default="usage" basedir=".">

-  <!-- enable compilation under IBM JDK 1.4 -->

-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>

-

   <!-- Allow properties following these statements to be overridden -->

   <!-- Note that all of these don't have to exist.  They've just been defined

        incase they are used. -->

@@ -52,8 +49,8 @@

     <property name="copyright" value="Copyright &#169; ${year} Apache XML Project. All Rights Reserved."/>

     <echo message= "---------------- ${parser.Name} ${parser.Version} [${year}] ---------------"/>

-    <!-- changed made to synchronize with a patch from Sam Ruby (<rubys@apache.org>) to Xerces1

-    <property name="build.compiler" value="classic"/> -->

+    <!-- changed made to synchronize with a patch from Sam Ruby (<rubys@apache.org>) to Xerces1 -->

+    <property name="build.compiler" value="modern"/> 

     <property name="debug" value="off"/>

     <property name="optimize" value="on"/>

     <property name="deprecation" value="off"/>

@@ -191,6 +188,7 @@

     </copy>

     <!-- now deal with API's:  -->

+

     <unzip src="${src.apis.zip}" dest="${build.src}">

         <patternset

             includes="org/xml/sax/** 

@@ -218,7 +216,7 @@

       </fileset>

     </copy>

-    <xjavac srcdir="${build.src}"

+    <javac srcdir="${build.src}"

            destdir="${build.dest}"

            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"

            debug="${debug}"

@@ -285,7 +283,7 @@

            excludes="dom/DOMAddLines.java 

                      dom/DOM3.java" />

     </copy>

-    <xjavac srcdir="${build.samples}"

+    <javac srcdir="${build.samples}"

            destdir="${build.dest}"

            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"

            debug="${debug}"

@@ -302,7 +300,7 @@

         <fileset dir="${tests.dir}"

          excludes="dom/rename/**, dom/registry/**" />

     </copy>

-    <xjavac srcdir="${build.tests}"

+    <javac srcdir="${build.tests}"

            destdir="${build.dest}"

            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"

            debug="${debug}"

@@ -850,7 +848,7 @@

       </fileset>

     </copy>

-    <xjavac srcdir="${build.src}"

+    <javac srcdir="${build.src}"

            destdir="${build.dest}"

            debug="${debug}"

            deprecation="${deprecation}"

@@ -942,6 +940,7 @@

              token="return ((String)type).getNamespace();" value="return null;"/>

     <!-- now deal with API's:  -->

+    

     <unzip src="${src.apis.zip}" dest="${build.src}">

         <patternset

             includes="org/xml/sax/** 

@@ -954,7 +953,6 @@

         />

     </unzip>

-

     <!-- substitute tokens as needed -->

     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>

@@ -993,7 +991,7 @@

       </fileset>

     </copy>

-    <xjavac srcdir="${build.src}"

+    <javac srcdir="${build.src}"

            destdir="${build.dest}"

            debug="${debug}"

            deprecation="${deprecation}"

@@ -1219,7 +1217,7 @@

       </fileset>

     </copy>

-    <xjavac srcdir="${build.src}"

+    <javac srcdir="${build.src}"

            destdir="${build.dest}"

            debug="${debug}"

            deprecation="${deprecation}"

@@ -1250,7 +1248,7 @@

    <replace file="${build.samples}/xs/QueryXS.java"  

              token="org.apache.xerces.dom3" value="org.w3c.dom"/> 

-   <xjavac srcdir="${build.samples}"

+   <javac srcdir="${build.samples}"

            destdir="${build.dest}"

            classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}"

            debug="${debug}"