You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/09/10 06:49:52 UTC
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs build.xml
craigmcc 01/09/09 21:49:52
Modified: . build.xml
webapps build.xml
webapps/ROOT build.xml index.html
webapps/tomcat-docs build.xml
Log:
Integrate the "tomcat-docs" webapp into the default build structure, and
resolve a timing issue on javadocs (which are not created unless you do a
"dist" build).
The new-format documentation tree is now the default, since it has been
brought up-to-date with all of the old documentation. Ultimately, the
static HTML versions of the old docs need to be removed from the HEAD
branch, but that can happen after a 4.0 release.
Revision Changes Path
1.35 +6 -3 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 2001/07/31 05:57:37 1.34
+++ build.xml 2001/09/10 04:49:51 1.35
@@ -140,14 +140,17 @@
<!-- ====================== DIST: Create Javadoc ======================== -->
<target name="dist-javadoc">
<ant dir="./catalina" target="javadoc"/>
- <copy todir="${tomcat.build}/webapps/ROOT/catalina-javadoc">
+ <mkdir dir="${tomcat.build}/webapps/tomcat-docs/catalina/docs/api"/>
+ <copy todir="${tomcat.build}/webapps/tomcat-docs/catalina/docs/api">
<fileset dir="${catalina.build}/javadoc" />
</copy>
<ant dir="./jasper" target="javadoc"/>
- <copy todir="${tomcat.build}/webapps/ROOT/jasper-javadoc">
+ <mkdir dir="${tomcat.build}/webapps/tomcat-docs/jasper/docs/api"/>
+ <copy todir="${tomcat.build}/webapps/tomcat-docs/jasper/docs/api">
<fileset dir="${jasper.build}/javadoc" />
</copy>
- <copy todir="${tomcat.build}/webapps/ROOT/servletapi-javadoc">
+ <mkdir dir="${tomcat.build}/webapps/tomcat-docs/servletapi"/>
+ <copy todir="${tomcat.build}/webapps/tomcat-docs/servletapi">
<fileset dir="${servletapi.home}/docs/api" />
</copy>
</target>
1.16 +1 -7 jakarta-tomcat-4.0/webapps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2001/07/28 01:35:39 1.15
+++ build.xml 2001/09/10 04:49:52 1.16
@@ -53,14 +53,8 @@
<!-- ================= BUILD: Compile Server Components ================= -->
<!-- Update the depends list for each subproject -->
- <target name="build" depends="build-prepare,ROOT,examples,manager,webdav"/>
-<!-- NOTE: tomcat-docs is excluded because the workaround for the Ant
- bug causes a rebuild every single time. Execute "ant tomcat-docs"
- directly if you want to create it.
--->
-<!--
<target name="build" depends="build-prepare,ROOT,examples,manager,tomcat-docs,webdav"/>
--->
+
<!-- ==================== BUILD: Execute Unit Tests ===================== -->
<target name="test" if="junit.present"
1.9 +0 -4 jakarta-tomcat-4.0/webapps/ROOT/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/05/21 21:47:27 1.8
+++ build.xml 2001/09/10 04:49:52 1.9
@@ -33,10 +33,6 @@
<exclude name="build.*"/>
</fileset>
</copy>
- <copy todir="${webapps.build}/${webapp.name}/docs">
- <fileset dir="../../catalina/docs" />
- </copy>
- <!-- FIXME: JavaDocs????? -->
</target>
1.26 +2 -5 jakarta-tomcat-4.0/webapps/ROOT/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/index.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- index.html 2001/08/10 05:40:43 1.25
+++ index.html 2001/09/10 04:49:52 1.26
@@ -82,10 +82,7 @@
</tr>
<tr>
<td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
- <a href="docs">Tomcat User Documentation</a><br>
- <a href="catalina-javadoc/index.html">Tomcat 4.0 API</a><br>
- <a href="jasper-javadoc/index.html">Jasper (JSP engine) API</a><br>
- <a href="servletapi-javadoc/index.html">Servlet 2.3 and JSP 1.2 API</a><br>
+ <a href="tomcat-docs">Tomcat Documentation</a><br>
</td>
</tr>
@@ -119,7 +116,7 @@
</blockquote>
</p>
- <p>where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="docs">Tomcat Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p>
+ <p>where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="tomcat-docs">Tomcat Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p>
<p>Included with this release are a host of sample Servlets and JSPs (with associated source code), extensive documentation (including the Servlet 2.3 and JSP 1.2 API JavaDoc), and an introductory guide to developing web applications.</p>
1.9 +0 -18 jakarta-tomcat-4.0/webapps/tomcat-docs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/08/16 23:32:55 1.8
+++ build.xml 2001/09/10 04:49:52 1.9
@@ -55,28 +55,10 @@
<!-- Catalina Functional Specifications -->
<mkdir dir="${webapps.build}/${webapp.name}/catalina/funcspecs"/>
- <!-- Catalina Javadocs -->
- <mkdir dir="${webapps.build}/${webapp.name}/catalina/docs/api"/>
- <copy todir="${webapps.build}/${webapp.name}/catalina/docs/api">
- <fileset dir="../../catalina/build/javadoc"/>
- </copy>
-
<!-- Images Subdirectory -->
<mkdir dir="${webapps.build}/${webapp.name}/images"/>
<copy todir="${webapps.build}/${webapp.name}/images">
<fileset dir="images"/>
- </copy>
-
- <!-- Jasper Javadocs -->
- <mkdir dir="${webapps.build}/${webapp.name}/jasper/docs/api"/>
- <copy todir="${webapps.build}/${webapp.name}/jasper/docs/api">
- <fileset dir="../../jasper/build/javadoc"/>
- </copy>
-
- <!-- Servlet/JSP Javadocs -->
- <mkdir dir="${webapps.build}/${webapp.name}/servletapi"/>
- <copy todir="${webapps.build}/${webapp.name}/servletapi">
- <fileset dir="${servletapi.home}/docs/api"/>
</copy>
<!-- WEB-INF Subdirectory -->
Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs build.xml
Posted by Remy Maucherat <re...@apache.org>.
> Does this mean that the parser error under Windoze (which was preventing
> the transformation) has been resolved?
It appears to be working fine with Ant 1.4.
Remy
Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs build.xml
Posted by Christopher Cain <cc...@mhsoftware.com>.
Does this mean that the parser error under Windoze (which was preventing
the transformation) has been resolved?
craigmcc@apache.org wrote:
>
> craigmcc 01/09/09 21:49:52
>
> Modified: . build.xml
> webapps build.xml
> webapps/ROOT build.xml index.html
> webapps/tomcat-docs build.xml
> Log:
> Integrate the "tomcat-docs" webapp into the default build structure, and
> resolve a timing issue on javadocs (which are not created unless you do a
> "dist" build).
>
> The new-format documentation tree is now the default, since it has been
> brought up-to-date with all of the old documentation. Ultimately, the
> static HTML versions of the old docs need to be removed from the HEAD
> branch, but that can happen after a 4.0 release.
>
> Revision Changes Path
> 1.35 +6 -3 jakarta-tomcat-4.0/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -r1.34 -r1.35
> --- build.xml 2001/07/31 05:57:37 1.34
> +++ build.xml 2001/09/10 04:49:51 1.35
> @@ -140,14 +140,17 @@
> <!-- ====================== DIST: Create Javadoc ======================== -->
> <target name="dist-javadoc">
> <ant dir="./catalina" target="javadoc"/>
> - <copy todir="${tomcat.build}/webapps/ROOT/catalina-javadoc">
> + <mkdir dir="${tomcat.build}/webapps/tomcat-docs/catalina/docs/api"/>
> + <copy todir="${tomcat.build}/webapps/tomcat-docs/catalina/docs/api">
> <fileset dir="${catalina.build}/javadoc" />
> </copy>
> <ant dir="./jasper" target="javadoc"/>
> - <copy todir="${tomcat.build}/webapps/ROOT/jasper-javadoc">
> + <mkdir dir="${tomcat.build}/webapps/tomcat-docs/jasper/docs/api"/>
> + <copy todir="${tomcat.build}/webapps/tomcat-docs/jasper/docs/api">
> <fileset dir="${jasper.build}/javadoc" />
> </copy>
> - <copy todir="${tomcat.build}/webapps/ROOT/servletapi-javadoc">
> + <mkdir dir="${tomcat.build}/webapps/tomcat-docs/servletapi"/>
> + <copy todir="${tomcat.build}/webapps/tomcat-docs/servletapi">
> <fileset dir="${servletapi.home}/docs/api" />
> </copy>
> </target>
>
>
>
> 1.16 +1 -7 jakarta-tomcat-4.0/webapps/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -r1.15 -r1.16
> --- build.xml 2001/07/28 01:35:39 1.15
> +++ build.xml 2001/09/10 04:49:52 1.16
> @@ -53,14 +53,8 @@
>
> <!-- ================= BUILD: Compile Server Components ================= -->
> <!-- Update the depends list for each subproject -->
> - <target name="build" depends="build-prepare,ROOT,examples,manager,webdav"/>
> -<!-- NOTE: tomcat-docs is excluded because the workaround for the Ant
> - bug causes a rebuild every single time. Execute "ant tomcat-docs"
> - directly if you want to create it.
> --->
> -<!--
> <target name="build" depends="build-prepare,ROOT,examples,manager,tomcat-docs,webdav"/>
> --->
> +
>
> <!-- ==================== BUILD: Execute Unit Tests ===================== -->
> <target name="test" if="junit.present"
>
>
>
> 1.9 +0 -4 jakarta-tomcat-4.0/webapps/ROOT/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.xml,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- build.xml 2001/05/21 21:47:27 1.8
> +++ build.xml 2001/09/10 04:49:52 1.9
> @@ -33,10 +33,6 @@
> <exclude name="build.*"/>
> </fileset>
> </copy>
> - <copy todir="${webapps.build}/${webapp.name}/docs">
> - <fileset dir="../../catalina/docs" />
> - </copy>
> - <!-- FIXME: JavaDocs????? -->
> </target>
>
>
>
>
>
> 1.26 +2 -5 jakarta-tomcat-4.0/webapps/ROOT/index.html
>
> Index: index.html
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/index.html,v
> retrieving revision 1.25
> retrieving revision 1.26
> diff -u -r1.25 -r1.26
> --- index.html 2001/08/10 05:40:43 1.25
> +++ index.html 2001/09/10 04:49:52 1.26
> @@ -82,10 +82,7 @@
> </tr>
> <tr>
> <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
> - <a href="docs">Tomcat User Documentation</a><br>
> - <a href="catalina-javadoc/index.html">Tomcat 4.0 API</a><br>
> - <a href="jasper-javadoc/index.html">Jasper (JSP engine) API</a><br>
> - <a href="servletapi-javadoc/index.html">Servlet 2.3 and JSP 1.2 API</a><br>
> + <a href="tomcat-docs">Tomcat Documentation</a><br>
>
> </td>
> </tr>
> @@ -119,7 +116,7 @@
> </blockquote>
> </p>
>
> - <p>where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="docs">Tomcat Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p>
> + <p>where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="tomcat-docs">Tomcat Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p>
>
> <p>Included with this release are a host of sample Servlets and JSPs (with associated source code), extensive documentation (including the Servlet 2.3 and JSP 1.2 API JavaDoc), and an introductory guide to developing web applications.</p>
>
>
>
>
> 1.9 +0 -18 jakarta-tomcat-4.0/webapps/tomcat-docs/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/build.xml,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- build.xml 2001/08/16 23:32:55 1.8
> +++ build.xml 2001/09/10 04:49:52 1.9
> @@ -55,28 +55,10 @@
> <!-- Catalina Functional Specifications -->
> <mkdir dir="${webapps.build}/${webapp.name}/catalina/funcspecs"/>
>
> - <!-- Catalina Javadocs -->
> - <mkdir dir="${webapps.build}/${webapp.name}/catalina/docs/api"/>
> - <copy todir="${webapps.build}/${webapp.name}/catalina/docs/api">
> - <fileset dir="../../catalina/build/javadoc"/>
> - </copy>
> -
> <!-- Images Subdirectory -->
> <mkdir dir="${webapps.build}/${webapp.name}/images"/>
> <copy todir="${webapps.build}/${webapp.name}/images">
> <fileset dir="images"/>
> - </copy>
> -
> - <!-- Jasper Javadocs -->
> - <mkdir dir="${webapps.build}/${webapp.name}/jasper/docs/api"/>
> - <copy todir="${webapps.build}/${webapp.name}/jasper/docs/api">
> - <fileset dir="../../jasper/build/javadoc"/>
> - </copy>
> -
> - <!-- Servlet/JSP Javadocs -->
> - <mkdir dir="${webapps.build}/${webapp.name}/servletapi"/>
> - <copy todir="${webapps.build}/${webapp.name}/servletapi">
> - <fileset dir="${servletapi.home}/docs/api"/>
> </copy>
>
> <!-- WEB-INF Subdirectory -->
>
>
>
--
- Christopher
/**
* Pleurez, pleurez, mes yeux, et fondez vous en eau!
* La moitié de ma vie a mis l'autre au tombeau.
* ---Corneille
*/
Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs build.xml
Posted by Remy Maucherat <re...@apache.org>.
> craigmcc 01/09/09 21:49:52
>
> Modified: . build.xml
> webapps build.xml
> webapps/ROOT build.xml index.html
> webapps/tomcat-docs build.xml
> Log:
> Integrate the "tomcat-docs" webapp into the default build structure, and
> resolve a timing issue on javadocs (which are not created unless you do
a
> "dist" build).
Craig, I need about 15 minutes to modify my installer script to package the
new docs.
Thanks,
Remy