Author: markt
Date: Tue Oct 15 19:36:24 2013
New Revision: 1532498
URL: http://svn.apache.org/r1532498
Log:
Can't use Ant property replacement in files that are generated via XSL
processing. Add processing to the stylesheet.
Modified:
tomcat/trunk/build.xml
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/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/tomcat-docs.xsl
tomcat/trunk/webapps/docs/windows-auth-howto.xml
tomcat/trunk/webapps/docs/windows-service-howto.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct 15 19:36:24 2013
@@ -850,6 +850,8 @@
<param name="subdir" expression=""/>
<param name="relative-path" expression="."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
<param name="year" expression="${year}"/>
@@ -865,6 +867,8 @@
<param name="subdir" expression="appdev/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
<param name="year" expression="${year}"/>
@@ -880,6 +884,8 @@
<param name="subdir" expression="funcspecs/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
<param name="year" expression="${year}"/>
@@ -895,6 +901,8 @@
<param name="subdir" expression="config/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
<param name="year" expression="${year}"/>
@@ -910,6 +918,8 @@
<param name="subdir" expression="architecture/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
<param name="year" expression="${year}"/>
@@ -926,6 +936,8 @@
<param name="subdir" expression="tribes/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
<param name="year" expression="${year}"/>
Modified: tomcat/trunk/webapps/docs/appdev/installation.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/installation.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/installation.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/installation.xml Tue Oct 15 19:36:24 2013
@@ -39,7 +39,7 @@ in the following subsections.</p>
<subsection name="JDK">
-<p>Tomcat @VERSION_MAJOR_MINOR@ 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 @VERSION_MAJOR@. 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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Tue Oct 15 19:36:24 2013
@@ -130,7 +130,7 @@ You might end up with something like thi
app.path=/hello
# Tomcat installation directory
-catalina.home=/usr/local/apache-tomcat-@VERSION_MAJOR_MINOR@
+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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Tue Oct 15 19:36:24 2013
@@ -82,7 +82,7 @@ available, which will be used to actuall
</section>
-<section name="Checkout or obtain the source code for Tomcat @VERSION_MAJO@">
+<section name="Checkout or obtain the Tomcat source code">
<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-@version_ma...@0.cgi";>http://tomcat.apache.org/download-@version_ma...@0.cgi</a>.
+ <download>http://tomcat.apache.org/download-<version-major/>0.cgi</download>.
</p>
<p>
Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Tue Oct 15 19:36:24 2013
@@ -113,7 +113,7 @@
<section name="Cluster Basics">
-<p>To run session replication in your Tomcat @VERSION_MAJOR@ 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-@VERSION_MAJOR_MINOR@-doc/api/org/apache/catalina/tribes/Channel.html";>send
flag(javadoc)</a>.
+ <doc path="/api/org/apache/catalina/tribes/Channel.html">send
flag(javadoc)</doc>.
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,8 +287,8 @@ 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-@VERSION_MAJOR_MINOR@-doc/api/org/apache/catalina/tribes/Channel.html";>
- our javadoc site</a>
+ The description of the send flags is available at <doc
path="/api/org/apache/catalina/tribes/Channel.html">
+ our javadoc site</doc>
The <code>DeltaManager</code> sends information using the
SimpleTcpCluster.send method, while the backup manager
sends it itself directly through the channel.
<br/>For more info, Please visit the <a
href="config/cluster.html">reference documentation</a>
Modified: tomcat/trunk/webapps/docs/default-servlet.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/trunk/webapps/docs/default-servlet.xml Tue Oct 15 19:36:24 2013
@@ -247,7 +247,7 @@ Format:
</table>
<xsl:apply-templates select="readme"/>
<hr style="height: 1px;" />
- <h3>Apache Tomcat/@VERSION_MAJOR_MINOR@</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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Tue Oct 15 19:36:24 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-@VERSION_MAJOR_MINOR@.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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Tue Oct 15 19:36:24 2013
@@ -35,7 +35,7 @@
<p>This is the top-level entry point of the documentation bundle for the
<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
-@VERSION_MAJOR_MINOR@ implements the Servlet 3.1 and JavaServer Pages 2.3
+<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
Modified: tomcat/trunk/webapps/docs/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Tue Oct 15 19:36:24 2013
@@ -110,7 +110,7 @@ below are various web sites and mailing
<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
+some documentation that is not relevant to Tomcat <version-major/>, but
only to earlier versions.</p>
<ul>
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Tue Oct 15 19:36:24 2013
@@ -36,7 +36,7 @@
<section name="Introduction">
-<p>Tomcat @VERSION_MAJOR_MINOR@ 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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Oct 15
19:36:24 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 @VERSION_MAJOR@.
+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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/security-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-howto.xml Tue Oct 15 19:36:24 2013
@@ -170,7 +170,7 @@
<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/@VERSION_MAJOR_MINOR@.0), the name of
+ Tomcat version (e.g. Apache Tomcat/<version-major-minor/>), 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.
@@ -178,7 +178,7 @@
<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 to
- @VERSION_MAJOR_MINOR@.x is Apache-Coyote/1.1. This header can provide
+ <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
@@ -212,8 +212,7 @@
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-@VERSION_MAJOR@.html";>Tomcat
- @VERSION_MAJOR@ security page</a>.</p>
+ <security>Tomcat <version-major/> security page</security>.</p>
<p>The <strong>requiredSecret</strong> attribute in AJP connectors
configures shared secret between Tomcat and reverse proxy in front of
@@ -280,7 +279,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/@VERSION_MAJOR_MINOR@.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/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Tue Oct 15 19:36:24 2013
@@ -40,12 +40,16 @@
<xsl:param name="subdir" select="''"/>
<xsl:param name="relative-path" select="'.'"/>
<xsl:param name="version" select="'8.0.x'"/>
- <xsl:param name="majorversion" select="'8.0'"/>
+ <xsl:param name="majorversion" select="'8'"/>
+ <xsl:param name="majorminorversion" select="'8.0'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="build-date-iso-8601" select="'yyyy-dd-MM'"/>
<xsl:param name="year" select="'yyyy'"/>
<xsl:param name="buglink"
select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="revlink"
select="'http://svn.apache.org/viewvc?view=rev&rev='"/>
+ <xsl:param name="doclink"
select="'http://tomcat.apache.org/tomcat-8.0-doc'"/>
+ <xsl:param name="sylink"
select="'http://tomcat.apache.org/security-8.html'"/>
+ <xsl:param name="dllink"
select="'http://tomcat.apache.org/download-80.cgi'"/>
<xsl:param name="sitedir" select="''"/>
<xsl:param name="filename" select="'-'"/>
@@ -492,6 +496,32 @@
<a href="{$link}">r<xsl:apply-templates/></a>
</xsl:template>
+ <!-- Link to online docs -->
+ <xsl:template match="doc">
+ <xsl:variable name="link"><xsl:value-of select="$doclink"/><xsl:value-of
select="@path"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Link to security page -->
+ <xsl:template match="security">
+ <xsl:variable name="link"><xsl:value-of select="$sylink"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Link to download page -->
+ <xsl:template match="download">
+ <xsl:variable name="link"><xsl:value-of select="$dllink"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Version numbers -->
+ <xsl:template match="version-major-minor">
+ <xsl:value-of select="$majorminorversion"/>
+ </xsl:template>
+ <xsl:template match="version-major">
+ <xsl:value-of select="$majorversion"/>
+ </xsl:template>
+
<!-- Process everything else by just passing it through -->
<xsl:template match="*|@*">
<xsl:copy>
Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Tue Oct 15 19:36:24 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-@VERSION_MAJOR_MINOR@.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-@VERSION_MAJOR_MINOR@.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-@VERSION_MAJOR_MINOR@.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=1532498&r1=1532497&r2=1532498&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/windows-service-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-service-howto.xml Tue Oct 15 19:36:24 2013
@@ -33,15 +33,16 @@
<toc/>
</section>
-<section name="Tomcat@VERSION_MAJOR@ service application">
+<section name="Tomcat service application">
<p>
- <b>Tomcat@VERSION_MAJOR@</b> is a service application for running Tomcat
@VERSION_MAJOR@ as NT service.
+ <b>Tomcat<version-major/></b> is a service application for running Tomcat
+ <version-major/> as a Windows service.
</p>
</section>
-<section name="Tomcat@VERSION_MAJOR@w monitor application">
+<section name="Tomcat monitor application">
<p>
- <b>Tomcat@VERSION_MAJOR@w</b> is a GUI application for monitoring and
configuring Tomcat
- services.
+ <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 +70,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 Tomcat@VERSION_MAJOR@</td>
+ exe suffix, meaning Tomcat<version-major/></td>
</tr>
<tr><td><b>//RS//</b></td>
<td>Run the service</td>
@@ -321,7 +322,7 @@ neither being logged on with an Administ
<code>/user</code> switch is sufficient.
</p>
-<source>Install the service named 'Tomcat@VERSION_MAJOR@'
+<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 +332,11 @@ service, as displayed in Windows service
C:\> service.bat install MyService</source>
<p>
-If using tomcat@VERSION_MAJOR@.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 '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 \
+<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 +347,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 'Tomcat@VERSION_MAJOR@'
-C:\> tomcat@VERSION_MAJOR@ //US//Tomcat@VERSION_MAJOR@ --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:\> tomcat@VERSION_MAJOR@ //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 +364,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 'Tomcat@VERSION_MAJOR@'
-C:\> tomcat@VERSION_MAJOR@ //DS//Tomcat@VERSION_MAJOR@</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:\> tomcat@VERSION_MAJOR@ //DS//MyService</source>
+C:\> tomcat<version-major/> //DS//MyService</source>
</section>
<section name="Debugging services">
@@ -378,13 +379,13 @@ C:\> tomcat@VERSION_MAJOR@ //DS//MyServi
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 tomcat@VERSION_MAJOR@.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 'Tomcat@VERSION_MAJOR@' in console mode
-C:\> tomcat@VERSION_MAJOR@ //TS//Tomcat@VERSION_MAJOR@ [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:\> tomcat@VERSION_MAJOR@</source>
+C:\> tomcat<version-major/></source>
</section>
<section name="Multiple Instances">
@@ -423,18 +424,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_@VERSION_MAJOR@
-set CATALINA_BASE=c:\tomcat_@VERSION_MAJOR@\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>tomcat@VERSION_MAJOR@w
//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_@VERSION_MAJOR@\instances\instance2
+<source>set CATALINA_BASE=c:\tomcat_<version-major/>\instances\instance2
service install instance2</source>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
