Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50893

Additional information for extras package

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1079781 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 8096de5..ac7247a 100644 (file)
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -64,13 +64,27 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
     wrapper and the compiled APR/native library for use with 64-bit JVMs on
     Itanium 64-bit Windows platforms.</dd>
   <dt>apache-tomcat-[version]-deployer.zip or .tar.gz</dt>
-    <dd>The standalone Tomcat Web Application Deployer.</dd>
+    <dd>The standalone
+    <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html">
+    Tomcat Web Application Deployer</a>.</dd>
   <dt>apache-tomcat-[version]-fulldocs.tar.gz</dt>
     <dd>The Tomcat documentation bundle, including complete javadocs.</dd>
 </dl></dd>
 <dt><b>bin/extras/</b></dt>
-<dd>Additional components. See
-  <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html">documentation</a>.</dd>
+<dd><dl>
+  <dt>tomcat-juli-adapters.jar & tomcat-juli.jar</dt>
+    <dd>Full commons-logging implementation. See the <a
+    href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/logging.html">
+    logging documentation</a> for more information.</dd>
+  <dt>catalina-ws.jar</dt>
+    <dd>Web Services support (JSR 109). See the <a
+    href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html">
+    extras documentation</a> for more information.</dd>
+  <dt>catalina-jmx-remote.jar</dt>
+    <dd>JMX Remote Lifecycle Listener. See the <a
+    href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html">
+    listeners documentation</a> for details.</dd>
+</dl></dd>  
 <dt><b>src/</b></dt>
 <dd><dl>
   <dt>apache-tomcat-[version].zip or .tar.gz</dt>

diff --git a/res/welcome.main.html b/res/welcome.main.html
index 271afe5..dd6be13 100644 (file)
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -64,13 +64,27 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
     wrapper and the compiled APR/native library for use with 64-bit JVMs on
     Itanium 64-bit Windows platforms.</dd>
   <dt>apache-tomcat-[version]-deployer.zip or .tar.gz</dt>
-    <dd>The standalone Tomcat Web Application Deployer.</dd>
+    <dd>The standalone
+    <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html">
+    Tomcat Web Application Deployer</a>.</dd>
   <dt>apache-tomcat-[version]-fulldocs.tar.gz</dt>
     <dd>The Tomcat documentation bundle, including complete javadocs.</dd>
 </dl></dd>
 <dt><b>bin/extras/</b></dt>
-<dd>Additional components. See
-  <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html">documentation</a>.</dd>
+<dd><dl>
+  <dt>tomcat-juli-adapters.jar & tomcat-juli.jar</dt>
+    <dd>Full commons-logging implementation. See the <a
+    href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/logging.html">
+    logging documentation</a> for more information.</dd>
+  <dt>catalina-ws.jar</dt>
+    <dd>Web Services support (JSR 109). See the <a
+    href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html">
+    extras documentation</a> for more information.</dd>
+  <dt>catalina-jmx-remote.jar</dt>
+    <dd>JMX Remote Lifecycle Listener. See the <a
+    href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html">
+    listeners documentation</a> for details.</dd>
+</dl></dd>  
 <dt><b>src/</b></dt>
 <dd><dl>
   <dt>apache-tomcat-[version].zip or .tar.gz</dt>

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fdb5197..556556e 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -74,6 +74,10 @@
         application when running under a security Manager and support a shared
         Manager installation when $CATALINA_HOME != CATALINA_BASE. (markt)
       </fix>
+      <fix>
+        <bug>50893</bug>: Add additional information to the download README for
+        the extras components. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">

diff --git a/webapps/docs/extras.xml b/webapps/docs/extras.xml
index 3c76cf9..65dfd82 100644 (file)
--- a/webapps/docs/extras.xml
+++ b/webapps/docs/extras.xml
@@ -35,9 +35,9 @@
 
   <section name="Introduction">
   <p>
-    A number of additional third party 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.
+    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>
@@ -53,8 +53,9 @@
   <section name="Building">
 
     <p>
-      The additional components are built using the <code>extras.xml</code> Ant
-      script which is present in the source bundle of Tomcat.
+      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>
@@ -104,6 +105,18 @@
 
   </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>