svn commit: r896214 - in /tomcat/trunk: dist.xml extras.xml

[markt]

Author: markt
Date: Tue Jan  5 20:56:14 2010
New Revision: 896214

URL: http://svn.apache.org/viewvc?rev=896214&view=rev
Log:
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

Modified:
    tomcat/trunk/dist.xml
    tomcat/trunk/extras.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=896214&r1=896213&r2=896214&view=diff
==============================================================================
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Tue Jan  5 20:56:14 2010
@@ -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>
 

Modified: tomcat/trunk/extras.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=896214&r1=896213&r2=896214&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Tue Jan  5 20:56:14 2010
@@ -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"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org