Author: kkolinko
Date: Thu May 24 23:58:03 2012
New Revision: 1342476
URL: http://svn.apache.org/viewvc?rev=1342476&view=rev
Log:
Fix documentation of default value of "xmlBase" attribute of Host.
The place where it is already documented correctly is Host.getXmlBase() and
Host.setXmlBase().
The actual default value is calculated in HostConfig.configBase()
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/webapps/docs/config/host.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1342476&r1=1342475&r2=1342476&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Thu May 24
23:58:03 2012
@@ -240,7 +240,8 @@ public class StandardHost extends Contai
/**
* Return the XML root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ * If null, defaults to
+ * ${catalina.base}/conf/<engine name>/<host name> directory
*/
@Override
public String getXmlBase() {
@@ -253,7 +254,8 @@ public class StandardHost extends Contai
/**
* Set the Xml root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ * If null, defaults to
+ * ${catalina.base}/conf/<engine name>/<host name> directory
*
* @param xmlBase The new XML root
*/
Modified: tomcat/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1342476&r1=1342475&r2=1342476&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/trunk/webapps/docs/config/host.xml Thu May 24 23:58:03 2012
@@ -108,7 +108,7 @@
<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>[engine_name]/[host_name]</code> will be used.</p>
+ <code>conf/<engine_name>/<host_name></code> will be
used.</p>
</attribute>
<attribute name="createDirs" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
