Index: ContextConfig.java
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.60
diff -u -r1.60 ContextConfig.java
--- ContextConfig.java	14 Dec 2004 13:57:31 -0000	1.60
+++ ContextConfig.java	22 Dec 2004 10:23:09 -0000
@@ -971,7 +971,7 @@
 
         // Dump the contents of this pipeline if requested
         if ((log.isDebugEnabled()) && (context instanceof ContainerBase)) {
-            log.debug("Pipline Configuration:");
+            log.debug("Pipeline Configuration:");
             Pipeline pipeline = ((ContainerBase) context).getPipeline();
             Valve valves[] = null;
             if (pipeline != null)
Index: HostConfig.java
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.51
diff -u -r1.51 HostConfig.java
--- HostConfig.java	1 Dec 2004 11:06:22 -0000	1.51
+++ HostConfig.java	22 Dec 2004 10:23:09 -0000
@@ -554,8 +554,8 @@
 
         // Assume this is a configuration descriptor and deploy it
         log.debug(sm.getString("hostConfig.deployDescriptor", file));
+        Context context = null;
         try {
-            Context context = null;
             synchronized (digester) {
                 try {
                     context = (Context) digester.parse(contextXml);
@@ -653,8 +653,9 @@
             log.error(sm.getString("hostConfig.deployDescriptor.error",
                                    file), t);
         }
-
-        deployed.put(contextPath, deployedApp);
+        if (context != null && host.findChild(context.getName()) != null) {
+            deployed.put(contextPath, deployedApp);
+        }
     }
 
 
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.10
diff -u -r1.10 LocalStrings.properties
--- LocalStrings.properties	1 Dec 2004 11:06:22 -0000	1.10
+++ LocalStrings.properties	22 Dec 2004 10:23:09 -0000
@@ -16,6 +16,8 @@
 contextConfig.defaultMissing=Missing default web.xml, using application web.xml only
 contextConfig.defaultParse=Parse error in default web.xml
 contextConfig.defaultPosition=Occurred at line {0} column {1}
+contextConfig.fixDocBase=Exception fixing docBase: {0} 
+contextConfig.init=ContextConfig: Initializing
 contextConfig.missingRealm=No Realm has been configured to authenticate against
 contextConfig.role.auth=WARNING: Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
 contextConfig.role.link=WARNING: Security role name {0} used in a <role-link> without being defined in a <security-role>
@@ -57,7 +59,8 @@
 hostConfig.reload=Reloading context [{0}]
 hostConfig.removeXML=Context [{0}] is undeployed
 hostConfig.removeDIR=Directory {0} is undeployed
-hostConfig.removeWAR=War {0} is undeployedhostConfig.start=HostConfig: Processing START
+hostConfig.removeWAR=War {0} is undeployed
+hostConfig.start=HostConfig: Processing START
 hostConfig.stop=HostConfig: Processing STOP
 hostConfig.undeploy=Undeploying web application at context path {0}
 hostConfig.undeploy.error=Error undeploying web application at context path {0}