craigmcc 01/05/18 18:07:54 Modified: catalina build.xml catalina/docs/dev/xdocs building.xml classloaders.xml fs-default.xml fs-invoker.xml catalina/docs/dev/xdocs/stylesheets project.xml Log: Clean up miscellaneous XML typos. Revision Changes Path 1.39 +16 -0 jakarta-tomcat-4.0/catalina/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- build.xml 2001/05/08 04:12:37 1.38 +++ build.xml 2001/05/19 01:07:49 1.39 @@ -166,6 +166,22 @@ </target> + <!-- ==================== BUILD: Catalina Developer Docs ================ --> + <target name="dev-doc"> + <delete dir="${catalina.build}/dev-doc"/> + <mkdir dir="${catalina.build}/dev-doc"/> + <mkdir dir="${catalina.build}/dev-doc/images"/> + <copy todir="${catalina.build}/dev-doc/images"> + <fileset dir="docs/dev/xdocs/images"/> + </copy> + <style basedir="docs/dev/xdocs" + destdir="${catalina.build}/dev-doc" + extension=".html" + style="stylesheets/tempoarary.xsl" + includes="*.xml"/> + </target> + + <!-- ======================= BUILD: Clean Directory ===================== --> <target name="build-clean"> <delete dir="${catalina.build}"/> 1.2 +8 -7 jakarta-tomcat-4.0/catalina/docs/dev/xdocs/building.xml Index: building.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/dev/xdocs/building.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- building.xml 2001/05/18 20:58:09 1.1 +++ building.xml 2001/05/19 01:07:50 1.2 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Craig McClanahan</author> <title>Building Catalina</title> - <revision>$Id: building.xml,v 1.1 2001/05/18 20:58:09 craigmcc Exp $</revision> + <revision>$Id: building.xml,v 1.2 2001/05/19 01:07:50 craigmcc Exp $</revision> </properties> <body> @@ -72,14 +72,14 @@ and install it.</li> <li>Add the full pathname of the <code>jdbc2_0-stdext.jar</code> file to your <code>CLASSPATH</code> environment variable.</li> - </ul> + </ul></li> <li><strong>JavaMail</strong>: <ul> <li>These steps are required <strong>only</strong> if you want to build the object factories for supporting mail-releated resource entries in your web application deployment descriptors.</li> <li>Download the JavaMail from - <a href="http://java.sun.com/products/javamail>http://java.sun.com/products/javamail</a> + <a href="http://java.sun.com/products/javamail">http://java.sun.com/products/javamail</a> and install it.</li> <li>Download the JavaBeans Activation Framework (JAF) from <a href="http://java.sun.com/beans/glasgow/jaf.html">http://java.sun.com/beans/glasgow/jaf.html</a> @@ -129,7 +129,7 @@ <li>These steps are required <strong>only</strong> if you want to build support for the Tyrex JNDI-accessed data source resources.</li> <li>Download the JTA package from - <http://java.sun.com/products/jta">http://java.sun.com/products/jta</a> + <a href="http://java.sun.com/products/jta">http://java.sun.com/products/jta</a> and install it.</li> <li>Add the full pathname of the <code>jta-spec1_0_1.jar</code> file (or equivalent) to your <code>CLASSPATH</code> environment @@ -160,7 +160,7 @@ binary distribution of each of these packages.</p> <ul> - <li><strong>Ant</strong> Build Tool</strong>: + <li><strong>Ant Build Tool</strong>: <ul> <li>Download and install the latest production release of Ant from <a href="http://jakarta.apache.org/site/binindex.html">http://jakarta.apache.org/site/binindex.html</a>. @@ -172,7 +172,7 @@ by adding <code>$ANT_HOME/bin</code> to your <code>PATH</code> environment variable. This is not currently required, but is likely to be required by later - changes in the build process. + changes in the build process.</li> </ul></li> <li><strong>Regular Expressions Library</strong>: <ul> @@ -182,6 +182,7 @@ full pathname of the directory in which REGEXP is installed.</li> </ul></li> <li><strong>Servlet API Classes</strong>: + <ul> <li>Download and install a recent nightly build of the <code>jakarta-servletapi-4</code> CVS repository from <a href="http://jakarta.apache.org/builds/jakarta-servletapi-4/nightly">http://jakarta.apache.org/builds/jakarta-servletapi-4/nightly</a></li> @@ -199,7 +200,7 @@ <p>You can download a nightly snapshot of the Tomcat 4.0 source repository at <a href="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/src">http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/src</a> or follow the directions for - <a href="http://jakarta.apache.org/site/cvsindex.html>anonymous CVS access</a> + <a href="http://jakarta.apache.org/site/cvsindex.html">anonymous CVS access</a> as described on the Jakarta web site.</p> <p>After downloading and installing the Tomcat source code, and all of the 1.2 +7 -7 jakarta-tomcat-4.0/catalina/docs/dev/xdocs/classloaders.xml Index: classloaders.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/dev/xdocs/classloaders.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- classloaders.xml 2001/05/18 20:58:09 1.1 +++ classloaders.xml 2001/05/19 01:07:51 1.2 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Craig McClanahan</author> <title>Catalina Class Loader Hierarchy</title> - <revision>$Id: classloaders.xml,v 1.1 2001/05/18 20:58:09 craigmcc Exp $</revision> + <revision>$Id: classloaders.xml,v 1.2 2001/05/19 01:07:51 craigmcc Exp $</revision> </properties> <body> @@ -75,7 +75,7 @@ <li><code>$JAVA_HOME/lib/tools.jar</code> - The Javac compiler used to compile the servlets generated from JSP pages (if present on your system).</li> - </ul> + </ul></li> <li><strong>Common</strong> - This class loader is initialized to include all unpacked classes in the <code>$CATALINA_HOME/common/classes</code> directory (if it exists), and all JAR files in the @@ -246,17 +246,17 @@ <p>For more information about class loaders in general, see the Java Language Specification, and the Javadocs for the following classes:</p> <ul> -<li><code>java.lang.ClassLoader</code> -<li><code>java.net.URLClassLoader</code> +<li><code>java.lang.ClassLoader</code></li> +<li><code>java.net.URLClassLoader</code></li> </ul> <p>The implementation class for all Catalina internal class loaders is <code>StandardClassLoader</code>. Required and available optional packages are described using the <code>Extension</code> class. For more information, -see the source code and/or Javadocs for the following classes: +see the source code and/or Javadocs for the following classes:</p> <ul> -<li><code>org.apache.catalina.loader.StandardClassLoader</code> -<li><code>org.apache.catalina.loader.Extension</code> +<li><code>org.apache.catalina.loader.StandardClassLoader</code></li> +<li><code>org.apache.catalina.loader.Extension</code></li> </ul> </subsection> 1.2 +5 -5 jakarta-tomcat-4.0/catalina/docs/dev/xdocs/fs-default.xml Index: fs-default.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/dev/xdocs/fs-default.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fs-default.xml 2001/05/18 20:58:09 1.1 +++ fs-default.xml 2001/05/19 01:07:51 1.2 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Craig McClanahan</author> <title>Default Servlet - Functional Specification</title> - <revision>$Id: fs-default.xml,v 1.1 2001/05/18 20:58:09 craigmcc Exp $</revision> + <revision>$Id: fs-default.xml,v 1.2 2001/05/19 01:07:51 craigmcc Exp $</revision> </properties> <body> @@ -30,9 +30,9 @@ <ul> <li><a href="http://java.sun.com/products/servlet/download.html"> Servlet Specification</a> (Version 2.3 PFD2)</li> - <li><a href="http://www.rfc-editor.org/rfc/rfc2046.txt>Multipurpose + <li><a href="http://www.rfc-editor.org/rfc/rfc2046.txt">Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types</a></li> - <li><a href="http://www.rfc-editor.org/rfc/rfc2616.txt>Hypertext + <li><a href="http://www.rfc-editor.org/rfc/rfc2616.txt">Hypertext Transfer Protocol -- HTTP/1.1</a></li> </ul> @@ -152,7 +152,7 @@ <li>If one of the specified welcome files exists, redirect to the path for that welcome file so that it will be served explicitly. </li> - </ul> + </ul></li> <li>If the request being processed contains an <code>If-Range</code> header, perform the processing described in the HTTP/1.1 specification to determine whether the client's information is up to date.</li> @@ -163,7 +163,7 @@ <li>If directory listings are suppressed, return HTTP status 404 (not found).</li> <li>Set the content type to <code>text/html</code>.</li> - </ul> + </ul></li> <li>Determine the range(s) to be returned, based on the existence of any <code>If-Range</code> and <code>Range</code> headers.</li> <li>If the requested resource is a directory, include an <code>ETag</code> 1.2 +6 -6 jakarta-tomcat-4.0/catalina/docs/dev/xdocs/fs-invoker.xml Index: fs-invoker.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/dev/xdocs/fs-invoker.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fs-invoker.xml 2001/05/18 20:58:09 1.1 +++ fs-invoker.xml 2001/05/19 01:07:52 1.2 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Craig McClanahan</author> <title>Invoker Servlet - Functional Specification</title> - <revision>$Id: fs-invoker.xml,v 1.1 2001/05/18 20:58:09 craigmcc Exp $</revision> + <revision>$Id: fs-invoker.xml,v 1.2 2001/05/19 01:07:52 craigmcc Exp $</revision> </properties> <body> @@ -104,7 +104,7 @@ method of the invoker servlet is called:</p> <ul> <li>Ensure that the container has called <code>setWrapper()</code>. If - not, throw a permanent <code>UnavailableException</code>. + not, throw a permanent <code>UnavailableException</code>.</li> <li>Look up and cache the <code>Context</code> that corresponds to our <code>Wrapper</code>. This is the component with which new servlet definitions and mappings will be registered.</li> @@ -140,7 +140,7 @@ <ol> <li>Ask our associated <code>Context</code> to find and return a child <code>Wrapper</code> named <code>{ServletSelector}</code>. - <li> + </li> <li>If there is no such child, skip to the next major step.</li> <li>Register a new servlet mapping for this <code>Wrapper</code>, using a URL pattern calculated as follows: @@ -211,7 +211,7 @@ <li>When an existing servlet definition is accessed by name, the request will be ultimately processed by the same servlet instance that would have processed it had a mapping to that servlet definition been used - on the request directly. + on the request directly.</li> <li>It is possible to access an anonymous servlet by class name through the invoker.</li> <li>When an anonymous servlet is accessed, the servlet instance is processed @@ -230,8 +230,8 @@ <li>It is possible to use any HTTP method (including GET and POST) that is supported by the Servlet class that is ultimately executed.</li> <li>The invoker servlet should never be asked to process a second or - subsequent request for the same <code>{ServletSelector} (because it - will have registered an appropriate servlet mapping.</li> + subsequent request for the same <code>{ServletSelector}</code> (because + it will have registered an appropriate servlet mapping.</li> </ul> </section> 1.2 +5 -5 jakarta-tomcat-4.0/catalina/docs/dev/xdocs/stylesheets/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/dev/xdocs/stylesheets/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.xml 2001/05/18 20:58:12 1.1 +++ project.xml 2001/05/19 01:07:53 1.2 @@ -9,12 +9,12 @@ <body> <menu name="Overview"> - <item name="Front Page" href="/index.html"/> + <item name="Front Page" href="index.html"/> <!-- <item name="Architecture" href="FIXME"/> --> - <item name="Building" href="/building.html"/> - <item name="Class Loaders" href="/classloaders.html"/> + <item name="Building" href="building.html"/> + <item name="Class Loaders" href="classloaders.html"/> <!-- <item name="Javadocs" href="FIXME"/> <item name="Source Organization" href="FIXME"/> @@ -22,8 +22,8 @@ </menu> <menu name="Functional Specs"> - <item name="Default Servlet" href="/fs-default.html"/> - <item name="Invoker Servlet" href="/fs-invoker.html"/> + <item name="Default Servlet" href="fs-default.html"/> + <item name="Invoker Servlet" href="fs-invoker.html"/> </menu> </body>