--- build.xml	Tue Mar 26 16:36:55 2002
+++ build.xml	Tue Jan 28 17:38:21 2003
@@ -51,6 +51,9 @@
   <property name="ant.bin" value="${ant.home}/bin"/>
   <property name="ant.lib" value="${ant.home}/lib"/>
   <property name="jsse.lib" value="${jsse.home}/lib"/>
+  <property name="commons-dbcp.lib" value="${jakarta-commons}/dbcp/dist"/>
+  <property name="commons-pool.lib" value="../jakarta-commons/pool/dist"/>
+  <property name="commons-collections.lib" value="../jakarta-commons/collections/dist"/>
 
   <!-- Binaries checked in ( servlet.jar is not likely to change,
       the 2.2 spec is final -->
@@ -68,7 +71,7 @@
     <available property="puretls.present"
  	       classname="COM.claymoresystems.ptls.SSLContext"/>
     <available property="commons-dbcp.present"
-               file="${jakarta-commons}/dbcp/dist/commons-dbcp.jar" />
+               file="${commons-dbcp.lib}/commons-dbcp.jar" />
     <available property="jdk12.present"
                classname="java.security.PrivilegedAction"/>
     <available property="jaxp-present"
@@ -125,15 +128,13 @@
     <echo message="Installing XERCES"/>
     <copy tofile="${tomcat.build}/lib/container/xerces.jar"
           file="${jaxp.home}/xerces.jar"/>
-    <copy tofile="${tomcat.build}/lib/container/jaxp.jar"
-          file="${jaxp.home}/jaxp.jar"/>
   </target>
   
   <target name="prepare.jaxp" depends="prepare.jaxp101,prepare.jaxp11,prepare.xerces" />
 
   <!-- ==================== Copy static files ==================== -->
 
-  <target name="prepare" depends="init,prepare.dirs,prepare.jaxp" 
+  <target name="prepare" depends="init,prepare.dirs" 
 	  description="Create the directory structure for build and copy binaries" />
 
   <target name="prepare.dirs" depends="init">
@@ -398,14 +399,14 @@
 -->    
     <echo message="copying commons jars"/>
     <copy todir="${tomcat.build}/lib/container" flatten="yes">
-        <fileset dir="../jakarta-commons/dbcp">
-            <include name="**/dist/*.jar"/>
+        <fileset dir="${commons-dbcp.lib}">
+            <include name="common-dbcp*.jar"/>
         </fileset>
-        <fileset dir="../jakarta-commons/pool">
-            <include name="**/dist/*.jar"/>
+        <fileset dir="${commons-pool.lib}">
+            <include name="common-pool*.jar"/>
         </fileset>
-        <fileset dir="../jakarta-commons/collections">
-            <include name="**/dist/*.jar"/>
+        <fileset dir="${commons-collections.lib}">
+            <include name="common-collections*.jar"/>
         </fileset>
     </copy>
   </target>
@@ -694,6 +695,11 @@
 
   <path id="javadoc.classpath">
     <pathelement location="${servlet22.jar}"/>
+    <pathelement location="${jaxp_parser_impl.jar}"/>
+    <pathelement location="${xml-commons-apis.jar}"/>
+    <pathelement location="${jsse.lib}/jsse.jar"/>
+    <pathelement location="${jsse.lib}/jnet.jar"/>
+    <pathelement location="${jsse.lib}/jcert.jar"/>
     <fileset dir="${jaxp.home}">
       <include name="jaxp.jar"/>
       <include name="parser.jar"/>
@@ -706,18 +712,21 @@
     <fileset dir="${java.home}">
       <include name="lib/classes.zip"/>
     </fileset>
-    <fileset dir="${ant.home}">
-      <include name="lib/ant.jar"/>
+    <fileset dir="${ant.lib}">
+      <include name="ant.jar"/>
+    </fileset>
+    <fileset dir="${puretls.lib}">
+        <include name="puretls.jar"/>
     </fileset>
   </path>
 
   <target name="javadoc" depends="main,webapps,tomcat-jars">
     <!-- Add Tomcat internal javadoc -->
-    <mkdir dir="${tomcat.build}/webapps/ROOT/javadoc"/>
+    <mkdir dir="${tomcat.build}/javadoc"/>
     <javadoc packagenames="org.apache.*"
              sourcepath="src/share;src/facade22"
              classpathref="javadoc.classpath"
-             destdir="${tomcat.build}/webapps/ROOT/javadoc"
+             destdir="${tomcat.build}/javadoc"
              author="true"
              version="true"
              use="true"