Improve JavaDoc generation

Based on the proposed patch for https://issues.apache.org/bugzilla/show_bug.cgi?id=48299
Also ensure the clean targets clean up fully

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@896214 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/dist.xml b/dist.xml
index 8bf001a..64c7760 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -122,6 +122,7 @@
 
     <delete dir="${tomcat.deployer}"/>
     <delete dir="${tomcat.dist}" failonerror="false"/>
+    <delete dir="${tomcat.release}" />
 
     <!-- This is why releasing must be done on a Windows box: 
          otherwise this check fails and the .exe distro is not generated -->
@@ -197,17 +198,28 @@
 
   </target>
 
+  <!-- Classpath -->
+  <path id="tomcat.classpath">
+    <pathelement location="${jdt.jar}"/>
+  </path>
+
   <target name="dist-javadoc" depends="dist-source"
     description="Create the Tomcat javadoc" >
     <javadoc packagenames="org.apache.*"
       sourcepath="${tomcat.dist}/src/java"
       destdir="${tomcat.dist}/webapps/docs/api"
-      author="true" version="true"
-      windowtitle="Tomcat API Documentation"
-      doctitle="Tomcat API"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.  All Rights Reserved."
+      version="true"
+      windowtitle="Apache Tomcat ${version} API Documentation"
+      doctitle="Apache Tomcat ${version} API"
+      header="&lt;b&gt;Apache Tomcat ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
       additionalparam="-breakiterator"
       maxmemory="256m" >
+      <classpath>
+        <path refid="tomcat.classpath"/>
+        <path location="${ant.core.lib}"/>
+      </classpath>
+      <link href="http://java.sun.com/j2se/1.6.0/docs/api/"/>
     </javadoc>
   </target>
 

diff --git a/extras.xml b/extras.xml
index 45b0a62..0bfce3f 100644 (file)
--- a/extras.xml
+++ b/extras.xml
@@ -92,6 +92,7 @@
 
   <target name="clean" description="Delete the default output folders">
        <delete dir="${tomcat.extras}"/>
+    <delete dir="${tomcat.embed}"/>
   </target>
 
   <target name="commons-logging" depends="prepare"