Author: markt
Date: Wed Jul 13 08:20:41 2022
New Revision: 1902689

URL: http://svn.apache.org/viewvc?rev=1902689&view=rev
Log:
First attempt to update Apache Tomcat Native download page for 2 versions

Modified:
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/xdocs/download-native.xml

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1902689&r1=1902688&r2=1902689&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Wed Jul 13 08:20:41 2022
@@ -1,130 +1,152 @@
 <!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&reg; - Tomcat Native 
Downloads</title></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>&reg;</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-lef
 t"><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&hellip;" 
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-10.cgi";>Tomcat 10</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.apach
 e.org/download-migration.cgi">Tomcat Migration Tool for Jakarta 
EE</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-10.1-doc/index.html">Tomcat 10.1 (beta)</a></li><li><a 
href="./tomcat-10.0-doc/index.html">Tomcat 10.0</a></li><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="./connectors-doc/">Tomcat Connectors</a></li><li><a 
href="./native-doc/">Tomcat Native 2</a></li><li><a 
href="./native-1.2-doc/">Tomcat Native 1.2</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><li><a 
href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</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://blo
 gs.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://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</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="Tomcat_Native_Downloads">Tom
 cat Native Downloads</h3><div class="text">
-
-      <p>Use the links below to download the Apache Tomcat<sup>&reg;</sup> 
Native software
-      from one of our mirrors. You <strong>must</strong>
-      <a href="#Verify_the_Integrity_of_the_Files">verify the integrity</a> of
-      the downloaded files using signatures downloaded from our main
-      distribution directory.</p>
-
+<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&reg; - Tomcat Native 
Downloads</title></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>&reg;</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-lef
 t"><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&hellip;" 
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-10.cgi";>Tomcat 10</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.apach
 e.org/download-migration.cgi">Tomcat Migration Tool for Jakarta 
EE</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-10.1-doc/index.html">Tomcat 10.1 (beta)</a></li><li><a 
href="./tomcat-10.0-doc/index.html">Tomcat 10.0</a></li><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="./connectors-doc/">Tomcat Connectors</a></li><li><a 
href="./native-doc/">Tomcat Native 2</a></li><li><a 
href="./native-1.2-doc/">Tomcat Native 1.2</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><li><a 
href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</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://blo
 gs.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://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</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="Tomcat_Native_Software_Downl
 oads">Tomcat Native Software Downloads</h3><div class="text">
+      <p>Welcome to the Apache Tomcat<sup>&reg;</sup> Native software download
+      page. This page provides download links for obtaining the latest version
+      of Tomcat Native software, as well as links to the archives of older
+      releases.</p>
       <p>Only current recommended releases are available on the main
-      distribution site and its mirrors.  Older releases are available from the
+      distribution site and its mirrors. Older releases are available from the
       <a 
href="https://archive.apache.org/dist/tomcat/tomcat-connectors/native/";>
       archive download site</a>.</p>
-
-      <p>Recent releases (48 hours) may not yet be available from the 
mirrors.</p>
-
-      <div class="subsection"><h4 id="Choose_a_Mirror">Choose a 
Mirror</h4><div class="text">
-        <p>You are currently using <b>[preferred]</b>.  If you
-        encounter a problem with this mirror, please select another
-        mirror.  If all mirrors are failing, there are <i>backup</i>
-        mirrors (at the end of the mirrors list) that should be
-        available.<br>
-        [if-any logo]
-          <a href="[link]" rel="nofollow"><img alt="Logo" src="[logo]"></a>
-        [end]
-        </p><form action="[location]" method="get" id="SelectMirror"><p>
-        Other mirrors: <select name="Preferred">
-        [if-any http]
-          [for http]<option value="[http]">[http]</option>[end]
-        [end]
-        [if-any ftp]
-          [for ftp]<option value="[ftp]">[ftp]</option>[end]
-        [end]
-        [if-any backup]
-          [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-        [end]
-        </select><input type="submit" value="Change"></p></form>
-        <p>You may also consult the <a 
href="http://www.apache.org/mirrors/";>complete
-        list of mirrors</a>.</p>
+    </div><h3 id="Quick_Navigation">Quick Navigation</h3><div class="text">
+      
+[define v]2.0.1[end]
+[define w]1.2.34[end]
+[define y]3.0.5[end]
+[define z]1.1.1o[end]
+      <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS</a> |
+      <a href="#[v]">[v]</a> |
+      <a href="#[w]">[w]</a> |
+      <a href="[preferred]tomcat/tomcat-connectors/native" 
rel="nofollow">Browse</a> |
+      <a 
href="https://archive.apache.org/dist/tomcat/tomcat-connectors/native";>Archives</a>
+    </div><h3 id="Release_Integrity">Release Integrity</h3><div class="text">
+      <p>You <strong>must</strong>
+      <a href="https://www.apache.org/info/verification.html";>verify</a> the
+      integrity of the downloaded files. We provide OpenPGP signatures for 
every
+      release file.  This signature should be matched against the
+      <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS</a>
+      file which contains the OpenPGP keys of Tomcat's Release Managers. We 
also
+      provide <code>SHA-512</code> checksums for every release file. After you
+      download the file, you should calculate a checksum for your download, and
+      make sure it is the same as ours.</p>
+    </div><h3 id="Mirrors">Mirrors</h3><div class="text">
+      
+      <p>You are currently using <b>[preferred]</b>. If you encounter a problem
+      with this mirror, please select another mirror. If all mirrors are
+      failing, there are <i>backup</i> mirrors (at the end of the mirrors list)
+      that should be available.
+      <br>[if-any logo]<a href="[link]" rel="nofollow"><img alt="Logo" 
src="[logo]"></a>[end]</p><form action="[location]" method="get" 
id="SelectMirror"><p>
+      Other mirrors: <select name="Preferred">
+      [if-any http]
+        [for http]<option value="[http]">[http]</option>[end]
+      [end]
+      [if-any ftp]
+        [for ftp]<option value="[ftp]">[ftp]</option>[end]
+      [end]
+      [if-any backup]
+        [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+      [end]
+      </select><input type="submit" value="Change"></p></form>
+    </div><h3 id="[v]">[v]</h3><div class="text">
+      <p>For more information concerning Tomcat Native 2.0.x, see the
+      <a href="http://tomcat.apache.org/native-doc/"; class="name">Tomcat
+      Native</a> site.</p>
+
+      <div class="subsection"><h4 id="[v]/Source_Distributions">Source 
Distributions</h4><div class="text">
+        <p>Please choose the correct format for your platform.</p>
+        <ul>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz"
 rel="nofollow">tar.gz</a>
+            - e.g. Unix, Linux, Mac OS
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.sha512";>SHA512</a>)
+          </li>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip"
 rel="nofollow">tar.gz</a>
+            - e.g. Windows
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.sha512";>SHA512</a>)
+          </li>
+        </ul>
       </div></div>
 
-      <div class="subsection"><h4 id="Tomcat_Native_Connector_-_1.2">Tomcat 
Native Connector - 1.2</h4><div class="text">
-        <p>For more information concerning Tomcat Native, see the
-        <a href="http://tomcat.apache.org/native-doc/"; class="name">Tomcat 
Native</a> site.</p>
-        <ul class="downloads">
-          <li class="download">
-          <div class="links"><span class="label">Source (please choose the 
correct format for your platform)</span></div>
-          <ul>
-            <li class="download">
-              <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz"
 rel="nofollow">
-                Native 1.2.34 Source Release tar.gz</a> (e.g. Unix, Linux, Mac 
OS)
-            <ul class="attributes">
-              <li>
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz.asc";>PGP</a>],
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz.sha512";>SHA512</a>]
-              </li>
-            </ul>
-            </li>
-            <li class="download">
-              <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-win32-src.zip"
 rel="nofollow">
-                Native 1.2.34 Source Release zip</a> (e.g. Windows)
-            <ul class="attributes">
-              <li>
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-win32-src.zip.asc";>PGP</a>],
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-win32-src.zip.sha512";>SHA512</a>]
-              </li>
-            </ul>
-            </li>
-          </ul>
+      <div class="subsection"><h4 id="[v]/Binary_Distributions">Binary 
Distributions</h4><div class="text">
+        <p>Binaries are provided for Microsoft Windows. The Windows binaries 
are
+        available in two variants. The standard variant is what people usually
+        use. This version of the library is included in the Apache Tomcat
+        distributions. The OCSP-enabled variant has enabled support for
+        verification of client SSL certificates via the OCSP protocol
+        (<a 
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=45392";>45392</a>).</p>
+        <p>Each archive contains <code>tcnative-2.dll</code> for 32-bit (x86)
+        and 64-bit (x64) CPU architectures. You have to use the DLL that 
matches
+        CPU architecture of JVM that you use to run Tomcat.</p>
+        <p>These binaries were built with OpenSSL [y].</p>
+        <ul>
+          <li>
+            Standard
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip"
 rel="nofollow">zip</a>
+            - recommended
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip.sha512";>SHA512</a>)
           </li>
-        </ul>
-        <p>You can find binaries release too.
-        You may download them from
-          <a href="[preferred]tomcat/tomcat-connectors/native/1.2.34/binaries" 
rel="nofollow">HERE</a>
-        </p>
-        <ul class="downloads">
-          <li class="download">
-            <div class="links">Binaries for Microsoft Windows</div>
-            <div class="links"><p>The Windows binaries are available in two
-              variants. a) Default. This is what people usually use. This
-              version of library is included in Apache Tomcat distributions.
-              b) OCSP-enabled. This one has enabled support for verification of
-              client SSL certificates via OCSP protocol (<a 
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=45392";>45392</a>).
-              </p>
-              <p>Each archive contains <code>tcnative-1.dll</code> for 32-bit
-              and 64-bit (x64) CPU architectures. You have to use the DLL that
-              matches CPU architecture of JVM that you use to run Tomcat.</p>
-            </div>
-            <div class="links">Binaries for Microsoft Windows built with 
OpenSSL 1.1.1o</div>
-            <ul>
-              <li class="download">
-                <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-win32-bin.zip"
 rel="nofollow">
-                  Native 1.2.34 Windows Binaries zip</a> (recommended)
-              <ul class="attributes">
-                <li>
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-win32-bin.zip.asc";>PGP</a>],
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-win32-bin.zip.sha512";>SHA512</a>]
-                </li>
-              </ul>
-              </li>
-              <li class="download">
-                <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-ocsp-win32-bin.zip"
 rel="nofollow">
-                  Native 1.2.34 Windows OCSP-enabled Binaries zip</a>
-              <ul class="attributes">
-                <li>
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-ocsp-win32-bin.zip.asc";>PGP</a>],
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-ocsp-win32-bin.zip.sha512";>SHA512</a>]
-                </li>
-              </ul>
-              </li>
-            </ul>
+          <li>
+            OCSP enabled
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip"
 rel="nofollow">zip</a>
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip.sha512";>SHA512</a>)
           </li>
         </ul>
+      </div></div>
 
+    </div><h3 id="[w]">[w]</h3><div class="text">
+      <p>For more information concerning Tomcat Native 1.2.x, see the
+      <a href="http://tomcat.apache.org/native-1.2-doc/"; class="name">Tomcat
+      Native</a> site.</p>
+
+      <div class="subsection"><h4 id="[w]/Source_Distributions">Source 
Distributions</h4><div class="text">
+        <p>Please choose the correct format for your platform.</p>
+        <ul>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz"
 rel="nofollow">tar.gz</a>
+            - e.g. Unix, Linux, Mac OS
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz.sha512";>SHA512</a>)
+          </li>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip"
 rel="nofollow">tar.gz</a>
+            - e.g. Windows
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.sha512";>SHA512</a>)
+          </li>
+        </ul>
       </div></div>
 
-      <div class="subsection"><h4 
id="Verify_the_Integrity_of_the_Files">Verify the Integrity of the 
Files</h4><div class="text">
-        <p>You <strong>must</strong>
-        <a href="https://www.apache.org/info/verification.html";>verify</a> the
-        integrity of the downloaded files. We provide OpenPGP signatures for
-        every release file. This signature should be matched against the
-        <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-        file which contains the OpenPGP keys of Tomcat's Release Managers. We
-        also provide <code>SHA512</code> checksums for every release file. 
After
-        you download the file, you should calculate a checksum for your
-        download, and make sure it is the same as ours.
-        </p>
+      <div class="subsection"><h4 id="[w]/Binary_Distributions">Binary 
Distributions</h4><div class="text">
+        <p>Binaries are provided for Microsoft Windows. The Windows binaries 
are
+        available in two variants. The standard variant is what people usually
+        use. This version of the library is included in the Apache Tomcat
+        distributions. The OCSP-enabled variant has enabled support for
+        verification of client SSL certificates via the OCSP protocol
+        (<a 
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=45392";>45392</a>).</p>
+        <p>Each archive contains <code>tcnative-1.dll</code> for 32-bit (x86)
+        and 64-bit (x64) CPU architectures. You have to use the DLL that 
matches
+        CPU architecture of JVM that you use to run Tomcat.</p>
+        <p>These binaries were built with OpenSSL [z].</p>
+        <ul>
+          <li>
+            Standard
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-win32-bin.zip"
 rel="nofollow">zip</a>
+            - recommended
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-win32-bin.zip.sha512";>SHA512</a>)
+          </li>
+          <li>
+            OCSP enabled
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-ocsp-win32-bin.zip"
 rel="nofollow">zip</a>
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-ocsp-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-ocsp-win32-bin.zip.sha512";>SHA512</a>)
+          </li>
+        </ul>
       </div></div>
 
     </div></div></div></div></main><footer id="footer">

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1902689&r1=1902688&r2=1902689&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Wed Jul 13 08:20:41 2022
@@ -1,136 +1,180 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
-  <properties><title>Tomcat Native Downloads</title></properties>
-  <body>
-    <section name="Tomcat Native Downloads">
-
-      <p>Use the links below to download the Apache Tomcat<sup>&#174;</sup> 
Native software
-      from one of our mirrors. You <strong>must</strong>
-      <a href="#Verify_the_Integrity_of_the_Files">verify the integrity</a> of
-      the downloaded files using signatures downloaded from our main
-      distribution directory.</p>
+  <properties>
+    <title>Tomcat Native Downloads</title>
+  </properties>
 
+  <body>
+  
+    <section name="Tomcat Native Software Downloads">
+      <p>Welcome to the Apache Tomcat<sup>&#174;</sup> Native software download
+      page. This page provides download links for obtaining the latest version
+      of Tomcat Native software, as well as links to the archives of older
+      releases.</p>
       <p>Only current recommended releases are available on the main
-      distribution site and its mirrors.  Older releases are available from the
+      distribution site and its mirrors. Older releases are available from the
       <a 
href="https://archive.apache.org/dist/tomcat/tomcat-connectors/native/";>
       archive download site</a>.</p>
+    </section>
 
-      <p>Recent releases (48 hours) may not yet be available from the 
mirrors.</p>
+    <section name="Quick Navigation">
+      <!--
+        Define variables to hold the current version numbers.
+        Documentation for ezt.py: https://code.google.com/p/ezt/wiki/Syntax
+      -->
+[define v]2.0.1[end]
+[define w]1.2.34[end]
+[define y]3.0.5[end]
+[define z]1.1.1o[end]
+      <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS</a> |
+      <a href="#[v]">[v]</a> |
+      <a href="#[w]">[w]</a> |
+      <a href="[preferred]tomcat/tomcat-connectors/native" 
rel="nofollow">Browse</a> |
+      <a 
href="https://archive.apache.org/dist/tomcat/tomcat-connectors/native";>Archives</a>
+    </section>
 
-      <subsection name="Choose a Mirror">
-        <p>You are currently using <b>[preferred]</b>.  If you
-        encounter a problem with this mirror, please select another
-        mirror.  If all mirrors are failing, there are <i>backup</i>
-        mirrors (at the end of the mirrors list) that should be
-        available.<br/>
-        [if-any logo]
-          <a href="[link]" rel="nofollow"><img alt="Logo" src="[logo]"/></a>
-        [end]
-        </p><form action="[location]" method="get" id="SelectMirror"><p>
-        Other mirrors: <select name="Preferred">
-        [if-any http]
-          [for http]<option value="[http]">[http]</option>[end]
-        [end]
-        [if-any ftp]
-          [for ftp]<option value="[ftp]">[ftp]</option>[end]
-        [end]
-        [if-any backup]
-          [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-        [end]
-        </select><input type="submit" value="Change"/></p></form>
-        <p>You may also consult the <a 
href="http://www.apache.org/mirrors/";>complete
-        list of mirrors</a>.</p>
-      </subsection>
+    <section name="Release Integrity">
+      <p>You <strong>must</strong>
+      <a href="https://www.apache.org/info/verification.html";>verify</a> the
+      integrity of the downloaded files. We provide OpenPGP signatures for 
every
+      release file.  This signature should be matched against the
+      <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS</a>
+      file which contains the OpenPGP keys of Tomcat's Release Managers. We 
also
+      provide <code>SHA-512</code> checksums for every release file. After you
+      download the file, you should calculate a checksum for your download, and
+      make sure it is the same as ours.</p>
+    </section>
+
+    <section name="Mirrors">
+      <!--
+        Note: The following CGI code is sensitive to line breaks.
+              Don't "prettify" it.
+      -->
+      <p>You are currently using <b>[preferred]</b>. If you encounter a problem
+      with this mirror, please select another mirror. If all mirrors are
+      failing, there are <i>backup</i> mirrors (at the end of the mirrors list)
+      that should be available.
+      <br/>[if-any logo]<a href="[link]" rel="nofollow"><img alt="Logo" 
src="[logo]"/></a>[end]</p><form action="[location]" method="get" 
id="SelectMirror"><p>
+      Other mirrors: <select name="Preferred">
+      [if-any http]
+        [for http]<option value="[http]">[http]</option>[end]
+      [end]
+      [if-any ftp]
+        [for ftp]<option value="[ftp]">[ftp]</option>[end]
+      [end]
+      [if-any backup]
+        [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+      [end]
+      </select><input type="submit" value="Change"/></p></form>
+    </section>
 
-      <subsection name="Tomcat Native Connector - 1.2">
-        <p>For more information concerning Tomcat Native, see the
-        <a href="http://tomcat.apache.org/native-doc/"; class="name">Tomcat 
Native</a> site.</p>
-        <ul class="downloads">
-          <li class="download">
-          <div class="links"><span class="label">Source (please choose the 
correct format for your platform)</span></div>
-          <ul>
-            <li class="download">
-              <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz"
 rel="nofollow">
-                Native 1.2.34 Source Release tar.gz</a> (e.g. Unix, Linux, Mac 
OS)
-            <ul class="attributes">
-              <li>
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz.asc";>PGP</a>],
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz.sha512";>SHA512</a>]
-              </li>
-            </ul>
-            </li>
-            <li class="download">
-              <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-win32-src.zip"
 rel="nofollow">
-                Native 1.2.34 Source Release zip</a> (e.g. Windows)
-            <ul class="attributes">
-              <li>
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-win32-src.zip.asc";>PGP</a>],
-                [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-win32-src.zip.sha512";>SHA512</a>]
-              </li>
-            </ul>
-            </li>
-          </ul>
+    <section name="[v]">
+      <p>For more information concerning Tomcat Native 2.0.x, see the
+      <a href="http://tomcat.apache.org/native-doc/"; class="name">Tomcat
+      Native</a> site.</p>
+
+      <subsection name="Source Distributions">
+        <p>Please choose the correct format for your platform.</p>
+        <ul>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz"
 rel="nofollow">tar.gz</a>
+            - e.g. Unix, Linux, Mac OS
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.sha512";>SHA512</a>)
+          </li>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip"
 rel="nofollow">tar.gz</a>
+            - e.g. Windows
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.sha512";>SHA512</a>)
           </li>
         </ul>
-        <p>You can find binaries release too.
-        You may download them from
-          <a href="[preferred]tomcat/tomcat-connectors/native/1.2.34/binaries" 
rel="nofollow">HERE</a>
-        </p>
-        <ul class="downloads">
-          <li class="download">
-            <div class="links">Binaries for Microsoft Windows</div>
-            <div class="links"><p>The Windows binaries are available in two
-              variants. a) Default. This is what people usually use. This
-              version of library is included in Apache Tomcat distributions.
-              b) OCSP-enabled. This one has enabled support for verification of
-              client SSL certificates via OCSP protocol (<bug>45392</bug>).
-              </p>
-              <p>Each archive contains <code>tcnative-1.dll</code> for 32-bit
-              and 64-bit (x64) CPU architectures. You have to use the DLL that
-              matches CPU architecture of JVM that you use to run Tomcat.</p>
-            </div>
-            <div class="links">Binaries for Microsoft Windows built with 
OpenSSL 1.1.1o</div>
-            <ul>
-              <li class="download">
-                <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-win32-bin.zip"
 rel="nofollow">
-                  Native 1.2.34 Windows Binaries zip</a> (recommended)
-              <ul class="attributes">
-                <li>
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-win32-bin.zip.asc";>PGP</a>],
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-win32-bin.zip.sha512";>SHA512</a>]
-                </li>
-              </ul>
-              </li>
-              <li class="download">
-                <a 
href="[preferred]tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-ocsp-win32-bin.zip"
 rel="nofollow">
-                  Native 1.2.34 Windows OCSP-enabled Binaries zip</a>
-              <ul class="attributes">
-                <li>
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-ocsp-win32-bin.zip.asc";>PGP</a>],
-                  [<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.34/binaries/tomcat-native-1.2.34-openssl-1.1.1o-ocsp-win32-bin.zip.sha512";>SHA512</a>]
-                </li>
-              </ul>
-              </li>
-            </ul>
+      </subsection>
+
+      <subsection name="Binary Distributions">
+        <p>Binaries are provided for Microsoft Windows. The Windows binaries 
are
+        available in two variants. The standard variant is what people usually
+        use. This version of the library is included in the Apache Tomcat
+        distributions. The OCSP-enabled variant has enabled support for
+        verification of client SSL certificates via the OCSP protocol
+        (<bug>45392</bug>).</p>
+        <p>Each archive contains <code>tcnative-2.dll</code> for 32-bit (x86)
+        and 64-bit (x64) CPU architectures. You have to use the DLL that 
matches
+        CPU architecture of JVM that you use to run Tomcat.</p>
+        <p>These binaries were built with OpenSSL [y].</p>
+        <ul>
+          <li>
+            Standard
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip"
 rel="nofollow">zip</a>
+            - recommended
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip.sha512";>SHA512</a>)
+          </li>
+          <li>
+            OCSP enabled
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip"
 rel="nofollow">zip</a>
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip.sha512";>SHA512</a>)
           </li>
         </ul>
+      </subsection>
+
+    </section>
 
+    <section name="[w]">
+      <p>For more information concerning Tomcat Native 1.2.x, see the
+      <a href="http://tomcat.apache.org/native-1.2-doc/"; class="name">Tomcat
+      Native</a> site.</p>
+
+      <subsection name="Source Distributions">
+        <p>Please choose the correct format for your platform.</p>
+        <ul>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz"
 rel="nofollow">tar.gz</a>
+            - e.g. Unix, Linux, Mac OS
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz.sha512";>SHA512</a>)
+          </li>
+          <li>
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip"
 rel="nofollow">tar.gz</a>
+            - e.g. Windows
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.sha512";>SHA512</a>)
+          </li>
+        </ul>
       </subsection>
 
-      <subsection name="Verify the Integrity of the Files">
-        <p>You <strong>must</strong>
-        <a href="https://www.apache.org/info/verification.html";>verify</a> the
-        integrity of the downloaded files. We provide OpenPGP signatures for
-        every release file. This signature should be matched against the
-        <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-        file which contains the OpenPGP keys of Tomcat's Release Managers. We
-        also provide <code>SHA512</code> checksums for every release file. 
After
-        you download the file, you should calculate a checksum for your
-        download, and make sure it is the same as ours.
-        </p>
+      <subsection name="Binary Distributions">
+        <p>Binaries are provided for Microsoft Windows. The Windows binaries 
are
+        available in two variants. The standard variant is what people usually
+        use. This version of the library is included in the Apache Tomcat
+        distributions. The OCSP-enabled variant has enabled support for
+        verification of client SSL certificates via the OCSP protocol
+        (<bug>45392</bug>).</p>
+        <p>Each archive contains <code>tcnative-1.dll</code> for 32-bit (x86)
+        and 64-bit (x64) CPU architectures. You have to use the DLL that 
matches
+        CPU architecture of JVM that you use to run Tomcat.</p>
+        <p>These binaries were built with OpenSSL [z].</p>
+        <ul>
+          <li>
+            Standard
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-win32-bin.zip"
 rel="nofollow">zip</a>
+            - recommended
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-win32-bin.zip.sha512";>SHA512</a>)
+          </li>
+          <li>
+            OCSP enabled
+            <a 
href="[preferred]tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-ocsp-win32-bin.zip"
 rel="nofollow">zip</a>
+            (<a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-ocsp-win32-bin.zip.asc";>PGP</a>,
+            <a 
href="https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[z]-ocsp-win32-bin.zip.sha512";>SHA512</a>)
+          </li>
+        </ul>
       </subsection>
 
     </section>
+
   </body>
+
 </document>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to