Author: markt
Date: Mon Jun 14 12:17:59 2010
New Revision: 954423
URL: http://svn.apache.org/viewvc?rev=954423&view=rev
Log:
After deprecating the Embedded class, move the package access/protection
initialisation to Catalina
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=954423&r1=954422&r2=954423&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Mon Jun 14
12:17:59 2010
@@ -34,6 +34,7 @@ import org.apache.catalina.Container;
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.juli.ClassLoaderLogManager;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.digester.Digester;
@@ -130,6 +131,14 @@ public class Catalina {
*/
protected boolean useNaming = true;
+
+ // ----------------------------------------------------------- Constructors
+
+ public Catalina() {
+ setSecurityProtection();
+ }
+
+
// ------------------------------------------------------------- Properties
@@ -768,6 +777,16 @@ public class Catalina {
}
+ /**
+ * Set the security package access/protection.
+ */
+ protected void setSecurityProtection(){
+ SecurityConfig securityConfig = SecurityConfig.newInstance();
+ securityConfig.setPackageDefinition();
+ securityConfig.setPackageAccess();
+ }
+
+
// --------------------------------------- CatalinaShutdownHook Inner Class
// XXX Should be moved to embedded !
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
