craigmcc 00/10/30 10:00:28
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
Temporarily comment out the call to permissionsConfig(), because running
under a security manager is not yet completed and this messes up (NPE) starting
Catalina in an embedded environment that contains a security manager.
Revision Changes Path
1.29 +5 -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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ContextConfig.java 2000/10/29 00:35:06 1.28
+++ ContextConfig.java 2000/10/30 18:00:25 1.29
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.28 2000/10/29 00:35:06 craigmcc Exp $
- * $Revision: 1.28 $
- * $Date: 2000/10/29 00:35:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.29 2000/10/30 18:00:25 craigmcc Exp $
+ * $Revision: 1.29 $
+ * $Date: 2000/10/30 18:00:25 $
*
* ====================================================================
*
@@ -117,7 +117,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.28 $ $Date: 2000/10/29 00:35:06 $
+ * @version $Revision: 1.29 $ $Date: 2000/10/30 18:00:25 $
*/
public final class ContextConfig
@@ -865,7 +865,7 @@
ok = true;
// Configure the Permissions for this Context (if necessary)
- permissionsConfig();
+ // permissionsConfig(); // FIXME - Method not finished yet
// Process the default and application web.xml files
XmlMapper mapper = createWebMapper();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
