Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Tue Feb 26 19:16:17 2019 @@ -1,227 +1,227 @@ <!DOCTYPE html SYSTEM "about:legacy-compat"> <html lang="en"> - <head> - <META http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link href="res/css/tomcat.css" rel="stylesheet" type="text/css"> - <link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css"> - <title>Apache Tomcat® - Which Version Do I Want?</title> - <meta name="author" content="Marc A. Saegesser"> - <meta name="author" content="Yoav Shapira"> - <meta name="author" content="Jean-Frederic Clere"> - </head> - <body> - <div id="wrapper"> - <header id="header"> - <div class="clearfix"> - <div class="menu-toggler pull-left" tabindex="1"> - <div class="hamburger"></div> - </div> - <a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a> - <h1 class="pull-left"> - Apache Tomcat<sup>®</sup> - </h1> - <div class="asf-logos pull-right"> - <a href="https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a> - </div> - </div> - </header> - <main id="middle"> - <div> - <div id="mainLeft"> - <div id="nav-wrapper"> - <form action="https://www.google.com/search"; method="get"> - <div class="searchbox"> - <input value="tomcat.apache.org" name="sitesearch" type="hidden"><input placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button> - </div> - </form> - <nav> - <div> - <h2>Apache Tomcat</h2> - <ul> - <li> - <a href="./index.html">Home</a> - </li> - <li> - <a href="./taglibs.html">Taglibs</a> - </li> - <li> - <a href="./maven-plugin.html">Maven Plugin</a> - </li> - </ul> - </div> - <div> - <h2>Download</h2> - <ul> - <li> - <a href="./whichversion.html">Which version?</a> - </li> - <li> - <a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a> - </li> - <li> - <a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a> - </li> - <li> - <a href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a> - </li> - <li> - <a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a> - </li> - <li> - <a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a> - </li> - <li> - <a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a> - </li> - <li> - <a href="https://archive.apache.org/dist/tomcat/";>Archives</a> - </li> - </ul> - </div> - <div> - <h2>Documentation</h2> - <ul> - <li> - <a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a> - </li> - <li> - <a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a> - </li> - <li> - <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a> - </li> - <li> - <a href="./connectors-doc/">Tomcat Connectors</a> - </li> - <li> - <a href="./native-doc/">Tomcat Native</a> - </li> - <li> - <a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a> - </li> - <li> - <a href="./migration.html">Migration Guide</a> - </li> - <li> - <a href="./presentations.html">Presentations</a> - </li> - </ul> - </div> - <div> - <h2>Problems?</h2> - <ul> - <li> - <a href="./security.html">Security Reports</a> - </li> - <li> - <a href="./findhelp.html">Find help</a> - </li> - <li> - <a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a> - </li> - <li> - <a href="./lists.html">Mailing Lists</a> - </li> - <li> - <a href="./bugreport.html">Bug Database</a> - </li> - <li> - <a href="./irc.html">IRC</a> - </li> - </ul> - </div> - <div> - <h2>Get Involved</h2> - <ul> - <li> - <a href="./getinvolved.html">Overview</a> - </li> - <li> - <a href="./svn.html">Source code</a> - </li> - <li> - <a href="./ci.html">Buildbot</a> - </li> - <li> - <a href="./tools.html">Tools</a> - </li> - </ul> - </div> - <div> - <h2>Media</h2> - <ul> - <li> - <a href="https://twitter.com/theapachetomcat";>Twitter</a> - </li> - <li> - <a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a> - </li> - <li> - <a href="https://blogs.apache.org/tomcat/";>Blog</a> - </li> - </ul> - </div> - <div> - <h2>Misc</h2> - <ul> - <li> - <a href="./whoweare.html">Who We Are</a> - </li> - <li> - <a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a> - </li> - <li> - <a href="./heritage.html">Heritage</a> - </li> - <li> - <a href="http://www.apache.org";>Apache Home</a> - </li> - <li> - <a href="./resources.html">Resources</a> - </li> - <li> - <a href="./contact.html">Contact</a> - </li> - <li> - <a href="./legal.html">Legal</a> - </li> - <li> - <a href="https://www.apache.org/foundation/contributing.html";>Support Apache</a> - </li> - <li> - <a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a> - </li> - <li> - <a href="http://www.apache.org/foundation/thanks.html";>Thanks</a> - </li> - <li> - <a href="http://www.apache.org/licenses/";>License</a> - </li> - </ul> - </div> - </nav> - </div> - </div> - <div id="mainRight"> - <div id="content"> - <h2 style="display: none;">Content</h2> - <h3 id="Apache_Tomcat_Versions">Apache Tomcat Versions</h3> - <div class="text"> - - <p> - Apache Tomcat<sup>®</sup> is an open source software implementation of the Java Servlet +<head> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link href="res/css/tomcat.css" rel="stylesheet" type="text/css"> +<link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css"> +<title>Apache Tomcat® - Which Version Do I Want?</title> +<meta name="author" content="Marc A. Saegesser"> +<meta name="author" content="Yoav Shapira"> +<meta name="author" content="Jean-Frederic Clere"> +</head> +<body> +<div id="wrapper"> +<header id="header"> +<div class="clearfix"> +<div class="menu-toggler pull-left" tabindex="1"> +<div class="hamburger"></div> +</div> +<a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a> +<h1 class="pull-left">Apache Tomcat<sup>®</sup> +</h1> +<div class="asf-logos pull-right"> +<a href="https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a> +</div> +</div> +</header> +<main id="middle"> +<div> +<div id="mainLeft"> +<div id="nav-wrapper"> +<form action="https://www.google.com/search"; method="get"> +<div class="searchbox"> +<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button> +</div> +</form> +<nav> +<div> +<h2>Apache Tomcat</h2> +<ul> +<li> +<a href="./index.html">Home</a> +</li> +<li> +<a href="./taglibs.html">Taglibs</a> +</li> +<li> +<a href="./maven-plugin.html">Maven Plugin</a> +</li> +</ul> +</div> +<div> +<h2>Download</h2> +<ul> +<li> +<a href="./whichversion.html">Which version?</a> +</li> +<li> +<a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a> +</li> +<li> +<a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a> +</li> +<li> +<a href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a> +</li> +<li> +<a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a> +</li> +<li> +<a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a> +</li> +<li> +<a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a> +</li> +<li> +<a href="https://archive.apache.org/dist/tomcat/";>Archives</a> +</li> +</ul> +</div> +<div> +<h2>Documentation</h2> +<ul> +<li> +<a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a> +</li> +<li> +<a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a> +</li> +<li> +<a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a> +</li> +<li> +<a href="./connectors-doc/">Tomcat Connectors</a> +</li> +<li> +<a href="./native-doc/">Tomcat Native</a> +</li> +<li> +<a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a> +</li> +<li> +<a href="./migration.html">Migration Guide</a> +</li> +<li> +<a href="./presentations.html">Presentations</a> +</li> +</ul> +</div> +<div> +<h2>Problems?</h2> +<ul> +<li> +<a href="./security.html">Security Reports</a> +</li> +<li> +<a href="./findhelp.html">Find help</a> +</li> +<li> +<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a> +</li> +<li> +<a href="./lists.html">Mailing Lists</a> +</li> +<li> +<a href="./bugreport.html">Bug Database</a> +</li> +<li> +<a href="./irc.html">IRC</a> +</li> +</ul> +</div> +<div> +<h2>Get Involved</h2> +<ul> +<li> +<a href="./getinvolved.html">Overview</a> +</li> +<li> +<a href="./source.html">Source code</a> +</li> +<li> +<a href="./ci.html">Buildbot</a> +</li> +<li> +<a href="./tools.html">Tools</a> +</li> +</ul> +</div> +<div> +<h2>Media</h2> +<ul> +<li> +<a href="https://twitter.com/theapachetomcat";>Twitter</a> +</li> +<li> +<a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a> +</li> +<li> +<a href="https://blogs.apache.org/tomcat/";>Blog</a> +</li> +</ul> +</div> +<div> +<h2>Misc</h2> +<ul> +<li> +<a href="./whoweare.html">Who We Are</a> +</li> +<li> +<a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a> +</li> +<li> +<a href="./heritage.html">Heritage</a> +</li> +<li> +<a href="http://www.apache.org";>Apache Home</a> +</li> +<li> +<a href="./resources.html">Resources</a> +</li> +<li> +<a href="./contact.html">Contact</a> +</li> +<li> +<a href="./legal.html">Legal</a> +</li> +<li> +<a href="https://www.apache.org/foundation/contributing.html";>Support Apache</a> +</li> +<li> +<a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a> +</li> +<li> +<a href="http://www.apache.org/foundation/thanks.html";>Thanks</a> +</li> +<li> +<a href="http://www.apache.org/licenses/";>License</a> +</li> +</ul> +</div> +</nav> +</div> +</div> +<div id="mainRight"> +<div id="content"> +<h2 style="display: none;">Content</h2> +<h3 id="Apache_Tomcat_Versions">Apache Tomcat Versions</h3> +<div class="text"> + +<p>Apache Tomcat<sup>®</sup> is an open source software implementation of the Java Servlet and JavaServer Pages technologies. Different versions of Apache Tomcat are available for different versions of the Servlet and JSP specifications. The mapping between <a href="https://wiki.apache.org/tomcat/Specifications";>the specifications</a> and the respective Apache Tomcat versions is: +</p> + - </p> - - <table class="detail-table"> - - <tr> - <th><strong>Servlet Spec</strong></th> +<table class="detail-table"> + + +<tr> + +<th><strong>Servlet Spec</strong></th> <th><strong>JSP Spec</strong></th> <th><strong>EL Spec</strong></th> <th><strong>WebSocket Spec</strong></th> @@ -230,10 +230,12 @@ and the respective Apache Tomcat version <th><strong>Latest Released Version</strong></th> <th><strong>Supported Java Versions</strong></th> - </tr> - - <tr> - <td>4.0</td> +</tr> + + +<tr> + +<td>4.0</td> <td>2.3</td> <td>3.0</td> <td>1.1</td> @@ -242,10 +244,12 @@ and the respective Apache Tomcat version <td>9.0.16</td> <td>8 and later</td> - </tr> - - <tr> - <td>3.1</td> +</tr> + + +<tr> + +<td>3.1</td> <td>2.3</td> <td>3.0</td> <td>1.1</td> @@ -254,10 +258,12 @@ and the respective Apache Tomcat version <td>8.5.38</td> <td>7 and later</td> - </tr> - - <tr> - <td>3.1</td> +</tr> + + +<tr> + +<td>3.1</td> <td>2.3</td> <td>3.0</td> <td>1.1</td> @@ -266,24 +272,26 @@ and the respective Apache Tomcat version <td>8.0.53 (superseded)</td> <td>7 and later</td> - </tr> - - <tr> - <td>3.0</td> +</tr> + + +<tr> + +<td>3.0</td> <td>2.2</td> <td>2.2</td> <td>1.1</td> <td>N/A</td> <td>7.0.x</td> <td>7.0.93</td> - <td>6 and later - <br> - (7 and later for WebSocket)</td> - - </tr> - - <tr> - <td>2.5</td> + <td>6 and later<br> (7 and later for WebSocket)</td> + +</tr> + + +<tr> + +<td>2.5</td> <td>2.1</td> <td>2.1</td> <td>N/A</td> @@ -292,10 +300,12 @@ and the respective Apache Tomcat version <td>6.0.53 (archived)</td> <td>5 and later</td> - </tr> - - <tr> - <td>2.4</td> +</tr> + + +<tr> + +<td>2.4</td> <td>2.0</td> <td>N/A</td> <td>N/A</td> @@ -304,10 +314,12 @@ and the respective Apache Tomcat version <td>5.5.36 (archived)</td> <td>1.4 and later</td> - </tr> - - <tr> - <td>2.3</td> +</tr> + + +<tr> + +<td>2.3</td> <td>1.2</td> <td>N/A</td> <td>N/A</td> @@ -316,10 +328,12 @@ and the respective Apache Tomcat version <td>4.1.40 (archived)</td> <td>1.3 and later</td> - </tr> - - <tr> - <td>2.2</td> +</tr> + + +<tr> + +<td>2.2</td> <td>1.1</td> <td>N/A</td> <td>N/A</td> @@ -328,41 +342,44 @@ and the respective Apache Tomcat version <td>3.3.2 (archived)</td> <td>1.1 and later</td> - </tr> - - </table> - - <p>Each version of Tomcat is supported for any stable Java release that meets +</tr> + + +</table> + + +<p>Each version of Tomcat is supported for any stable Java release that meets the requirements of the final column in the table above.</p> - - <p>Tomcat should also work on any Java early access build that meets the + + +<p>Tomcat should also work on any Java early access build that meets the requirements of the final column in the table above. For example, users were successfully running Tomcat 8 on Java 8 many months before the first stable Java 8 release. However, users of early access builds should be aware of the following:</p> - - <ul> - - <li>It is not unusual for the initial early access builds to contain bugs that + +<ul> + +<li>It is not unusual for the initial early access builds to contain bugs that can cause problems for web applications running on Tomcat.</li> - - <li>If the new Java version introduces new language features then the default + +<li>If the new Java version introduces new language features then the default JSP compiler may not support them immediately. Switching the JSP compiler to javac may enable these new language features to be used in JSPs.</li> - - <li> - If you do discover an problem using a Java early access build, please + +<li>If you do discover an problem using a Java early access build, please <a href="findhelp.html">ask for help</a>. The Tomcat user's mailing - list is probably the best place to start. - </li> - - </ul> - - <p>The releases are described in more detail below to help you determine + list is probably the best place to start.</li> + +</ul> + + +<p>The releases are described in more detail below to help you determine which one is right for you. More details about each release can be found in the associated release notes.</p> - - <p>Please note that although we offer downloads and documentation of older + + +<p>Please note that although we offer downloads and documentation of older releases, such as Apache Tomcat 7.x, we strongly encourage users to use the latest stable version of Apache Tomcat whenever possible. We recognize that upgrading across major versions may not be a trivial task, and some support is @@ -370,106 +387,109 @@ still offered on the mailing list for us of the community-driven support approach, the older your version, fewer people will be interested or able to support you. </p> - - </div> - <h3 id="Alpha_/_Beta_/_Stable">Alpha / Beta / Stable</h3> - <div class="text"> - - <p>When voting for a release, reviewers specify the stability level that they + + +</div> +<h3 id="Alpha_/_Beta_/_Stable">Alpha / Beta / Stable</h3> +<div class="text"> + + +<p>When voting for a release, reviewers specify the stability level that they consider the release has reached. Initial releases of a new major version typically process from Alpha, through Beta to Stable over a period of several months. However, the Stable level is only available once the Java specifications the release implements have been finalised. This means a release that in all other respects is considered stable, may still be labelled as Beta if the specifications are not final.</p> - - <p>The download pages will always show the latest stable release and any newer + + +<p>The download pages will always show the latest stable release and any newer Alpha or Beta release if one exists. Alpha and beta releases are always clearly marked on the download pages.</p> - - <p> - Stability is a subjective judgement and you should always read carefully the + + +<p>Stability is a subjective judgement and you should always read carefully the release notes for any version you intend to make use of. If you are an early adopter of a release, we would love to hear your opinion about its stability as part of the vote: it takes place on the <a href="lists.html">development mailing -list</a>. - </p> - - <p> - <strong>Alpha</strong> releases may contain large amounts of untested/missing +list</a>.</p> + + +<p> +<strong>Alpha</strong> releases may contain large amounts of untested/missing functionality required by the specification and/or significant bugs and are not -expected to run stably for any length of time. - </p> - - <p> - <strong>Beta</strong> releases may contain some untested functionality and/or +expected to run stably for any length of time.</p> + + +<p> +<strong>Beta</strong> releases may contain some untested functionality and/or a number of relatively minor bugs. Beta releases are not expected to run stably. +</p> + - </p> - - <p> - <strong>Stable</strong> releases may contain a small number of relatively +<p> +<strong>Stable</strong> releases may contain a small number of relatively minor bugs. Stable releases are intended for production use and are expected to -run stably for extended periods of time. - </p> - - </div> - <h3 id="Apache_Tomcat_9.x">Apache Tomcat 9.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 9.x</strong> is the current focus of development. It +run stably for extended periods of time.</p> + + +</div> +<h3 id="Apache_Tomcat_9.x">Apache Tomcat 9.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 9.x</strong> is the current focus of development. It builds on Tomcat 8.0.x and 8.5.x and implements the <strong>Servlet 4.0</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>, <strong>WebSocket 1.1 </strong> and <strong>JASPIC 1.1</strong> specifications (the versions required by Java EE 8 platform). In addition to this, it includes the following significant improvements: +</p> + +<ul> - </p> - - <ul> - - <li> - Adds support for HTTP/2 (requires either running on Java 9 (since Apache Tomcat +<li>Adds support for HTTP/2 (requires either running on Java 9 (since Apache Tomcat 9.0.0.M18) or the <a href="/native-doc/">Tomcat Native</a> library being installed) +</li> - </li> - - <li>Adds support for using OpenSSL for TLS support with the JSSE connectors +<li>Adds support for using OpenSSL for TLS support with the JSSE connectors (NIO and NIO2) </li> - - <li>Adds support for TLS virtual hosting (SNI)</li> - - </ul> - - </div> - <h3 id="Apache_Tomcat_8.x">Apache Tomcat 8.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 8.0.x</strong> builds on Tomcat 7.0.x and implements the + +<li>Adds support for TLS virtual hosting (SNI)</li> + +</ul> + + +</div> +<h3 id="Apache_Tomcat_8.x">Apache Tomcat 8.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 8.0.x</strong> builds on Tomcat 7.0.x and implements the <strong>Servlet 3.1</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong> and <strong>WebSocket 1.1</strong> specifications. In addition to that, it includes the following significant improvements: +</p> + +<ul> - </p> - - <ul> - - <li>A single, common resources implementation to replace the multiple resource +<li>A single, common resources implementation to replace the multiple resource extension features provided in earlier versions.</li> - - </ul> - - <p> - - <strong>Apache Tomcat 8.5.x</strong> supports the same Servlet, JSP, EL, and + +</ul> + + +<p> + +<strong>Apache Tomcat 8.5.x</strong> supports the same Servlet, JSP, EL, and WebSocket Specification versions as Apache Tomcat 8.0.x. In addition to that, it also implements the <strong>JASPIC 1.1</strong> specification. +</p> + - </p> - - <p> +<p> It was created in March 2016 as a fork from Tomcat 9.0.0.M4 (alpha) milestone release. It provides HTTP/2 support and other features from Tomcat 9.x codebase, while being compatible with Tomcat 8.0 runtime and @@ -477,260 +497,265 @@ specification requirements. (A stable re created at that time, as Java EE specifications targeted by Tomcat 9 were finalized only a few years later). </p> - - <p> - Tomcat 8.5 is thought as a replacement for Tomcat 8.0. Please refer to + + +<p>Tomcat 8.5 is thought as a replacement for Tomcat 8.0. Please refer to <a href="/migration.html">Migration guide</a> for guidance on migrating to -Tomcat 8.5. - </p> - - <p> +Tomcat 8.5.</p> + + +<p> Apache Tomcat 8.5.x includes the following significant improvements: </p> - - <ul> - - <li> - Adds support for HTTP/2 (requires the <a href="/native-doc/">Tomcat Native</a> library) - </li> - - <li>Adds support for using OpenSSL for TLS support with the JSSE connectors + + +<ul> + +<li>Adds support for HTTP/2 (requires the <a href="/native-doc/">Tomcat Native</a> library)</li> + +<li>Adds support for using OpenSSL for TLS support with the JSSE connectors (NIO and NIO2) </li> - - <li>Adds support for TLS virtual hosting (SNI)</li> - - </ul> - - <p>The following technologies were removed in Apache Tomcat 8.5.x:</p> - - <ul> - - <li>BIO implementation of HTTP and AJP connectors</li> - - <li>Support for Comet API</li> - - </ul> - - <p>There are significant changes in many areas under the hood, resulting in + +<li>Adds support for TLS virtual hosting (SNI)</li> + +</ul> + + +<p>The following technologies were removed in Apache Tomcat 8.5.x:</p> + + +<ul> + +<li>BIO implementation of HTTP and AJP connectors</li> + +<li>Support for Comet API</li> + +</ul> + + +<p>There are significant changes in many areas under the hood, resulting in improved performance, stability, and total cost of ownership. Please refer to the Apache Tomcat 8.5 Changelog for details. </p> - - <p> - Users of Tomcat 8.0 should be aware that Tomcat 8.0 has now reached + + +<p>Users of Tomcat 8.0 should be aware that Tomcat 8.0 has now reached <a href="tomcat-80-eol.html">end of life</a>. Users of Tomcat 8.0.x should -upgrade to Tomcat 8.5.x or later. - </p> - - </div> - <h3 id="Apache_Tomcat_7.x">Apache Tomcat 7.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 7.x</strong> builds upon the improvements made in +upgrade to Tomcat 8.5.x or later.</p> + + +</div> +<h3 id="Apache_Tomcat_7.x">Apache Tomcat 7.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 7.x</strong> builds upon the improvements made in Tomcat 6.0.x and implements the <strong>Servlet 3.0</strong>, <strong>JSP 2.2</strong>, <strong>EL 2.2</strong> and <strong>WebSocket 1.1</strong> specifications. In addition to that, it includes the following improvements: +</p> + +<ul> + +<li>Web application memory leak detection and prevention</li> - </p> - - <ul> - - <li>Web application memory leak detection and prevention</li> - - <li>Improved security for the Manager and Host Manager applications</li> - - <li>Generic CSRF protection</li> - - <li>Support for including external content directly in a web application</li> - - <li>Refactoring (connectors, lifecycle) and lots of internal code clean-up</li> - - </ul> - - </div> - <h3 id="Apache_Tomcat_6.x">Apache Tomcat 6.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 6.x</strong> builds upon the improvements made in +<li>Improved security for the Manager and Host Manager applications</li> + +<li>Generic CSRF protection</li> + +<li>Support for including external content directly in a web application</li> + +<li>Refactoring (connectors, lifecycle) and lots of internal code clean-up</li> + +</ul> + + +</div> +<h3 id="Apache_Tomcat_6.x">Apache Tomcat 6.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 6.x</strong> builds upon the improvements made in Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and <strong>JSP 2.1</strong> specifications. In addition to that, it includes the following improvements: +</p> + +<ul> + +<li>Memory usage optimizations</li> + +<li>Advanced IO capabilities</li> - </p> - - <ul> - - <li>Memory usage optimizations</li> - - <li>Advanced IO capabilities</li> - - <li>Refactored clustering</li> - - </ul> - - <p> - Users of Tomcat 6 should be aware that Tomcat 6 has now reached +<li>Refactored clustering</li> + +</ul> + + +<p>Users of Tomcat 6 should be aware that Tomcat 6 has now reached <a href="tomcat-60-eol.html">end of life</a>. Users of Tomcat 6.x should -upgrade to Tomcat 7.x or later. - </p> - - </div> - <h3 id="Apache_Tomcat_5.x">Apache Tomcat 5.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 5.x</strong> is available for download from the -archives. - </p> - - <p> - <strong>Apache Tomcat 5.5.x</strong> supports the same Servlet and JSP +upgrade to Tomcat 7.x or later.</p> + + +</div> +<h3 id="Apache_Tomcat_5.x">Apache Tomcat 5.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 5.x</strong> is available for download from the +archives.</p> + + +<p> +<strong>Apache Tomcat 5.5.x</strong> supports the same Servlet and JSP Specification versions as Apache Tomcat 5.0.x. There are significant changes in many areas under the hood, resulting in improved performance, stability, and total cost of ownership. Please refer to the Apache Tomcat 5.5 Changelog for details. +</p> + + +<p> +<strong>Apache Tomcat 5.0.x</strong> improves on Apache Tomcat 4.1 in many +ways, including:</p> - </p> - - <p> - <strong>Apache Tomcat 5.0.x</strong> improves on Apache Tomcat 4.1 in many -ways, including: - </p> - - <ul> - - <li>Performance optimizations and reduced garbage collection</li> - - <li>Refactored application deployer, with an optional standalone deployer +<ul> + +<li>Performance optimizations and reduced garbage collection</li> + +<li>Refactored application deployer, with an optional standalone deployer allowing validation and compilation of a web application before putting it in production</li> - - <li>Complete server monitoring using JMX and the manager web application</li> - - <li>Scalability and reliability enhancements</li> - - <li>Improved Taglibs handling, including advanced pooling and tag plugins</li> - - <li>Improved platform integration, with native Windows and Unix wrappers</li> - - <li>Embedding using JMX</li> - - <li>Enhanced Security Manager support</li> - - <li>Integrated session clustering</li> - - <li>Expanded documentation</li> - - </ul> - - <p> - Users of Tomcat 5 should be aware that Tomcat 5 has now reached + +<li>Complete server monitoring using JMX and the manager web application</li> + +<li>Scalability and reliability enhancements</li> + +<li>Improved Taglibs handling, including advanced pooling and tag plugins</li> + +<li>Improved platform integration, with native Windows and Unix wrappers</li> + +<li>Embedding using JMX</li> + +<li>Enhanced Security Manager support</li> + +<li>Integrated session clustering</li> + +<li>Expanded documentation</li> + +</ul> + + +<p>Users of Tomcat 5 should be aware that Tomcat 5 has now reached <a href="tomcat-55-eol.html">end of life</a>. Users of Tomcat 5.x should -upgrade to Tomcat 7.x or later. - </p> - - </div> - <h3 id="Apache_Tomcat_4.x">Apache Tomcat 4.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 4.x</strong> is available for download from the -archives. - </p> - - <p> - <strong>Apache Tomcat 4.x</strong> implements a new servlet container (called +upgrade to Tomcat 7.x or later.</p> + + +</div> +<h3 id="Apache_Tomcat_4.x">Apache Tomcat 4.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 4.x</strong> is available for download from the +archives.</p> + + +<p> +<strong>Apache Tomcat 4.x</strong> implements a new servlet container (called Catalina) that is based on completely new architecture. The 4.x releases implement the <strong>Servlet 2.3</strong> and <strong>JSP 1.2</strong> -specifications. - </p> - - <p> - <strong>Apache Tomcat 4.1.x</strong> is a refactoring -of Apache Tomcat 4.0.x, and contains significant enhancements, including: - </p> - - <ul> - - <li>JMX based administration features</li> - - <li>JSP and Struts based administration web application</li> - - <li>New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support)</li> - - <li>Rewritten Jasper JSP page compiler</li> - - <li>Performance and memory efficiency improvements</li> - - <li>Enhanced manager application support for integration with development +specifications.</p> + + +<p> +<strong>Apache Tomcat 4.1.x</strong> is a refactoring +of Apache Tomcat 4.0.x, and contains significant enhancements, including:</p> + +<ul> + +<li>JMX based administration features</li> + +<li>JSP and Struts based administration web application</li> + +<li>New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support)</li> + +<li>Rewritten Jasper JSP page compiler</li> + +<li>Performance and memory efficiency improvements</li> + +<li>Enhanced manager application support for integration with development tools</li> - - <li>Custom Ant tasks to interact with the manager application directly + +<li>Custom Ant tasks to interact with the manager application directly from build.xml scripts</li> - - </ul> - - <p> - <strong>Apache Tomcat 4.0.x</strong>. Apache Tomcat 4.0.6 is the old production + +</ul> + + +<p> +<strong>Apache Tomcat 4.0.x</strong>. Apache Tomcat 4.0.6 is the old production quality release. The 4.0 servlet container (Catalina) has been developed from the ground up for flexibility and performance. Version 4.0 implements the final released versions of the Servlet 2.3 and JSP 1.2 specifications. As required by the specifications, Apache Tomcat 4.0 also supports web applications built for the Servlet 2.2 and JSP 1.1 -specifications with no changes. - </p> - - <p>Users of Tomcat 4 should be aware that Tomcat 4 has now reached +specifications with no changes.</p> + + +<p>Users of Tomcat 4 should be aware that Tomcat 4 has now reached end of life. Users of Tomcat 4.x should upgrade to Tomcat 7.x or later.</p> - - </div> - <h3 id="Apache_Tomcat_3.x">Apache Tomcat 3.x</h3> - <div class="text"> - - <p> - <strong>Apache Tomcat 3.x</strong> is available for download from the -archives. - </p> - - <ul> - - <li> - Version <strong>3.3</strong> is the current production quality release for + + +</div> +<h3 id="Apache_Tomcat_3.x">Apache Tomcat 3.x</h3> +<div class="text"> + + +<p> +<strong>Apache Tomcat 3.x</strong> is available for download from the +archives.</p> + + +<ul> + +<li>Version <strong>3.3</strong> is the current production quality release for the Servlet 2.2 and JSP 1.1 specifications. Apache Tomcat 3.3 is the latest continuation of the Apache Tomcat 3.x architecture; it is more advanced then 3.2.4, -which is the 'old' production quality release. - </li> - - <li>Version 3.2.4 is the 'old' production quality release and is now in +which is the 'old' production quality release.</li> + +<li>Version 3.2.4 is the 'old' production quality release and is now in maintenance only mode.</li> - - <li>Version 3.1.1 is a legacy release.</li> - - </ul> - - <p> - All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to the + +<li>Version 3.1.1 is a legacy release.</li> + +</ul> + + +<p> +All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to the original Servlet and JSP implementations that Sun donated to the Apache Software Foundation. The 3.x versions all implement the <strong>Servlet 2.2</strong> and <strong>JSP 1.1</strong> specifications. +</p> + - </p> - - <p> - <strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production +<p> +<strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production quality release. It continues the refactoring that was begun in version 3.2 and carries it to its logical conclusion. Version 3.3 provides a much more modular design and allows the servlet container to be customized by adding and removing modules that control the processing of servlet requests. This version also -contains many performance improvements. - </p> - - <p> - <strong>Apache Tomcat 3.2.x</strong>. Version 3.2 added few new features +contains many performance improvements.</p> + + +<p> +<strong>Apache Tomcat 3.2.x</strong>. Version 3.2 added few new features since 3.1; the major effort was a refactoring of the internals to improve performance and stability. The 3.2.1 release, like 3.1.1, was a security patch. Version 3.2.2 fixed a large number of bugs and all known @@ -738,43 +763,42 @@ specification compliance issues. Versio closes a serious security hole. Version 3.2.4 is a minor bug fix release. All users of Apache Tomcat versions prior to 3.2.3 should upgrade as soon as possible. With the exception of fixes for critical security related bugs, -development on the Apache Tomcat 3.2.x branch has stopped. - </p> - - <p> - <strong>Apache Tomcat 3.1.x</strong>. The 3.1 release contained several +development on the Apache Tomcat 3.2.x branch has stopped.</p> + + +<p> +<strong>Apache Tomcat 3.1.x</strong>. The 3.1 release contained several improvements over Apache Tomcat 3.0, including servlet reloading, WAR file support and added connectors for the IIS and Netscape web servers. The latest maintenance release, 3.1.1, contained fixes for security problems. There is no active development ongoing for Apache Tomcat 3.1.x. Users of Apache Tomcat 3.1 should update to 3.1.1 to close the security holes and they are strongly encouraged to migrate to the current production release, Apache Tomcat -3.3. - </p> - - <p> - <strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release. - </p> - - <p>Users of Tomcat 3 should be aware that Tomcat 3 has now reached +3.3.</p> + + +<p> +<strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p> + + +<p>Users of Tomcat 3 should be aware that Tomcat 3 has now reached end of life. Users of Tomcat 3.x should upgrade to Tomcat 7.x or later.</p> - - </div> - </div> - </div> - </div> - </main> - <footer id="footer"> - Copyright © 1999-2019, The Apache Software Foundation - - <br> - Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat + + +</div> +</div> +</div> +</div> +</main> +<footer id="footer"> + Copyright © 1999-2019, The Apache Software Foundation + <br> + Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are either registered trademarks or trademarks of the Apache Software Foundation. - - </footer> - </div> - <script src="res/js/tomcat.js"></script> - </body> + </footer> +</div> +<script src="res/js/tomcat.js"></script> +</body> </html>
Added: tomcat/site/trunk/xdocs/.htaccess URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1854413&view=auto ============================================================================== --- tomcat/site/trunk/xdocs/.htaccess (added) +++ tomcat/site/trunk/xdocs/.htaccess Tue Feb 26 19:16:17 2019 @@ -0,0 +1,2 @@ +RewriteEngine On +RewriteRule ^/svn.html /source.html [R=301] \ No newline at end of file Propchange: tomcat/site/trunk/xdocs/.htaccess ------------------------------------------------------------------------------ svn:eol-style = native Modified: tomcat/site/trunk/xdocs/bugreport.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/bugreport.xml (original) +++ tomcat/site/trunk/xdocs/bugreport.xml Tue Feb 26 19:16:17 2019 @@ -203,7 +203,7 @@ problem you are having before reporting <a href="https://tomcat.apache.org/tomcat-9.0-doc/changelog.html";>changelog.html</a> </td> <td> - <a href="https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml";>changelog.xml</a> + <a href="https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html";>changelog.html - CI</a> </td> </tr> @@ -213,7 +213,7 @@ problem you are having before reporting <a href="https://tomcat.apache.org/tomcat-8.5-doc/changelog.html";>changelog.html</a> </td> <td> - <a href="https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml";>changelog.xml</a> + <a href="https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html";>changelog.html - CI</a> </td> </tr> @@ -223,7 +223,7 @@ problem you are having before reporting <a href="https://tomcat.apache.org/tomcat-7.0-doc/changelog.html";>changelog.html</a> </td> <td> - <a href="https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml";>changelog.xml</a> + <a href="https://ci.apache.org/projects/tomcat/tomcat7/docs/changelog.html";>changelog.html - CI</a> </td> </tr> @@ -393,7 +393,9 @@ bug in your web application.</p> "<code>enhancement</code>". </p> - <p>To propose a patch, attach it to a Bugzilla issue. + <p>For components available via GitHub you may provide a proposed patch as a + pull request. Alternatively, you can attach your proposed patch to a + Bugzilla issue. When providing a patch, please mention to which version of the source code it applies. Any patches are welcome, but we prefer the ones that use the <a href="http://en.wikipedia.org/wiki/Diff#Unified_format"; rel="nofollow"> @@ -404,7 +406,7 @@ bug in your web application.</p> <p>To patch and build Apache Tomcat see the following references:</p> <ul> - <li><a href="svn.html">Subversion repository structure</a> of Apache Tomcat</li> + <li><a href="source.html">Repository access </a> for Apache Tomcat</li> <li>Read BUILDING.txt in the source distribution</li> </ul> Modified: tomcat/site/trunk/xdocs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/doap_Tomcat.rdf?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/xdocs/doap_Tomcat.rdf Tue Feb 26 19:16:17 2019 @@ -86,10 +86,11 @@ </Version> </release> <repository> - <SVNRepository> - <location rdf:resource="http://svn.apache.org/repos/asf/tomcat"/> - <browse rdf:resource="http://svn.apache.org/viewvc/tomcat/"/> - </SVNRepository> + < + <GitRepository> + <location rdf:resource="https://gitbox.apache.org/repos/asf/tomcat.git"/> + <browse rdf:resource="https://gitbox.apache.org/repos/asf?p=tomcat.git;a=summary"/> + </GitRepository> </repository> <asfext:implements> <asfext:Standard> Modified: tomcat/site/trunk/xdocs/migration-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-7.xml (original) +++ tomcat/site/trunk/xdocs/migration-7.xml Tue Feb 26 19:16:17 2019 @@ -508,95 +508,18 @@ of Apache Tomcat.</p> <p>Select a configuration file, old version and new version from the boxes below and then click "View differences" to see the differences. The differences will be shown in a new tab/window.</p> + + <p><b>Note:</b> If there are no differences you will see an error page.</p> - <script type="text/javascript"><![CDATA[ - "use strict"; // Enable strict mode - - document.addEventListener("DOMContentLoaded", function() { - var formSubmit = document.getElementById("tc7Submit"); - formSubmit.addEventListener("submit", function() { - var revisions = { - "HEAD":"HEAD", - "7.0.0":"954232", - "7.0.2":"982035", - "7.0.4":"1022637", - "7.0.5":"1038717", - "7.0.6":"1057288", - "7.0.8":"1067169", - "7.0.10":"1078282", - "7.0.11":"1080182", - "7.0.12":"1087797", - "7.0.14":"1101230", - "7.0.16":"1134562", - "7.0.19":"1146504", - "7.0.20":"1155255", - "7.0.21":"1162976", - "7.0.22":"1176599", - "7.0.23":"1203305", - "7.0.25":"1232371", - "7.0.26":"1245466", - "7.0.27":"1307817", - "7.0.28":"1350468", - "7.0.29":"1356494", - "7.0.30":"1379863", - "7.0.32":"1393331", - "7.0.33":"1410718", - "7.0.34":"1416816", - "7.0.35":"1431695", - "7.0.37":"1445362", - "7.0.39":"1459741", - "7.0.40":"1479250", - "7.0.41":"1490220", - "7.0.42":"1498817", - "7.0.47":"1533319", - "7.0.50":"1552395", - "7.0.52":"1567856", - "7.0.53":"1581197", - "7.0.54":"1595997", - "7.0.55":"1611608", - "7.0.56":"1627729", - "7.0.57":"1635775", - "7.0.59":"1655365", - "7.0.61":"1669546", - "7.0.62":"1678231", - "7.0.63":"1688364", - "7.0.64":"1696589", - "7.0.65":"1707663", - "7.0.67":"1718339", - "7.0.68":"1729238", - "7.0.69":"1738539", - "7.0.70":"1748587", - "7.0.72":"1760687", - "7.0.73":"1768587", - "7.0.75":"1779379", - "7.0.76":"1786169", - "7.0.77":"1789168", - "7.0.78":"1794730", - "7.0.79":"1799944", - "7.0.81":"1804761", - "7.0.82":"1810087", - "7.0.84":"1821664", - "7.0.85":"1823510", - "7.0.86":"1828768", - "7.0.88":"1831087", - "7.0.90":"1834866", - "7.0.91":"1840853", - "7.0.92":"1846225", - "7.0.93":"1853723" - }; - - formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/"; + - document.getElementById('select-filename').value; - formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; - formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; - return true; - }, false); - }, false); - ]]></script> + <form action="https://gitbox.apache.org/repos/asf"; + method="get" + target="_blank"> + <input type="hidden" name="p" value="tomcat.git"/> + <input type="hidden" name="a" value="blobdiff"/> <p><label>Configuration file: - <select id="select-filename"> + <select name="f"> <option value="conf/catalina.policy">catalina.policy</option> <option value="conf/catalina.properties">catalina.properties</option> <option value="conf/context.xml">context.xml</option> @@ -607,7 +530,7 @@ of Apache Tomcat.</p> </select></label> </p> <p><label>Old version: - <select id="select-r1"> + <select name="hpb"> <option value="7.0.0">7.0.0</option> <option value="7.0.2">7.0.2</option> <option value="7.0.4">7.0.4</option> @@ -675,7 +598,7 @@ of Apache Tomcat.</p> <option value="7.0.92" selected="selected">7.0.92</option> <option value="7.0.93">7.0.93</option> </select>,</label> <label>new version: - <select id="select-r2"> + <select name="hb"> <option value="7.0.0">7.0.0</option> <option value="7.0.2">7.0.2</option> <option value="7.0.4">7.0.4</option> @@ -746,18 +669,13 @@ of Apache Tomcat.</p> </select></label> </p> - <form id="tc7Submit" action="to-be-replaced" method="get" - target="_blank"> <p> - <input type="hidden" name="diff_format" value="h"/> - <input type="hidden" name="r1"/><input type="hidden" name="r2"/> <button>View Differences</button> </p> </form> - <p>You can also use Subversion command similar to the following (all on one line):</p> - <source>svn diff - --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_27/conf/ - --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/conf/</source> + <p>You can also use a Git command similar to the following from within a + working copy:</p> + <source>git diff 7.0.0 7.0.80 -- conf/</source> </subsection> </section> Modified: tomcat/site/trunk/xdocs/migration-85.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-85.xml (original) +++ tomcat/site/trunk/xdocs/migration-85.xml Tue Feb 26 19:16:17 2019 @@ -243,57 +243,17 @@ of Apache Tomcat.</p> below and then click "View differences" to see the differences. The differences will be shown in a new tab/window.</p> - <script type="text/javascript"><![CDATA[ - "use strict"; // Enable strict mode + <p><b>Note:</b> If there are no differences you will see an error page.</p> - document.addEventListener("DOMContentLoaded", function() { - var formSubmit = document.getElementById("tc8Submit"); - formSubmit.addEventListener("submit", function() { - var revisions = { - "HEAD":"HEAD", - "8.5.0":"1735438", - "8.5.2":"1743439", - "8.5.3":"1747521", - "8.5.4":"1751624", - "8.5.5":"1758670", - "8.5.6":"1763654", - "8.5.8":"1767971", - "8.5.9":"1772784", - "8.5.11":"1778198", - "8.5.12":"1786041", - "8.5.13":"1788935", - "8.5.14":"1791243", - "8.5.15":"1794013", - "8.5.16":"1799487", - "8.5.20":"1803930", - "8.5.21":"1808282", - "8.5.23":"1809969", - "8.5.24":"1816448", - "8.5.27":"1821550", - "8.5.28":"1823407", - "8.5.29":"1825889", - "8.5.30":"1828275", - "8.5.31":"1830392", - "8.5.32":"1833943", - "8.5.33":"1837884", - "8.5.34":"1840071", - "8.5.35":"1845673", - "8.5.37":"1848752", - "8.5.38":"1852987" - }; - - formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/"; + - document.getElementById('select-filename').value; - formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; - formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; - return true; - }, false); - }, false); - ]]></script> + <form action="https://gitbox.apache.org/repos/asf"; + method="get" + target="_blank"> + <input type="hidden" name="p" value="tomcat.git"/> + <input type="hidden" name="a" value="blobdiff"/> <p><label>Configuration file: - <select id="select-filename"> + <select name="f"> <option value="conf/catalina.policy">catalina.policy</option> <option value="conf/catalina.properties">catalina.properties</option> <option value="conf/context.xml">context.xml</option> @@ -304,7 +264,7 @@ of Apache Tomcat.</p> </select></label> </p> <p><label>Old version: - <select id="select-r1"> + <select name="hpb"> <option value="8.5.0">8.5.0</option> <option value="8.5.2">8.5.2</option> <option value="8.5.3">8.5.3</option> @@ -335,7 +295,7 @@ of Apache Tomcat.</p> <option value="8.5.37" selected="selected">8.5.37</option> <option value="8.5.38">8.5.38</option> </select>,</label> <label>new version: - <select id="select-r2"> + <select name="hb"> <option value="8.5.0">8.5.0</option> <option value="8.5.2">8.5.2</option> <option value="8.5.3">8.5.3</option> @@ -369,18 +329,13 @@ of Apache Tomcat.</p> </select></label> </p> - <form id="tc8Submit" action="to-be-replaced" method="get" - target="_blank"> <p> - <input type="hidden" name="diff_format" value="h"/> - <input type="hidden" name="r1"/><input type="hidden" name="r2"/> <button>View Differences</button> </p> </form> - <p>You can also use Subversion command similar to the following (all on one line):</p> - <source>svn diff - --old=http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_0/conf/ - --new=http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_2/conf/</source> + <p>You can also use a Git command similar to the following from within a + working copy:</p> + <source>git diff 8.5.0 8.5.20 -- conf/</source> </subsection> </section> Modified: tomcat/site/trunk/xdocs/migration-9.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-9.xml (original) +++ tomcat/site/trunk/xdocs/migration-9.xml Tue Feb 26 19:16:17 2019 @@ -311,58 +311,17 @@ of Apache Tomcat.</p> below and then click "View differences" to see the differences. The differences will be shown in a new tab/window.</p> - <script type="text/javascript"><![CDATA[ - "use strict"; // Enable strict mode + <p><b>Note:</b> If there are no differences you will see an error page.</p> - document.addEventListener("DOMContentLoaded", function() { - var formSubmit = document.getElementById("tc9Submit"); - formSubmit.addEventListener("submit", function() { - var revisions = { - "HEAD":"HEAD", - "9.0.0.M1":"1714130", - "9.0.0.M3":"1728005", - "9.0.0.M4":"1734692", - "9.0.0.M6":"1743436", - "9.0.0.M8":"1747242", - "9.0.0.M9":"1751366", - "9.0.0.M10":"1758617", - "9.0.0.M11":"1763638", - "9.0.0.M13":"1767969", - "9.0.0.M15":"1772668", - "9.0.0.M17":"1778197", - "9.0.0.M18":"1785983", - "9.0.0.M19":"1788896", - "9.0.0.M20":"1791176", - "9.0.0.M21":"1793917", - "9.0.0.M22":"1799415", - "9.0.0.M26":"1803915", - "9.0.1":"1809848", - "9.0.2":"1816351", - "9.0.4":"1821547", - "9.0.5":"1823394", - "9.0.6":"1825860", - "9.0.7":"1828274", - "9.0.8":"1830389", - "9.0.10":"1833930", - "9.0.11":"1837880", - "9.0.12":"1840069", - "9.0.13":"1845587", - "9.0.14":"1848363", - "9.0.16":"1852937" - }; - - formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/"; + - document.getElementById('select-filename').value; - formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; - formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; - return true; - }, false); - }, false); - ]]></script> + <form action="https://gitbox.apache.org/repos/asf"; + method="get" + target="_blank"> + <input type="hidden" name="p" value="tomcat.git"/> + <input type="hidden" name="a" value="blobdiff"/> <p><label>Configuration file: - <select id="select-filename"> + <select name="f"> <option value="conf/catalina.policy">catalina.policy</option> <option value="conf/catalina.properties">catalina.properties</option> <option value="conf/context.xml">context.xml</option> @@ -373,7 +332,7 @@ of Apache Tomcat.</p> </select></label> </p> <p><label>Old version: - <select id="select-r1"> + <select name="hpb"> <option value="9.0.0.M1">9.0.0.M1</option> <option value="9.0.0.M3">9.0.0.M3</option> <option value="9.0.0.M4">9.0.0.M4</option> @@ -405,7 +364,7 @@ of Apache Tomcat.</p> <option value="9.0.14" selected="selected">9.0.14</option> <option value="9.0.16">9.0.16</option> </select>,</label> <label>new version: - <select id="select-r2"> + <select name="hb"> <option value="9.0.0.M1">9.0.0.M1</option> <option value="9.0.0.M3">9.0.0.M3</option> <option value="9.0.0.M4">9.0.0.M4</option> @@ -440,18 +399,13 @@ of Apache Tomcat.</p> </select></label> </p> - <form id="tc9Submit" action="to-be-replaced" method="get" - target="_blank"> <p> - <input type="hidden" name="diff_format" value="h"/> - <input type="hidden" name="r1"/><input type="hidden" name="r2"/> <button>View Differences</button> </p> </form> - <p>You can also use Subversion command similar to the following (all on one line):</p> - <source>svn diff - --old=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/conf/ - --new=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_4/conf/</source> + <p>You can also use a Git command similar to the following from within a + working copy:</p> + <source>git diff 9.0.0 9.0.12 -- conf/</source> </subsection> </section> Modified: tomcat/site/trunk/xdocs/security.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security.xml (original) +++ tomcat/site/trunk/xdocs/security.xml Tue Feb 26 19:16:17 2019 @@ -14,12 +14,12 @@ particular vulnerability you should upgrade to an Apache Tomcat version where that vulnerability has been fixed.</p> - <p>Source patches, usually in the form of references to SVN commits, may be + <p>Source patches, usually in the form of references to commits, may be provided in either in a vulnerability announcement and/or the vulnerability details listed on these pages. These source patches may be used by users wishing to build their own local version of Tomcat with just that security patch rather than upgrade. Please note that an exercise is - currently underway to add links to the svn commits for all the + currently underway to add links to the commits for all the vulnerabilities listed on these pages.</p> <p>Lists of security problems fixed in released versions of Apache Tomcat Modified: tomcat/site/trunk/xdocs/sitemap-main.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/sitemap-main.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/sitemap-main.xml (original) +++ tomcat/site/trunk/xdocs/sitemap-main.xml Tue Feb 26 19:16:17 2019 @@ -97,7 +97,7 @@ <priority>0.6</priority> </url> <url> - <loc>http://tomcat.apache.org/svn.html</loc> + <loc>http://tomcat.apache.org/source.html</loc> <changefreq>weekly</changefreq> <priority>0.6</priority> </url> Added: tomcat/site/trunk/xdocs/source.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1854413&view=auto ============================================================================== --- tomcat/site/trunk/xdocs/source.xml (added) +++ tomcat/site/trunk/xdocs/source.xml Tue Feb 26 19:16:17 2019 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="UTF-8"?> +<document> + + <properties> + <title>Repository Access</title> + </properties> + +<body> + +<section name="Table of Contents"> +<toc/> +</section> + +<section name="Version Control"> + +<p>The Apache Tomcat project is in the process of migrating from Subversion to +Git for version control. The following components have been migrated: +</p> +<ul> +<li>Apache Tomcat 9.0.x</li> +<li>Apache Tomcat 8.5.x</li> +<li>Apache Tomcat 7.0.x</li> +</ul> +<p>The following components currently use Subversion as the primary version +control system:</p> +<ul> +<li>Tomcat Connectors *</li> +<li>Tomcat Maven plugin *</li> +<li>Tomcat Native *</li> +<li>Tomcat web site</li> +<li>Taglibs</li> +<li>archive</li> +</ul> +<p>The Subversion repositories marked with a * are also mirrored to a Git repository.</p> +</section> + +<section name="Git"> + +<p>The ASF operates a dual master system for repositories that use Git as their +primary version control system. This means committers may commit to either +gitbox.apache.org or GitHub.</p> + +<p>For repositories that are mirrored to Git from Subversion, the mirrors may be +found at git.apache.org or GitHub and are read-only for everyone.</p> + +</section> + +<section name="tomcat.git"> + +<p>This the Git repository that contains the Apache Tomcat source code. There +are currently three branches:</p> +<ul> +<li>master</li> +<li>8.5.x</li> +<li>7.0.x</li> +</ul> +<p>master is the primary development branch. Apache Tomcat 9.0.x releases are +tagged from this branch. Development work generally occurs in this branch +first.</p> +<p>8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes +are cherry picked from master into this branch.</p> +<p>7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes +are cherry picked from 8.5.x into this branch.</p> +<p>A web based view of this repository is available via +<a href="https://gitbox.apache.org/repos/asf?p=tomcat.git";>GitBox</a> or +<a href="https://github.com/apache/tomcat";>GitHub</a>.</p> +</section> + +<section name="Subversion Repository"> + +<p>The root of the repository is +<a href="http://svn.apache.org/repos/asf/tomcat";> +http://svn.apache.org/repos/asf/tomcat</a>.</p> + +<p><em>Note:</em> there is also ViewVC-powered +<a href="http://svn.apache.org/viewvc/tomcat/";>web view of the repository</a>.</p> + +<p>The directories below this level are:</p> +<table class="defaultTable noHighlight"> + <tr> + <th>Directory</th><th>Contents</th> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/archive";> + <code>/archive/</code></a></td> + <td>Modules that are no longer maintained</td> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/jk";> + <code>/jk/</code></a></td> + <td>The native source code for the Tomcat Connectors. This includes + mod_jk, isapi and nsapi. The current code is in + <a href="http://svn.apache.org/repos/asf/tomcat/jk/trunk";> + <code>/jk/trunk/</code></a>.</td> + </tr> + <tr> + <td style="white-space: nowrap;"><a href="http://svn.apache.org/repos/asf/tomcat/maven-plugin";> + <code>/maven-plugin/</code></a></td> + <td>The Apache Tomcat Maven Plugin source code and website.</td> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/native";> + <code>/native/</code></a></td> + <td>The native source code for the Tomcat Native/APR Connector. + The current code is in + <a href="http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x";> + <code>/native/branches/1.1.x/</code></a> (1.1.x) and + <a href="http://svn.apache.org/repos/asf/tomcat/native/trunk";> + <code>/native/trunk/</code></a> (1.2.x). + </td> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/sandbox";> + <code>/sandbox/</code></a></td> + <td>An area where Tomcat committers can experiment with new ideas.</td> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/site";> + <code>/site/</code></a></td> + <td>The Apache Tomcat website.</td> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/taglibs";> + <code>/taglibs/</code></a></td> + <td>The Apache Taglibs source code and website.</td> + </tr> + <tr> + <td><a href="http://svn.apache.org/repos/asf/tomcat/tags";> + <code>/tags/</code></a></td> + <td>Tags for the primary development branch. Mainly used for modules.</td> + </tr> +</table> + +<subsection name="Line endings"> + +<p>The repositories are configured so that when you check out from svn, you get +the line ending appropriate for your platform for all files. The thinking behind +this is that, for example, if you need to fix a typo in a .bat file from MacOS, +it is easier if the .bat file has MacOS line-endings.</p> + +<p>When you build locally, line-endings are not changed. The expectation is that +the source has the correct line-endings for your platform so all the files that +matter on your platform will have the correct line endings. When you are on +Windows it doesn't matter if the .sh files have Windows line-endings since +you'll never use them on Windows.</p> + +</subsection> + +</section> + +</body> +</document> Propchange: tomcat/site/trunk/xdocs/source.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1854413&r1=1854412&r2=1854413&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/stylesheets/project.xml (original) +++ tomcat/site/trunk/xdocs/stylesheets/project.xml Tue Feb 26 19:16:17 2019 @@ -49,7 +49,7 @@ <menu name="Get Involved"> <item name="Overview" href="/getinvolved.html"/> - <item name="Source code" href="/svn.html"/> + <item name="Source code" href="/source.html"/> <item name="Buildbot" href="/ci.html"/> <item name="Tools" href="/tools.html"/> </menu> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
![https://www.apache.org/images/SupportApache-small.png"](https://www.apache.org/images/SupportApache-small.png"){kind=link}