You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mg...@apache.org on 2020/02/03 09:51:13 UTC
svn commit: r1873527 [9/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1873527&r1=1873526&r2=1873527&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Mon Feb 3 09:51:13 2020
@@ -1,290 +1,298 @@
<!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® - Tomcat Maven Plugin</title>
-<meta name="author" content="Apache Tomcat Team">
-</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 aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button>
-</div>
-</form>
-<div class="asfevents">
-<a href="https://www.apache.org/events/current-event.html"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Next ASF event"><br>
- Save the date!
+ <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® - Tomcat Maven Plugin</title>
+ <meta name="author" content="Apache Tomcat Team">
+ </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 aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button>
+ </div>
+ </form>
+ <div class="asfevents">
+ <a href="https://www.apache.org/events/current-event.html"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Next ASF event">
+ <br>
+ Save the date!
</a>
-</div>
-<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://cwiki.apache.org/confluence/display/TOMCAT">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://cwiki.apache.org/confluence/display/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="https://cwiki.apache.org/confluence/x/vIPzBQ">Translations</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="Maven_Plugin">Maven Plugin</h3>
-<div class="text">
-
-
-<p>
- The Apache Tomcat Maven Plugin provides goals to manipulate WAR
+ </div>
+ <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://cwiki.apache.org/confluence/display/TOMCAT">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://cwiki.apache.org/confluence/display/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="https://cwiki.apache.org/confluence/x/vIPzBQ">Translations</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="Maven_Plugin">Maven Plugin</h3>
+ <div class="text">
+
+ <p>
+ The Apache Tomcat Maven Plugin provides goals to manipulate WAR
projects within the Apache Tomcat servlet container.
You can run your War Apache Maven project through
<a href="http://maven.apache.org/">Apache Maven</a> without
deploying your WAR file to an Apache Tomcat instance.
- </p>
-<p>
+ </p>
+
+ <p>
More details are available in the Maven generated site:
</p>
-
-<ul>
-
-<li>
-<a href="maven-plugin-trunk/">Trunk documentation</a> (under development)</li>
-
-<li>
-<a href="maven-plugin-2.2/">Version 2.2</a> (released version: 2013-11-11)</li>
-
-<li>
-<a href="maven-plugin-2.1/">Version 2.1</a> (released version: 2013-02-25)</li>
-
-<li>
-<a href="maven-plugin-2.0/">Version 2.0</a> (released version: 2012-09-14)</li>
-
-<li>
-<a href="maven-plugin-2.0-beta-1/">Version 2.0-beta-1</a> (released version: 2012-02-01)</li>
-
-</ul>
-
-<div class="subsection">
-<h4 id="Sources">Sources</h4>
-<div class="text">
-
-<p>
+
+ <ul>
+
+ <li>
+ <a href="maven-plugin-trunk/">Trunk documentation</a> (under development)
+ </li>
+
+ <li>
+ <a href="maven-plugin-2.2/">Version 2.2</a> (released version: 2013-11-11)
+ </li>
+
+ <li>
+ <a href="maven-plugin-2.1/">Version 2.1</a> (released version: 2013-02-25)
+ </li>
+
+ <li>
+ <a href="maven-plugin-2.0/">Version 2.0</a> (released version: 2012-09-14)
+ </li>
+
+ <li>
+ <a href="maven-plugin-2.0-beta-1/">Version 2.0-beta-1</a> (released version: 2012-02-01)
+ </li>
+
+ </ul>
+
+ <div class="subsection">
+ <h4 id="Sources">Sources</h4>
+ <div class="text">
+
+ <p>
Sources are located in the following svn path:
http://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/
</p>
-
-</div>
-</div>
-
-<div class="subsection">
-<h4 id="Bug_Tracker">Bug Tracker</h4>
-<div class="text">
-
-<p>
- The Bug Tracker to use is the ASF Jira instance:
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Bug_Tracker">Bug Tracker</h4>
+ <div class="text">
+
+ <p>
+ The Bug Tracker to use is the ASF Jira instance:
<a href="https://bz.apache.org/jira/browse/MTOMCAT">https://bz.apache.org/jira/browse/MTOMCAT</a>
-</p>
-
-</div>
-</div>
-
+ </p>
+
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </main>
+ <footer id="footer">
+ Copyright © 1999-2020, The Apache Software Foundation
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
- Copyright © 1999-2020, The Apache Software Foundation
- <br>
- Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+ <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>
Modified: tomcat/site/trunk/docs/migration-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1873527&r1=1873526&r2=1873527&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-6.html (original)
+++ tomcat/site/trunk/docs/migration-6.html Mon Feb 3 09:51:13 2020
@@ -1,528 +1,518 @@
<!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® - Migration Guide - Tomcat 6.0.x</title>
-<meta name="author" content="Apache Tomcat Project">
-</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 aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button>
-</div>
-</form>
-<div class="asfevents">
-<a href="https://www.apache.org/events/current-event.html"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Next ASF event"><br>
- Save the date!
+ <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® - Migration Guide - Tomcat 6.0.x</title>
+ <meta name="author" content="Apache Tomcat Project">
+ </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 aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button>
+ </div>
+ </form>
+ <div class="asfevents">
+ <a href="https://www.apache.org/events/current-event.html"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Next ASF event">
+ <br>
+ Save the date!
</a>
-</div>
-<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://cwiki.apache.org/confluence/display/TOMCAT">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://cwiki.apache.org/confluence/display/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="https://cwiki.apache.org/confluence/x/vIPzBQ">Translations</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="Table_of_Contents">Table of Contents</h3>
-<div class="text">
-
-<ul>
-<li>
-<a href="#General">General</a>
-</li>
-<li>
-<a href="#Migrating_from_5.5.x_to_6.0.x">Migrating from 5.5.x to 6.0.x</a>
-<ol>
-<li>
-<a href="#Java_5_required">Java 5 required</a>
-</li>
-<li>
-<a href="#Modified_directory_structure">Modified directory structure</a>
-<ol>
-<li>
-<a href="#Shared_libraries">Shared libraries</a>
-</li>
-<li>
-<a href="#Endorsed_libraries">Endorsed libraries</a>
-</li>
-<li>
-<a href="#Default_web_applications">Default web applications</a>
-</li>
-</ol>
-</li>
-<li>
-<a href="#Modified_classloading">Modified classloading</a>
-</li>
-<li>
-<a href="#Internal_Logging_API_package_renaming">Internal Logging API package renaming</a>
-</li>
-<li>
-<a href="#commons-logging.jar">commons-logging.jar</a>
-</li>
-<li>
-<a href="#SSLEnabled_attribute_on_Connector">SSLEnabled attribute on Connector</a>
-</li>
-<li>
-<a href="#Connector_thread_pools">Connector thread pools</a>
-</li>
-<li>
-<a href="#Clustering_configuration_changes">Clustering configuration changes</a>
-</li>
-</ol>
-</li>
-<li>
-<a href="#Upgrading_6.0.x">Upgrading 6.0.x</a>
-<ol>
-<li>
-<a href="#Tomcat_6.0.x_configuration_file_differences">Tomcat 6.0.x configuration file differences</a>
-</li>
-</ol>
-</li>
-</ul>
-
-</div>
-<h3 id="General">General</h3>
-<div class="text">
-
-
-<p>Please read general <a href="migration.html">Migration Guide page</a> first,
+ </div>
+ <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://cwiki.apache.org/confluence/display/TOMCAT">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://cwiki.apache.org/confluence/display/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="https://cwiki.apache.org/confluence/x/vIPzBQ">Translations</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="Table_of_Contents">Table of Contents</h3>
+ <div class="text">
+
+ <ul>
+ <li>
+ <a href="#General">General</a>
+ </li>
+ <li>
+ <a href="#Migrating_from_5.5.x_to_6.0.x">Migrating from 5.5.x to 6.0.x</a>
+ <ol>
+ <li>
+ <a href="#Java_5_required">Java 5 required</a>
+ </li>
+ <li>
+ <a href="#Modified_directory_structure">Modified directory structure</a>
+ <ol>
+ <li>
+ <a href="#Shared_libraries">Shared libraries</a>
+ </li>
+ <li>
+ <a href="#Endorsed_libraries">Endorsed libraries</a>
+ </li>
+ <li>
+ <a href="#Default_web_applications">Default web applications</a>
+ </li>
+ </ol>
+ </li>
+ <li>
+ <a href="#Modified_classloading">Modified classloading</a>
+ </li>
+ <li>
+ <a href="#Internal_Logging_API_package_renaming">Internal Logging API package renaming</a>
+ </li>
+ <li>
+ <a href="#commons-logging.jar">commons-logging.jar</a>
+ </li>
+ <li>
+ <a href="#SSLEnabled_attribute_on_Connector">SSLEnabled attribute on Connector</a>
+ </li>
+ <li>
+ <a href="#Connector_thread_pools">Connector thread pools</a>
+ </li>
+ <li>
+ <a href="#Clustering_configuration_changes">Clustering configuration changes</a>
+ </li>
+ </ol>
+ </li>
+ <li>
+ <a href="#Upgrading_6.0.x">Upgrading 6.0.x</a>
+ <ol>
+ <li>
+ <a href="#Tomcat_6.0.x_configuration_file_differences">Tomcat 6.0.x configuration file differences</a>
+ </li>
+ </ol>
+ </li>
+ </ul>
+
+ </div>
+ <h3 id="General">General</h3>
+ <div class="text">
+
+ <p>
+ Please read general <a href="migration.html">Migration Guide page</a> first,
for common considerations that apply to migration or upgrade between versions
-of Apache Tomcat.</p>
-
-
-</div>
-<h3 id="Migrating_from_5.5.x_to_6.0.x">Migrating from 5.5.x to 6.0.x</h3>
-<div class="text">
-
-
-<p> This section lists all the known changes between 5.5.x and 6.0.x which may
+of Apache Tomcat.
+ </p>
+
+ </div>
+ <h3 id="Migrating_from_5.5.x_to_6.0.x">Migrating from 5.5.x to 6.0.x</h3>
+ <div class="text">
+
+ <p> This section lists all the known changes between 5.5.x and 6.0.x which may
cause backwards compatibility problems when upgrading.</p>
+
-
-<div class="subsection">
-<h4 id="Java_5_required">Java 5 required</h4>
-<div class="text">
-
-
-<p>Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which
+ <div class="subsection">
+ <h4 id="Java_5_required">Java 5 required</h4>
+ <div class="text">
+
+ <p>Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which
could use a compatibility package to run on JRE 1.4.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Modified_directory_structure">Modified directory structure</h4>
-<div class="text">
-
-
-<div class="subsection">
-<h4 id="Shared_libraries">Shared libraries</h4>
-<div class="text">
-
-
-<p>Apache Tomcat 5.5.x used, by default, a directory structure including
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Modified_directory_structure">Modified directory structure</h4>
+ <div class="text">
+
+ <div class="subsection">
+ <h4 id="Shared_libraries">Shared libraries</h4>
+ <div class="text">
+
+ <p>
+ Apache Tomcat 5.5.x used, by default, a directory structure including
<code>common</code>, <code>shared</code> and <code>server</code> subdirectories.
- Apache Tomcat 6.0.x uses a single <code>lib</code> directory.</p>
-
-
-<p>The <code>lib</code> directory is the direct replacement for both
+ Apache Tomcat 6.0.x uses a single <code>lib</code> directory.
+ </p>
+
+ <p>
+ The <code>lib</code> directory is the direct replacement for both
<code>common/lib</code> and <code>common/classes</code> subdirectories:
- it accepts both JARs and exploded class hierarchies.</p>
-
-
-<p>The <code>conf/catalina.properties</code> file can be used to modify
- the directory structure.</p>
-
-
-<p>Starting with version 6.0.21, Apache Tomcat supports both the
+ it accepts both JARs and exploded class hierarchies.
+ </p>
+
+ <p>
+ The <code>conf/catalina.properties</code> file can be used to modify
+ the directory structure.
+ </p>
+
+ <p>
+ Starting with version 6.0.21, Apache Tomcat supports both the
<code>$CATALINA_BASE/lib</code> and <code>$CATALINA_HOME/lib</code>
directories. The jars and classes in <code>$CATALINA_BASE/lib</code>
- are earlier on the class path and thus take precedence.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Endorsed_libraries">Endorsed libraries</h4>
-<div class="text">
-
-
-<p>The <code>$CATALINA_HOME/common/endorsed</code> subdirectory is replaced
+ are earlier on the class path and thus take precedence.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Endorsed_libraries">Endorsed libraries</h4>
+ <div class="text">
+
+ <p>
+ The <code>$CATALINA_HOME/common/endorsed</code> subdirectory is replaced
by the <code>$CATALINA_HOME/endorsed</code> directory. This directory is
- absent by default.</p>
-
-
-<p>The <code>JAVA_ENDORSED_DIRS</code> environment variable can be used
+ absent by default.
+ </p>
+
+ <p>
+ The <code>JAVA_ENDORSED_DIRS</code> environment variable can be used
with <code>setenv.bat</code>|<code>sh</code> scripts to provide alternative
- location of this directory.</p>
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Default_web_applications">Default web applications</h4>
-<div class="text">
-
-
-<p>The Manager and Host Manager web applications are no longer in
+ location of this directory.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Default_web_applications">Default web applications</h4>
+ <div class="text">
+
+ <p>
+ The Manager and Host Manager web applications are no longer in
<code>server/webapps</code>. All of the default web applications
- are now located in the <code>webapps</code> directory.</p>
-
-
-<p>Note, that if <code>deployOnStartup</code> or <code>autoDeploy</code>
+ are now located in the <code>webapps</code> directory.
+ </p>
+
+ <p>
+ Note, that if <code>deployOnStartup</code> or <code>autoDeploy</code>
options on the <strong>Host</strong> are enabled, the
<code>META-INF/context.xml</code> files of manager and host-manager
applications will be copied into the
<code>$CATALINA_BASE/conf/[engine_name]/[host_name]</code>
- directory when Tomcat starts for the first time.</p>
-
-
-<p>When using a shared webhosting environment, it is recommended to forbid
+ directory when Tomcat starts for the first time.
+ </p>
+
+ <p>
+ When using a shared webhosting environment, it is recommended to forbid
the use of context.xml inside the web applications (using the
<code>deployXML</code> attribute of the <strong>Host</strong> element).
- (This option is also available in Tomcat 5.5).</p>
-
-
-</div>
-</div>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Modified_classloading">Modified classloading</h4>
-<div class="text">
-
-
-<p>As a result of the modification of the directory structure, the
+ (This option is also available in Tomcat 5.5).
+ </p>
+
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Modified_classloading">Modified classloading</h4>
+ <div class="text">
+
+ <p>
+ As a result of the modification of the directory structure, the
common, shared and server classloaders have been merged into one.
Effectively, the shared and server classloaders are not configured by
default and the common classloader is mapped to the <code>lib</code>
- directory, as described above.</p>
-
-<p>This behavior and structure can be modified using the
- <code>conf/catalina.properties</code> file.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Internal_Logging_API_package_renaming">Internal Logging API package renaming</h4>
-<div class="text">
-
-
-<p>Apache Tomcat 5.5.x relied on the
+ directory, as described above.
+ </p>
+
+ <p>
+ This behavior and structure can be modified using the
+ <code>conf/catalina.properties</code> file.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Internal_Logging_API_package_renaming">Internal Logging API package renaming</h4>
+ <div class="text">
+
+ <p>
+ Apache Tomcat 5.5.x relied on the
<a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
library for its internal logging. Apache Tomcat 6.0.x and later no more
uses the library directly, but uses a private copy of it. The classes are
in the <code>org.apache.juli.logging</code> package.
- </p>
-
-<p>The rationale behind this change is that so that application logging
+ </p>
+
+ <p>The rationale behind this change is that so that application logging
can be as independent as possible from the container, while still having
the possibility of being unified.</p>
-
-
-<p>By default only a subset of Apache Commons Logging classes that are
+
+ <p>
+ By default only a subset of Apache Commons Logging classes that are
needed to perform logging to <code>java.util.logging</code> is included
with Tomcat. If you want to configure Tomcat to redirect its logging into
<a href="http://logging.apache.org/log4j/">Log4J</a>, or any other logging
framework supported by the full Apache Commons Logging library, you will
have to replace one of Tomcat JARs with the full implementation. The JAR
is available as an extras component. See the logging and extras
- documentation for more details.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="commons-logging.jar">commons-logging.jar</h4>
-<div class="text">
-
-
-<p>As Apache Tomcat no longer directly uses the
+ documentation for more details.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="commons-logging.jar">commons-logging.jar</h4>
+ <div class="text">
+
+ <p>
+ As Apache Tomcat no longer directly uses the
<a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
library, the <code>commons-logging-api.jar</code> library is no longer
provided for the web applications. The web applications that use
Apache Commons Logging have to provide their own copy of that library.
It is recommended to put it into their <code>WEB-INF/lib</code> directory,
- like any other JAR.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="SSLEnabled_attribute_on_Connector">SSLEnabled attribute on Connector</h4>
-<div class="text">
-
-
-<p>For all SSL enabled connectors, the <code>SSLEnabled</code> flag must be set
+ like any other JAR.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="SSLEnabled_attribute_on_Connector">SSLEnabled attribute on Connector</h4>
+ <div class="text">
+
+ <p>
+ For all SSL enabled connectors, the <code>SSLEnabled</code> flag must be set
to <code>true</code> to enable encryption. Tomcat no longer relies on using
the protocol and other parameters to determine if the transport should be
- encrypted, to give maximum flexibility in proxied scenarios.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Connector_thread_pools">Connector thread pools</h4>
-<div class="text">
-
-
-<p>The <strong>Connector</strong> thread pools have been simplified. They
+ encrypted, to give maximum flexibility in proxied scenarios.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Connector_thread_pools">Connector thread pools</h4>
+ <div class="text">
+
+ <p>
+ The <strong>Connector</strong> thread pools have been simplified. They
now grow to the maximum size specified but never shrink. The attributes
associated with shrinking the thread pool (e.g. <code>minSpareThreads</code>)
will be ignored. If you require a thread pool that grows and shrinks with
demand you'll need to configure an <strong>Executor</strong> and then
- configure your <strong>Connector</strong> to use it.</p>
-
-
-</div>
-</div>
-
-
-<div class="subsection">
-<h4 id="Clustering_configuration_changes">Clustering configuration changes</h4>
-<div class="text">
-
-
-<p>Clustering configuration was refactored. See the clustering documentation
+ configure your <strong>Connector</strong> to use it.
+ </p>
+
+ </div>
+ </div>
+
+ <div class="subsection">
+ <h4 id="Clustering_configuration_changes">Clustering configuration changes</h4>
+ <div class="text">
+
+ <p>Clustering configuration was refactored. See the clustering documentation
for more details.</p>
-
-
-</div>
-</div>
-
-
-</div>
-<h3 id="Upgrading_6.0.x">Upgrading 6.0.x</h3>
-<div class="text">
-
-
-<p>When upgrading instances of Apache Tomcat from one version of Tomcat 6 to
+
+ </div>
+ </div>
+
+ </div>
+ <h3 id="Upgrading_6.0.x">Upgrading 6.0.x</h3>
+ <div class="text">
+
+ <p>When upgrading instances of Apache Tomcat from one version of Tomcat 6 to
another, particularly when using separate locations for $CATALINA_HOME and
$CATALINA_BASE, it is necessary to ensure that any changes in the
configuration files such as new attributes and changes to defaults are applied
as part of the upgrade. To assist with the identification of these changes,
the form below may be used to view the differences between the configuration
files in different versions of Tomcat 6.</p>
+
-
-<div class="subsection">
-<h4 id="Tomcat_6.0.x_configuration_file_differences">Tomcat 6.0.x configuration file differences</h4>
-<div class="text">
-
-
-<p>Select a configuration file, old version and new version from the boxes
+ <div class="subsection">
+ <h4 id="Tomcat_6.0.x_configuration_file_differences">Tomcat 6.0.x configuration file differences</h4>
+ <div class="text">
+
+ <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>
-
-
-<script type="text/javascript">
+ <script type="text/javascript">
"use strict"; // Enable strict mode
document.addEventListener("DOMContentLoaded", function() {
@@ -576,8 +566,8 @@ of Apache Tomcat.</p>
-<p>
-<label>Configuration file:
+ <p>
+ <label>Configuration file:
<select id="select-filename">
<option value="conf/catalina.policy">catalina.policy</option>
<option value="conf/catalina.properties">catalina.properties</option>
@@ -588,10 +578,10 @@ of Apache Tomcat.</p>
<option value="conf/web.xml">web.xml</option>
</select></label>
-</p>
-
-<p>
-<label>Old version:
+ </p>
+
+ <p>
+ <label>Old version:
<select id="select-r1">
<option value="6.0.0">6.0.0</option>
<option value="6.0.1">6.0.1</option>
@@ -664,48 +654,48 @@ of Apache Tomcat.</p>
<option value="HEAD">trunk (unreleased)</option>
</select></label>
-</p>
-
-
-<form id="tc6Submit" action="to-be-replaced" method="get" target="_blank">
-
-<p>
-
-<input type="hidden" name="diff_format" value="h">
+ </p>
+
+ <form id="tc6Submit" 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>
-
-<div class="codeBox">
-<pre>
-<code>svn diff
+ </p>
+
+ </form>
+
+ <p>You can also use Subversion command similar to the following (all on one line):</p>
+
+ <div class="codeBox">
+ <pre>
+ <code>svn diff
--old=http://svn.apache.org/repos/asf/tomcat/archive/tc6.0.x/tags/TOMCAT_6_0_36/conf/
--new=http://svn.apache.org/repos/asf/tomcat/archive/tc6.0.x/tags/TOMCAT_6_0_37/conf/</code>
-</pre>
-</div>
-
-</div>
-</div>
-
-
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
- Copyright © 1999-2020, The Apache Software Foundation
- <br>
- Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+ </pre>
+ </div>
+
+ </div>
+ </div>
+
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </main>
+ <footer id="footer">
+ Copyright © 1999-2020, 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org