From 9d9c4e3e5e4f50ba1189b8606ec547b3d335f4c2 Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Tue, 19 Oct 2010 00:22:05 +0000
Subject: [PATCH] Get the genrecord and tests targets running again

---
 build.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 68a1432..22a046c 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
   <condition property="maven-ant.exists"><available file="${maven-ant.jar}"/></condition>
   <target name="-download-maven-ant" unless="maven-ant.exists">
     <mkdir dir="${maven-ant.dir}"/>
-    <get src="${maven-ant.url}/maven-ant-tasks-${maven-ant.vers}.jar" 
+    <get src="${maven-ant.url}/maven-ant-tasks-${maven-ant.vers}.jar"
          dest="${maven-ant.jar}" usetimestamp="true"/>
   </target>
 
@@ -25,6 +25,12 @@
              uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
     <artifact:pom id="pom" file="pom.xml"/>
     <artifact:dependencies pathId="classpath" pomRefId="pom"/>
+    <path id="test.classpath">
+        <path refid="classpath"/>
+        <pathelement location="${classes.dir}"/>
+        <pathelement location="${tclasses.dir}"/>
+        <pathelement location="${basedir}"/> <!-- for rsrc/ -->
+    </path>
   </target>
 
   <target name="-prepare" depends="-init-maven-ant">
@@ -34,16 +40,16 @@
   <target name="genrecord" depends="-prepare"
           description="Generates fields for persistent record classes.">
     <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
-             classpathref="classpath"/>
+             classpathref="test.classpath"/>
     <!-- make sure the record class files are all compiled -->
     <javac destdir="${classes.dir}" debug="on" optimize="${build.optimize}" deprecation="on">
-      <src name="${src.dir}"/>
-      <src name="${test.dir}"/>
+      <src path="${src.dir}"/>
+      <src path="${test.dir}"/>
       <classpath refid="classpath"/>
       <include name="**/*Record.java"/>
     </javac>
     <!-- now update the source files -->
-    <grecord classpathref="classpath">
+    <grecord classpathref="test.classpath">
       <fileset dir="${src.dir}" includes="**/*Record.java"/>
       <fileset dir="${test.dir}" includes="**/*Record.java"/>
     </grecord>
@@ -76,10 +82,7 @@
     <mkdir dir="${tclasses.dir}"/>
     <javac srcdir="${test.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
-      <classpath>
-        <pathelement location="${classes.dir}"/>
-        <path refid="classpath"/>
-      </classpath>
+      <classpath refid="test.classpath"/>
       <compilerarg value="-Xlint"/>
       <compilerarg value="-Xlint:-serial"/>
     </javac>
@@ -107,12 +110,7 @@
     <taskdef name="unit" classpathref="classpath"
       classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
     <unit printsummary="off" haltonfailure="yes" fork="${junit.fork}">
-      <classpath>
-        <pathelement location="${classes.dir}"/>
-        <pathelement location="${tclasses.dir}"/>
-        <pathelement location="${basedir}"/> <!-- for rsrc/ -->
-        <fileset dir="${deploy.dir}/lib" includes="*.jar"/>
-      </classpath>
+      <classpath refid="test.classpath"/>
       <sysproperty key="com.samskivert.depot.debug" value="${debug}"/>
       <formatter type="brief" usefile="false"/>
       <batchtest>