glenn 01/02/25 19:53:13
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
Implement DefaultContext in server.xml config
Revision Changes Path
1.41 +21 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ContextConfig.java 2001/01/24 19:23:09 1.40
+++ ContextConfig.java 2001/02/26 03:53:12 1.41
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.40 2001/01/24 19:23:09 remm Exp $
- * $Revision: 1.40 $
- * $Date: 2001/01/24 19:23:09 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.41 2001/02/26 03:53:12 glenn Exp $
+ * $Revision: 1.41 $
+ * $Date: 2001/02/26 03:53:12 $
*
* ====================================================================
*
@@ -89,6 +89,7 @@
import javax.naming.directory.DirContext;
import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.catalina.Authenticator;
+import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
@@ -99,7 +100,10 @@
import org.apache.catalina.Valve;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.ContainerBase;
-import org.apache.catalina.deploy.ErrorPage;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Host;
+import org.apache.catalina.core.DefaultContext;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.loader.Extension;
@@ -116,7 +120,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.40 $ $Date: 2001/01/24 19:23:09 $
+ * @version $Revision: 1.41 $ $Date: 2001/02/26 03:53:12 $
*/
public final class ContextConfig
@@ -771,6 +775,18 @@
if (debug > 0)
log(sm.getString("contextConfig.start"));
ok = true;
+
+ // Set properties based on DefaultContext
+ Container container = context.getParent();
+ if( !context.getOverride() ) {
+ if( container instanceof Host ) {
+ ((Host)container).importDefaultContext(context);
+ container = container.getParent();
+ }
+ if( container instanceof Engine ) {
+ ((Engine)container).importDefaultContext(context);
+ }
+ }
// Process the default and application web.xml files
XmlMapper mapper = createWebMapper();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
