Index: catalina/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.52
diff -u -r1.52 build.xml
--- catalina/build.xml	2001/08/27 16:47:57	1.52
+++ catalina/build.xml	2001/09/05 14:42:45
@@ -199,20 +199,55 @@
 
   <!-- ================ BUILD: Create Catalina Javadocs =================== -->
   <target name="javadoc" depends="build-main">
+    <available property="tyrex.present"
+     classname="tyrex.jdbc.xa.EnabledDataSource" />
+    <available property="jdbcse.present"
+     classname="javax.sql.DataSource" />
+    <available property="jta.present"
+     classname="javax.transaction.UserTransaction" />
+    <available property="avalon.present" 
+     classname="org.apache.avalon.blocks.Block" />
+    <available property="javamail.present"
+     classname="javax.mail.internet.MimeMessage" />
+    <available property="jdk.1.3.present"
+     classname="java.lang.reflect.Proxy" />
+  
     <delete dir="${catalina.build}/javadoc"/>
     <mkdir dir="${catalina.build}/javadoc"/>
+
+    <property name="catalina.javadoc.src" value="${catalina.build}/src"/>
+    <mkdir dir="${catalina.javadoc.src}"/>
+    <copy todir="${catalina.javadoc.src}">
+    	<fileset dir="src/share">
+	    <exclude name="**/CVS/**"/>
+            <exclude name="**/factory/Tyrex*.java" 
+                unless="tyrex.present" />
+            <exclude name="**/factory/MailSessionFactory.java"
+                unless="javamail.present" />
+            <exclude name="**/factory/SendMailFactory.java"
+                unless="javamail.present" />
+            <exclude name="**/startup/CatalinaBlock.java" 
+                unless="avalon.present" />
+            <exclude name="**/util/ProcessHelper.java"
+                unless="jdk.1.3.present"/>
+            <exclude name="**/servlets/CGIServlet.java"
+                unless="jdk.1.3.present"/>
+	</fileset>
+    </copy>
+
     <javadoc packagenames="org.apache.catalina.*,org.apache.naming.*"
-             classpath="${parser.jar}:${jaxp.jar}:${jcert.jar}:${jsse.jar}:${jnet.jar}:${regexp.jar}:${jmxri.jar}:${servlet.jar}:${catalina.build}/classes"
-               sourcepath="src/share"
+             classpath="${parser.jar}:${jaxp.jar}:${jcert.jar}:${jsse.jar}:${jnet.jar}:${regexp.jar}:${jmxri.jar}:${servlet.jar}:${catalina.build}/classes:${jndi.jar}"
+               sourcepath="${catalina.javadoc.src}"
                   destdir="${catalina.build}/javadoc"
                    author="true"
                   version="true"
               windowtitle="Catalina Internal API Documentation"
                  doctitle="Catalina API"
                    bottom="Copyright &#169; 2000 Apache Software Foundation.  All Rights Reserved."
-    />
+    >
+    </javadoc>
+    <delete dir="${catalina.javadoc.src}"/>
   </target>
-
 
   <!-- ==================== BUILD: Catalina Developer Docs ================ -->
   <target name="dev-doc">