--- build.xml.orig	2007-01-07 15:54:42.000000000 +0100
+++ build.xml	2007-01-07 16:40:45.000000000 +0100
@@ -70,7 +70,8 @@
     <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
     <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
     <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
-    <available property="j2ee.version" value="1.2"
+    <!--
+	<available property="j2ee.version" value="1.2"
                classpathref="lib.classpath"
                classname="javax.servlet.Servlet" />
     <available property="j2ee.version" value="1.3"
@@ -79,6 +80,7 @@
     <available property="httpclient" value="true"
                classpathref="lib.classpath"
                classname="org.apache.commons.httpclient.HttpClient" />
+	-->
 
     <property name="jar.j2ee.name" value="" />
 
@@ -118,7 +120,6 @@
            srcdir="${src.core.dir}">
       <classpath>
         <path refid="lib.classpath" />
-        <pathelement path="${java.class.path}" />
       </classpath>
     </javac>
 
@@ -134,7 +135,6 @@
       <src path="${src.jdk.dir}/common" />
       <classpath>
         <path refid="lib.classpath" />
-        <pathelement path="${java.class.path}" />
         <pathelement path="${core.classes}" />
       </classpath>
     </javac>
@@ -158,7 +158,6 @@
 
       <classpath>
         <path refid="lib.classpath" />
-        <pathelement path="${java.class.path}" />
         <pathelement path="${core.classes}" />
         <pathelement path="${jdk.classes}" />
       </classpath>
@@ -179,7 +178,6 @@
         <pathelement location="${j2ee.classes}" />
         <pathelement location="${jdk.classes}" />
         <pathelement location="${core.classes}" />
-        <pathelement path="${java.class.path}" />
       </classpath>
 
       <formatter type="plain" usefile="false" />
@@ -222,7 +220,6 @@
 
         <classpath>
           <path refid="lib.classpath" />
-          <pathelement path="${java.class.path}" />
           <pathelement path="${core.classes}" />
           <pathelement path="${jdk.classes}" />
         </classpath>
@@ -234,7 +231,7 @@
   </target>
 
   <target name="jar"
-          depends="junit, jar-core, jar-jdk, jar-j2ee"/>
+          depends="compile-j2ee, jar-core, jar-jdk, jar-j2ee"/>
 
   <target name="jar-core"
           depends="compile-core, deliverable-names"
@@ -292,7 +289,7 @@
   </target>
 
   <target name="jar-ext-httpclient"
-          depends="junit, compile-ext-httpclient"
+          depends="compile-ext-httpclient"
 	  description="Generate extension mockobjects jar">
     <jar jarfile="${out.dir}/${ant.project.name}-httpclient.jar"
       manifest="${conf.dir}/manifest">
@@ -322,7 +319,6 @@
 
       <classpath>
         <path refid="lib.classpath" />
-        <pathelement path="${java.class.path}" />
       </classpath>
       <sourcepath>
         <pathelement path="${src.dir}/core"/>
@@ -401,8 +397,8 @@
        ========================================================================
     -->
   <target name="all"
-          depends="clean, junit, jar, javadoc, dist"
-          description="do it all (clean, jar, javadoc, junit, dist)">
+          depends="clean, jar, javadoc, dist"
+          description="do it all (clean, jar, javadoc, dist)">
   </target>
 
   <target name="src" depends="clean,prepare-dist">
@@ -423,5 +419,12 @@
     <delete file="${dist.name}-src.tar" />
   </target>
 
+   <!-- zip the sources -->
+   <target name="sourcezip">
+         <zip destfile="${out.dir}/${ant.project.name}-src.zip">
+                <zipfileset dir="src" />
+         </zip>
+        </target>
+
 </project>