Author: kkolinko
Date: Fri May 25 00:13:03 2012
New Revision: 1342477
URL: http://svn.apache.org/viewvc?rev=1342477&view=rev
Log:
Merged revision 1342476 from tomcat/trunk:
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().
Resolved a merge conflict by reordering StandardHost#getXmlBase() and
#setAppBase(). It aligns with TC trunk.
Corrected typo in changelog.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342476
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1342477&r1=1342476&r2=1342477&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Fri
May 25 00:13:03 2012
@@ -197,30 +197,31 @@ public class StandardHost extends Contai
/**
- * Return the XML root for this Host. This can be an absolute
+ * Set the application root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ *
+ * @param appBase The new application root
*/
@Override
- public String getXmlBase() {
+ public void setAppBase(String appBase) {
- return (this.xmlBase);
+ String oldAppBase = this.appBase;
+ this.appBase = appBase;
+ support.firePropertyChange("appBase", oldAppBase, this.appBase);
}
/**
- * Set the application root for this Host. This can be an absolute
+ * Return the XML root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- *
- * @param appBase The new application root
+ * If null, defaults to
+ * ${catalina.base}/conf/<engine name>/<host name> directory
*/
@Override
- public void setAppBase(String appBase) {
+ public String getXmlBase() {
- String oldAppBase = this.appBase;
- this.appBase = appBase;
- support.firePropertyChange("appBase", oldAppBase, this.appBase);
+ return (this.xmlBase);
}
@@ -228,7 +229,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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1342477&r1=1342476&r2=1342477&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 25 00:13:03 2012
@@ -5257,7 +5257,7 @@
<add>
<bug>48662</bug>: Provide a new option to control the copying of
context
XML descriptors from web applications to the host's xmlBase. Copying of
- XMl descriptors is now disabled by default. (markt)
+ XML descriptors is now disabled by default. (markt)
</add>
<fix>
Move comet classes from the org.apache.catalina package to the
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml?rev=1342477&r1=1342476&r2=1342477&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml Fri May 25 00:13: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: [email protected]
For additional commands, e-mail: [email protected]
