This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 6107934 Update Tomcat 9 to Tomact 10 6107934 is described below commit 6107934e05b495110a8230c91a537ef80f9b275c Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Sep 29 12:45:26 2020 +0100 Update Tomcat 9 to Tomact 10 --- CONTRIBUTING.md | 1 + README.md | 2 ++ java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- webapps/docs/architecture/project.xml | 4 ++-- webapps/docs/changelog.xml | 5 +++++ webapps/docs/config/cluster-interceptor.xml | 2 +- webapps/docs/config/cluster-membership.xml | 14 ++------------ webapps/docs/config/http.xml | 20 ++++++++++---------- webapps/docs/config/listeners.xml | 6 +----- webapps/docs/config/project.xml | 4 ++-- webapps/docs/rewrite.xml | 2 +- 11 files changed, 28 insertions(+), 34 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0157a0..3484864 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,6 +76,7 @@ manually generate the patch file by using diff. If this is what you want, you can download the sources from the "Source Code Distributions" section of the Download Page. There is one such page for every major Tomcat version: +- [Tomcat 10](https://tomcat.apache.org/download-10.cgi) - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) - [Tomcat 8](https://tomcat.apache.org/download-80.cgi) - [Tomcat 7](https://tomcat.apache.org/download-70.cgi) diff --git a/README.md b/README.md index 9a8e002..ec1353d 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ project logo are trademarks of the Apache Software Foundation. For every major Tomcat version there is one download page containing links to the latest binary and source code downloads, but also links for browsing the download directories and archives: +- [Tomcat 10](https://tomcat.apache.org/download-10.cgi) - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) - [Tomcat 8](https://tomcat.apache.org/download-80.cgi) - [Tomcat 7](https://tomcat.apache.org/download-70.cgi) @@ -42,6 +43,7 @@ The documentation available as of the date of this release is included in the docs webapp which ships with tomcat. You can access that webapp by starting tomcat and visiting <http://localhost:8080/docs/> in your browser. The most up-to-date documentation for each version can be found at: +- [Tomcat 10](https://tomcat.apache.org/tomcat-10.0-doc/) - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/) - [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/) - [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/) diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java b/java/org/apache/tomcat/util/compat/JreCompat.java index 099ee87..1b79e28 100644 --- a/java/org/apache/tomcat/util/compat/JreCompat.java +++ b/java/org/apache/tomcat/util/compat/JreCompat.java @@ -50,7 +50,7 @@ public class JreCompat { protected static final Method getApplicationProtocolMethod; static { - // This is Tomcat 9 with a minimum Java version of Java 8. + // This is Tomcat 10 with a minimum Java version of Java 8. // Look for the highest supported JVM first if (GraalCompat.isSupported()) { instance = new GraalCompat(); diff --git a/webapps/docs/architecture/project.xml b/webapps/docs/architecture/project.xml index 7bf0c73..0589be6 100644 --- a/webapps/docs/architecture/project.xml +++ b/webapps/docs/architecture/project.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project name="Apache Tomcat 9 Architecture" +<project name="Apache Tomcat 10 Architecture" href="https://tomcat.apache.org/"> - <title>Apache Tomcat 9 Architecture</title> + <title>Apache Tomcat 10 Architecture</title> <logo href="/images/tomcat.gif"> The Apache Tomcat Servlet/JSP Container diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8dc1aba..f966a93 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -152,6 +152,11 @@ clarify when a user may wish to deploy additional instances of the Manager web application. (markt) </fix> + <fix> + <bug>64774</bug>: Review references to Tomcat 9 in the the documentation + web application and remove them or upadte them to refer to Tomact 10 as + appropriate. (markt) + </fix> </changelog> </subsection> <subsection name="Other"> diff --git a/webapps/docs/config/cluster-interceptor.xml b/webapps/docs/config/cluster-interceptor.xml index 836c4cd..2dfc362 100644 --- a/webapps/docs/config/cluster-interceptor.xml +++ b/webapps/docs/config/cluster-interceptor.xml @@ -200,7 +200,7 @@ <subsection name="org.apache.catalina.tribes.group.interceptors.EncryptInterceptor Attributes"> <p> The EncryptInterceptor adds encryption to the channel messages carrying - session data between nodes. Added in Tomcat 9.0.13. + session data between nodes. </p> <p> If using the <code>TcpFailureDetector</code>, the <code>EncryptInterceptor</code> diff --git a/webapps/docs/config/cluster-membership.xml b/webapps/docs/config/cluster-membership.xml index 80e4be3..6c3640b 100644 --- a/webapps/docs/config/cluster-membership.xml +++ b/webapps/docs/config/cluster-membership.xml @@ -231,7 +231,7 @@ <p><b>LocalMember:</b> <br/> Static member that is the local member of the static cluster group. </p> - <p><strong>Note:</strong> In Tomcat 9.0.17 and later, The setting of local member is not required. + <p><strong>Note:</strong> The setting of local member is not required. It is possible to set up a list of all cluster members including local member instead of setting this components. </p> <attributes> @@ -301,17 +301,7 @@ </subsection> <subsection name="Setting"> - <p><b>Before Tomcat 9.0.16</b> <br/> - <source><![CDATA[ <Membership className="org.apache.catalina.tribes.membership.StaticMembershipService"> - <LocalMember className="org.apache.catalina.tribes.membership.StaticMember" - uniqueId="{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}"/> - <Member className="org.apache.catalina.tribes.membership.StaticMember" - port="4004" - host="tomcat02.mydomain.com" - uniqueId="{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,1}"/> - </Membership>]]></source> - </p> - <p><b>Tomcat9.0.17 and later</b> <br/> + <p> <source><![CDATA[ <Membership className="org.apache.catalina.tribes.membership.StaticMembershipService"> <Member className="org.apache.catalina.tribes.membership.StaticMember" port="4004" diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 9f9dbc7..33cdecc 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1051,16 +1051,16 @@ <section name="Nested Components"> - <p>First implemented in Tomcat 9 and back-ported to 8.5, Tomcat now supports - Server Name Indication (SNI). This allows multiple SSL configurations to be - associated with a single secure connector with the configuration used for any - given connection determined by the host name requested by the client. To - facilitate this, the <strong>SSLHostConfig</strong> element was added which - can be used to define one of these configurations. Any number of - <strong>SSLHostConfig</strong> may be nested in a <strong>Connector</strong>. - At the same time, support was added for multiple certificates to be associated - with a single <strong>SSLHostConfig</strong>. Each SSL certificate is - therefore configured in a <strong>Certificate</strong> element with in an + <p>Tomcat supports Server Name Indication (SNI). This allows multiple SSL + configurations to be associated with a single secure connector with the + configuration used for any given connection determined by the host name + requested by the client. To facilitate this, the + <strong>SSLHostConfig</strong> element was added which can be used to define + one of these configurations. Any number of <strong>SSLHostConfig</strong> may + be nested in a <strong>Connector</strong>. At the same time, support was added + for multiple certificates to be associated with a single + <strong>SSLHostConfig</strong>. Each SSL certificate is therefore configured + in a <strong>Certificate</strong> element within an <strong>SSLHostConfig</strong>. For further information, see the SSL Support section below.</p> diff --git a/webapps/docs/config/listeners.xml b/webapps/docs/config/listeners.xml index 99af04e..ea5ac06 100644 --- a/webapps/docs/config/listeners.xml +++ b/webapps/docs/config/listeners.xml @@ -323,11 +323,7 @@ <p>The <strong>Security Lifecycle Listener</strong> performs a number of security checks when Tomcat starts and prevents Tomcat from starting if they fail. The listener is not enabled by default. To enabled it uncomment the - listener in $CATALINA_BASE/conf/server.xml. For Tomcat versions before 9.0.7, - if the operating system supports umask then the line in - $CATALINA_HOME/bin/catalina.sh that obtains the umask also needs to be - uncommented. For Tomcat 9.0.7 and later, the umask is automatically - passed-into Tomcat.</p> + listener in $CATALINA_BASE/conf/server.xml.</p> <p>This listener must only be nested within <a href="server.html">Server</a> elements.</p> diff --git a/webapps/docs/config/project.xml b/webapps/docs/config/project.xml index 5ebcf05..2e175d9 100644 --- a/webapps/docs/config/project.xml +++ b/webapps/docs/config/project.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project name="Apache Tomcat 9 Configuration Reference" +<project name="Apache Tomcat 10 Configuration Reference" href="https://tomcat.apache.org/"> - <title>Apache Tomcat 9 Configuration Reference</title> + <title>Apache Tomcat 10 Configuration Reference</title> <logo href="/images/tomcat.gif"> The Apache Tomcat Servlet/JSP Container diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml index 81763fc..4948026 100644 --- a/webapps/docs/rewrite.xml +++ b/webapps/docs/rewrite.xml @@ -430,7 +430,7 @@ public interface RewriteMap { (be careful with whitespace) – by calling <code>setParameters(String)</code>. That instance will then be registered under the name given as the first parameter of <code>RewriteMap</code> rule.</p> - <p>Note: Starting with Tomcat 9 you can use more than one parameter. These have to be separated by spaces. Parameters + <p>Note: You can use more than one parameter. These have to be separated by spaces. Parameters can be quoted with ". This enables space characters inside parameters.</p> <p>That map instance will be given the the lookup value that is configured in the corresponding <code>RewriteRule</code> by --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org