glenn 01/01/23 14:12:51
Modified: catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
Implement SecurityManager
Revision Changes Path
1.15 +15 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
Index: StandardLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardLoader.java 2001/01/23 05:05:48 1.14
+++ StandardLoader.java 2001/01/23 22:12:49 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.14 2001/01/23 05:05:48 remm Exp $
- * $Revision: 1.14 $
- * $Date: 2001/01/23 05:05:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.15 2001/01/23 22:12:49 glenn Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/01/23 22:12:49 $
*
* ====================================================================
*
@@ -110,7 +110,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.14 $ $Date: 2001/01/23 05:05:48 $
+ * @version $Revision: 1.15 $ $Date: 2001/01/23 22:12:49 $
*/
public final class StandardLoader
@@ -602,9 +602,18 @@
(parentClassLoader, shFactory);
for (int i = 0; i < repositories.length; i++)
classLoader.addRepository(repositories[i]);
- classLoader.addRestricted("org.apache.catalina.");
- classLoader.addSystem("javax.servlet.");
((StandardClassLoader) classLoader).setDelegate(this.delegate);
+ if (container instanceof Context) {
+ // Tell the class loader the root of the context
+ Resources resources = ((Context) container).getResources();
+ try {
+ URL contextURL = resources.getResource("/");
+ if( contextURL != null )
+ ((StandardClassLoader)classLoader).setPermissions(
+ contextURL);
+ } catch (MalformedURLException e) {
+ }
+ }
if (classLoader instanceof Lifecycle)
((Lifecycle) classLoader).start();
} catch (Throwable t) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
