--- build.xml.old	2009-06-20 16:40:26.000000000 +1200
+++ build.xml	2009-06-20 16:43:57.000000000 +1200
@@ -158,7 +158,8 @@
             <pathelement path="${extlibs.dir}/asm-3.1.jar" />
             <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
             <pathelement path="${extlibs.dir}/constantine-0.4.jar" />
-            <pathelement path="${extlibs.dir}/jna-posix.jar"/>
+	    <pathelement path="${extlibs.dir}/jna-posix.jar"/>
+	    <pathelement path="${extlibs.dir}/ant.jar" />
         </path>
 
         <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
@@ -166,8 +167,8 @@
 
         <path id="test.classpath">
             <path refid="main.classpath"/>
-            <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
-            <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
+	    <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
+	    <pathelement path="${extlibs.dir}/xercesImpl-2.9.1.jar" />
             <pathelement path="${exposed.dir}" />
             <pathelement path="${compile.dir}" />
             <pathelement path="${cpptasks.jar.dir}" />
@@ -236,17 +237,8 @@
         <condition property="do.checkout" value="true">
             <istrue value="${has.repositories.connection}" />
         </condition>
-
-        <!-- classpath for svn ant task -->
-        <path id="svn.classpath">
-            <pathelement path="${java.class.path}" />
-            <fileset dir="${svnant.jar.dir}">
-              <include name="*.jar"/>
-            </fileset>
-        </path>
-    	<!-- taskdef for svn ant task -->
-    	<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" />
     </target>
+
     <target name="full-check" depends="full-preinit, init, dump-env">
         <!-- Require all of the optional jars for a full build -->
         <fail unless="informix.present" message="informix jar not present" />
@@ -347,6 +339,16 @@
     </target>
 
     <target name="checkout" depends="prepare" if="do.checkout">
+        <!-- classpath for svn ant task -->
+        <path id="svn.classpath">
+            <pathelement path="${java.class.path}" />
+            <fileset dir="${svnant.jar.dir}">
+              <include name="*.jar"/>
+            </fileset>
+        </path>
+    	<!-- taskdef for svn ant task -->
+    	<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" />
+
         <svn javahl="${javahl.dir}" >
             <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
             <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />