From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 8 Sep 2007 19:57:27 +0000 (+0000)
Subject: Clarify appBase - docBase relationship
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5ed5f368878d67d9b97b0b3421ea4972a85e68f1;p=tomcat7.0

Clarify appBase - docBase relationship

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

diff --git a/webapps/docs/virtual-hosting-howto.xml b/webapps/docs/virtual-hosting-howto.xml
index 5a9dca37b..d38cdb7d1 100644
--- a/webapps/docs/virtual-hosting-howto.xml
+++ b/webapps/docs/virtual-hosting-howto.xml
@@ -48,14 +48,18 @@
     </p>
     <source>
 &lt;Engine name="Catalina" defaultHost="ren"&gt;
-    &lt;Host name="ren"    appBase="webapps/ren"/&gt;
-    &lt;Host name="stimpy" appBase="webapps/stimpy"/&gt;
+    &lt;Host name="ren"    appBase="webapps-ren"/&gt;
+    &lt;Host name="stimpy" appBase="webapps-stimpy"/&gt;
 &lt;/Engine&gt;
     </source>
     <p>
+      Note that the directory structures under the appBase for each host should
+      not overlap each other.
+    </p>
+    <p>
       Consult the configuration documentation for other attributes of the
       <a href="config/engine.html">Engine</a> and <a href="config/host.html">
-      Host</a>elements.
+      Host</a> elements.
     </p>
   </section>
 
@@ -64,23 +68,36 @@
       Create directories for each of the virtual hosts:
     </p>
     <source>
-mkdir $CATALINA_HOME/webapps/ren
-mkdir $CATALINA_HOME/webapps/stimpy
+mkdir $CATALINA_HOME/webapps-ren
+mkdir $CATALINA_HOME/webapps-stimpy
     </source>
   </section>
 
   <section name="Configuring Your Contexts">
-    <subsection name="Approach #1">
+    <subsection name="General">
+      <p>Contexts are normally located underneath the appBase directory. For
+       example, to deploy the <code>foobar</code> context as a war file in
+       the <code>ren</code> host, use
+       <code>$CATALINA_HOME/webapps-ren/foobar.war</code>. Note that the
+       default or ROOT context for <code>ren</code> would be deployed as
+       <code>$CATALINA_HOME/webapps-ren/ROOT.war</code> (WAR) or
+       <code>$CATALINA_HOME/webapps-ren/ROOR</code> (directory).
+      </p>
+      <p><strong>NOTE: The <code>docBase</code> for a context should never be
+        the same as the <code>appBase</code> for a host.</strong>
+      </p>
+    </subsection>
+    <subsection name="context.xml - approach #1">
       <p>
         Within your Context, create a <code>META-INF</code> directory and then
         place your Context definition in it in a file named
         <code>context.xml</code>. i.e.
-        <code>$CATALINA_HOME/webapps/ren/ROOT/META-INF/context.xml</code>
+        <code>$CATALINA_HOME/webapps-ren/ROOT/META-INF/context.xml</code>
         This makes deployment easier, particularly if you're distributing a WAR
         file.
       </p>
     </subsection>
-    <subsection name="Approach #2">
+    <subsection name="context.xml - approach #2">
       <p>
         Create a structure under <code>$CATALINA_HOME/conf/Catalina</code>
         corresponding to your virtual hosts, e.g.:
@@ -118,6 +135,5 @@ cp localhost/manager.xml stimpy/
       </p>
     </subsection>
   </section>
-
 </body>
 </document>