From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 29 Jul 2011 12:52:26 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51567
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b0236555142d2a340dedc6816825f4334bf536ea;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51567
Update the class loading page of the documentation web application to include information on the search order for the common class loader when separate values are used for $CATALINA_HOME and $CATALINA_BASE.

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 071b9a20f..93509294e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,12 @@
         application to recommend the use of digest.[bat|sh] to generate digests
         rather than calling RealmBase directly. (markt) 
       </fix>
+      <fix>
+        <bug>51567</bug>: Update the class loading page of the documentation
+        web application to include information on the search order for the
+        common class loader when separate values are used for $CATALINA_HOME and
+        $CATALINA_BASE. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index c7968ef2e..9bfa823ac 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -100,10 +100,17 @@ loaders as it is initialized:</p>
 <li><strong>Common</strong> - This class loader contains additional classes
     that are made visible to both Tomcat internal classes and to all web
     applications.  Normally, application classes should <strong>NOT</strong>
-    be placed here.  All unpacked classes and resources in
-    <code>$CATALINA_HOME/lib</code>, as well as classes and
-    resources in JAR files are made visible through this
-    class loader.  By default, that includes the following:
+    be placed here.  The locations searched by this class loader are defined by
+    the <code>common.loader</code> property in
+    $CATALINA_BASE/conf/catalina.properties. The default setting will search the
+    following locations in the order they are listed:
+    <ul>
+      <li>unpacked classes and resources in <code>$CATALINA_BASE/lib</code></li>
+      <li>JAR files in <code>$CATALINA_BASE/lib</code></li>
+      <li>unpacked classes and resources in <code>$CATALINA_HOME/lib</code></li>
+      <li>JAR files in <code>$CATALINA_HOME/lib</code></li>
+    </ul>
+    By default, this includes the following:
     <ul>
     <li><em>annotations-api.jar</em> - JEE annotations classes.</li>
     <li><em>catalina.jar</em> - Implementation of the Catalina servlet