--- core/build.xml.orig	2004-06-29 16:56:35.151350000 +0200
+++ core/build.xml	2004-06-29 16:56:52.281395000 +0200
@@ -94,7 +94,7 @@
     <!-- =================================================================== -->
     <target name="beautify" depends="prepare">
         <taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"
-                 classpath="${lib.dir}/prettyprinter.jar"/>
+                 classpath="${lib.dir}/jrefactory.jar"/>
 
         <pretty settingsDir="${config.dir}" cvs="true" compileDir="${core.classes.dir}">
             <fileset dir="${core.src.dir}">
--- modules/modules-common.ent.orig	2004-06-29 17:19:10.494768000 +0200
+++ modules/modules-common.ent	2004-06-29 17:19:33.364834000 +0200
@@ -225,7 +225,7 @@
     <target name="beautify" depends="init" unless="module.jar.uptodate">
 
         <taskdef name="pretty2" classname="org.acm.seguin.ant.Pretty"
-                 classpath="${lib.dir}/prettyprinter.jar"/>
+                 classpath="${lib.dir}/jrefactory.jar"/>
 
         <pretty2 settingsDir="${config.dir}" cvs="true" compileDir="${module.classes.dir}">
             <fileset dir="${module.src.dir}">
--- build.xml.orig	2005-05-04 09:59:46.000000000 -0400
+++ build.xml	2005-05-04 11:09:49.000000000 -0400
@@ -6,14 +6,19 @@
     <property file="${user.home}/build.properties"/>
     <property name="xjavadoc.jar" location="${lib.dir}/xjavadoc-${xjavadoc.version}.jar"/>
     <property environment="env"/>
+    <property name="xjavadoc.uptodate" value="true"/>
+    <property name="xjavadoc.sources.present" value="true"/>
 
     <target name="xjavadoc-determine-presence">
         <available property="xjavadoc.sources.present"
                    file="${basedir}/../xjavadoc"
                    type="dir"/>
+        <condition property="xjavadoc.sources.available">
+            <istrue value="${xjavadoc.sources.present}" />
+        </condition>
     </target>
 
-    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence" if="xjavadoc.sources.present">
+    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence" if="xjavadoc.sources.present" unless="xjavadoc.uptodate">
         <echo>XJavaDoc sources are available. Checking against ${xjavadoc.jar}</echo>
         <uptodate property="xjavadoc.uptodate"
                   targetfile="${xjavadoc.jar}">
@@ -23,7 +28,7 @@
         </uptodate>
     </target>
 
-    <target name="build-xjavadoc" depends="xjavadoc-determine-uptodate" if="xjavadoc.sources.present" unless="xjavadoc.uptodate">
+    <target name="build-xjavadoc" depends="download-xjavadoc,xjavadoc-determine-uptodate" if="xjavadoc.sources.available" unless="xjavadoc.uptodate">
         <echo>XJavaDoc sources modified after jar file. Building XJavaDoc...</echo>
         <ant dir="${basedir}/../xjavadoc">
             <property name="rootdir" value="${basedir}/../xjavadoc"/>
@@ -47,9 +52,11 @@
         
         <get src="http://xdoclet.sourceforge.net/repository/xjavadoc/jars/xjavadoc-${xjavadoc.version}.jar"
              dest="${xjavadoc.jar}"/>
+
+        <property name="xjavadoc.sources.available" value="true"/>
     </target>
 
-    <target name="xjavadoc" depends="build-xjavadoc,dont-build-xjavadoc,download-xjavadoc"/>
+    <target name="xjavadoc" depends="build-xjavadoc,dont-build-xjavadoc"/>
 
     <target name="core">
         <ant dir="${core.dir}"/>
@@ -145,7 +152,7 @@
         <copy file="${lib.dir}/log4j.jar" todir="${dist.lib.dir}"/>
 
         <!-- Copy the Jakarta Commons Collections jar to the dist.lib directory -->
-        <copy file="${lib.dir}/commons-collections-2.0.jar" todir="${dist.lib.dir}"/>
+        <copy file="${lib.dir}/commons-collections.jar" todir="${dist.lib.dir}"/>
 
         <delete file="${dist.dir}/activity-log.xml"/>