jfarcand 2002/10/18 14:30:43
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java BootstrapService.java
Log:
Use the security.SecurityClassLoad.
Revision Changes Path
1.3 +7 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Bootstrap.java 24 Aug 2002 02:27:27 -0000 1.2
+++ Bootstrap.java 18 Oct 2002 21:30:43 -0000 1.3
@@ -72,6 +72,7 @@
import java.net.URL;
import java.util.ArrayList;
import org.apache.catalina.loader.StandardClassLoader;
+import org.apache.catalina.security.SecurityClassLoad;
/**
@@ -114,7 +115,7 @@
if ("-debug".equals(args[i]))
debug = 1;
}
-
+
// Configure catalina.base from catalina.home if not yet set
if (System.getProperty("catalina.base") == null)
System.setProperty("catalina.base", getCatalinaHome());
@@ -160,13 +161,11 @@
System.exit(1);
}
-
-
Thread.currentThread().setContextClassLoader(catalinaLoader);
+
// Load our startup class and call its process() method
try {
-
SecurityClassLoad.securityClassLoad(catalinaLoader);
// Instantiate a startup class instance
1.4 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/BootstrapService.java
Index: BootstrapService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BootstrapService.java 11 Oct 2002 10:54:52 -0000 1.3
+++ BootstrapService.java 18 Oct 2002 21:30:43 -0000 1.4
@@ -72,6 +72,7 @@
import java.net.URL;
import java.util.ArrayList;
import org.apache.catalina.loader.StandardClassLoader;
+import org.apache.catalina.security.SecurityClassLoad;
/**
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
