jfarcand 2003/02/06 17:07:14
Modified: catalina/src/share/org/apache/catalina/startup Embedded.java
Catalina.java
Log:
Move the security configuration inside Embedded to allow security protection when
this class is used.
Revision Changes Path
1.5 +15 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Embedded.java 14 Jan 2003 22:41:01 -0000 1.4
+++ Embedded.java 7 Feb 2003 01:07:13 -0000 1.5
@@ -93,6 +93,7 @@
import org.apache.catalina.logger.SystemOutLogger;
import org.apache.catalina.net.ServerSocketFactory;
import org.apache.catalina.realm.MemoryRealm;
+import org.apache.catalina.security.SecurityConfig;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.LogFactory;
@@ -185,7 +186,8 @@
super();
setLogger(logger);
setRealm(realm);
-
+ setSecurityProtection();
+
}
@@ -1238,5 +1240,13 @@
}
+ /**
+ * Set the security package access/protection.
+ */
+ protected void setSecurityProtection(){
+ SecurityConfig securityConfig = SecurityConfig.newInstance();
+ securityConfig.setPackageDefinition();
+ securityConfig.setPackageAccess();
+ }
}
1.14 +4 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Catalina.java 29 Jan 2003 22:32:09 -0000 1.13
+++ Catalina.java 7 Feb 2003 01:07:13 -0000 1.14
@@ -75,7 +75,6 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Server;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.security.SecurityConfig;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.tomcat.util.log.SystemLogHandler;
@@ -486,10 +485,6 @@
long t2 = System.currentTimeMillis();
log.debug( "Server.xml processed " + (t2 - t1));
- // TODO: move to Embedded
- SecurityConfig securityConfig = SecurityConfig.newInstance();
- securityConfig.setPackageDefinition();
- securityConfig.setPackageAccess();
// Replace System.out and System.err with a custom PrintStream
// TODO: move to Embedded, make it configurable
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
