From 9c2379e4e0115257b6f8bae1935006a306ede5b8 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 14 Jun 2010 12:17:59 +0000
Subject: [PATCH] After deprecating the Embedded class, move the package
 access/protection initialisation to Catalina

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@954423 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/Catalina.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index 2b366f0d1..048c3b041 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -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 !
-- 
2.11.0