Author: kkolinko
Date: Thu Jun 13 09:04:30 2013
New Revision: 1492580
URL: http://svn.apache.org/r1492580
Log:
CTR: docs
1) Merged r1492570 from tomcat/trunk:
Replace anchor links that use spaces with underscore ones.
2) Documented UserConfig listener. This is the same as in trunk minus "allow"
and "deny" attributes.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1492570
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?rev=1492580&r1=1492579&r2=1492580&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Thu Jun 13 09:04:30 2013
@@ -84,7 +84,7 @@
to be deployed on this virtual host. You may specify an
absolute pathname, or a pathname that is relative to the
<code>$CATALINA_BASE</code> directory. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information on automatic recognition and
deployment of web applications. If not specified, the default of
<code>webapps</code> will be used.</p>
@@ -99,7 +99,7 @@
descriptors found. Updated web applications or context XML descriptors
will trigger a reload of the web application. The flag's value defaults
to true. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
@@ -137,7 +137,7 @@
directory named <code>foo</code> but not <code>foo.war</code>,
<code>foobar</code>, or <code>myfooapp</code>. To match anything with
"foo", you could use <code>.*foo.*</code>.</p>
- <p>See <a href="#Automatic Application Deployment">Automatic
Application
+ <p>See <a href="#Automatic_Application_Deployment">Automatic
Application
Deployment</a> for more information.</p>
</attribute>
@@ -145,7 +145,7 @@
<p>This flag value indicates if web applications from this host should
be automatically deployed when Tomcat starts. The flag's value defaults
to true. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
@@ -204,7 +204,7 @@
structure, <code>false</code> to run such web applications directly
from a WAR file. WAR files located outside of the Host's
<strong>appBase</strong> will not be expanded. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml?rev=1492580&r1=1492579&r2=1492580&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml Thu Jun 13 09:04:30
2013
@@ -376,6 +376,46 @@ service:jmx:rmi://<hostname>:10002
</subsection>
+ <subsection name="UserConfig - org.apache.catalina.startup.UserConfig">
+
+ <p>The <strong>UserConfig</strong> provides feature of User Web
Applications.
+ User Web Applications map a request URI starting with a tilde character
("~")
+ and a username to a directory (commonly named public_html) in that user's
+ home directory on the server.</p>
+
+ <p>See the <a href="host.html#User_Web_Applications">User Web
Applications</a>
+ special feature on the <strong>Host</strong> element for more
information.</p>
+
+ <p>The following additional attributes are supported by the
+ <strong>UserConfig</strong>:</p>
+
+ <attributes>
+
+ <attribute name="directoryName" required="false">
+ <p>The directory name to be searched for within each user home
directory.
+ The default is <code>public_html</code>.</p>
+ </attribute>
+
+ <attribute name="userClass" required="false">
+ <p>The class name of the user database class.
+ There are currently two user database, the
+ <code>org.apache.catalina.startup.PasswdUserDatabase</code> is used on
a
+ Unix system that uses the /etc/passwd file to identify valid users.
+ The <code>org.apache.catalina.startup.HomesUserDatabase</code> is used
on
+ a server where /etc/passwd is not in use. HomesUserDatabase deploy all
+ directories found in a specified base directory.</p>
+ </attribute>
+
+ <attribute name="homeBase" required="false">
+ <p>The base directory containing user home directories.This is
effective
+ only when <code>org.apache.catalina.startup.HomesUserDatabase</code> is
+ used.</p>
+ </attribute>
+
+ </attributes>
+
+ </subsection>
+
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
