Change default xmlBase to prevent exceptions on start up and errors every time the...

Remove unused code block.

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

diff --git a/java/org/apache/catalina/Host.java b/java/org/apache/catalina/Host.java
index 515dc88..2527c43 100644 (file)
--- a/java/org/apache/catalina/Host.java
+++ b/java/org/apache/catalina/Host.java
@@ -70,15 +70,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 ${catalina.base}/conf/ directory
+     * If null, 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 ${catalina.base}/conf/ directory
-     *
+     * If null, defaults to
+     * ${catalina.base}/conf/<engine name>/<host name> directory
      * @param xmlBase The new XML root
      */
     public void setXmlBase(String xmlBase);

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index 015bb9a..12581ce 100644 (file)
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -304,9 +304,6 @@ public class HostConfig
                 setUnpackWARs(((StandardHost) host).isUnpackWARs());
                 setXmlNamespaceAware(((StandardHost) host).getXmlNamespaceAware());
                 setXmlValidation(((StandardHost) host).getXmlValidation());
-                if (((StandardHost) host).getXmlBase()!=null) {
-                    
-                }
             }
         } catch (ClassCastException e) {
             log.error(sm.getString("hostConfig.cce", event.getLifecycle()), e);
@@ -439,7 +436,15 @@ public class HostConfig
         if (host.getXmlBase()!=null) {
             configBase = returnCanonicalPath(host.getXmlBase());
         } else {
-            configBase = returnCanonicalPath("conf");
+            StringBuffer xmlDir = new StringBuffer("conf");
+            Container parent = host.getParent();
+            if (parent instanceof Engine) {
+                xmlDir.append('/');
+                xmlDir.append(parent.getName());
+            }
+            xmlDir.append('/');
+            xmlDir.append(host.getName());
+            configBase = returnCanonicalPath(xmlDir.toString());
         }
         return (configBase);