--- build.xml.orig	2007-11-04 23:22:54.000000000 +0100
+++ build.xml	2007-11-04 23:23:58.000000000 +0100
@@ -84,7 +84,7 @@
             <link href="http://help.eclipse.org/help31/nftopic/org.eclipse.platform.doc.isv/reference/api/"/>
             <link href="http://www.jdocs.com/formlayout/1.0.4/api/" packagelistloc="extensions/jgoodiesforms/lib"/>
             <link href="http://nachocalendar.sourceforge.net/doc/"/>
-            <link href="http://www.jfree.org/jfreechart/javadoc/"/>
+            <link href="http://www.jfree.org/jfreechart/api/javadoc/"/>
             <link href="http://download.java.net/javadesktop/swinglabs/releases/0.8/docs/api/"/>
 
             <doctitle><![CDATA[<h1>Glazed Lists 1.7.0</h1>]]></doctitle>
@@ -130,7 +130,7 @@
 		description="Compile the default components of the source.">
 	</target>
 
-	<target name="compileall" depends="core,migrationkit,swing,io,swt,ktable,jfreechart,issuesbrowser,swinglabs,treetable"
+	<target name="compileall" depends="core,migrationkit,swing,io,treetable"
 		description="Compile all components of the source.">
 	</target>
 
@@ -178,11 +178,13 @@
 
     <target name="swt" depends="core">
         <mkdir dir="extensions/swt/lib"/>
+	<!--
         <java classname="ca.odell.glazedlists.impl.HttpClient">
             <classpath path="${classes.dir}"/>
             <arg value="https://glazedlists.dev.java.net/files/documents/1073/25145/swt-api.jar"/>
             <arg value="extensions/swt/lib/swt-api.jar"/>
         </java>
+        -->
         <javac destdir="${classes.dir}" srcdir="extensions/swt/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
             <classpath>
                 <fileset dir="extensions/swt/lib/" includes="*.jar"/>
@@ -207,11 +209,13 @@
 
     <target name="jgoodiesforms" depends="core,swing">
         <mkdir dir="extensions/jgoodiesforms/lib"/>
+        <!--
         <java classname="ca.odell.glazedlists.impl.HttpClient">
             <classpath path="${classes.dir}"/>
             <arg value="https://glazedlists.dev.java.net/files/documents/1073/27334/forms.jar"/>
             <arg value="extensions/jgoodiesforms/lib/forms.jar"/>
         </java>
+        -->
         <javac destdir="${classes.dir}" srcdir="extensions/jgoodiesforms/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
             <classpath>
                 <fileset dir="extensions/jgoodiesforms/lib/" includes="*.jar"/>
@@ -223,11 +227,13 @@
         <!-- the swinglabs .jar is Java 1.5+ only, so we do not bother to run
              this code through our Java 1.5 to Java 1.4 source code translator -->
         <mkdir dir="extensions/swinglabs/lib"/>
+        <!--
         <java classname="ca.odell.glazedlists.impl.HttpClient">
             <classpath path="${classes.dir}"/>
             <arg value="https://glazedlists.dev.java.net/files/documents/1073/32966/swingx.jar"/>
             <arg value="extensions/swinglabs/lib/swingx.jar"/>
         </java>
+        -->
         <javac destdir="${classes.dir}" srcdir="extensions/swinglabs/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
             <classpath>
                 <fileset dir="extensions/swinglabs/lib/" includes="*.jar"/>
@@ -237,11 +243,13 @@
 
     <target name="nachocalendar" depends="core,swing">
         <mkdir dir="extensions/nachocalendar/lib"/>
+        <!--
         <java classname="ca.odell.glazedlists.impl.HttpClient">
             <classpath path="${classes.dir}"/>
             <arg value="https://glazedlists.dev.java.net/files/documents/1073/29958/nachocalendar.jar"/>
             <arg value="extensions/nachocalendar/lib/nachocalendar.jar"/>
         </java>
+        -->
         <javac destdir="${classes.dir}" srcdir="extensions/nachocalendar/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
             <classpath>
                 <fileset dir="extensions/nachocalendar/lib/" includes="*.jar"/>
@@ -255,6 +263,7 @@
 
     <target name="jfreechart" depends="swing">
         <mkdir dir="extensions/jfreechart/lib"/>
+        <!--
         <java classname="ca.odell.glazedlists.impl.HttpClient">
             <classpath path="${classes.dir}"/>
             <arg value="https://glazedlists.dev.java.net/files/documents/1073/26197/jcommon.jar"/>
@@ -265,6 +274,7 @@
             <arg value="https://glazedlists.dev.java.net/files/documents/1073/26198/jfreechart.jar"/>
             <arg value="extensions/jfreechart/lib/jfreechart.jar"/>
         </java>
+        -->
         <javac destdir="${classes.dir}" srcdir="extensions/jfreechart/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
             <classpath>
                 <fileset dir="extensions/jfreechart/lib/" includes="*.jar"/>
@@ -535,7 +545,6 @@
                         <pathelement location="${classes.dir}"/>
                         <pathelement location="${testclasses.dir}"/>
                         <fileset dir="extensions" includes="**/*.jar"/>
-                        <fileset file="${ant.home}/lib/junit.jar"/>
                     </classpath>
                     <formatter type="brief" usefile="false"/>
                     <batchtest>
@@ -546,15 +555,11 @@
     </target>
 
     <target name="compiletests" depends="compileall">
-        <!-- Verify that JUnit is available on the classpath -->
-		<available classname="junit.framework.TestCase" property="junit.present"/>
-		<fail unless="junit.present" message="To run this task, install junit.jar and optional.jar into ${ant.home}/lib/ JUnit is available free at http://www.junit.org"/>
 		<mkdir dir="${testclasses.dir}"/>
 	    <javac destdir="${testclasses.dir}" srcdir="test" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
             <classpath>
                 <pathelement location="${classes.dir}"/>
                 <fileset dir="extensions" includes="**/*.jar"/>
-                <fileset file="${ant.home}/lib/junit.jar"/>
             </classpath>
         </javac>
     </target>