You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/09/24 16:49:08 UTC
[tomcat] branch 7.0.x updated (664e5e1 -> e2ce8c9)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 664e5e1 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC
new 7322990 Polish. Fix spacing. Remove svn & cvs references. Align with 8.5.x.
new e15f4b9 Align Java version references
new dd0cc25 Parameterise minimum Java version
new 97aebf8 Fix xml source file that wasn't using expected version replacement
new e2ce8c9 Fix xml source file that wasn't using expected version replacement
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES | 2 +-
RUNNING.txt | 2 +-
build.xml | 36 +++++------
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 4 +-
res/welcome.main.html | 4 +-
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/appdev/processes.xml | 4 +-
webapps/docs/changelog.xml | 5 ++
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/default-servlet.xml | 116 +++++++++++++++++------------------
webapps/docs/setup.xml | 4 +-
webapps/docs/tomcat-docs.xsl | 4 ++
13 files changed, 97 insertions(+), 90 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Align Java version references
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e15f4b983f67fb96e4ffeffbf9cd90e65bc6ada9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:14:37 2019 +0100
Align Java version references
---
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index ea93aaa..0cfed2c 100644
--- a/build.xml
+++ b/build.xml
@@ -80,9 +80,9 @@
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
- <!-- Servlet 3.0 spec requires 1.6+ -->
- <property name="compile.source" value="1.6"/>
- <property name="compile.target" value="1.6"/>
+ <!-- Servlet 3.0 spec requires Java 6+ -->
+ <property name="compile.source" value="6"/>
+ <property name="compile.target" value="6"/>
<!-- Expose commons-logging defaults so they can be orver-ridden -->
<property name="logging.compile.source" value="1.2" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Parameterise minimum Java version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dd0cc250e4b2f671e9e4aecf7d56a6bce45b77a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:00:31 2019 +0100
Parameterise minimum Java version
---
RELEASE-NOTES | 2 +-
RUNNING.txt | 2 +-
build.xml | 2 ++
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 4 ++--
res/welcome.main.html | 4 ++--
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/changelog.xml | 5 +++++
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/setup.xml | 4 ++--
webapps/docs/tomcat-docs.xsl | 4 ++++
11 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7024160..ebf045c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,7 +41,7 @@ CONTENTS:
===================
Dependency Changes:
===================
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 6 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java @MIN_JAVA_VERSION@ and later.
In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler for
compiling JSP pages. This means you no longer need to have the complete
diff --git a/RUNNING.txt b/RUNNING.txt
index b50a0e2..b74ab6a 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -172,7 +172,7 @@ create the following script file:
On Windows, %CATALINA_BASE%\bin\setenv.bat:
- set "JRE_HOME=%ProgramFiles%\Java\jre6"
+ set "JRE_HOME=%ProgramFiles%\Java\jre@MIN_JAVA_VERSION@"
exit /b 0
On *nix, $CATALINA_BASE/bin/setenv.sh:
diff --git a/build.xml b/build.xml
index 0cfed2c..0b2b8d2 100644
--- a/build.xml
+++ b/build.xml
@@ -83,6 +83,7 @@
<!-- Servlet 3.0 spec requires Java 6+ -->
<property name="compile.source" value="6"/>
<property name="compile.target" value="6"/>
+ <property name="min.java.version" value="6"/>
<!-- Expose commons-logging defaults so they can be orver-ridden -->
<property name="logging.compile.source" value="1.2" />
@@ -249,6 +250,7 @@
<filter token="VERSION_BUILT" value="${today} ${tstamp} UTC"/>
<filter token="JDT_VERSION" value="${jdt.version}"/>
<filter token="GIT_BRANCH" value="${git.branch}"/>
+ <filter token="MIN_JAVA_VERSION" value="${min.java.version}"/>
</filterset>
<!-- Files to change line endings for depending on target platform -->
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index f2c9077..b8d1a5b 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -132,7 +132,7 @@ Var ServiceInstallLog
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
- LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java SE 6.0 or later JRE installed on your system."
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java @MIN_JAVA_VERSION@ or later JRE installed on your system."
LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown Port"
LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector Port"
LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 214bb06..4e354b5 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -34,9 +34,9 @@ and must be untarred with a GNU compatible version of tar. The version
of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later. Read the
+<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java @MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-</font></p>
+</p>
<h4>Packaging Details (or "What Should I Download?")</h4>
<dl>
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 0ab79da..b4cfecf 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -34,9 +34,9 @@ and must be untarred with a GNU compatible version of tar. The version
of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later. Read the
+<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java @MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-</font></p>
+</p>
<h4>Packaging Details (or "What Should I Download?")</h4>
<dl>
diff --git a/webapps/docs/appdev/installation.xml b/webapps/docs/appdev/installation.xml
index 8ac111d..c2fd470 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -39,7 +39,7 @@ in the following subsections.</p>
<subsection name="JDK">
-<p>Tomcat 7.0 was designed to run on Java SE 6.
+<p>Tomcat <version-major-minor/> was designed to run on Java <min-java-version/> or later.
</p>
<p>Compatible JDKs for many platforms (or links to where they can be found)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a352705..6d6812e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -279,6 +279,11 @@
grant sufficient privileges to enable the uninstaller to execute when
user account control is active. (markt)
</fix>
+ <add>
+ Use a build property to define the minimum supported Java version and
+ use that build property to reduce the number of edits required to update
+ the minimum supported Java version. (markt)
+ </add>
</changelog>
</subsection>
</section>
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index 45192c2..a7653cd 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -611,7 +611,7 @@ should be completed:</p>
<section name="Monitoring your Cluster with JMX">
<p>Monitoring is a very important question when you use a cluster. Some of the cluster objects are JMX MBeans </p>
-<p>Add the following parameter to your startup script with Java 5:</p>
+<p>Add the following parameter to your startup script:</p>
<source>set CATALINA_OPTS=\
-Dcom.sun.management.jmxremote \
-Dcom.sun.management.jmxremote.port=%my.jmx.port% \
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 5182fb5..f0f52d1 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -61,12 +61,12 @@
administration tool and its documentation).</li>
<li><strong>Java location</strong>: The installer will provide a default
JRE to use to run the service. The installer uses the registry to
- determine the base path of a Java 6 or later JRE, including the JRE
+ determine the base path of a Java <min-java-version/> or later JRE, including the JRE
installed as part of the full JDK. When running on a 64-bit
operating system, the installer will first look for a 64-bit JRE and
only look for a 32-bit JRE if a 64-bit JRE is not found. It is not
mandatory to use the default JRE detected by the installer. Any
- installed Java 6 or later JRE (32-bit or 64-bit) may be used.</li>
+ installed Java <min-java-version/> or later JRE (32-bit or 64-bit) may be used.</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
when choosing to run Tomcat at the end of installation, the tray
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 37865e5..8dfdea7 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -38,6 +38,7 @@
<xsl:param name="version" select="'7.0.x'"/>
<xsl:param name="majorversion" select="'7'"/>
<xsl:param name="majorminorversion" select="'7.0'"/>
+ <xsl:param name="minjavaversion" select="'6'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="year" select="'yyyy'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
@@ -619,6 +620,9 @@ p.notice {
<xsl:template match="version-major">
<xsl:value-of select="$majorversion"/>
</xsl:template>
+ <xsl:template match="min-java-version">
+ <xsl:value-of select="$minjavaversion"/>
+ </xsl:template>
<!-- specially process td tags ala site.vsl -->
<xsl:template match="table[@class='detail-table']/tr/td">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/05: Fix xml source file that wasn't using expected
version replacement
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e2ce8c9f6af7d0850363927c6eefd1d502c90357
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:07:55 2019 +0100
Fix xml source file that wasn't using expected version replacement
Source block is xml so need to xml escape so we can remove the CDATA
allowing the version replacement to work.
---
webapps/docs/default-servlet.xml | 116 +++++++++++++++++++--------------------
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index 38ef059..a705bac 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -203,23 +203,23 @@ Format:
<p>
The following is a sample xsl file which mimics the default tomcat behavior:
</p>
-<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<source><?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
- <xsl:output method="html" html-version="5.0"
- encoding="UTF-8" indent="no"
- doctype-system="about:legacy-compat"/>
+ <xsl:output method="html" html-version="5.0"
+ encoding="UTF-8" indent="no"
+ doctype-system="about:legacy-compat"/>
- <xsl:template match="listing">
- <html>
- <head>
- <title>
+ <xsl:template match="listing">
+ <html>
+ <head>
+ <title>
Sample Directory Listing For
- <xsl:value-of select="@directory"/>
- </title>
- <style>
+ <xsl:value-of select="@directory"/>
+ </title>
+ <style>
h1 {color : white;background-color : #0086b2;}
h3 {color : white;background-color : #0086b2;}
body {font-family : sans-serif,Arial,Tahoma;
@@ -227,56 +227,56 @@ Format:
b {color : white;background-color : #0086b2;}
a {color : black;} HR{color : #0086b2;}
table td { padding: 5px; }
- </style>
- </head>
- <body>
- <h1>Sample Directory Listing For
- <xsl:value-of select="@directory"/>
- </h1>
- <hr style="height: 1px;" />
- <table style="width: 100%;">
- <tr>
- <th style="text-align: left;">Filename</th>
- <th style="text-align: center;">Size</th>
- <th style="text-align: right;">Last Modified</th>
- </tr>
- <xsl:apply-templates select="entries"/>
- </table>
- <xsl:apply-templates select="readme"/>
- <hr style="height: 1px;" />
- <h3>Apache Tomcat/8.0</h3>
- </body>
- </html>
- </xsl:template>
+ </style>
+ </head>
+ <body>
+ <h1>Sample Directory Listing For
+ <xsl:value-of select="@directory"/>
+ </h1>
+ <hr style="height: 1px;" />
+ <table style="width: 100%;">
+ <tr>
+ <th style="text-align: left;">Filename</th>
+ <th style="text-align: center;">Size</th>
+ <th style="text-align: right;">Last Modified</th>
+ </tr>
+ <xsl:apply-templates select="entries"/>
+ </table>
+ <xsl:apply-templates select="readme"/>
+ <hr style="height: 1px;" />
+ <h3>Apache Tomcat/<version-major-minor/></h3>
+ </body>
+ </html>
+ </xsl:template>
- <xsl:template match="entries">
- <xsl:apply-templates select="entry"/>
- </xsl:template>
+ <xsl:template match="entries">
+ <xsl:apply-templates select="entry"/>
+ </xsl:template>
- <xsl:template match="readme">
- <hr style="height: 1px;" />
- <pre><xsl:apply-templates/></pre>
- </xsl:template>
+ <xsl:template match="readme">
+ <hr style="height: 1px;" />
+ <pre><xsl:apply-templates/></pre>
+ </xsl:template>
- <xsl:template match="entry">
- <tr>
- <td style="text-align: left;">
- <xsl:variable name="urlPath" select="@urlPath"/>
- <a href="{$urlPath}">
- <pre><xsl:apply-templates/></pre>
- </a>
- </td>
- <td style="text-align: right;">
- <pre><xsl:value-of select="@size"/></pre>
- </td>
- <td style="text-align: right;">
- <pre><xsl:value-of select="@date"/></pre>
- </td>
- </tr>
- </xsl:template>
+ <xsl:template match="entry">
+ <tr>
+ <td style="text-align: left;">
+ <xsl:variable name="urlPath" select="@urlPath"/>
+ <a href="{$urlPath}">
+ <pre><xsl:apply-templates/></pre>
+ </a>
+ </td>
+ <td style="text-align: right;">
+ <pre><xsl:value-of select="@size"/></pre>
+ </td>
+ <td style="text-align: right;">
+ <pre><xsl:value-of select="@date"/></pre>
+ </td>
+ </tr>
+ </xsl:template>
-</xsl:stylesheet>]]></source>
+</xsl:stylesheet></source>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: Polish. Fix spacing. Remove svn & cvs references.
Align with 8.5.x.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 73229901a7d575b729e54c8ddf2417bb493f5da0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:11:18 2019 +0100
Polish. Fix spacing. Remove svn & cvs references. Align with 8.5.x.
---
build.xml | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 8fbe02d..ea93aaa 100644
--- a/build.xml
+++ b/build.xml
@@ -42,15 +42,15 @@
<property name="version.major.minor" value="${version.major}.${version.minor}" />
<!-- constant to declare a file binary for md5sum -->
- <property name="md5sum.binary-prefix" value=" *" />
+ <property name="md5sum.binary-prefix" value=" *" />
<!-- Exact spec versions (for the manifests) -->
- <property name="servlet.revision" value="FR" />
- <property name="jsp.revision" value="FR" />
- <property name="el.revision" value="FR" />
- <property name="websocket.revision" value="FR" />
+ <property name="servlet.revision" value="FR" />
+ <property name="jsp.revision" value="FR" />
+ <property name="el.revision" value="FR" />
+ <property name="websocket.revision" value="FR" />
<!-- MR 1 but this was first 1.1 release so use FR -->
- <property name="annotation.revision" value="FR" />
+ <property name="annotation.revision" value="FR" />
<!-- Release artifact base names -->
<property name="final.name" value="${project}-${version}" />
@@ -620,7 +620,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
<compilerarg value="-Xlint:unchecked"/>
@@ -674,7 +673,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
<compilerarg value="-Xlint:unchecked"/>
@@ -1162,7 +1160,6 @@
source="${compile.source}"
target="${compile.target}"
classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
</javac>
@@ -1174,7 +1171,6 @@
source="${compile.source}"
target="${compile.target}"
classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
</javac>
@@ -2923,7 +2919,7 @@ skip.installer property in build.properties" />
<antcall target="downloadfile">
<param name="sourcefile" value="${easymock.loc}"/>
<param name="destfile" value="${easymock.jar}"/>
- <param name="destdir" value="${base.path}"/>
+ <param name="destdir" value="${easymock.home}"/>
<param name="checksum.enabled" value="${easymock.checksum.enabled}"/>
<param name="checksum.algorithm" value="${easymock.checksum.algorithm}"/>
<param name="checksum.value" value="${easymock.checksum.value}"/>
@@ -2941,7 +2937,7 @@ skip.installer property in build.properties" />
<antcall target="downloadfile">
<param name="sourcefile" value="${objenesis.loc}"/>
<param name="destfile" value="${objenesis.jar}"/>
- <param name="destdir" value="${base.path}"/>
+ <param name="destdir" value="${objenesis.home}"/>
<param name="checksum.enabled" value="${objenesis.checksum.enabled}"/>
<param name="checksum.algorithm" value="${objenesis.checksum.algorithm}"/>
<param name="checksum.value" value="${objenesis.checksum.value}"/>
@@ -3121,7 +3117,7 @@ skip.installer property in build.properties" />
</sequential>
</macrodef>
- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+ <target name="downloadgz" unless="exist" depends="testexist,setproxy">
<!-- Download and extract the package -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3138,7 +3134,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}.tar.gz"/>
</target>
- <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
+ <target name="downloadgz-2" unless="exist" depends="testexist">
<!-- Download and extract the package from the two alternative locations -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3163,7 +3159,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}.tar.gz"/>
</target>
- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+ <target name="downloadzip" unless="exist" depends="testexist,setproxy">
<!-- Download and extract the package -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3203,7 +3199,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}"/>
</target>
- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+ <target name="downloadfile" unless="exist" depends="testexist,setproxy">
<!-- Download the file -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Fix xml source file that wasn't using expected
version replacement
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 97aebf8c4dbf8e0cd31d690e227a24d15a6c4bb9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:07:18 2019 +0100
Fix xml source file that wasn't using expected version replacement
No special characters used in the source block so just remove the CDATA
---
webapps/docs/appdev/processes.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml
index bd9af1d..5620c74 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -126,7 +126,7 @@ the sample <code>build.xml</code> script. At a minimum, you will generally
need to define the <code>catalina.home</code> property defining where
Tomcat is installed, and the manager application username and password.
You might end up with something like this:</p>
-<source><![CDATA[# Context path to install this application on
+<source># Context path to install this application on
app.path=/hello
# Tomcat 7 installation directory
@@ -134,7 +134,7 @@ catalina.home=/usr/local/apache-tomcat-7.0
# Manager webapp username and password
manager.username=myusername
-manager.password=mypassword]]></source>
+manager.password=mypassword</source>
<p>In general, you will <strong>not</strong> want to check the
<code>build.properties</code> file in to the CVS repository, because it
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org