You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2001/02/04 01:51:47 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Bootstrap.java
glenn 01/02/03 16:51:47
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Implement SecurityManager
Revision Changes Path
1.10 +22 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Bootstrap.java 2001/01/23 05:05:51 1.9
+++ Bootstrap.java 2001/02/04 00:51:47 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v 1.9 2001/01/23 05:05:51 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2001/01/23 05:05:51 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v 1.10 2001/02/04 00:51:47 glenn Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/02/04 00:51:47 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* class path and therefore not visible to application level classes.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2001/01/23 05:05:51 $
+ * @version $Revision: 1.10 $ $Date: 2001/02/04 00:51:47 $
*/
public final class Bootstrap {
@@ -123,6 +123,25 @@
// Load our startup class and call its process() method
try {
+
+ if( System.getSecurityManager() != null ) {
+ // Pre load some classes required for SecurityManager
+ // so that defineClassInPackage does not throw a
+ // security exception.
+ String basePackage = "org.apache.catalina.";
+ catalinaLoader.loadClass(basePackage +
+ "core.ApplicationContext$PrivilegedGetRequestDispatcher");
+ catalinaLoader.loadClass(basePackage +
+ "core.ApplicationDispatcher$PrivilegedForward");
+ catalinaLoader.loadClass(basePackage +
+ "core.ApplicationDispatcher$PrivilegedInclude");
+ catalinaLoader.loadClass(basePackage +
+ "session.StandardSession");
+ catalinaLoader.loadClass(basePackage +
+ "util.Enumerator");
+ catalinaLoader.loadClass(
+ "javax.servlet.http.Cookie");
+ }
// Instantiate a startup class instance
if (debug >= 1)