Hi,
This is a patch which changes Tomcat version strings from "Tomcat 4"
to "Tomcat 5" in documents (html-manager-howto.xml, manager-howto.xml
and mbeans-descriptor-howto.xml).
Could anyone apply this patch to CVS?
Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation Laboratories
Index: webapps/docs/html-manager-howto.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/webapps/docs/html-manager-howto.xml,v
retrieving revision 1.4
diff -c -u -r1.4 html-manager-howto.xml
--- webapps/docs/html-manager-howto.xml 17 Aug 2003 11:16:02 -0000 1.4
+++ webapps/docs/html-manager-howto.xml 20 Sep 2003 05:51:34 -0000
@@ -117,7 +117,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to start the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -157,7 +157,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to stop the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -205,7 +205,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to restart the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -494,7 +494,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to start the new web application.
- Check the Tomcat 4 logs for the details, but likely explanations include
+ Check the Tomcat 5 logs for the details, but likely explanations include
problems parsing your <code>/WEB-INF/web.xml</code> file, or missing
classes encountered when initializing application event listeners and
filters.</p>
Index: webapps/docs/manager-howto.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/webapps/docs/manager-howto.xml,v
retrieving revision 1.8
diff -c -u -r1.8 manager-howto.xml
--- webapps/docs/manager-howto.xml 17 Aug 2003 11:16:02 -0000 1.8
+++ webapps/docs/manager-howto.xml 20 Sep 2003 05:51:34 -0000
@@ -55,10 +55,10 @@
to deploy a new web application, or undeploy an existing one, without having
to shut down and restart the entire container. In addition, you can request
an existing application to reload itself, even if you have not declared it
-to be <code>reloadable</code> in the Tomcat 4 server
+to be <code>reloadable</code> in the Tomcat 5 server
configuration file.</p>
-<p>To support these capabilities, Tomcat 4 includes a web application
+<p>To support these capabilities, Tomcat 5 includes a web application
(installed by default on context path <code>/manager</code>) that supports
the following functions:</p>
<ul>
@@ -121,7 +121,7 @@
</ul>
</p>
-<p>Future versions of Tomcat 4 will include administrative functionality that
+<p>Future versions of Tomcat 5 will include administrative functionality that
is presented in (at least) the following forms:
<ul>
<li>As web services, so that Tomcat administration can be easily integrated
@@ -138,9 +138,9 @@
<blockquote><em>
<p>The description below uses the variable name $CATALINA_HOME
- to refer to the directory into which you have installed Tomcat 4,
+ 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 4 for multiple
+ 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>
@@ -164,7 +164,7 @@
<ul>
<li><em>MemoryRealm</em> - If you have not customized your
<code>$CATALINA_HOME/conf/server.xml</code> to select a different one,
- Tomcat 4 defaults to an XML-format file stored at
+ Tomcat 5 defaults to an XML-format file stored at
<code>$CATALINA_HOME/conf/tomcat-users.xml</code>, which can be
edited with any text editor. This file contains an XML
<code><user></code> for each individual user, which might
@@ -329,7 +329,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to start the new web application.
- Check the Tomcat 4 logs for the details, but likely explanations include
+ Check the Tomcat 5 logs for the details, but likely explanations include
problems parsing your <code>/WEB-INF/web.xml</code> file, or missing
classes encountered when initializing application event listeners and
filters.</p>
@@ -513,7 +513,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to start the new web application.
- Check the Tomcat 4 logs for the details, but likely explanations include
+ Check the Tomcat 5 logs for the details, but likely explanations include
problems parsing your <code>/WEB-INF/web.xml</code> file, or missing
classes encountered when initializing application event listeners and
filters.</p>
@@ -597,7 +597,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to restart the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -641,7 +641,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to enumerate the system properties.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
</ul>
@@ -686,7 +686,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to enumerate the global JNDI
- resources. Check the Tomcat 4 logs for the details.</p>
+ resources. Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>No global JNDI resources are available</em>
<blockquote>
@@ -795,7 +795,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to start the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -838,7 +838,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to stop the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -891,7 +891,7 @@
<li><em>Encountered exception</em>
<blockquote>
<p>An exception was encountered trying to undeploy the web application.
- Check the Tomcat 4 logs for the details.</p>
+ Check the Tomcat 5 logs for the details.</p>
</blockquote></li>
<li><em>Invalid context path was specified</em>
<blockquote>
@@ -918,7 +918,7 @@
<section name="Executing Manager Commands With Ant">
<p>In addition to the ability to execute Manager commands via HTTP requests,
-as documented above, Tomcat 4 includes a convenient set of Task definitions
+as documented above, Tomcat 5 includes a convenient set of Task definitions
for the <em>Ant</em> (version 1.4 or later) build tool. In order to use these
commands, you must perform the following setup operations:</p>
<ul>
@@ -927,7 +927,7 @@
You must use version <strong>1.4</strong> or later.</li>
<li>Install the Ant distribution in a convenient directory (called
ANT_HOME in the remainder of these instructions).</li>
-<li>Copy the file <code>server/lib/catalina-ant.jar</code> from your Tomcat 4
+<li>Copy the file <code>server/lib/catalina-ant.jar</code> from your Tomcat 5
installation into Ant's library directory (<code>$ANT_HOME/lib</code>).
</li>
<li>Add the <code>$ANT_HOME/bin</code> directory to your <code>PATH</code>
Index: webapps/docs/mbeans-descriptor-howto.xml
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-catalina/webapps/docs/mbeans-descriptor-howto.xml,v
retrieving revision 1.1
diff -c -u -r1.1 mbeans-descriptor-howto.xml
--- webapps/docs/mbeans-descriptor-howto.xml 3 Feb 2003 23:17:08 -0000 1.1
+++ webapps/docs/mbeans-descriptor-howto.xml 20 Sep 2003 05:51:34 -0000
@@ -15,7 +15,7 @@
<section name="Introduction">
-<p>Tomcat 4 uses JMX MBeans as the technology for implementing
+<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
Index: webapps/docs/realm-howto.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/webapps/docs/realm-howto.xml,v
retrieving revision 1.8
diff -c -u -r1.8 realm-howto.xml
--- webapps/docs/realm-howto.xml 7 May 2003 15:55:39 -0000 1.8
+++ webapps/docs/realm-howto.xml 20 Sep 2003 05:51:35 -0000
@@ -347,7 +347,7 @@
<h3>Introduction</h3>
-<p><strong>DataSourceRealm</strong> is an implementation of the Tomcat 4
+<p><strong>DataSourceRealm</strong> is an implementation of the Tomcat 5
<code>Realm</code> interface that looks up users in a relational database
accessed via a JNDI named JDBC DataSource. There is substantial configuration
flexibility that lets you adapt to existing table and column names, as long
@@ -391,7 +391,7 @@
for information on how to configure a JNDI named JDBC DataSource.</li>
<li>Set up a <code><Realm></code> element, as described below, in your
<code>$CATALINA_HOME/conf/server.xml</code> file.</li>
-<li>Restart Tomcat 4 if it is already running.</li>
+<li>Restart Tomcat 5 if it is already running.</li>
</ol>
<h3>Realm Element Attributes</h3>
@@ -492,7 +492,7 @@
<p>DataSourceRealm operates according to the following rules:</p>
<ul>
<li>When a user attempts to access a protected resource for the first time,
- Tomcat 4 will call the <code>authenticate()</code> method of this
+ Tomcat 5 will call the <code>authenticate()</code> method of this
<code>Realm</code>. Thus, any changes you have made to the database
directly (new users, changed passwords or roles, etc.) will be immediately
reflected.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
