Author: steveh
Date: Thu Aug 5 14:27:15 2004
New Revision: 35753
Modified:
incubator/beehive/trunk/netui/ant/javadoc.xml
Log:
(1) Removed dependency on test.properties.
(2) Added note about java bug 5055723.
(3) Removed old saxon.jar-dependent targets.
(4) Added tomcat-related classes to javadoc build.
Modified: incubator/beehive/trunk/netui/ant/javadoc.xml
==============================================================================
--- incubator/beehive/trunk/netui/ant/javadoc.xml (original)
+++ incubator/beehive/trunk/netui/ant/javadoc.xml Thu Aug 5 14:27:15 2004
@@ -6,12 +6,10 @@
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property file="bootstrap.properties"/>
<property file="common.properties"/>
+
<property name="docs.temp" value="${docs.dir}/temp"/>
<property name="docs.build.dir" value="${build.dir}/docs"/>
- <property name="ant-launch.jar"
location="${ant.home}/lib/ant-launcher.jar"/>
- <property file="../test/ant/test.properties"/>
-
<path id="javadoc.classpath">
<fileset dir="${struts.dir}" includes="*.jar"/>
<fileset dir="${tomcat.lib.dir}/4x" includes="*.jar"/>
@@ -71,6 +69,10 @@
<antcall target="generate-taglib-ref-html"/>
</target>
+ <!-- The 'use' is set to currently set to 'false' because of Java bug
5055723.
+ This bug will be fixed for the general release of JDK5.
+ Track the bug at:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5055723
+ When the fix arrives in JDK5, set use="true". -->
<target name="generate-class-ref">
<javadoc destdir="${docs.build.dir}/java-class"
maxmemory="256M"
@@ -104,26 +106,14 @@
<tag name="jsptagref.attributesyntaxvalue" enabled="false"
description=""/>
<packageset dir="${src.dir}/bootstrap"/>
<packageset dir="${src.dir}/compiler"/>
- <packageset dir="${src.dir}/pageflow">
- <!-- When the following line is uncommented: you get this
exception:
- [javadoc] java.util.MissingResourceException: Can't find
resource for bundle com.sun.tools.doclets
- .formats.html.resources.standard, key
doclet.malformed_html_link_tag
- -->
- <!--exclude name="org/apache/beehive/netui/pageflow/config/**"/-->
- </packageset>
+ <packageset dir="${src.dir}/pageflow"/>
<packageset dir="${src.dir}/scoping"/>
<packageset dir="${src.dir}/tags-databinding"/>
<packageset dir="${src.dir}/tags-html"/>
- <packageset dir="${src.dir}/tags-template"/>
- <!--packageset dir="${src.dir}/util"/-->
- <!--fileset dir="${src.dir}/bootstrap" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/compiler" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/pageflow" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/scoping" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/tags-databinding" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/tags-html" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/tags-template" defaultexcludes="yes"/>
- <fileset dir="${src.dir}/util" defaultexcludes="yes"/-->
+ <packageset dir="${src.dir}/tags-template"/>
+ <packageset dir="${src.dir}/tomcat-common/4x"/>
+ <packageset dir="${src.dir}/tomcat-server/4x"/>
+ <packageset dir="${src.dir}/tomcat-webapp/4x"/>
</javadoc>
</target>
@@ -172,58 +162,42 @@
<fileset dir="${docs.dir}/tools/static_files"/>
</copy>
<!-- #### Creates the Tag Libraray HTML #### -->
- <!-- ... the overview-summary of taglibs (=initial display in right-frame)
-->
+ <!-- ... the overview-summary of taglibs (initial display in right-frame)
-->
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/taglib-overview-summary.html"
style="${docs.dir}/tools/xslt/taglib-overview-summary.xslt">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
- <!-- ... the framed taglib overview (= upper-left) -->
+ <!-- ... the framed taglib overview (upper-left frame) -->
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/taglib-overview-frame.html"
style="${docs.dir}/tools/xslt/taglib-overview-frame.xslt">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
- <!-- ... the framed list of all JSP tags in all libraries (= lower-left
frame) -->
+ <!-- ... the framed list of all JSP tags in all libraries (lower-left
frame) -->
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/alltaglibs-frame.html"
style="${docs.dir}/tools/xslt/alltaglibs-frame.xslt">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
- <!-- ... the taglib-frame pages (=displayed in lower-left frame when
upper-left frame links are clicked) -->
- <!-- ******** Depends on xalan-241.jar!!!
- ******** You must call this target from the command line with the
following flag:
+ <!-- ... the taglib-frame pages (displayed in lower-left frame when
upper-left frame links are clicked) -->
+ <!-- ******** Depends on xalan-241.jar!
+ ******** You must call the 'build' and 'generate-taglib-ref-html'
targets with the following command line flag
******** -lib %BEEHIVE_HOME%\netui\test\external\xalan-241.jar -->
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/taglib-frame-ignore.html"
style="${docs.dir}/tools/xslt/taglib-frame.xslt">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
- <!-- ... the taglib-summary pages (=displayed in right frame when 'tag
library' links in the tag topics are clicked) -->
- <!-- ******** Depends on xalan-241.jar!!!
- ******** You must call this target from the command line with the
following flag:
+ <!-- ... the taglib-summary pages (displayed in right-hand frame when 'tag
library' links in the tag topics are clicked) -->
+ <!-- ******** Depends on xalan-241.jar!
+ ******** You must call the 'build' and 'generate-taglib-ref-html'
targets with the following command line flag:
******** -lib %BEEHIVE_HOME%\netui\test\external\xalan-241.jar -->
<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
out="${docs.build.dir}/taglib/taglib-summary-ignore.html"
style="${docs.dir}/tools/xslt/taglib-summary.xslt">
<param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
</xslt>
- <!-- ... the taglib-frame pages (=displayed in lower-left frame when
upper-left frame links are clicked) -->
- <!-- ******** Depends on saxon.jar!!! saxon.jar must be in
BEEHIVE_HOME/installed/apache-ant-1.6.1/lib ********
- ******** saxon.jar can be downloaded from
http://voxel.dl.sourceforge.net/sourceforge/saxon/saxon6_5_3.zip ******** -->
- <!--<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
- out="${docs.build.dir}/taglib/taglib-frame-ignore.html"
- style="${docs.dir}/tools/xslt/taglib-frame-saxon.xslt">
- <param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
- </xslt>-->
- <!-- ... the taglib-summary pages (=displayed in right frame when 'tag
library' links in the tag topics are clicked) -->
- <!-- ******** Depends on saxon.jar!!! saxon.jar must be in
BEEHIVE_HOME/installed/apache-ant-1.6.1/lib ********
- ******** saxon.jar can be downloaded from
http://voxel.dl.sourceforge.net/sourceforge/saxon/saxon6_5_3.zip ******** -->
- <!--<xslt in="${docs.dir}/temp/xml/tagref/overview.xml"
- out="${docs.build.dir}/taglib/taglib-summary-ignore.html"
- style="${docs.dir}/tools/xslt/taglib-summary-saxon.xslt">
- <param name="taglibLocation" expression="${docs.build.dir}/taglib"/>
- </xslt>-->
<!-- ... the individual tag topics -->
<xslt basedir="${docs.temp}/xml/tagref"
destdir="${docs.build.dir}/taglib"
