larryi 02/03/11 20:14:50 Modified: src/doc tomcat-ug.html serverxml.html Log: Document new startup/shutdown attributes, ajp12id and ajp13id. Also some miscellaneous edits. Revision Changes Path 1.24 +53 -3 jakarta-tomcat/src/doc/tomcat-ug.html Index: tomcat-ug.html =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ug.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- tomcat-ug.html 31 Dec 2001 23:43:28 -0000 1.23 +++ tomcat-ug.html 12 Mar 2002 04:14:49 -0000 1.24 @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <!-- $Id: tomcat-ug.html,v 1.23 2001/12/31 23:43:28 larryi Exp $ --> + <!-- $Id: tomcat-ug.html,v 1.24 2002/03/12 04:14:49 larryi Exp $ --> <!-- Copyright 1999-2001 Apache Software Foundation --> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link rel="stylesheet" type="text/css" href="style.css"> @@ -642,9 +642,27 @@ <tr><td> </td><td>ajpid <i><file></i><br> or<br>secretFile <i><file></i></td> <td>Specify the defaults file written by the - <a href="serverxml.html#Ajp12Connector">Ajp12Connector</a> module. It + <a href="serverxml.html#Ajp12Connector">Ajp12Connector</a> or + <a href="serverxml.html#Ajp13Connector">Ajp13Connector</a> module. It contains default values for <code>port</code>, <code>host</code>, and - <code>pass</code> arguments. The default value is TOMCAT_HOME/conf/ajp12.id.</td></tr> + <code>pass</code> arguments. The default value is + <code>TOMCAT_HOME/conf/ajp12.id</code> or <code>TOMCAT_HOME/conf/ajp13.id</code> + if <code>ajp12</code> or <code>ajp13</code> is specified, respectively. + If neither <code>ajp12</code> or <code>ajp13</code> is specified, the + ajpid file defaults first to <code>TOMCAT_HOME/conf/ajp13.id</code>, and + if not found, defaults to <code>TOMCAT_HOME/conf/ajp12.id</code>.</td></tr> + <tr><td> </td><td>ajp12</td><td>Specifies that the ajp12 protocol should + be used for shutdown. It implies the format of the ajpid file as that + written by the Ajp12Connector.</td></tr> + <tr><td> </td><td>ajp13</td><td>Specifies that the ajp13 protocol should + be used for shutdown. It implies the format of the ajpid file as that + written by the Ajp13Connector.</td></tr> + <tr><td> </td><td>ajpid12 <i><file></i><br><b>[Tomcat 3.3.1]</b></td> + <td>Equivalent to specifying <code>ajpid <i><file></i></code> + and <code>ajp12</code>.</td></tr> + <tr><td> </td><td>ajpid13 <i><file></i><br><b>[Tomcat 3.3.1]</b></td> + <td>Equivalent to specifying <code>ajpid <i><file></i></code> + and <code>ajp13</code>.</td></tr> <tr><td> </td><td>help</td><td>Display usage information.</td></tr> <tr><td> </td><td>home <i><dir></i><br> or<br>h <i><dir></i></td> @@ -678,6 +696,38 @@ <tr><td>jspc</td><td> </td> <td>Pre-compiles JSP pages using the org.apache.tomcat.startup.Jspc class.</td></tr> <tr><td> </td><td> </td><td><i>arguments not yet documented</i></td></tr> +</table> + +<p>The <code>start</code>, <code>run</code>, and <code>estart</code> tasks +assume a command line argument that doesn't match one of the predefined +arguments is a ContextManager property name and the next command line argument +is its value. Thus a command such as:</p> + +<pre>bin/startup.sh myprop myvalue</pre> + +<p>would define a ContextManager property named "myprop" with a +String value of "myvalue". ContextManager properties can used for +parameter substitution in the <code>server.xml</code> file. Set the +<a href="serverxml.html#substitution">Variable substitution</a> section of +the Server.xml document for details. There are also some ContextManager +properties supported by certain modules. These are listed in the following +table.</p> + +<table border="1"> + <tr><th bgcolor="#c0c0c0">Module</th> + <th bgcolor="#c0c0c0">Context Property</th> + <th bgcolor="#c0c0c0">Description</th></tr> + <tr><td><a href="serverxml.html#Ajp12Connector">Ajp12Connector</a></td> + <td>ajpid12</td> + <td>Overrides the <code>ajpidFile</code> attribute to specify the file + in which to record Ajp12 connector info and password.</td></tr> + <tr><td><a href="serverxml.html#Ajp13Connector">Ajp13Connector</a></td> + <td>ajpid13</td> + <td>Overrides the <code>ajpidFile</code> attribute to specify the file + in which to record Ajp13 connector info and password.</td></tr> + <tr><td><a href="serverxml.html#LoaderInterceptor11">LoaderInterceptor11</a></td> + <td>additionalJars</td> + <td>List of jars to be added to each web application.</td></tr> </table> <p></p> 1.22 +16 -7 jakarta-tomcat/src/doc/serverxml.html Index: serverxml.html =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- serverxml.html 24 Feb 2002 03:47:16 -0000 1.21 +++ serverxml.html 12 Mar 2002 04:14:49 -0000 1.22 @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <!-- $Id: serverxml.html,v 1.21 2002/02/24 03:47:16 larryi Exp $ --> + <!-- $Id: serverxml.html,v 1.22 2002/03/12 04:14:49 larryi Exp $ --> <!-- Copyright 1999-2001 Apache Software Foundation --> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" > <link rel="stylesheet" href="style.css"> @@ -444,7 +444,10 @@ </tr> <tr valign="top"> <td>ajpidFile</td> - <td>File in which to record Ajp12 connector info and password.</td> + <td>File in which to record Ajp12 connector info and password. In + Tomcat 3.3.1 this setting can be overridden by a ContextManager property + named "ajpid12". Such a property would normally be set using + command line arguments.</td> <td>conf/ajp12.id</td> </tr> <tr valign="top"> @@ -544,7 +547,7 @@ <p>In Tomcat 3.3.1, some attributes were added for supporting password protected shutdown using Ajp13. This feature is actived by setting the -<code>shutDownEnabled</code> to <code>true</code>, or setting a password using +<code>shutdownEnable</code> to <code>true</code>, or setting a password using the <code>secret</code> or <code>useSecret</code> attributes. Also, if a password is set, authentication of Ajp13 connections can also be performed. This feature requires the <code>authenticateRequests</code> attribute be set @@ -563,7 +566,10 @@ </tr> <tr valign="top"> <td>ajpidFile<br><b>[Tomcat 3.3.1]</td> - <td>File in which to record Ajp13 connector info and password.</td> + <td>File in which to record Ajp13 connector info and password. This + setting can be overridden by a ContextManager property named + "ajpid13". Such a property would normally be set using a + command line argument.</td> <td>conf/ajp13.id</td> </tr> <tr valign="top"> @@ -590,7 +596,9 @@ <td><i>not specified</i></td> </tr> <tr valign="top"> - <td>shutDownEnable</td> + <td>shutDownEnable<br> + <br> + shutdownEnable<br><b>[Tomcat 3.3.1]</b></td> <td>Enable shutdown signal via this connector. This attribute is automatically set <code>true</code> if a password is set using the <code>secret</code> or <code>useSecret</code> attributes.</td> @@ -1861,8 +1869,9 @@ </tr> <tr valign="top"> <td></td> - <td><b>Options for Jasper JSP servlet</b> - These are not used if - <code>useJspServlet</code> is <code>false</code>.</td> + <td><b>Options for Jasper JSP servlet</b> - The attributes other than + <code>useJspServlet</code> are ignored if <code>useJspServlet</code> + is <code>false</code>.</td> <td></td> </tr> <tr valign="top">
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>