tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1527315 - in /tomcat/trunk/webapps: ROOT/ docs/ docs/appdev/ docs/config/
Date Sun, 29 Sep 2013 12:27:47 GMT
Author: rjung
Date: Sun Sep 29 12:27:46 2013
New Revision: 1527315

URL: http://svn.apache.org/r1527315
Log:
Replace explicit version number 8(.0) with ant
filter variables in docs.

Modified:
    tomcat/trunk/webapps/ROOT/index.jsp
    tomcat/trunk/webapps/docs/appdev/installation.xml
    tomcat/trunk/webapps/docs/appdev/processes.xml
    tomcat/trunk/webapps/docs/building.xml
    tomcat/trunk/webapps/docs/cluster-howto.xml
    tomcat/trunk/webapps/docs/config/http.xml
    tomcat/trunk/webapps/docs/config/index.xml
    tomcat/trunk/webapps/docs/default-servlet.xml
    tomcat/trunk/webapps/docs/deployer-howto.xml
    tomcat/trunk/webapps/docs/index.xml
    tomcat/trunk/webapps/docs/introduction.xml
    tomcat/trunk/webapps/docs/jasper-howto.xml
    tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
    tomcat/trunk/webapps/docs/security-howto.xml
    tomcat/trunk/webapps/docs/windows-auth-howto.xml
    tomcat/trunk/webapps/docs/windows-service-howto.xml

Modified: tomcat/trunk/webapps/ROOT/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.jsp?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/trunk/webapps/ROOT/index.jsp Sun Sep 29 12:27:46 2013
@@ -110,7 +110,7 @@ request.setAttribute("tomcatExamplesUrl"
                         <p>For security, access to the <a href="/manager/html">manager
webapp</a> is restricted.
                         Users are defined in:</p>
                         <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
-                        <p>In Tomcat 8.0 access to the manager application is split
between
+                        <p>In Tomcat @VERSION_MAJOR_MINOR@ access to the manager application
is split between
                            different users. &nbsp; <a href="${tomcatDocUrl}manager-howto.html">Read
more...</a></p>
                         <br />
                         <h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt">Release
Notes</a></h4>
@@ -122,16 +122,16 @@ request.setAttribute("tomcatExamplesUrl"
                 <div id="low-docs" class="">
                     <div class="curved container">
                         <h3>Documentation</h3>
-                        <h4><a href="${tomcatDocUrl}">Tomcat 8.0 Documentation</a></h4>
-                        <h4><a href="${tomcatDocUrl}config/">Tomcat 8.0 Configuration</a></h4>
+                        <h4><a href="${tomcatDocUrl}">Tomcat @VERSION_MAJOR_MINOR@
Documentation</a></h4>
+                        <h4><a href="${tomcatDocUrl}config/">Tomcat @VERSION_MAJOR_MINOR@
Configuration</a></h4>
                         <h4><a href="http://wiki.apache.org/tomcat/FrontPage">Tomcat
Wiki</a></h4>
                         <p>Find additional important configuration information in:</p>
                         <pre>$CATALINA_HOME/RUNNING.txt</pre>
                         <p>Developers may be interested in:</p>
                         <ul>
-                            <li><a href="http://tomcat.apache.org/bugreport.html">Tomcat
8.0 Bug Database</a></li>
-                            <li><a href="${tomcatDocUrl}api/index.html">Tomcat
8.0 JavaDocs</a></li>
-                            <li><a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x/">Tomcat
8.0 SVN Repository</a></li>
+                            <li><a href="http://tomcat.apache.org/bugreport.html">Tomcat
@VERSION_MAJOR_MINOR@ Bug Database</a></li>
+                            <li><a href="${tomcatDocUrl}api/index.html">Tomcat
@VERSION_MAJOR_MINOR@ JavaDocs</a></li>
+                            <li><a href="http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/">Tomcat
@VERSION_MAJOR_MINOR@ SVN Repository</a></li>
                         </ul>
                     </div>
                 </div>

Modified: tomcat/trunk/webapps/docs/appdev/installation.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/installation.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/installation.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/installation.xml Sun Sep 29 12:27:46 2013
@@ -39,7 +39,7 @@ in the following subsections.</p>
 
 <subsection name="JDK">
 
-<p>Tomcat 8.0 was designed to run on Java SE 7.
+<p>Tomcat @VERSION_MAJOR_MINOR@ was designed to run on Java SE 7.
 </p>
 
 <p>Compatible JDKs for many platforms (or links to where they can be found)
@@ -53,7 +53,7 @@ are available at
 <p>Binary downloads of the <strong>Tomcat</strong> server are available
from
 <a href="http://tomcat.apache.org/">http://tomcat.apache.org/</a>.
 This manual assumes you are using the most recent release
-of Tomcat 8.  Detailed instructions for downloading and installing
+of Tomcat @VERSION_MAJOR@.  Detailed instructions for downloading and installing
 Tomcat are available <a href="../setup.html">here</a>.</p>
 
 <p>In the remainder of this manual, example shell scripts assume that you have

Modified: tomcat/trunk/webapps/docs/appdev/processes.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Sun Sep 29 12:27:46 2013
@@ -129,8 +129,8 @@ You might end up with something like thi
 <source><![CDATA[# Context path to install this application on
 app.path=/hello
 
-# Tomcat 7 installation directory
-catalina.home=/usr/local/apache-tomcat-7.0
+# Tomcat installation directory
+catalina.home=/usr/local/apache-tomcat-@VERSION_MAJOR_MINOR@
 
 # Manager webapp username and password
 manager.username=myusername

Modified: tomcat/trunk/webapps/docs/building.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Sun Sep 29 12:27:46 2013
@@ -82,7 +82,7 @@ available, which will be used to actuall
 
 </section>
 
-<section name="Checkout or obtain the source code for Tomcat 8">
+<section name="Checkout or obtain the source code for Tomcat @VERSION_MAJO@">
 
   <p>
   Tomcat SVN repository URL:
@@ -90,7 +90,7 @@ available, which will be used to actuall
   </p>
   <p>
   Tomcat source packages:
-  <a href="http://tomcat.apache.org/download-80.cgi">http://tomcat.apache.org/download-80.cgi</a>.
+  <a href="http://tomcat.apache.org/download-@VERSION_MAJOR@0.cgi">http://tomcat.apache.org/download-@VERSION_MAJOR@0.cgi</a>.
   </p>
 
   <p>

Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Sun Sep 29 12:27:46 2013
@@ -113,7 +113,7 @@
 
 <section name="Cluster Basics">
 
-<p>To run session replication in your Tomcat 7.0 container, the following steps
+<p>To run session replication in your Tomcat @VERSION_MAJOR@ container, the following
steps
 should be completed:</p>
 <ul>
   <li>All your session attributes must implement <code>java.io.Serializable</code></li>
@@ -195,7 +195,7 @@ should be completed:</p>
     Synchronous vs. asynchronous is configured using the <code>channelSendOptions</code>
     flag and is an integer value. The default value for the <code>SimpleTcpCluster/DeltaManager</code>
combo is
     8, which is asynchronous. You can read more on the <a href="tribes/introduction.html">send
flag(overview)</a> or the
-    <a href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/tribes/Channel.html">send
flag(javadoc)</a>.
+    <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/api/org/apache/catalina/tribes/Channel.html">send
flag(javadoc)</a>.
     During async replication, the request is returned before the data has been replicated.
async replication yields shorter
     request times, and synchronous replication guarantees the session to be replicated before
the request returns.
 </p>
@@ -287,7 +287,7 @@ should be completed:</p>
       The main element, inside this element all cluster details can be configured.
       The <code>channelSendOptions</code> is the flag that is attached to each
message sent by the
       SimpleTcpCluster class or any objects that are invoking the SimpleTcpCluster.send method.
-      The description of the send flags is available at <a href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/tribes/Channel.html">
+      The description of the send flags is available at <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/api/org/apache/catalina/tribes/Channel.html">
       our javadoc site</a>
       The <code>DeltaManager</code> sends information using the SimpleTcpCluster.send
method, while the backup manager
       sends it itself directly through the channel.

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Sun Sep 29 12:27:46 2013
@@ -620,8 +620,7 @@
 
       <attribute name="pollerThreadCount" required="false">
         <p>(int)The number of threads to be used to run for the polling events.
-        Default value is <code>1</code> per processor up to and including version
7.0.27.
-        Default value as of version 7.0.28 is <code>1</code> per processor but
not more than 2.<br/>
+        Default value is <code>1</code> per processor but not more than 2.<br/>
         When accepting a socket, the operating system holds a global lock. So the benefit
of
         going above 2 threads diminishes rapidly. Having more than one thread is for
         system that need to accept connections very rapidly. However usually just

Modified: tomcat/trunk/webapps/docs/config/index.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/index.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/index.xml (original)
+++ tomcat/trunk/webapps/docs/config/index.xml Sun Sep 29 12:27:46 2013
@@ -34,7 +34,7 @@
 
 <p>This manual contains reference information about all of the configuration
 directives that can be included in a <code>conf/server.xml</code> file to
-configure the behavior of the Tomcat 7 Servlet/JSP container.  It does not
+configure the behavior of the Tomcat Servlet/JSP container.  It does not
 attempt to describe which configuration directives should be used to perform
 specific tasks - for that, see the various <em>HOW-TO</em> documents on the
 main index page.</p>

Modified: tomcat/trunk/webapps/docs/default-servlet.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/trunk/webapps/docs/default-servlet.xml Sun Sep 29 12:27:46 2013
@@ -237,7 +237,7 @@ Format:
         </table>
       <xsl:apply-templates select="readme"/>
       <hr style="height: 1px;" />
-      <h3>Apache Tomcat/8.0</h3>
+      <h3>Apache Tomcat/@VERSION_MAJOR_MINOR@</h3>
     </body>
    </html>
   </xsl:template>

Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Sun Sep 29 12:27:46 2013
@@ -86,7 +86,7 @@
             The TCD is not packaged with the Tomcat core
             distribution, and must therefore be downloaded separately from
             the Downloads area. The download is usually labelled
-            <i>apache-tomcat-8.0.x-deployer</i>.
+            <i>apache-tomcat-@VERSION_MAJOR_MINOR@.x-deployer</i>.
         </p>
         <p>
             TCD has prerequisites of Apache Ant 1.6.2+ and a Java installation.

Modified: tomcat/trunk/webapps/docs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Sun Sep 29 12:27:46 2013
@@ -34,8 +34,8 @@
 <section name="Introduction">
 
 <p>This is the top-level entry point of the documentation bundle for the
-<strong>Apache Tomcat</strong> Servlet/JSP container.  Apache Tomcat version
8.0
-implements the Servlet 3.1 and JavaServer Pages 2.3
+<strong>Apache Tomcat</strong> Servlet/JSP container.  Apache Tomcat version
+@VERSION_MAJOR_MINOR@ implements the Servlet 3.1 and JavaServer Pages 2.3
 <a href="http://wiki.apache.org/tomcat/Specifications">specifications</a> 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
@@ -50,8 +50,8 @@ manual is described in more detail below
 
 <section name="Apache Tomcat User Guide">
 
-<p>The following documents will assist you in downloading, installing
-Apache Tomcat 7, and using many of the Apache Tomcat features.</p>
+<p>The following documents will assist you in downloading and installing
+Apache Tomcat, and using many of the Apache Tomcat features.</p>
 
 <ol>
 <li><a href="introduction.html"><strong>Introduction</strong></a>
- A

Modified: tomcat/trunk/webapps/docs/introduction.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Sun Sep 29 12:27:46 2013
@@ -108,12 +108,10 @@ meaning that any change to the files nec
 written and easy to understand, we may have missed something.  Provided
 below are various web sites and mailing lists in case you get stuck.</p>
 
-<p>As Tomcat 7 is a new release of Tomcat, keep in mind that some of the
-issues and solutions vary between the major versions of Tomcat (6.x versus
-7.x).  As you search around the web, there will be some documentation that
-is not relevant to Tomcat 7, but 6.x, 5.x or earlier versions.  Doing 3.x
-or 4.x things to 7 will probably not work in most cases as the server.xml
-files are very different.</p>
+<p>Keep in mind that some of the issues and solutions vary between the
+major versions of Tomcat.  As you search around the web, there will be
+some documentation that is not relevant to Tomcat @VERSION_MAJOR@, but
+only to earlier versions.</p>
 
 <ul>
 <li>Current document - most documents will list potential hangups. Be sure

Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Sun Sep 29 12:27:46 2013
@@ -36,7 +36,7 @@
 
 <section name="Introduction">
 
-<p>Tomcat 8.0 uses the Jasper 2 JSP Engine to implement
+<p>Tomcat @VERSION_MAJOR_MINOR@ uses the Jasper 2 JSP Engine to implement
 the <a href="http://wiki.apache.org/tomcat/Specifications">JavaServer Pages 2.3</a>
 specification.</p>
 

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Sun Sep 29 12:27:46 2013
@@ -54,7 +54,7 @@ to the wider audience, or if you feel we
 <b>Please note that JNDI resource configuration changed somewhat between
 Tomcat 5.0.x and Tomcat 5.5.x.</b>  You will most likely need to modify older
 JNDI resource configurations to match the syntax in the example below in order
-to make them work in Tomcat 7.x.x.
+to make them work in Tomcat @VERSION_MAJOR@.
 </p>
 
 <p>

Modified: tomcat/trunk/webapps/docs/security-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/security-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-howto.xml Sun Sep 29 12:27:46 2013
@@ -170,14 +170,15 @@
       <p>The <strong>xpoweredBy</strong> attribute controls whether or
not the
       X-Powered-By HTTP header is sent with each request. If sent, the value of
       the header contains the Servlet and JSP specification versions, the full
-      Tomcat version (e.g. Apache Tomcat/7.0.0), the name of the JVM vendor and
+      Tomcat version (e.g. Apache Tomcat/@VERSION_MAJOR_MINOR@.0), the name of
+      the JVM vendor and
       the version of the JVM. This header is disabled by default. This header
       can provide useful information to both legitimate clients and attackers.
       </p>
 
       <p>The <strong>server</strong> attribute controls the value of the
Server
-      HTTP header. The default value of this header for Tomcat 4.1.x, 5.0.x,
-      5.5.x, 6.0.x and 7.0.x is Apache-Coyote/1.1. This header can provide
+      HTTP header. The default value of this header for Tomcat 4.1.x to
+      @VERSION_MAJOR_MINOR@.x is Apache-Coyote/1.1. This header can provide
       limited information to both legitimate clients and attackers.</p>
 
       <p>The <strong>SSLEnabled</strong>, <strong>scheme</strong>
and
@@ -211,8 +212,8 @@
       to the BIO connector. It is only necessary if the underlying SSL
       implementation is vulnerable to CVE-2009-3555. For more information on the
       current state of this vulnerability and the work-arounds available see the
-      <a href="http://tomcat.apache.org/security-7.html">Tomcat 7 security
-      page</a>.</p>
+      <a href="http://tomcat.apache.org/security-@VERSION_MAJOR@.html">Tomcat
+      @VERSION_MAJOR@ security page</a>.</p>
 
       <p>The <strong>requiredSecret</strong> attribute in AJP connectors
       configures shared secret between Tomcat and reverse proxy in front of
@@ -279,7 +280,7 @@
       can be changed by creating the file
       CATALINA_BASE/lib/org/apache/catalina/util/ServerInfo.properties with
       content as follows:</p>
-      <source>server.info=Apache Tomcat/7.0.x</source>
+      <source>server.info=Apache Tomcat/@VERSION_MAJOR_MINOR@.x</source>
       <p>Modify the values as required. Note that this will also change the version
       number reported in some of the management tools and may make it harder to
       determine the real version installed. The CATALINA_HOME/bin/version.bat|sh

Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Sun Sep 29 12:27:46 2013
@@ -123,7 +123,7 @@ policy had to be relaxed. This is not re
   <code>$CATALINA_BASE/conf/krb5.ini</code>. The file used in this how-to
   contained:<source>[libdefaults]
 default_realm = DEV.LOCAL
-default_keytab_name = FILE:c:\apache-tomcat-7.0.x\conf\tomcat.keytab
+default_keytab_name = FILE:c:\apache-tomcat-@VERSION_MAJOR_MINOR@.x\conf\tomcat.keytab
 default_tkt_enctypes = rc4-hmac,aes256-cts-hmac-sha1-96,aes128-cts-hmac-sha1-96
 default_tgs_enctypes = rc4-hmac,aes256-cts-hmac-sha1-96,aes128-cts-hmac-sha1-96
 forwardable=true
@@ -145,7 +145,7 @@ dev.local= DEV.LOCAL
     doNotPrompt=true
     principal="HTTP/win-tc01.dev.local@DEV.LOCAL"
     useKeyTab=true
-    keyTab="c:/apache-tomcat-7.0.x/conf/tomcat.keytab"
+    keyTab="c:/apache-tomcat-@VERSION_MAJOR_MINOR@.x/conf/tomcat.keytab"
     storeKey=true;
 };
 
@@ -154,7 +154,7 @@ com.sun.security.jgss.krb5.accept {
     doNotPrompt=true
     principal="HTTP/win-tc01.dev.local@DEV.LOCAL"
     useKeyTab=true
-    keyTab="c:/apache-tomcat-7.0.x/conf/tomcat.keytab"
+    keyTab="c:/apache-tomcat-@VERSION_MAJOR_MINOR@.x/conf/tomcat.keytab"
     storeKey=true;
 };</source>
   The location of this file can be changed by setting the

Modified: tomcat/trunk/webapps/docs/windows-service-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-service-howto.xml?rev=1527315&r1=1527314&r2=1527315&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/windows-service-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-service-howto.xml Sun Sep 29 12:27:46 2013
@@ -33,14 +33,14 @@
 <toc/>
 </section>
 
-<section name="Tomcat7 service application">
+<section name="Tomcat@VERSION_MAJOR@ service application">
 <p>
-    <b>Tomcat7</b> is a service application for running Tomcat7 as NT service.
+    <b>Tomcat@VERSION_MAJOR@</b> is a service application for running Tomcat
@VERSION_MAJOR@ as NT service.
 </p>
 </section>
-<section name="Tomcat7w monitor application">
+<section name="Tomcat@VERSION_MAJOR@w monitor application">
 <p>
-    <b>Tomcat7w</b> is a GUI application for monitoring and configuring Tomcat
+    <b>Tomcat@VERSION_MAJOR@w</b> is a GUI application for monitoring and configuring
Tomcat
     services.
 </p>
     <p>The available command line options are:</p>
@@ -69,7 +69,7 @@
         <td>Run the service as console application</td>
         <td>This is the default operation. It is called if the no option is
             provided. The ServiceName is the name of the executable without
-            exe suffix, meaning Tomcat7</td>
+            exe suffix, meaning Tomcat@VERSION_MAJOR@</td>
     </tr>
     <tr><td><b>//RS//</b></td>
         <td>Run the service</td>
@@ -321,7 +321,7 @@ neither being logged on with an Administ
 <code>/user</code> switch is sufficient.
 </p>
 
-<source>Install the service named 'Tomcat7'
+<source>Install the service named 'Tomcat@VERSION_MAJOR@'
 C:\> service.bat install</source>
 
 <p>There is a 2nd optional parameter that lets you specify the name of the
@@ -331,11 +331,11 @@ service, as displayed in Windows service
 C:\> service.bat install MyService</source>
 
 <p>
-If using tomcat7.exe, you need to use the <b>//IS//</b> parameter.</p>
+If using tomcat@VERSION_MAJOR@.exe, you need to use the <b>//IS//</b> parameter.</p>
 
-<source>Install the service named 'Tomcat7'
-C:\> tomcat7 //IS//Tomcat7 --DisplayName="Apache Tomcat 7" \
-C:\> --Install="C:\Program Files\Tomcat\bin\tomcat7.exe" --Jvm=auto \
+<source>Install the service named 'Tomcat@VERSION_MAJOR@'
+C:\> tomcat@VERSION_MAJOR@ //IS//Tomcat@VERSION_MAJOR@ --DisplayName="Apache Tomcat @VERSION_MAJOR@"
\
+C:\> --Install="C:\Program Files\Tomcat\bin\tomcat@VERSION_MAJOR@.exe" --Jvm=auto \
 C:\> --StartMode=jvm --StopMode=jvm \
 C:\> --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start \
 C:\> --StopClass=org.apache.catalina.startup.Bootstrap --StopParams=stop</source>
@@ -346,15 +346,15 @@ C:\> --StopClass=org.apache.catalina.sta
 To update the service parameters, you need to use the <b>//US//</b> parameter.
 </p>
 
-<source>Update the service named 'Tomcat7'
-C:\> tomcat7 //US//Tomcat7 --Description="Apache Tomcat Server - http://tomcat.apache.org/
" \
+<source>Update the service named 'Tomcat@VERSION_MAJOR@'
+C:\> tomcat@VERSION_MAJOR@ //US//Tomcat@VERSION_MAJOR@ --Description="Apache Tomcat Server
- http://tomcat.apache.org/ " \
 C:\> --Startup=auto --Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar</source>
 
 <p>If you gave the service an optional name, you need to specify it like this:
 </p>
 
 <source>Update the service named 'MyService'
-C:\> tomcat7 //US//MyService --Description="Apache Tomcat Server - http://tomcat.apache.org/
" \
+C:\> tomcat@VERSION_MAJOR@ //US//MyService --Description="Apache Tomcat Server - http://tomcat.apache.org/
" \
 C:\> --Startup=auto --Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar</source>
 
 </section>
@@ -363,14 +363,14 @@ C:\> --Startup=auto --Classpath=%JAVA_HO
 To remove the service, you need to use the <b>//DS//</b> parameter.<br/>
 If the service is running it will be stopped and then deleted.</p>
 
-<source>Remove the service named 'Tomcat7'
-C:\> tomcat7 //DS//Tomcat7</source>
+<source>Remove the service named 'Tomcat@VERSION_MAJOR@'
+C:\> tomcat@VERSION_MAJOR@ //DS//Tomcat@VERSION_MAJOR@</source>
 
 <p>If you gave the service an optional name, you need to specify it like this:
 </p>
 
 <source>Remove the service named 'MyService'
-C:\> tomcat7 //DS//MyService</source>
+C:\> tomcat@VERSION_MAJOR@ //DS//MyService</source>
 
 </section>
 <section name="Debugging services">
@@ -378,13 +378,13 @@ C:\> tomcat7 //DS//MyService</source>
 To run the service in console mode, you need to use the <b>//TS//</b> parameter.
 The service shutdown can be initiated by pressing <b>CTRL+C</b> or
 <b>CTRL+BREAK</b>.
-If you rename the tomcat7.exe to testservice.exe then you can just execute the
+If you rename the tomcat@VERSION_MAJOR@.exe to testservice.exe then you can just execute
the
 testservice.exe and this command mode will be executed by default.</p>
 
-<source>Run the service named 'Tomcat7' in console mode
-C:\> tomcat7 //TS//Tomcat7 [additional arguments]
+<source>Run the service named 'Tomcat@VERSION_MAJOR@' in console mode
+C:\> tomcat@VERSION_MAJOR@ //TS//Tomcat@VERSION_MAJOR@ [additional arguments]
 Or simply execute:
-C:\> tomcat7</source>
+C:\> tomcat@VERSION_MAJOR@</source>
 
 </section>
 <section name="Multiple Instances">
@@ -423,18 +423,18 @@ name of the Tomcat installation director
 variable CATALINA_BASE and point this to the instance folder. Then run "service
 install" command specifying a service name.</p>
 
-<source>set CATALINA_HOME=c:\tomcat_7
-set CATALINA_BASE=c:\tomcat_7\instances\instance1
+<source>set CATALINA_HOME=c:\tomcat_@VERSION_MAJOR@
+set CATALINA_BASE=c:\tomcat_@VERSION_MAJOR@\instances\instance1
 service install instance1</source>
 
 <p>
-To modify the service settings, you can run <b>tomcat7w //ES//instance1</b>.
+To modify the service settings, you can run <b>tomcat@VERSION_MAJOR@w //ES//instance1</b>.
 </p>
 <p>
 For additional instances, create additional instance folder, update the
 CATALINA_BASE environment variable, and run the service install again.</p>
 
-<source>set CATALINA_BASE=c:\tomcat_7\instances\instance2
+<source>set CATALINA_BASE=c:\tomcat_@VERSION_MAJOR@\instances\instance2
 service install instance2</source>
 
 </section>



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


Mime
View raw message