You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/05/02 01:25:31 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup ContextConfig.java
craigmcc 00/05/01 16:25:30
Modified: proposals/catalina/src/conf web.xml
proposals/catalina/src/share/org/apache/tomcat/core
StandardContext.java
proposals/catalina/src/share/org/apache/tomcat/startup
ContextConfig.java
Log:
Cosmetic changes only.
Revision Changes Path
1.5 +1 -1 jakarta-tomcat/proposals/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/conf/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 2000/04/30 01:23:19 1.4
+++ web.xml 2000/05/01 23:25:27 1.5
@@ -6,7 +6,7 @@
<web-app>
- <!-- Mappings in this file are the defaults for all contexts -->
+ <!-- Mappings in this file are the defaults for all Contexts -->
<!-- The default servlet that serves static resources -->
<servlet>
1.15 +4 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardContext.java 2000/05/01 01:53:54 1.14
+++ StandardContext.java 2000/05/01 23:25:29 1.15
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java,v 1.14 2000/05/01 01:53:54 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2000/05/01 01:53:54 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java,v 1.15 2000/05/01 23:25:29 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2000/05/01 23:25:29 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* requests directed to a particular servlet.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2000/05/01 01:53:54 $
+ * @version $Revision: 1.15 $ $Date: 2000/05/01 23:25:29 $
*/
public final class StandardContext
@@ -1161,13 +1161,11 @@
}
}
-
// Complain if there is no match at all
if (wrapper == null) {
log(sm.getString("standardContext.mappingError", relativeURI));
return (null);
}
-
// Update the Request (if requested) and return this Wrapper
if (debug > 0)
1.6 +6 -5 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextConfig.java 2000/04/29 23:20:34 1.5
+++ ContextConfig.java 2000/05/01 23:25:30 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java,v 1.5 2000/04/29 23:20:34 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/04/29 23:20:34 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java,v 1.6 2000/05/01 23:25:30 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/05/01 23:25:30 $
*
* ====================================================================
*
@@ -93,10 +93,11 @@
/**
* Startup event listener for a <b>Context</b> that configures the properties
* of that Context, and the associated defined servlets, from the "web.xml"
- * resource for this web application.
+ * resource for this web application. FIXME: arrange for this to be attached
+ * to all contexts without having to be explicitly mentioned.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/04/29 23:20:34 $
+ * @version $Revision: 1.6 $ $Date: 2000/05/01 23:25:30 $
*/
public final class ContextConfig