tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/docs/config http.xml server.xml loader.xml host.xml context.xml service.xml engine.xml manager.xml ajp.xml globalresources.xml logger.xml defaultcontext.xml
Date Wed, 01 Sep 2004 22:04:29 GMT
remm        2004/09/01 15:04:29

  Modified:    webapps/docs setup.xml jndi-resources-howto.xml
                        developers.xml balancer-howto.xml
                        mbeans-descriptor-howto.xml
                        jndi-datasource-examples-howto.xml
                        windows-service-howto.xml class-loader-howto.xml
                        ssl-howto.xml project.xml building.xml
                        jasper-howto.xml status.xml index.xml
                        deployer-howto.xml changelog.xml
               webapps/docs/config http.xml server.xml loader.xml host.xml
                        context.xml service.xml engine.xml manager.xml
                        ajp.xml globalresources.xml
  Added:       webapps/docs connectors.xml
  Removed:     webapps/docs/config logger.xml defaultcontext.xml
  Log:
  - Big docs update (thanks to my train which takes forever to get from Toulouse to Nice).
  
  Revision  Changes    Path
  1.10      +4 -7      jakarta-tomcat-catalina/webapps/docs/setup.xml
  
  Index: setup.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/setup.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- setup.xml	26 Aug 2004 16:25:34 -0000	1.9
  +++ setup.xml	1 Sep 2004 22:04:27 -0000	1.10
  @@ -39,13 +39,7 @@
               administration tool and its documentation).</li>
           <li><strong>Java location</strong>: The installer will use the registry
               or the JAVA_HOME environment variable to determine the base path
  -            of the JDK or a JRE. If only a JRE (or an incorrect path) 
  -            is specified, Tomcat will run but will be unable to compile
  -            JSP pages at runtime. Either all webapps will need to be 
  -            precompiled (this can be easily done using the Tomcat deployer),
  -            or the <code>lib\tools.jar</code> file from a JDK installation
  -            must be copied to the <code>common\lib</code> path of the Tomcat 
  -            installation.
  +            of a J2SE 5 JRE.
               </li>
           <li><strong>Tray icon</strong>: When Tomcat is run as a service, there
               will not be any tray icon present when Tomcat is running. Note that
  @@ -61,6 +55,9 @@
       <p>The installer will create shortcuts allowing starting and configuring 
          Tomcat. It is important to note that the Tomcat administration web 
          application can only be used when Tomcat is running.</p>
  +
  +    <p>If using a J2SE 1.4 JRE, the compatibility package must be downloaded and
  +       expanded inside the folder where Tomcat was installed.</p>
   
     </section>
   
  
  
  
  1.8       +5 -10     jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml
  
  Index: jndi-resources-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jndi-resources-howto.xml	26 Aug 2004 23:16:50 -0000	1.7
  +++ jndi-resources-howto.xml	1 Sep 2004 22:04:27 -0000	1.8
  @@ -500,20 +500,15 @@
   
       <h3>4.  Configure Tomcat's Resource Factory</h3>
   
  -    <p>To configure Tomcat's resource factory, add an elements like this to the
  -    <code>$CATALINA_HOME/conf/server.xml</code> file, nested inside the
  -    <code>Context</code> element for this web application.</p>
  +    <p>To configure Tomcat's resource factory, add an element like this to the
  +    <code>/META-INF/context.xml</code> file in the web application.</p>
   <source>
   &lt;Context ...&gt;
     ...
     &lt;Resource name="jdbc/EmployeeDB" auth="Container"
  -            type="javax.sql.DataSource"
  -            username="dbusername"
  -            password="dbpassword"
  -            driverClassName="org.hsql.jdbcDriver"
  -            url="jdbc:HypersonicSQL:database"
  -            maxActive="8"
  -            maxIdle="4"/&gt;
  +            type="javax.sql.DataSource" username="dbusername" password="dbpassword"
  +            driverClassName="org.hsql.jdbcDriver" url="jdbc:HypersonicSQL:database"
  +            maxActive="8" maxIdle="4"/&gt;
     ...
   &lt;/Context&gt;
   </source>
  
  
  
  1.6       +1 -2      jakarta-tomcat-catalina/webapps/docs/developers.xml
  
  Index: developers.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/developers.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- developers.xml	10 Jun 2004 01:04:06 -0000	1.5
  +++ developers.xml	1 Sep 2004 22:04:27 -0000	1.6
  @@ -40,8 +40,7 @@
         <li>Jean-Frederic Clere (jfclere): Connectors</li>
         <li>Kin-Man Chung (kinman): Jasper</li>
         <li>Mladen Turk (mturk): Connectors</li>
  -      <li>Remy Maucherat (remm): Catalina, Connectors, Docs, Release 
  -          Manager</li>
  +      <li>Remy Maucherat (remm): Catalina, Connectors, Docs</li>
         <li>Tim Funk (funkman): Catalina, Docs</li>
         <li>Yoav Shapira (yoavs): Docs, JMX, Catalina, balancer, Release Manager</li>
       </ul>
  
  
  
  1.5       +9 -88     jakarta-tomcat-catalina/webapps/docs/balancer-howto.xml
  
  Index: balancer-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/balancer-howto.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- balancer-howto.xml	12 Feb 2004 16:49:02 -0000	1.4
  +++ balancer-howto.xml	1 Sep 2004 22:04:27 -0000	1.5
  @@ -17,104 +17,25 @@
   
   <section name="Table of Contents">
   <p>
  -<a href="#Using the JK native connector">
  +<a href="#Using the JK 1.2.x native connector">
   Using the JK native connector</a><br />
  -<a href="#Using Apache 2 with mod_proxy and mod_rewrite">
  -Using Apache 2 with mod_proxy and mod_rewrite</a><br />
  +<a href="#Using Apache httpd 2.2 with mod_proxy">
  +Using Apache httpd 2.2 and mod_proxy</a><br />
   <a href="#Using the balancer webapp">Using the balancer webapp</a><br />
   </p>
   </section>
   
  -<section name="Using the JK native connector">
  +<section name="Using the JK 1.2.x native connector">
   
  -Please refer to the JK documentation.
  +Please refer to the JK 1.2.x documentation.
   
   </section>
   
  -<section name="Using Apache 2 with mod_proxy and mod_rewrite">
  +<section name="Using Apache httpd 2.2 with mod_proxy">
   
  -<subsection name="Overview">
  -
  -<p>
  -It is possible to use Apache 2, with mod_proxy and mod_rewrite, to load balance
  -requests to a set of Tomcat servers, using the HTTP protocol rather than AJP.
  -Although it does not have any advanced load balancing or failover strategies,
  -it is very easy to setup.
  -</p>
  -
  -<p>
  -Thanks to Pier Fumagalli for helping document this method. 
  -</p>
  -
  -</subsection>
  -
  -<subsection name="Configuring Tomcat">
  -
  -<p>
  -Edit <code>$CATALINA_HOME/conf/server.xml</code>, and find the Engine element 
  -and add an attribute called jvmRoute. Set its value to LB1.
  -</p>
  -
  -<source>
  -&lt;Engine name="MainEngine" defaultHost="localhost" jvmRoute="LB1"&gt;
  -</source>
  -
  -<p>
  -Do the same for each server in the group, giving each a different ID: LB2, 
  -LB3, ...
  -</p>
  -
  -</subsection>
  -
  -<subsection name="Apache 2 configuration">
  -
  -<p>
  -First we must create a rewrite map (for mod_rewrite) (balancing.conf):
  -</p>
  -
  -<source>
  -LB1  tomcat1.foo.com:8080
  -LB2  tomcat2.foo.com:8080
  -LB3  tomcat3.foo.com:8888
  -ALL  tomcat1.foo.com:8080|tomcat2.foo.com:8080|tomcat3.foo.com:8888
  -</source>
  -
  -<p>
  -This means each worker is associated with a specific server and port. The name
  -associated with each node <strong>must</strong> match the one used for the 
  -jvmRoute attribute specified on the Engine element of each node's server.xml.
  -</p>
  -
  -<p>
  -In <code>httpd.conf</code>:
  -</p>
  -
  -<source>RewriteMap SERVERS rnd:/usr/local/httpd/conf/servers.conf
  -
  -&lt;Location /webapp&gt;
  -    RewriteEngine On
  -
  -    RewriteCond "%{HTTP_COOKIE}"                  "(^|;\s*)jsessionid=\w*\.(\w+)($|;)"
  -    RewriteRule "(.*)"                            "http://${SERVERS:%2}%{REQUEST_URI}"  [P,L]
  -    RewriteRule "^.*;jsessionid=\w*\.(\w+)($|;)"  "http://${SERVERS:$1}%{REQUEST_URI}"  [P,L]
  -    RewriteRule "(.*)"                            "http://${SERVERS:ALL}%{REQUEST_URI}" [P,L]
  -&lt;/Location&gt;
  -</source>
  -
  -<p>
  -The first entry means that we want to load the server map which we
  -created. The "ALL" entry in the server map will affect those users who
  -do not yet have a session ID. Meaning the session cookie which Tomcat
  -creates will have the LBx id in it, the other entries will govern which
  -host we're directed to.
  -</p>
  -
  -<p>The rewrite rules govern those users with a cookie. Apache will
  -rewrite the URL and point you to one of the instances of Tomcat. This
  -is vodoo but it should work.
  -</p>
  -
  -</subsection>
  +Please refer to the mod_proxy documentation for Apache 2.2. This supports either
  +HTTP or AJP load balancing. This new version of mod_proxy is also useable with
  +Apache httpd 2.0.
   
   </section>
   
  
  
  
  1.3       +5 -21     jakarta-tomcat-catalina/webapps/docs/mbeans-descriptor-howto.xml
  
  Index: mbeans-descriptor-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/mbeans-descriptor-howto.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mbeans-descriptor-howto.xml	20 Sep 2003 20:47:21 -0000	1.2
  +++ mbeans-descriptor-howto.xml	1 Sep 2004 22:04:27 -0000	1.3
  @@ -18,35 +18,19 @@
   <p>Tomcat 5 uses JMX MBeans as the technology for implementing 
   manageability of Tomcat.</p>
   
  -<p>The descriptions of JMX MBeans for Catalina are in the 
  -org.apache.catalina.mbeans.mbeans-descriptor.xml file.</p>
  +<p>The descriptions of JMX MBeans for Catalina are in the mbeans-descriptor.xml 
  +file in each package.</p>
   
   <p>You will need to add MBean descriptions for your custom components 
   in order to avoid a "ManagedBean is not found" exception.</p>
   
   </section>
   
  -<section name="Including your own mbean-descriptor files">
  -
  -<p>You may configure custom components (e.g. Valves/Realms) by including 
  -your own mbean-descriptor file(s), and setting the "descriptors" 
  -attribute to point to a ';' separated list of paths (in the ClassLoader sense) 
  -of files to add to the default list under ServerLifecycleListener definition 
  -in server.xml.</p>
  -
  -<source>
  -&lt;Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
  -          debug="0"
  -          descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"/&gt;
  -</source>          
  -
  -
  -</section>
  -
  -<section name="Adding MBean description to Catalina's mbean-descriptors.xml">
  +<section name="Adding MBean descriptions">
   
   <p>You may also add MBean descriptions for custom components in 
  -org.apache.catalina.mbeans.mbeans-descriptor.xml file.</p>
  +a mbeans-descriptor.xml file, located in the same package as the class files
  +it describes.</p>
   
   <source>
     &lt;mbean         name="LDAPRealm"
  
  
  
  1.12      +3 -1      jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml
  
  Index: jndi-datasource-examples-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jndi-datasource-examples-howto.xml	30 Aug 2004 19:34:10 -0000	1.11
  +++ jndi-datasource-examples-howto.xml	1 Sep 2004 22:04:27 -0000	1.12
  @@ -64,7 +64,9 @@
   <li>Jakarta-Commons Pool</li>
   </ul>
   These libraries are located in a single JAR at 
  -<code>$CATALINA_HOME/common/lib/naming-factory-dbcp.jar</code>.
  +<code>$CATALINA_HOME/common/lib/naming-factory-dbcp.jar</code>. However,
  +only the classes needed for connection pooling have been included, and the
  +packages have been renamed to avoid interfering with applications.
   </p>
   
   </subsection>
  
  
  
  1.2       +5 -0      jakarta-tomcat-catalina/webapps/docs/windows-service-howto.xml
  
  Index: windows-service-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/windows-service-howto.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- windows-service-howto.xml	10 Aug 2004 09:34:44 -0000	1.1
  +++ windows-service-howto.xml	1 Sep 2004 22:04:27 -0000	1.2
  @@ -13,6 +13,11 @@
   
   <body>
    
  +<section name="NOTICE">
  +<p>
  +    <b>This section of the documentation applies to procrun 1.0, and is now obsolete.</b>
  +</p>
  +</section>
   <section name="Tomcat5 service application">
   <p>
       <b>Tomcat5</b> is a service application for running Tomcat5 as NT service.
  
  
  
  1.12      +31 -24    jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml
  
  Index: class-loader-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- class-loader-howto.xml	16 Jun 2004 18:04:39 -0000	1.11
  +++ class-loader-howto.xml	1 Sep 2004 22:04:27 -0000	1.12
  @@ -45,7 +45,7 @@
   resources.  This mechanism is used to provide the functionality defined in the
   Servlet Specification, version 2.4 -- in particular, Sections 9.4 and 9.6.</p>
   
  -<p>In a Java 2 (that is, JDK 1.2 or later) environment, class loaders are
  +<p>In a J2SE 2 (that is, J2SE 1.2 or later) environment, class loaders are
   arranged in a parent-child tree.  Normally, when a class loader is asked to
   load a particular class or resource, it delegates the request to a parent
   class loader first, and then looks in its own repositories only if the parent
  @@ -112,19 +112,16 @@
       be placed here.  All unpacked classes and resources in
       <code>$CATALINA_HOME/common/classes</code>, as well as classes and
       resources in JAR files under the
  -    <code>$CATALINA_HOME/commons/endorsed</code> and
  +    <code>$CATALINA_HOME/commons/endorsed</code>,
  +    <code>$CATALINA_HOME/commons/i18n</code> and
       <code>$CATALINA_HOME/common/lib</code> directories,
       are made visible through this
       class loader.  By default, that includes the following:
       <ul>
  -    <li><em>ant.jar</em> - Apache Ant.</li>
  -    <li><em>commons-collection.jar</em> - Jakarta commons collection.</li>
  -    <li><em>commons-dbcp.jar</em> - Jakarta commons DBCP, providing a
  -        JDBC connection pool to web applications.</li>
       <li><em>commons-el.jar</em> - Jakarta commons el, implementing the 
           expression language used by Jasper.</li>
  -    <li><em>commons-pool.jar</em> - Jakarta commons pool.</li>
       <li><em>jasper-compiler.jar</em> - The JSP 2.0 compiler.</li>
  +    <li><em>jasper-compiler-jdt.jar</em> - The Eclipse JDT Java compiler.</li>
       <li><em>jasper-runtime.jar</em> - The JSP 2.0 runtime.</li>
       <li><em>jsp-api.jar</em> - The JSP 2.0 API.</li>
       <li><em>naming-common.jar</em> - The JNDI implementation used by Tomcat 5
  @@ -132,12 +129,19 @@
       <li><em>naming-factory.jar</em> - The JNDI implementation used by Tomcat 5
           to resolve references to enterprise resources (EJB, connection 
           pools).</li>
  +    <li><em>naming-factory-dbcp.jar</em> - Jakarta commons DBCP, providing a
  +        JDBC connection pool to web applications. The classes have been moved
  +        out of their default org.apache.commons package.</li>
  +    <li><em>naming-java.jar</em> - Handler for the java: namespace.</li>
       <li><em>naming-resources.jar</em> - The specialized JNDI naming context
           implementation used to represent the static resources of a web
  -        application.</li>
  -    <li><em>servlet-api.jar</em> - The Servlet and JSP API classes.</li>
  -    <li><em>xerces.jar</em> - The XML parser that is visible by default to
  -        Tomcat internal classes and to web applications.</li>
  +        application. This is not related to the support of the J2EE ENC, and
  +        cannot be removed.</li>
  +    <li><em>servlet-api.jar</em> - The Servlet 2.4 API.</li>
  +    <li><em>tomcat-i18n-**.jar</em> - Optional JARs containing resource bundles
  +        for other languages. As default bundles are also included in each 
  +        individual JAR, they can be safely removed if no internationalization
  +        of messages is needed.</li>
       </ul></li>
   <li><strong>Catalina</strong> - This class loader is initialized to include
       all classes and resources required to implement Tomcat 5 itself.  These
  @@ -150,20 +154,22 @@
       <ul>
       <li><em>catalina.jar</em> - Implementation of the Catalina servlet
           container portion of Tomcat 5.</li>
  -    <li><em>jakarta-regexp-X.Y.jar</em> - The binary distribution of the
  -        <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a>
  -        regular expression processing library, used in the implementation of
  -        request filters.</li>
  +    <li><em>catalina-ant.jar</em> - Some Ant tasks which can be used to
  +        manage Tomcat using the manager web application.</li>
  +    <li><em>catalina-optional.jar</em> - Some optional components of
  +        Catalina.</li>
  +    <li><em>commons-modeler.jar</em> - A model MBeans implementation used
  +        by Tomcat to expose its internal objects through JMX.</li>
       <li><em>servlets-xxxxx.jar</em> - The classes associated with each
           internal servlet that provides part of Tomcat's functionality.
           These are separated so that they can be completely removed if the
           corresponding service is not required, or they can be subject to
           specialized security manager permissions.</li>
  -    <li><em>tomcat-coyote.jar</em> - Coyote connector for Tomcat 5.</li>
  -    <li><em>tomcat-http11.jar</em> - Standalone Java HTTP/1.1 
  +    <li><em>tomcat-coyote.jar</em> - Coyote API.</li>
  +    <li><em>tomcat-http.jar</em> - Standalone Java HTTP/1.1 
           connector.</li>
  -    <li><em>tomcat-jk2.jar</em> - Classes for the Java portion of the
  -        <code>JK 2</code> web server connector, which allows Tomcat to
  +    <li><em>tomcat-ajp.jar</em> - Classes for the Java portion of the
  +        <code>AJP</code> web server connector, which allows Tomcat to
           run behind web servers such as Apache and iPlanet iAS and iWS.</li>
       <li><em>tomcat-util.jar</em> - Utility classes required by some
           Tomcat connectors.</li>
  @@ -196,7 +202,7 @@
   this class loader will look in the local repositories <strong>first</strong>,
   instead of delegating before looking.  There are exceptions. Classes which are
   part of the JRE base classes cannot be overriden. For some classes (such as
  -the XML parser components in JDK 1.4+), the JDK 1.4 endorsed feature can be 
  +the XML parser components in J2SE 1.4+), the J2SE 1.4 endorsed feature can be 
   used used 
   (see the common classloader definition above). In addition, for the following
   class patterns, the classloader will always delegate first 
  @@ -221,6 +227,7 @@
   <li><em>/WEB-INF/lib/*.jar</em> of your web application</li>
   <li><em>$CATALINA_HOME/common/classes</em></li>
   <li><em>$CATALINA_HOME/common/endorsed/*.jar</em></li>
  +<li><em>$CATALINA_HOME/common/i18n/*.jar</em></li>
   <li><em>$CATALINA_HOME/common/lib/*.jar</em></li>
   <li><em>$CATALINA_BASE/shared/classes</em></li>
   <li><em>$CATALINA_BASE/shared/lib/*.jar</em></li>
  @@ -229,16 +236,16 @@
   </section>
   
   
  -<section name="XML Parsers and JDK 1.4">
  +<section name="XML Parsers and J2SE 1.4">
   
  -<p>Among many other changes, the JDK 1.4 release packages the JAXP APIs, and
  -a version of Xerces, inside the JDK.  This has impacts on applications that
  +<p>Among many other changes, the J2SE 1.4 release packages the JAXP APIs, and
  +a version of Xerces, inside the JRE.  This has impacts on applications that
   wish to use their own XML parser.</p>
   
   <p>In previous versions of Tomcat 5, you could simply replace the XML parser
   in the <code>$CATALINA_HOME/common/lib</code> directory to change the parser
   used by all web applications.  However, this technique will not be effective
  -when you are running on JDK 1.4, because the usual class loader delegation
  +when you are running on J2SE 1.4, because the usual class loader delegation
   process will always choose the implementation inside the JDK in preference
   to this one.</p>
   
  
  
  
  1.12      +1 -1      jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml
  
  Index: ssl-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ssl-howto.xml	26 Jan 2004 02:11:09 -0000	1.11
  +++ ssl-howto.xml	1 Sep 2004 22:04:27 -0000	1.12
  @@ -284,7 +284,7 @@
   <source>
   &lt;-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
   &lt;!--
  -&lt;Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
  +&lt;Connector 
              port="8443" minProcessors="5" maxProcessors="75"
              enableLookups="true" disableUploadTimeout="true"
              acceptCount="100" debug="0" scheme="https" secure="true";
  
  
  
  1.23      +2 -1      jakarta-tomcat-catalina/webapps/docs/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/project.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- project.xml	19 Aug 2004 19:43:03 -0000	1.22
  +++ project.xml	1 Sep 2004 22:04:27 -0000	1.23
  @@ -2,7 +2,7 @@
   <project name="Apache Jakarta Tomcat Documentation - Top Level Directory"
           href="http://jakarta.apache.org/tomcat/">
   
  -    <title>The Apache Jakarta Tomcat 5 Servlet/JSP Container</title>
  +    <title>The Apache Jakarta Tomcat 5.5 Servlet/JSP Container</title>
   
       <logo href="/images/tomcat.gif">
         The Apache Jakarta Tomcat Servlet/JSP Container
  @@ -38,6 +38,7 @@
           <item name="17) Default Servlet"    href="default-servlet.html"/>
           <item name="18) Clustering"         href="cluster-howto.html"/>
           <item name="19) Load Balancer"      href="balancer-howto.html"/>
  +        <item name="20) Connectors"         href="connectors.html"/>
       </menu>
   
       <menu name="Reference">
  
  
  
  1.5       +3 -3      jakarta-tomcat-catalina/webapps/docs/building.xml
  
  Index: building.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/building.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- building.xml	29 Aug 2004 14:27:46 -0000	1.4
  +++ building.xml	1 Sep 2004 22:04:27 -0000	1.5
  @@ -41,17 +41,17 @@
   
   </section>
   
  -<section name="Install Apache Ant 1.5.x">
  +<section name="Install Apache Ant 1.6.x">
   
   <p>
  -Download a binary distribution of Ant 1.5.x from 
  +Download a binary distribution of Ant 1.6.x from 
   <a href="http://ant.apache.org/bindownload.cgi">here</a>.
   </p>
   
   <p>
   Unpack the binary distribution into a convenient location so that the
   Ant release resides in its own directory (conventionally named
  -"jakarta-ant-1.5.1").  For the purposes of the remainder of this document,
  +"jakarta-ant-1.6.2").  For the purposes of the remainder of this document,
   the symbolic name "${ant.home}" is used to refer to the full pathname of
    the release directory.
   </p>
  
  
  
  1.15      +15 -9     jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml
  
  Index: jasper-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jasper-howto.xml	18 Jun 2004 23:49:21 -0000	1.14
  +++ jasper-howto.xml	1 Sep 2004 22:04:27 -0000	1.15
  @@ -25,7 +25,7 @@
   
   <section name="Introduction">
   
  -<p>Tomcat 5.0 uses the Jasper 2 JSP Engine to implement
  +<p>Tomcat 5.5 uses the Jasper 2 JSP Engine to implement
   the <a href="http://java.sun.com/products/jsp/">JavaServer Pages 2.0</a>
   specification.</p>
   
  @@ -45,9 +45,10 @@
   <li><strong>Recompile JSP when included page changes</strong> - Jasper 2
   can now detect when a page included at compile time from a JSP has changed
   and then recompile the parent JSP.</li>
  -<li><strong>Ant used to compile JSP pages</strong> - The
  -<a href="http://jakarta.apache.org/ant/">Ant Build Tool</a> is now
  -used to perform JSP java source code compilation.</li>
  +<li><strong>JDT used to compile JSP pages</strong> - The
  +Eclipse JDT Java compiler is now used to perform JSP java source code
  +compilation. This compiler loads source dependencies from the container
  +classloader. Ant and javac can still be used.</li>
   </ul>
   </p>
   
  @@ -73,8 +74,9 @@
   <code>300</code> seconds.</li>
   
   <li><strong>compiler</strong> - Which compiler Ant should use to compile JSP
  -pages.  See the Ant documenation for more information. Default
  -<code>javac</code>.</li>
  +pages.  See the Ant documenation for more information. If the value is not set,
  +then the default Eclipse JDT Java compiler will be used instead of using Ant. 
  +No default value.</li>
   
   <li><strong>classdebuginfo</strong> - Should the class file be compiled with
   debugging information?  <code>true</code> or <code>false</code>, default
  @@ -113,7 +115,7 @@
   <code>true</code> or <code>false</code>, default <code>true</code>.</li>
   
   <li><strong>reloading</strong> - Should Jasper check for modified JSPs?
  -<code>true</code> or <code>false</code>, default <code>true</code>.</li>
  +<code>true</code> or <code>false</code>, default <code>false</code>.</li>
   
   <li><strong>scratchdir</strong> - What scratch directory should we use when
   compiling JSP pages? Default is the work directory for the current web
  @@ -131,8 +133,8 @@
   <p>When using Jasper 2 in a production Tomcat server you should consider
   making the following changes from the default configuration.
   <ul>
  -<li><strong>development</strong> - To enable background compilation of JSP
  -pages set this to <code>false</code>.</li>
  +<li><strong>development</strong> - To disable on access checks for JSP
  +pages compilation set this to <code>false</code>.</li>
   <li><strong>fork</strong> - The internal JVM javac compiler used by Ant
   has a known memory leak. And Ant requires that java compiles be synchronized,
   i.e. only one JSP page can be compiled at a time.  Set fork to
  @@ -143,6 +145,9 @@
   collected by the JVM Tomcat is running in. This also works around known 
   issues with javac, including memory leaking, as well as JAR file locking
   on Windows.</li>
  +<li><strong>reloading</strong> - To disable background compilation of JSP
  +pages, which uses one thread per web application, set this to 
  +<code>false</code>.</li>
   </ul>
   </p>
   
  @@ -253,6 +258,7 @@
   <a href="http://oss.software.ibm.com/developerworks/opensource/jikes/">
   Jikes</a> to compile JSP pages:
   <ul>
  +<li>Download and install the Ant JAR in <code>$CATALINA_BASE/common/lib</code>.</li>
   <li>Download and install jikes. jikes must support the -encoding option.
   Execute <code>jikes -help</code> to verify that it was built with support
   for <code>-encoding</code>.</li>
  
  
  
  1.8       +6 -12     jakarta-tomcat-catalina/webapps/docs/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/status.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- status.xml	31 Aug 2004 19:55:17 -0000	1.7
  +++ status.xml	1 Sep 2004 22:04:28 -0000	1.8
  @@ -31,7 +31,7 @@
       <p>
         <b>Tomcat 5.0.27</b> was released on June 17th, 2004.  At that time, the TOMCAT_5_0
         branch was tagged in CVS, and work on Tomcat 5.5 began.  Until the first stable 
  -      release of Tomcat 5.1, building from
  +      release of Tomcat 5.5, building from
         CVS head may be unstable or broken: use the TOMCAT_5_0 branch tag to build
         the Tomcat 5.0 releases.
       </p>
  @@ -94,20 +94,14 @@
     <section name="TODO List">
   
       <status>
  -      <item priority="High" owner="remm, costin">
  -        Refactor ClassLoaders for Tomcat 5.1.
  -      </item>
  -      <item priority="High" owner="remm">
  -        Refactor application deployment for Tomcat 5.1.
  -      </item>
  -      <item priority="High" owner="remm">
  -        Remove Logger interface and implementation, use commons-logging everywhere.
  +      <item priority="High" owner="costin">
  +        Refactor ClassLoaders for Tomcat 5.5 to allow container plugins.
         </item>
         <item priority="Medium" owner="fhanik">
  -        Enhance Cluster functionality for Tomcat 5.1.
  +        Enhance Cluster functionality for Tomcat 5.5.
         </item>
  -      <item priority="Low" owner="yoavs, funkman">
  -        Update docs, site, and FAQ for Tomcat 5.1 once ready.
  +      <item priority="Low" owner="yoavs, remm, funkman">
  +        Update docs, site, and FAQ for Tomcat 5.5 once ready.
         </item>
         <item priority="Low" owner="everyone">
           Continue fixing bugs ;)
  
  
  
  1.18      +2 -1      jakarta-tomcat-catalina/webapps/docs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- index.xml	20 Aug 2004 11:21:04 -0000	1.17
  +++ index.xml	1 Sep 2004 22:04:28 -0000	1.18
  @@ -18,7 +18,8 @@
   <section name="Introduction">
   
   <p>This is the top-level entry point of the documentation bundle for the
  -<strong>Apache Jakarta Tomcat</strong> Servlet/JSP container.  Tomcat version 5 implements the
  +<strong>Apache Jakarta Tomcat</strong> Servlet/JSP container.  Tomcat version 5.5 
  +implements the
   Servlet 2.4 and JavaServer Pages 2.0 specifications from the
   <a href="http://www.jcp.org">Java Community Process</a>, and includes many
   additional features that make it a useful platform for developing and deploying
  
  
  
  1.7       +4 -1      jakarta-tomcat-catalina/webapps/docs/deployer-howto.xml
  
  Index: deployer-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/deployer-howto.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- deployer-howto.xml	26 Aug 2004 16:34:06 -0000	1.6
  +++ deployer-howto.xml	1 Sep 2004 22:04:28 -0000	1.7
  @@ -102,6 +102,9 @@
           name corresponding to the context path of the previously deployed
           application) is added in the 
           <code>$CATALINA_HOME/conf/[enginename]/[hostname]/</code> folder.</li>
  +    <li>Undeployment of the web application if its document base is deleted
  +        (on Windows, this assumes that anti locking features are enabled, otherwise
  +        it is not possible to delete the resources of a running web application).</li>
   </ul>
   Note: Web application reloading can also be configured in the loader, in which
   case loaded classes will be tracked for changes.
  @@ -134,7 +137,7 @@
       <li><code>compile</code> (default): Compile and validate the web 
           application. This can be used standalone, and does not need a running
           Tomcat server. The compiled application will only run on the associated
  -        Tomcat 5.0.x server release, and is not guaranteed to work on another
  +        Tomcat 5.5.x server release, and is not guaranteed to work on another
           Tomcat release, as the code generated by Jasper depends on its runtime
           component. It should also be noted that this target will also compile
           automatically any Java source file located in the 
  
  
  
  1.96      +23 -14    jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- changelog.xml	1 Sep 2004 18:47:54 -0000	1.95
  +++ changelog.xml	1 Sep 2004 22:04:28 -0000	1.96
  @@ -16,8 +16,8 @@
   
   <section name="Preface">
     <p>
  -  This is the Changelog for Tomcat 5.5.x.  For changes in Tomcat version 5.0.x,
  -  which preceded version 5.5.0, please see
  +  This is the Changelog for Tomcat 5.5.x, which was branched based on Tomcat 5.0.27.
  +  For changes in Tomcat version 5.0.x, which preceded version 5.5.0, please see
     <a href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/changelog.html">The
     Tomcat 5.0.x Changelog</a>.  As maintenance releases are cut on the 5.0.x branch,
     most fixes will be ported into a 5.5.x release and noted both here and in the
  @@ -26,7 +26,6 @@
     </p>
   </section>
   
  -
   <section name="Tomcat 5.5.1 (yoavs)">
     <subsection name="General">
       <changelog>
  @@ -35,6 +34,10 @@
   
     <subsection name="Catalina">
       <changelog>
  +      <fix>
  +        Allow overriding the location of the default context file, similar to the default
  +        web.xml. (remm)
  +      </fix>
         <update>
           Backport if-else logic for SSI servlet from 4.1 (funkman)
         </update>
  @@ -46,6 +49,9 @@
   
     <subsection name="Jasper">
       <changelog>
  +      <fix>
  +        Use the "compiler" parameter to allow specifying that Ant should be used. (remm)
  +      </fix>
       </changelog>
     </subsection>
   
  @@ -54,6 +60,9 @@
   
     <subsection name="Webapps">
       <changelog>
  +      <update> 
  +        Major documentation update with current Tomcat 5.5 changes. (remm)
  +      </update>
       </changelog>
     </subsection>
   </section>
  @@ -67,14 +76,14 @@
         <update>
           Designed and tested Tomcat on J2SE 5.0 (aka JDK 1.5). (everyone)
         </update>
  -      <update>
  +      <update> 
           Bundled Eclipse JDT (new dependency) to allow Tomcat to run on a JRE only, i.e. no JDK required. (remm)
         </update>
  -      <update>
  +      <update> 
           Repackage commons-dbcp and its dependencies as a sigle smaller WAR, with renamed packages. (remm)
         </update>
  -      <update>
  -        Removed dependencies on commons-digester, commons-beanutils, and commons-collections.
  +      <update> 
  +        Removed dependencies on commons-digester, commons-beanutils, and commons-collections. 
           The relevant digester functionality is now merged in tomcat-util. (remm)
         </update>
       </changelog>
  @@ -94,21 +103,21 @@
         <update>
           Extensively profiled and optimized the server startup performance as well as the request mapping and processing pipeline. (remm)
         </update>
  -      <update>
  +      <update> 
           The container will now always process a /META-INF/context.xml resource, unless the webapp has a specified external context file. (remm)
         </update>
  -      <update>
  +      <update> 
           New default configuration mechanism for web applications, replacing DefaultContext. This uses a
           shared context file located in conf/context.xml. (remm)
         </update>
  -      <update>
  +      <update> 
           Revamped deployer, alloying full hotdeploy (note: on Windows, this requires the anti file locking
           features). (remm)
         </update>
  -      <update>
  +      <update> 
           Remove verbosity from the JNDI resources configuration, by allowing arbitrary attributes on the Resource element. (remm)
         </update>
  -      <update>
  +      <update> 
           Simpler Valve interface, to allow smaller stack traces and reducing the amount of method calls. (remm)
         </update>
       </changelog>
  @@ -119,11 +128,11 @@
   
     <subsection name="Jasper">
       <changelog>
  -      <update>
  +      <update> 
           Eclipse JDT is now the default Java compiler in Jasper. Source dependencies are now loaded from
           the container classloader, and compilation times are much faster. (remm)
         </update>
  -      <update>
  +      <update> 
           Jasper development mode should now have acceptable performance for heavily accessed pages.
           Precompiling JSPs is still significantly more efficient, however. (remm)
         </update>
  
  
  
  1.1                  jakarta-tomcat-catalina/webapps/docs/connectors.xml
  
  Index: connectors.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE document [
    <!ENTITY project SYSTEM "project.xml">
  ]>
  <document url="connectors.html">
  
      &project;
  
      <properties>
          <author email="remm@apache.org">Remy Maucherat</author>
          <title>Connectors How To</title>
      </properties>
  
  <body>
  
  <section name="Introduction">
  
  <p>Choosing a connector to use with Tomcat can be difficult. This page will
  list the connectors which are supported with this Tomcat release, and will
  hopefully help you make the right choice according to your needs.</p>
  
  </section>
  
  <section name="Standalone HTTP/1.1">
  
  <p>The HTTP connector is setup by default with Tomcat, and is ready to use.</p>
  
  </section>
  
  <section name="Clustered HTTP/1.1">
  
  <p>The HTTP connector is setup by default with Tomcat, and is ready to use. A HTTP 
  load balancer <b>with support for web sessions stickiness</b> must be installed to
  direct the traffic to the Tomcat servers.</p>
  
  <p>
  Tomcat supports mod_proxy (included by default in Apache httpd 2.2) as the load 
  balancer. This version of mod_proxy can also be used with Apache httpd 2.0. It should
  be noted that the performance of HTTP proxying is usually lower than the performance
  of AJP, so AJP clustering is often preferable.
  </p>
  
  </section>
  
  <section name="Standalone AJP">
  
  <p>When using a single server, the performance when using a native webserver in 
  front of the Tomcat instance is most of the time significantly worse than a
  standalone Tomcat with its default HTTP connector, even if a large part of the web
  application is made of static files. If integration with the native webserver is 
  needed for any reason, an AJP connector will provide faster performance than 
  proxied HTTP.</p>
  
  <p>The native connectors supported with this Tomcat release are:
  <ul>
  <li>mod_jk 1.2.x</li>
  <li>mod_proxy on Apache httpd 2.2, with AJP support</li>
  </ul>
  </p>
  
  </section>
  
  <section name="Clustered AJP">
  
  <p>AJP clustering is the most efficient from the Tomcat perspective. It is otherwise
  functionally equivalent to HTTP clustering.</p>
  
  </section>
  
  </body>
  
  </document>
  
  
  
  1.13      +1 -1      jakarta-tomcat-catalina/webapps/docs/config/http.xml
  
  Index: http.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- http.xml	1 Sep 2004 19:20:12 -0000	1.12
  +++ http.xml	1 Sep 2004 22:04:29 -0000	1.13
  @@ -29,7 +29,7 @@
   
     <p>If you wish to configure the <strong>Connector</strong> that is used
     for connections to web servers using the AJP protocol (such as the
  -  <code>mod_jk</code> connector for Apache 1.3), see
  +  <code>mod_jk 1.2.x</code> connector for Apache 1.3), see
     <a href="ajp.html">here</a> instead.</p>
   
     <p>At server startup time, this <strong>Connector</strong> will create a
  
  
  
  1.5       +4 -1      jakarta-tomcat-catalina/webapps/docs/config/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/server.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- server.xml	1 Sep 2004 19:20:12 -0000	1.4
  +++ server.xml	1 Sep 2004 22:04:29 -0000	1.5
  @@ -32,21 +32,25 @@
     support the following attributes:</p>
   
     <attributes>
  +
       <attribute name="className" required="false">
         <p>Java class name of the implementation to use.  This class must
         implement the <code>org.apache.catalina.Server</code> interface.
         If no class name is specified, the standard implementation will
         be used.</p>
       </attribute>
  +
       <attribute name="port" required="true">
         <p>The TCP/IP port number on which this server waits for a shutdown
         command.  This connection must be initiated from the same server
         computer that is running this instance of Tomcat.</p>
       </attribute>
  +
       <attribute name="shutdown" required="true">
         <p>The command string that must be received via a TCP/IP connection
         to the specified port number, in order to shut down Tomcat.</p>
       </attribute>
  +
     </attributes>
   
     </subsection>
  @@ -59,7 +63,6 @@
     common attributes listed above):</p>
   
     <attributes>
  -
     </attributes>
   
     </subsection>
  
  
  
  1.6       +5 -2      jakarta-tomcat-catalina/webapps/docs/config/loader.xml
  
  Index: loader.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/loader.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- loader.xml	1 Sep 2004 19:20:12 -0000	1.5
  +++ loader.xml	1 Sep 2004 22:04:29 -0000	1.6
  @@ -134,8 +134,11 @@
   
   <section name="Special Features">
   
  -  <p>No special features are associated with a <strong>Loader</strong>
  -  element.</p>
  +  <subsection name="Logging">
  +
  +    <p>A loader is associated with the log category based on its classname.</p>
  +
  +  </subsection>
   
   </section>
   
  
  
  
  1.8       +9 -6      jakarta-tomcat-catalina/webapps/docs/config/host.xml
  
  Index: host.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/host.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- host.xml	1 Sep 2004 19:20:12 -0000	1.7
  +++ host.xml	1 Sep 2004 22:04:29 -0000	1.8
  @@ -201,12 +201,6 @@
     by nesting a corresponding element inside your <strong>Host</strong>
     element:</p>
     <ul>
  -  <li><a href="logger.html"><strong>Logger</strong></a> -
  -      Configure a logger that will receive
  -      and process all log messages for this <strong>Host</strong>, plus
  -      messages from <a href="context.html">Contexts</a> associated with
  -      this Host (unless overridden by a
  -      <a href="logger.html">Logger</a> configuration at a lower level).</li>
     <li><a href="realm.html"><strong>Realm</strong></a> -
         Configure a realm that will allow its
         database of users, and their associated roles, to be shared across all
  @@ -219,6 +213,15 @@
   
   
   <section name="Special Features">
  +
  +
  +  <subsection name="Logging">
  +
  +    <p>A host is associated with the 
  +       <code>org.apache.catalina.core.ContainerBase.[enginename].[hostname]</code>
  +       log category.</p>
  +
  +  </subsection>
   
   
     <subsection name="Access Logs">
  
  
  
  1.15      +26 -9     jakarta-tomcat-catalina/webapps/docs/config/context.xml
  
  Index: context.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/context.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- context.xml	1 Sep 2004 19:20:12 -0000	1.14
  +++ context.xml	1 Sep 2004 22:04:29 -0000	1.15
  @@ -16,8 +16,6 @@
   
   <section name="Introduction">
   
  -  <p><b>FIXME: This needs updates</b></p>
  -
     <p>The <strong>Context</strong> element represents a <em>web
     application</em>, which is run within a particular virtual host.
     Each web application is based on a <em>Web Application Archive</em>
  @@ -47,14 +45,25 @@
     requests that do not match any other Context's context path.</p>
   
     <p>In addition to nesting <strong>Context</strong> elements inside a
  -  <a href="host.html">Host</a> element, you can also store them in
  -  individual files (with a ".xml" extension) in the 
  -  <code>$CATALINA_HOME/conf/[enginename]/[hostname]/</code> directory.  See
  +  <a href="host.html">Host</a> element, you can also store them:</p>
  +  <ul>
  +  <li>in the individual <code>$CATALINA_HOME/conf/context.xml</code> file: 
  +  the Context element information will be loaded by all webapps</li>
  +  <li>in the individual 
  +  <code>$CATALINA_HOME/conf/[enginename]/[hostname]/context.xml.default</code>
  +  file: the Context element information will be loaded by all webapps of that
  +  host</li>
  +  <li>in individual files (with a ".xml" extension) in the 
  +  <code>$CATALINA_HOME/conf/[enginename]/[hostname]/</code> directory</li>
  +  <li>if the previous file was not found for this application, in individual file
  +  at <code>/META-INF/context.xml</code> inside the application files</li>
  +  </ul>
  +  <p>See
     <a href="host.html#Automatic Application Deployment">Automatic
     Application Deployment</a> for more information. This method allows dynamic
     reconfiguration of the web application, since the main 
     <code>conf/server.xml</code> file cannot be reloaded without restarting
  -  Tomcat. <b>Please note that for tomcat 5.x, unlike tomcat 4.x, it is NOT
  +  Tomcat. <b>Please note that for tomcat 5, unlike tomcat 4.x, it is NOT
     recommended to place &lt;Context&gt; elements directly in the server.xml file.</b>
     Instead, put them in the META-INF/context.xml directory of your WAR file or
     the conf directory as described above.
  @@ -151,14 +160,16 @@
           servlets, like the manager servlet.</p>
         </attribute>
   
  -      <attribute name="path" required="true">
  +      <attribute name="path" required="false">
           <p>The <em>context path</em> of this web application, which is
           matched against the beginning of each request URI to select the
           appropriate web application for processing.  All of the context paths
           within a particular <a href="host.html">Host</a> must be unique.
           If you specify a context path of an empty string (""), you are
           defining the <em>default</em> web application for this Host, which
  -        will process all requests not assigned to other Contexts.</p>
  +        will process all requests not assigned to other Contexts. The value of
  +        this field must not be set most of the time, as it will be infered from
  +        the filenames used for either the .xml context file of the docBase.</p>
         </attribute>
   
         <attribute name="reloadable" required="false">
  @@ -342,6 +353,10 @@
         Configure the resource manager that will be used to access the static
         resources associated with this web application.  Normally, the
         default configuration of the resource manager will be sufficient.</li>
  +  <li><strong>WatchedResource</strong> - The auto deployer will monitor the 
  +      specified static resource of the web application for updates, and will
  +      reload the web application if is is updated. The content of this element
  +      must be a string.</li>
     </ul>
   
   </section>
  @@ -352,7 +367,9 @@
   
     <subsection name="Logging">
   
  -  <p><b>FIXME: This needs updates</b></p>
  +    <p>A context is associated with the 
  +       <code>org.apache.catalina.core.ContainerBase.[enginename].[hostname].[path]</code>
  +       log category.</p>
   
     </subsection>
   
  
  
  
  1.5       +3 -0      jakarta-tomcat-catalina/webapps/docs/config/service.xml
  
  Index: service.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/service.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- service.xml	1 Sep 2004 19:20:12 -0000	1.4
  +++ service.xml	1 Sep 2004 22:04:29 -0000	1.5
  @@ -33,12 +33,14 @@
     support the following attributes:</p>
   
     <attributes>
  +
       <attribute name="className" required="false">
         <p>Java class name of the implementation to use.  This class must
         implement the <code>org.apache.catalina.Service</code> interface.
         If no class name is specified, the standard implementation will
         be used.</p>
       </attribute>
  +
       <attribute name="name" required="true">
         <p>The display name of this <strong>Service</strong>, which will
         be included in log messages if you utilize standard Catalina
  @@ -46,6 +48,7 @@
         associated with a particular <a href="server.html">Server</a>
         must be unique.</p>
       </attribute>
  +
     </attributes>
   
     </subsection>
  
  
  
  1.6       +9 -8      jakarta-tomcat-catalina/webapps/docs/config/engine.xml
  
  Index: engine.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/engine.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- engine.xml	1 Sep 2004 19:20:12 -0000	1.5
  +++ engine.xml	1 Sep 2004 22:04:29 -0000	1.6
  @@ -119,14 +119,6 @@
     by nesting a corresponding element inside your <strong>Engine</strong>
     element:</p>
     <ul>
  -  <li><a href="logger.html"><strong>Logger</strong></a> -
  -      Configure a logger that will receive
  -      and process all log messages for this <strong>Engine</strong>, plus
  -      messages from <strong>Connectors</strong> associated with this Engine
  -      in the surrounding Service.  In addition, this Logger will log messages
  -      from subordinate <a href="host.html">Hosts</a> and
  -      <a href="context.html">Contexts</a>, unless overridden by a
  -      <a href="logger.html">Logger</a> configuration at a lower level.</li>
     <li><a href="realm.html"><strong>Realm</strong></a> -
         Configure a realm that will allow its
         database of users, and their associated roles, to be shared across all
  @@ -139,6 +131,15 @@
   
   
   <section name="Special Features">
  +
  +
  +  <subsection name="Logging">
  +
  +    <p>An engine is associated with the 
  +       <code>org.apache.catalina.core.ContainerBase.[enginename]</code>
  +       log category.</p>
  +
  +  </subsection>
   
   
     <subsection name="Access Logs">
  
  
  
  1.8       +0 -21     jakarta-tomcat-catalina/webapps/docs/config/manager.xml
  
  Index: manager.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/manager.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- manager.xml	1 Sep 2004 19:20:12 -0000	1.7
  +++ manager.xml	1 Sep 2004 22:04:29 -0000	1.8
  @@ -163,13 +163,6 @@
           this manager implementation.</p>
         </attribute>
   
  -      <attribute name="debug" required="false">
  -        <p>The level of debugging detail logged by this <strong>Manager</strong>
  -        to the associated <a href="logger.html">Logger</a>.  Higher numbers
  -        generate more detailed output.  If not specified, the default
  -        debugging detail level is zero (0).</p>
  -      </attribute>
  -
         <attribute name="entropy" required="false">
           <p>A String value that is utilized when seeding the random number
           generator used to create session identifiers for this Manager.
  @@ -276,13 +269,6 @@
         to use this implementation.</p>
       </attribute>
   
  -    <attribute name="debug" required="false">
  -      <p>The level of debugging detail logged by this <strong>Store</strong>
  -      to the associated <a href="logger.html">Logger</a>.  Higher numbers
  -      generate more detailed output.  If not specified, the default
  -      debugging detail level is zero (0).</p>
  -    </attribute>
  -
       <attribute name="directory" required="false">
         <p>Absolute or relative (to the temporary work directory for this web
         application) pathname of the directory into which individual session
  @@ -325,13 +311,6 @@
         <p>The connection URL that will be handed to the configured JDBC
         driver to establish a connection to the database containing our
         session table.</p>
  -    </attribute>
  -
  -    <attribute name="debug" required="false">
  -      <p>The level of debugging detail logged by this <strong>Store</strong>
  -      to the associated <a href="logger.html">Logger</a>.  Higher numbers
  -      generate more detailed output.  If not specified, the default
  -      debugging detail level is zero (0).</p>
       </attribute>
   
       <attribute name="driverName" required="true">
  
  
  
  1.8       +8 -10     jakarta-tomcat-catalina/webapps/docs/config/ajp.xml
  
  Index: ajp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ajp.xml	1 Sep 2004 19:20:12 -0000	1.7
  +++ ajp.xml	1 Sep 2004 22:04:29 -0000	1.8
  @@ -29,6 +29,14 @@
     the <code>jvmRoute</code> attribute of the 
     <a href="engine.html">Engine</a>.</p>
   
  +  <p>On the native side, Tomcat 5.5 supports the following connectors:</p>
  +  <ul>
  +  <li>mod_jk 1.2.x with any of its supported native servers</li>
  +  <li>Apache httpd 2.2 with mod_proxy configured for AJP</li>
  +  </ul>
  +  <p>Other native connectors supporting AJP/1.3 may work, but are no longer
  +  supported.</p>
  +
   </section>
   
   
  @@ -139,16 +147,6 @@
   <section name="Nested Components">
   
     <p>None at this time.</p>
  -
  -</section>
  -
  -
  -<section name="Configuration HOWTOs">
  -
  -  <p>Please refer to the 
  -<a href="../../connectors-doc/jk2">JK documentation</a> 
  -     for HOW-TOs and complete configuration information.
  -  </p>
   
   </section>
   
  
  
  
  1.4       +3 -80     jakarta-tomcat-catalina/webapps/docs/config/globalresources.xml
  
  Index: globalresources.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/globalresources.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- globalresources.xml	21 Jul 2004 19:24:00 -0000	1.3
  +++ globalresources.xml	1 Sep 2004 22:04:29 -0000	1.4
  @@ -126,12 +126,10 @@
       deployment descriptor by defining them in this element and then linking 
       them with <a href="context.html#Resource Links">&lt;ResourceLink&gt;</a> 
       elements
  -    in the <code><strong>&lt;Context&gt;</strong></code>
  -    or <code><strong>&lt;DefaultContext&gt;</strong></code> elements.  
  +    in the <code><strong>&lt;Context&gt;</strong></code> element.  
   
  -    You <strong>MUST</strong> also define
  -    <a href="#Resource Parameters">Resource Parameters</a>
  -    for the same resource name, to configure
  +    You <strong>MUST</strong> also define any other needed parameters using
  +    attributes on the Resource element, to configure
       the object factory to be used (if not known to Tomcat already), and
       the properties used to configure that object factory.</p>
   
  @@ -226,81 +224,6 @@
       </source>
   
      </subsection>
  -
  -  <subsection name="Resource Parameters">
  -
  -    <p>This element is used to configure the resource manager (or object
  -    factory) used to return objects when the web application performs a
  -    JNDI lookup operation on the corresponding resource name.  You
  -    <strong>MUST</strong> define resource parameters for every resource name
  -    that is specified by a <code>&lt;Resource&gt;</code> element inside a
  -    <code>&lt;Context&gt;</code> or <code>&lt;DefaultContext&gt;</code>
  -    element in <code>$CATALINA_HOME/conf/server.xml</code>, and/or for every
  -    name declared in a <code>&lt;resource-ref&gt;</code> or
  -    <code>&lt;resource-env-ref&gt;</code> element in the web application
  -    deployment descriptor, before that resource can be successfully
  -    accessed.</p>
  -
  -    <p>Resource parameters are defined by name, and the precise set of
  -    parameter names supported depend on the resource manager (or object
  -    factory) you are using - they must match the names of settable JavaBeans
  -    properties on the corresponding factory class.  The JNDI implementation
  -    will configure an instance of the specified factory class specified by
  -    calling all the corresponding JavaBeans property setters, and then
  -    making the factory instance available via the JNDI <code>lookup()</code>
  -    call.</p>
  -
  -    <p>The resource parameters for a JDBC data source might look something
  -    like this:</p>
  -<source>
  -&lt;GlobalNamingResources ...&gt;
  -  ...
  -  &lt;ResourceParams name="jdbc/EmployeeDB"&gt;
  -    &lt;parameter&gt;
  -      &lt;name&gt;driverClassName&lt;/name&gt;
  -      &lt;value&gt;org.hsql.jdbcDriver&lt;/value&gt;
  -    &lt;/parameter&gt;
  -    &lt;parameter&gt;
  -      &lt;name&gt;driverName&lt;/name&gt;
  -      &lt;/value&gt;jdbc:HypersonicSQL:database&lt;/value&gt;
  -    &lt;/parameter&gt;
  -    &lt;parameter&gt;
  -      &lt;name&gt;user&lt;/name&gt;
  -      &lt;value&gt;dbusername&lt;/value&gt;
  -    &lt;/parameter&gt;
  -    &lt;parameter&gt;
  -      &lt;name&gt;password&lt;/name&gt;
  -      &lt;value&gt;dbpassword&lt;/value&gt;
  -    &lt;/parameter&gt;
  -  &lt;/ResourceParams&gt;
  -  ...
  -&lt;/GlobalNamingResources&gt;
  -</source>
  -
  -    <p>If you need to specify the Java class name of a factory class for a
  -    particular resource type, use a <code>&lt;parameter&gt;</code> entry
  -    named <code>factory</code> nested inside the
  -    <code>&lt;ResourceParams&gt;</code> element.</p>
  -
  -    <p>The valid attributes of a <code>&lt;ResourceParams&gt;</code> element
  -    are as follows:</p>
  -
  -    <attributes>
  -
  -      <attribute name="name" required="true">
  -        <p>The name of the resource being configured, relative to the
  -        <code>java:comp/env</code> contxt.  This name <strong>MUST</strong>
  -        match the name of a resource defined by a <code>&lt;Resource&gt;</code>
  -        element in <code>$CATALINA_HOME/conf/server.xml</code>, and/or
  -        referenced in a <code>&lt;resource-ref&gt;</code> or
  -        <code>&lt;resource-env-ref&gt;</code> element in the web application
  -        deployment descriptor.</p>
  -      </attribute>
  -
  -    </attributes>
  -
  -  </subsection>
  -
   
   </section>
   
  
  
  

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


Mime
View raw message