This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 9cae503 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63733 9cae503 is described below commit 9cae503078b05ef01b9a7688dbeabfa8d225905a Author: Mark Thomas <ma...@apache.org> AuthorDate: Sat Sep 7 21:33:10 2019 +0100 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63733 Remove out of date extras documentation --- webapps/docs/changelog.xml | 5 ++ webapps/docs/extras.xml | 124 --------------------------------------------- webapps/docs/project.xml | 16 +++--- 3 files changed, 12 insertions(+), 133 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f741ab4..c8735f1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -102,6 +102,11 @@ application to enable release builds to be built with Java 10 onwards. (markt) </fix> + <fix> + <bug>63733</bug>: Remove the documentation for the "Additional + Components" since they have been remove / merged into the core + Tomcat distribution for 9.0.5 onwards. (markt) + </fix> </changelog> </subsection> <subsection name="Other"> diff --git a/webapps/docs/extras.xml b/webapps/docs/extras.xml deleted file mode 100644 index 109fea2..0000000 --- a/webapps/docs/extras.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!DOCTYPE document [ - <!ENTITY project SYSTEM "project.xml"> -]> -<document url="extras.html"> - - &project; - - <properties> - <title>Additional Components</title> - <author>Remy Maucherat</author> - </properties> - -<body> - -<section name="Table of Contents"> -<toc/> -</section> - - <section name="Introduction"> - <p> - A number of additional components may be used with Apache Tomcat. These - components may be built by users should they need them or they can be - downloaded from one of the mirrors. - </p> - - </section> - - <section name="Downloading"> - <p> - To download the extras components open the - <download>Tomcat download page</download> - and select "Browse" from the Quick Navigation Links. The extras components - can be found in bin/extras. - </p> - </section> - - <section name="Building"> - - <p> - The additional components are built using the <code>extras</code> target - of the standard Tomcat Ant script which is present in the source bundle of - Tomcat. - </p> - - <p>The build process is the following:</p> - - <ul> - <li>Follow the <a href="building.html">build instructions</a> to build a - Tomcat binary from the source bundle (note: it will be used by the build - process of the additional components, but does not need to be actually - used later on)</li> - <li>Execute the command <code>ant extras</code> to run the build - script</li> - <li>The additional components JARs will be placed in the - <code>output/extras</code> folder</li> - <li>Refer to the documentation below about the usage of these JARs</li> - </ul> - - </section> - - <section name="Components list"> - - <subsection name="Full commons-logging implementation"> - - <p> - Tomcat uses a package renamed commons-logging API implementation which is - hardcoded to use the java.util.logging API. The commons-logging additional - component builds a full fledged package renamed commons-logging - implementation which can be used to replace the implementation provided with - Tomcat. See the <a href="logging.html">logging</a> page for usage - instructions. - </p> - - </subsection> - - <subsection name="Web Services support (JSR 109)"> - - <p> - Tomcat provides factories for JSR 109 which may be used to resolve web - services references. Place the generated catalina-ws.jar as well as - jaxrpc.jar and wsdl4j.jar (or another implementation of JSR 109) in the - Tomcat lib folder. - </p> - - <p> - Users should be aware that wsdl4j.jar is licensed under CPL 1.0 and not the - Apache License version 2.0. - </p> - - </subsection> - - <subsection name="JMX Remote Lifecycle Listener"> - - <p> - The JMX protocol requires the JMX server (Tomcat in this instance) to listen - on two network ports. One of these ports can be fixed via configuration but - the second is selected randomly. This makes it difficult to use JMX through - a firewall. The JMX Remote Lifecycle Listener allows both ports to be fixed, - simplifying the process of connecting to JMX through a firewall. See the <a - href="config/listeners.html">listeners</a> page for usage instructions. - </p> - - </subsection> - </section> - -</body> -</document> diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml index 1ce12e7..f11ffc0 100644 --- a/webapps/docs/project.xml +++ b/webapps/docs/project.xml @@ -64,18 +64,16 @@ <item name="24) APR/Native" href="apr.html"/> <item name="25) Virtual Hosting" href="virtual-hosting-howto.html"/> <item name="26) Advanced IO" href="aio.html"/> - <item name="27) Additional Components" - href="extras.html"/> - <item name="28) Mavenized" href="maven-jars.html"/> - <item name="29) Security Considerations" + <item name="27) Mavenized" href="maven-jars.html"/> + <item name="28) Security Considerations" href="security-howto.html"/> - <item name="30) Windows Service" href="windows-service-howto.html"/> - <item name="31) Windows Authentication" + <item name="29) Windows Service" href="windows-service-howto.html"/> + <item name="30) Windows Authentication" href="windows-auth-howto.html"/> - <item name="32) Tomcat's JDBC Pool" + <item name="31) Tomcat's JDBC Pool" href="jdbc-pool.html"/> - <item name="33) WebSocket" href="web-socket-howto.html"/> - <item name="34) Rewrite" href="rewrite.html"/> + <item name="32) WebSocket" href="web-socket-howto.html"/> + <item name="33) Rewrite" href="rewrite.html"/> <item name="34) CDI 2 and JAX-RS" href="cdi.html"/> </menu> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org