You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/09/15 16:07:00 UTC

cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev build.xml.txt deployment.xml installation.xml processes.xml

remm        2003/09/15 07:07:00

  Modified:    webapps/docs/appdev build.xml.txt deployment.xml
                        installation.xml processes.xml
  Log:
  - Update the most problematic items of the appdev docs.
  - Now this probably would need to be updated a bit with respect to the
    deployer (which in turn could inherit a few concepts from here).
  
  Revision  Changes    Path
  1.3       +14 -14    jakarta-tomcat-catalina/webapps/docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/build.xml.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml.txt	30 Jul 2002 03:58:28 -0000	1.2
  +++ build.xml.txt	15 Sep 2003 14:07:00 -0000	1.3
  @@ -143,10 +143,10 @@
   
   -->
   
  -  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
  -  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"/>
  -  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"/>
  -  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"/>
  +  <taskdef name="deploy"   classname="org.apache.catalina.ant.DeployTask"/>
  +  <taskdef name="list"     classname="org.apache.catalina.ant.ListTask"/>
  +  <taskdef name="reload"   classname="org.apache.catalina.ant.ReloadTask"/>
  +  <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"/>
   
   
   <!--  ==================== Compilation Control Options ==================== -->
  @@ -357,11 +357,11 @@
     <target name="install" depends="compile"
      description="Install application to servlet container">
   
  -    <install url="${manager.url}"
  -        username="${manager.username}"
  -        password="${manager.password}"
  -            path="${app.path}"
  -             war="file://${build.home}"/>
  +    <deploy url="${manager.url}"
  +       username="${manager.username}"
  +       password="${manager.password}"
  +           path="${app.path}"
  +            war="file://${build.home}"/>
   
     </target>
   
  @@ -486,10 +486,10 @@
     <target name="remove"
      description="Remove application on servlet container">
   
  -    <remove url="${manager.url}"
  -       username="${manager.username}"
  -       password="${manager.password}"
  -           path="${app.path}"/>
  +    <undeploy url="${manager.url}"
  +         username="${manager.username}"
  +         password="${manager.password}"
  +             path="${app.path}"/>
   
     </target>
   
  
  
  
  1.4       +29 -16    jakarta-tomcat-catalina/webapps/docs/appdev/deployment.xml
  
  Index: deployment.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/deployment.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- deployment.xml	15 Jan 2003 03:40:43 -0000	1.3
  +++ deployment.xml	15 Sep 2003 14:07:00 -0000	1.4
  @@ -125,14 +125,9 @@
   <p>Out of the box, a standard Tomcat 5 installation includes a variety
   of pre-installed shared library files, including:</p>
   <ul>
  -<li>The <em>JavaMail 1.2</em> (and associated <em>JavaBeans Activation
  -    Framework</em>) APIs, so you can write mail-enabled web applications.
  -    <br/><br/></li>
  -<li>The <em>JDBC 2.0 Optional Package</em> APIs, which define things like
  -    <code>javax.sql.DataSource</code>.<br/><br/></li>
   <li>The <em>Servlet 2.4</em> and <em>JSP 2.0</em> APIs that are fundamental
       to writing servlets and JavaServer Pages.<br/><br/></li>
  -<li>An <em>XML Parser</em> compliant with the JAXP (version 1.1) APIs, so
  +<li>An <em>XML Parser</em> compliant with the JAXP (version 1.2) APIs, so
       your application can perform DOM-based or SAX-based processing of
       XML documents.<br/><br/></li>
   </ul>
  @@ -178,6 +173,28 @@
   </section>
   
   
  +<section name="Tomcat Context Descriptor">
  +
  +    <blockquote><em>
  +    <p>The description below uses the variable name $CATALINA_HOME
  +    to refer to the directory into which you have installed Tomcat 5,
  +    and is the base directory against which most relative paths are
  +    resolved.  However, if you have configured Tomcat 5 for multiple
  +    instances by setting a CATALINA_BASE directory, you should use
  +    $CATALINA_BASE instead of $CATALINA_HOME for each of these
  +    references.</p>
  +    </em></blockquote>
  +
  +<p>A /META-INF/context.xml file can be used to define Tomcat specific
  +configuration options, such as loggers, data sources, session manager
  +configuration and more. This XML file must contain one Context element, which
  +will be considered as if it was the child of the Host element corresponding
  +to the Host to which the  The Tomcat configuration documentation contains
  +information on the Context element.</p>
  +
  +</section>
  +
  +
   <section name="Deployment With Tomcat 5">
   
   <p>In order to be executed, a web application must be deployed on
  @@ -215,16 +232,12 @@
   <li><em>Use "Manager" Ant Tasks In Your Build Script</em>.  Tomcat 5
       includes a set of custom task definitions for the <code>Ant</code>
       build tool that allow you to automate the execution of commands to the
  -    "Manager" web application.  These tasks are used in the example
  -    build script discussed later, and are explained there.<br/><br/></li>
  -<li><em>Add a <code>&lt;Context&gt;</code> entry in the
  -    <code>$CATALINA_HOME/conf/server.xml</code> configuration file</em>.
  -    This approach is described briefly below, and allows you to position
  -    the document root of your web application at some point other than the
  -    <code>$CATALINA_HOME/webapps/</code> directory.  You will need to restart
  -    Tomcat to have changes in this configuration file take effect.  See the
  -    administrator documentation (TODO: hyperlink) for more information on
  -    configuring new Contexts in this way.</li>
  +    "Manager" web application.  These tasks are used in the Tomcat deployer.
  +    <br/><br/></li>
  +<li><em>Use the Tomcat Deployer</em>.  Tomcat 5 includes a packaged tool
  +    bundling the Ant tasks, and can be used to automatically precompile JSPs
  +    which are part of the web application before deployment to the server.
  +    <br/><br/></li>
   </ul>
   
   <p>Deploying your app on other servlet containers will be specific to each
  
  
  
  1.4       +1 -1      jakarta-tomcat-catalina/webapps/docs/appdev/installation.xml
  
  Index: installation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/installation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- installation.xml	15 Jan 2003 03:40:43 -0000	1.3
  +++ installation.xml	15 Sep 2003 14:07:00 -0000	1.4
  @@ -38,7 +38,7 @@
   <subsection name="Tomcat">
   
   <p>Binary downloads of the <strong>Tomcat</strong> server are available from
  -<a href="http://jakarta.apache.org/downloads/binindex.html">http://jakarta.apache.org/downloads/binindex.html</a>.
  +<a href="http://jakarta.apache.org/binindex.cgi">http://jakarta.apache.org/binindex.cgi</a>.
   This manual assumes you are using the most recent release
   of Tomcat 5.  Detailed instructions for downloading and installing
   Tomcat 5 are available <a href="../RUNNING.txt">here</a>.</p>
  
  
  
  1.4       +1 -1      jakarta-tomcat-catalina/webapps/docs/appdev/processes.xml
  
  Index: processes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/processes.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- processes.xml	15 Jan 2003 03:40:43 -0000	1.3
  +++ processes.xml	15 Sep 2003 14:07:00 -0000	1.4
  @@ -118,7 +118,7 @@
   app.path=/hello
   
   # Tomcat 5 installation directory
  -catalina.home=/usr/local/jakarta-tomcat-4.0
  +catalina.home=/usr/local/jakarta-tomcat-5.0
   
   # Manager webapp username and password
   manager.username=myusername