Index: jakarta-tomcat/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat/build.xml,v
retrieving revision 1.125
diff -u -r1.125 build.xml
--- jakarta-tomcat/build.xml	2001/03/23 21:53:59	1.125
+++ jakarta-tomcat/build.xml	2001/04/01 11:48:02
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Tomcat" default="main" basedir=".">
 
+  <!-- Centralize location for overriding property values
+	benefits include toggling of libraries to use for compiling e.g. serlvet23.jar, etc  -->
+  <property file="build.properties"/>
+
   <!-- Compilation properties -->
 
   <property name="optimize" value="false"/>
@@ -46,13 +50,23 @@
   <property name="ant.lib" value="${ant.home}/lib"/>
   <property name="jsse.lib" value="${jsse.home}/lib"/>
 
+  <property name="jaxp.jar" value="${jaxp.home}/jaxp.jar"/>
+
   <!-- Binaries checked in ( servlet.jar is not likely to change, 
       the 2.2 spec is final -->
-  <property name="servlet22.jar" value="bin/servlet22.jar"/>
+  <property name="servlet.jar" value="bin/servlet22.jar"/>
+
+  <!-- Binaries checked in ( sax.jar is not likely to change -->
+  <property name="sax.jar" value="bin/sax2.jar"/>
 
+  <!-- Binaries checked in ( w3cdom.jar is not likely to change -->
+  <property name="w3cdom.jar" value="bin/w3cdom2.jar"/>
+
   <!-- We can assume tomcat.build will hold a working tomcat -->
   <property name="tomcat.home" value="${tomcat.build}"/>
- 
+
+
+
   <!-- ==================== Initialization - guessing config ========== -->
   <target name="detect">
     <available property="jsse.present.runtime" 
@@ -137,7 +151,7 @@
          classpath, just a hack to ease the transition
      -->
     <copy tofile="${tomcat.build}/lib/common/servlet.jar" 
-	  file="${servlet22.jar}"/>
+	  file="${servlet.jar}"/>
 
     <fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" cr="remove"/>
     <fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" cr="add"/>
@@ -293,7 +307,7 @@
 	   deprecation="off" 
 	   srcdir="src/facade22">
       <classpath>
-	<pathelement location="${servlet22.jar}"/>
+	<pathelement location="${servlet.jar}"/>
 	<pathelement location="${tomcat.build}/lib/tomcat_util.jar"/>
 	<pathelement location="${tomcat.build}/lib/tomcat_core.jar"/>
       </classpath>
@@ -346,7 +360,7 @@
 	   optimize="${optimize}" 
 	   deprecation="off">
       <classpath>
-	<pathelement location="${servlet22.jar}"/>
+	<pathelement location="${servlet.jar}"/>
       </classpath>
       <include name="org/apache/jasper/**"/>    
       <exclude name="org/apache/jasper/servlet/JasperLoader12.java" 
@@ -399,7 +413,7 @@
     <javac srcdir="src/examples/WEB-INF/classes" 
 	   optimize="${optimize}" 
 	   destdir="${tomcat.build}/webapps/examples/WEB-INF/classes" 
-	   classpath="${tomcat.build}/classes;${servlet22.jar}"/>
+	   classpath="${tomcat.build}/classes;${servlet.jar}"/>
     <javac srcdir="src/examples/jsp/plugin/applet" 
 	   optimize="${optimize}" 
 	   destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
@@ -416,7 +430,7 @@
     <javac srcdir="src/webpages/WEB-INF/classes" 
 	   optimize="${optimize}" 
 	   destdir="${tomcat.build}/webapps/ROOT/WEB-INF/classes" 
-	   classpath="${tomcat.build}/classes;${servlet22.jar}"/>
+	   classpath="${tomcat.build}/classes;${servlet.jar}"/>
       
       <!-- admin context -->
     <mkdir dir="${tomcat.build}/webapps/admin"/>
@@ -428,7 +442,7 @@
     <javac srcdir="src/admin/WEB-INF/classes" 
 	   optimize="${optimize}" 
 	   destdir="${tomcat.build}/webapps/admin/WEB-INF/classes" 
-	   classpath="${tomcat.build}/classes;${servlet22.jar}"/>
+	   classpath="${tomcat.build}/classes;${servlet.jar}"/>
       
   </target>
 
@@ -489,8 +503,17 @@
              use="true" 
              windowtitle="Tomcat and Jasper Internal API" 
              doctitle="Tomcat and Jasper Internal API" 
-             bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."
-             />
+             bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
+      <classpath>
+	<pathelement location="${jsse.lib}/jcert.jar"/>
+	<pathelement location="${jsse.lib}/jnet.jar"/>
+	<pathelement location="${jsse.lib}/jsse.jar"/>
+	<pathelement location="${jaxp.jar}"/>
+	<pathelement location="${sax.jar}"/>
+	<pathelement location="${servlet.jar}"/>
+	<pathelement location="${w3cdom.jar}"/>
+      </classpath>
+    </javadoc>
   </target>
   <target name="javadoc.tomcat" depends="main,webapps,tomcat-jars-new">
     <javadoc packagenames="org.apache.tomcat.*" 
@@ -501,7 +524,17 @@
 	     use="true" 
 	     windowtitle="Tomcat API" 
 	     doctitle="Tomcat API" 
-	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."/>
+	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
+      <classpath>
+	<pathelement location="${jsse.lib}/jcert.jar"/>
+	<pathelement location="${jsse.lib}/jnet.jar"/>
+	<pathelement location="${jsse.lib}/jsse.jar"/>
+	<pathelement location="${jaxp.jar}"/>
+	<pathelement location="${sax.jar}"/>
+	<pathelement location="${servlet.jar}"/>
+	<pathelement location="${w3cdom.jar}"/>
+      </classpath>
+    </javadoc>
   </target>
   <target name="javadoc.tomcat.core" depends="main,webapps,tomcat-jars-new">
     <javadoc packagenames="org.apache.tomcat.core" 
@@ -523,7 +556,12 @@
 	     use="true" 
 	     windowtitle="Tomcat Facade API" 
 	     doctitle="Tomcat Facade API" 
-	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."/>
+	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
+      <classpath>
+	<pathelement location="${sax.jar}"/>
+	<pathelement location="${servlet.jar}"/>
+      </classpath>
+    </javadoc>
   </target>
   <target name="javadoc.tomcat.modules" depends="main,webapps,tomcat-jars-new">
     <javadoc packagenames="org.apache.tomcat.modules.*" 
@@ -534,7 +572,14 @@
 	     use="true" 
 	     windowtitle="Tomcat Modules API" 
 	     doctitle="Tomcat Modules API" 
-	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."/>
+	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
+      <classpath>
+	<pathelement location="${jaxp.jar}"/>
+	<pathelement location="${sax.jar}"/>
+	<pathelement location="${servlet.jar}"/>
+	<pathelement location="${w3cdom.jar}"/>
+      </classpath>
+    </javadoc>
   </target>
   <target name="javadoc.tomcat.startup" depends="main,webapps,tomcat-jars-new">
     <javadoc packagenames="org.apache.tomcat.startup" 
@@ -556,7 +601,16 @@
 	     use="true" 
 	     windowtitle="Tomcat Utilities API" 
 	     doctitle="Tomcat Utilities API" 
-	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."/>
+	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
+      <classpath>
+	<pathelement location="${jsse.lib}/jcert.jar"/>
+	<pathelement location="${jsse.lib}/jnet.jar"/>
+	<pathelement location="${jsse.lib}/jsse.jar"/>
+	<pathelement location="${jaxp.jar}"/>
+	<pathelement location="${sax.jar}"/>
+	<pathelement location="${w3cdom.jar}"/>
+      </classpath>
+    </javadoc>
   </target>
   <target name="javadoc.jasper" depends="main,webapps,tomcat-jars-new">
     <javadoc packagenames="org.apache.jasper.*" 
@@ -567,7 +621,14 @@
 	     use="true" 
 	     windowtitle="Jasper API" 
 	     doctitle="Jasper API" 
-	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."/>
+	     bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
+      <classpath>
+	<pathelement location="${jaxp.jar}"/>
+	<pathelement location="${sax.jar}"/>
+	<pathelement location="${servlet.jar}"/>
+	<pathelement location="${w3cdom.jar}"/>
+      </classpath>
+    </javadoc>
   </target>
 
   <target name="dist.war" depends="dist.prepare" >