Author: remm
Date: Thu Oct 25 09:26:43 2018
New Revision: 1844818
URL: http://svn.apache.org/viewvc?rev=1844818&view=rev
Log:
Fix javadoc as XmlBase cannot be a URL (getConfigBaseFile, which is actually
used, will only handle files).
Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=1844818&r1=1844817&r2=1844818&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Thu Oct 25 09:26:43 2018
@@ -68,16 +68,16 @@ public interface Host extends Container
/**
* @return the XML root for this Host. This can be an absolute
- * pathname, a relative pathname, or a URL.
- * If null, defaults to
+ * pathname or a relative pathname.
+ * If null, the base path defaults to
* ${catalina.base}/conf/<engine name>/<host name> directory
*/
public String getXmlBase();
/**
* Set the Xml root for this Host. This can be an absolute
- * pathname, a relative pathname, or a URL.
- * If null, defaults to
+ * pathname or a relative pathname.
+ * If null, the base path defaults to
* ${catalina.base}/conf/<engine name>/<host name> directory
* @param xmlBase The new XML root
*/
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=1844818&r1=1844817&r2=1844818&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Thu Oct 25
09:26:43 2018
@@ -266,10 +266,7 @@ 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/<engine name>/<host name> directory
+ * ({@inheritDoc}
*/
@Override
public String getXmlBase() {
@@ -278,12 +275,7 @@ 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/<engine name>/<host name> directory
- *
- * @param xmlBase The new XML root
+ * ({@inheritDoc}
*/
@Override
public void setXmlBase(String xmlBase) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
