geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r111366 - in geronimo/branches/djencks/jetty-deployer1/trunk/modules: jetty/src/test/org/apache/geronimo/jetty security/src/java/org/apache/geronimo/security/jacc
Date Thu, 09 Dec 2004 08:43:33 GMT
Author: adc
Date: Thu Dec  9 00:43:32 2004
New Revision: 111366

URL: http://svn.apache.org/viewcvs?view=rev&rev=111366
Log:
Enabled security tests
http://nagoya.apache.org/jira/browse/GERONIMO-523
Modified:
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?view=diff&rev=111366&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java&r1=111365&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java&r2=111366
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Thu Dec  9 00:43:32 2004
@@ -16,36 +16,38 @@
  */
 package org.apache.geronimo.jetty;
 
-import java.util.Map;
-import java.util.HashMap;
+import java.io.File;
+import java.net.URI;
 import java.util.Collections;
-import java.util.Set;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Properties;
-import java.net.URI;
-import java.io.File;
-
+import java.util.Set;
 import javax.management.ObjectName;
 
 import junit.framework.TestCase;
+import org.mortbay.jetty.servlet.FormAuthenticator;
+
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
-import org.apache.geronimo.transaction.OnlineUserTransaction;
-import org.apache.geronimo.transaction.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.jetty.connector.HTTPConnector;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.security.SecurityServiceImpl;
 import org.apache.geronimo.security.deploy.Security;
-import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import org.apache.geronimo.security.jaas.GeronimoLoginConfiguration;
 import org.apache.geronimo.security.jaas.JaasLoginService;
 import org.apache.geronimo.security.jaas.LoginModuleGBean;
+import org.apache.geronimo.security.realm.GenericSecurityRealm;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.mortbay.jetty.servlet.FormAuthenticator;
+import org.apache.geronimo.transaction.GeronimoTransactionManager;
+import org.apache.geronimo.transaction.OnlineUserTransaction;
+import org.apache.geronimo.transaction.context.TransactionContextManager;
+
 
 /**
  * @version $Rev:  $ $Date:  $
@@ -65,6 +67,8 @@
     private GBeanData tcm;
     private ClassLoader cl;
     private J2eeContext moduleContext = new J2eeContextImpl("jetty.test", "test", "null",
"jettyTest", null, null);
+    private GBeanData loginConfigurationGBean;
+    protected ObjectName loginConfigurationName;
     private GBeanData securityServiceGBean;
     protected ObjectName securityServiceName;
     private ObjectName loginServiceName;
@@ -76,8 +80,9 @@
     private ObjectName serverInfoName;
     private GBeanData serverInfoGBean;
 
-    public void testDummy() throws Exception { }
-    
+    public void testDummy() throws Exception {
+    }
+
     protected void setUpStaticContentServlet() throws Exception {
         GBeanData staticContentServletGBeanData = new GBeanData(JettyServletHolder.GBEAN_INFO);
         staticContentServletGBeanData.setAttribute("servletName", "default");
@@ -106,10 +111,9 @@
         OnlineUserTransaction userTransaction = new OnlineUserTransaction();
         app.setAttribute("userTransaction", userTransaction);
         //we have no classes or libs.
-        app.setAttribute("webClassPath", new URI[] {});
+        app.setAttribute("webClassPath", new URI[]{});
         app.setAttribute("contextPriorityClassLoader", Boolean.FALSE);
         app.setAttribute("configurationBaseUrl", new File("src/test-resources/deployables/").toURL());
-//        app.setAttribute("configurationBaseUrl", Thread.currentThread().getContextClassLoader().getResource("deployables/"));
         app.setReferencePattern("TransactionContextManager", tcmName);
         app.setReferencePattern("TrackedConnectionAssociator", ctcName);
         app.setReferencePattern("JettyContainer", containerName);
@@ -121,13 +125,14 @@
 
     protected void setUpSecureAppContext(Security securityConfig, Set uncheckedPermissions,
Set excludedPermissions, Map rolePermissions, Set securityRoles, Map legacySecurityConstraintMap)
throws Exception {
         GBeanData app = new GBeanData(webModuleName, JettyWebAppJACCContext.GBEAN_INFO);
-        app.setAttribute("loginDomainName", "jaasTest");
+        app.setAttribute("loginDomainName", "demo-properties-realm");
         app.setAttribute("securityConfig", securityConfig);
         app.setAttribute("uncheckedPermissions", uncheckedPermissions);
         app.setAttribute("excludedPermissions", excludedPermissions);
         app.setAttribute("rolePermissions", rolePermissions);
         app.setAttribute("securityRoles", securityRoles);
         app.setAttribute("legacySecurityConstraintMap", legacySecurityConstraintMap);
+
         FormAuthenticator formAuthenticator = new FormAuthenticator();
         formAuthenticator.setLoginPage("/auth/logon.html?param=test");
         formAuthenticator.setErrorPage("/auth/logonError.html?param=test");
@@ -136,10 +141,11 @@
         app.setAttribute("policyContextID", "TEST");
         app.setAttribute("uri", URI.create("war3/"));
         app.setAttribute("componentContext", null);
+
         OnlineUserTransaction userTransaction = new OnlineUserTransaction();
         app.setAttribute("userTransaction", userTransaction);
         //we have no classes or libs.
-        app.setAttribute("webClassPath", new URI[] {});
+        app.setAttribute("webClassPath", new URI[]{});
         app.setAttribute("contextPriorityClassLoader", Boolean.FALSE);
         app.setAttribute("configurationBaseUrl", new File("src/test-resources/deployables/").toURL());
         app.setReferencePattern("TransactionContextManager", tcmName);
@@ -152,6 +158,14 @@
     }
 
     protected void setUpSecurity() throws Exception {
+
+        loginConfigurationName = new ObjectName("geronimo.security:type=LoginConfiguration");
+        loginConfigurationGBean = new GBeanData(loginConfigurationName, GeronimoLoginConfiguration.getGBeanInfo());
+        Set configurations = new HashSet();
+        configurations.add(new ObjectName("geronimo.security:type=SecurityRealm,*"));
+        configurations.add(new ObjectName("geronimo.security:type=ConfigurationEntry,*"));
+        loginConfigurationGBean.setReferencePatterns("Configurations", configurations);
+
         securityServiceName = new ObjectName("geronimo.security:type=SecurityService");
         securityServiceGBean = new GBeanData(securityServiceName, SecurityServiceImpl.GBEAN_INFO);
         securityServiceGBean.setReferencePatterns("Realms", Collections.singleton(new ObjectName("geronimo.security:type=SecurityRealm,*")));
@@ -166,17 +180,18 @@
         loginServiceGBean.setAttribute("password", "secret");
 
         serverInfoName = new ObjectName("geronimo.system:role=ServerInfo");
-         serverInfoGBean = new GBeanData(serverInfoName, ServerInfo.GBEAN_INFO);
-       serverInfoGBean.setAttribute("baseDirectory", ".");
+        serverInfoGBean = new GBeanData(serverInfoName, ServerInfo.GBEAN_INFO);
+        serverInfoGBean.setAttribute("baseDirectory", ".");
 
         propertiesLMName = new ObjectName("geronimo.security:type=LoginModule,name=demo-properties-login");
         propertiesLMGBean = new GBeanData(propertiesLMName, LoginModuleGBean.GBEAN_INFO);
         propertiesLMGBean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         propertiesLMGBean.setAttribute("serverSide", Boolean.TRUE);
         Properties options = new Properties();
-        options.setProperty("usersURI", new File(new File("."), "src/test-resources/data/users.properties").toString());
-        options.setProperty("groupsURI", new File(new File("."), "src/test-resources/data/groups.properties").toString());
+        options.setProperty("usersURI", "src/test-resources/data/users.properties");
+        options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
         propertiesLMGBean.setAttribute("options", options);
+        propertiesLMGBean.setAttribute("loginDomainName", "demo-properties-realm");
 
         propertiesRealmName = new ObjectName("geronimo.security:type=SecurityRealm,realm=demo-properties-realm");
         propertiesRealmGBean = new GBeanData(propertiesRealmName, GenericSecurityRealm.GBEAN_INFO);
@@ -188,6 +203,7 @@
 //        propertiesRealmGBean.setAttribute("autoMapPrincipalClasses", "org.apache.geronimo.security.realm.providers.PropertiesFileGroupPrincipal");
         propertiesRealmGBean.setAttribute("defaultPrincipal", "metro=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal");
 
+        start(loginConfigurationGBean);
         start(securityServiceGBean);
         start(loginServiceGBean);
         start(serverInfoGBean);
@@ -202,12 +218,13 @@
         stop(serverInfoName);
         stop(loginServiceName);
         stop(securityServiceName);
+        stop(loginConfigurationName);
     }
 
     private void start(GBeanData gbeanData) throws Exception {
         kernel.loadGBean(gbeanData, cl);
         kernel.startGBean(gbeanData.getName());
-        if (((Integer)kernel.getAttribute(gbeanData.getName(), "state")).intValue() != State.RUNNING_INDEX
) {
+        if (((Integer) kernel.getAttribute(gbeanData.getName(), "state")).intValue() != State.RUNNING_INDEX)
{
             fail("gbean not started: " + gbeanData.getName());
         }
     }

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java?view=diff&rev=111366&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r1=111365&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java&r2=111366
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
Thu Dec  9 00:43:32 2004
@@ -24,11 +24,15 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.security.jacc.WebResourcePermission;
 import javax.security.jacc.WebUserDataPermission;
 
+import org.mortbay.http.SecurityConstraint;
+
 import org.apache.geronimo.security.SecurityService;
 import org.apache.geronimo.security.deploy.AutoMapAssistant;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
@@ -50,7 +54,7 @@
      *
      * @throws Exception thrown if an error in the test occurs
      */
-    public void xtestExplicitMapping() throws Exception {
+    public void XtestExplicitMapping() throws Exception {
         Security securityConfig = new Security();
         securityConfig.setUseContextHandler(false);
 
@@ -76,10 +80,39 @@
         securityConfig.getRoleMappings().put(role.getRoleName(), role);
 
         Set uncheckedPermissions = new HashSet();
+
         Set excludedPermissions = new HashSet();
+        excludedPermissions.add(new WebResourcePermission("/auth/login.html", ""));
+        excludedPermissions.add(new WebUserDataPermission("/auth/login.html", ""));
+
         Map rolePermissions = new HashMap();
+        Set permissions = new HashSet();
+        permissions.add(new WebUserDataPermission("/protected/*", ""));
+        permissions.add(new WebResourcePermission("/protected/*", ""));
+        rolePermissions.put("content-administrator", permissions);
+        rolePermissions.put("auto-administrator", permissions);
+
         Set securityRoles = new HashSet();
+        securityRoles.add("content-administrator");
+        securityRoles.add("auto-administrator");
+
+        /**
+         * TODO Remove the legacySecurityConstraintMap
+         */
         Map legacySecurityConstraintMap = new HashMap();
+        List constraints = new LinkedList();
+        SecurityConstraint constraint = new SecurityConstraint();
+        constraint.setAuthenticate(true);
+        constraint.addRole("content-administrator");
+        constraint.addRole("auto-administrator");
+        constraints.add(constraint);
+        legacySecurityConstraintMap.put("/protected/*", constraints);
+
+        constraints = new LinkedList();
+        constraint = new SecurityConstraint();
+        constraint.setAuthenticate(true);
+        constraints.add(constraint);
+        legacySecurityConstraintMap.put("/auth/logon.html", constraints);
 
         startWebApp(securityConfig, uncheckedPermissions, excludedPermissions, rolePermissions,
securityRoles, legacySecurityConstraintMap);
 
@@ -153,7 +186,7 @@
      *
      * @throws Exception thrown if an error in the test occurs
      */
-    public void xtestAutoMapping() throws Exception {
+    public void testAutoMapping() throws Exception {
         Security securityConfig = new Security();
         securityConfig.setUseContextHandler(false);
 
@@ -171,25 +204,40 @@
             kernel.getProxyManager().destroyProxy(securityService);
         }
 
-        String actions = "GET,POST,PUT,DELETE,HEAD,OPTIONS,TRACE";
         Set uncheckedPermissions = new HashSet();
-        uncheckedPermissions.add(new WebUserDataPermission("/protected/*", actions));
-        uncheckedPermissions.add(new WebResourcePermission("/:/protected/*:/auth/logon.html",
actions));
-        uncheckedPermissions.add(new WebUserDataPermission("/:/protected/*:/auth/logon.html",
actions));
+
         Set excludedPermissions = new HashSet();
-        excludedPermissions.add(new WebResourcePermission("/auth/login.html", actions));
-        excludedPermissions.add(new WebUserDataPermission("/auth/login.html", actions));
+        excludedPermissions.add(new WebResourcePermission("/auth/login.html", ""));
+        excludedPermissions.add(new WebUserDataPermission("/auth/login.html", ""));
+
         Map rolePermissions = new HashMap();
-        WebResourcePermission permission = new WebResourcePermission("/protected/*", actions);
-        Set permissionSet = new HashSet();
-        permissionSet.add(permission);
-        rolePermissions.put("content-administrator", permissionSet);
-        rolePermissions.put("auto-administrator", permissionSet);
+        Set permissions = new HashSet();
+        permissions.add(new WebUserDataPermission("/protected/*", ""));
+        permissions.add(new WebResourcePermission("/protected/*", ""));
+        rolePermissions.put("content-administrator", permissions);
+        rolePermissions.put("auto-administrator", permissions);
+
         Set securityRoles = new HashSet();
         securityRoles.add("content-administrator");
         securityRoles.add("auto-administrator");
 
+        /**
+         * TODO Remove the legacySecurityConstraintMap
+         */
         Map legacySecurityConstraintMap = new HashMap();
+        List constraints = new LinkedList();
+        SecurityConstraint constraint = new SecurityConstraint();
+        constraint.setAuthenticate(true);
+        constraint.addRole("content-administrator");
+        constraint.addRole("auto-administrator");
+        constraints.add(constraint);
+        legacySecurityConstraintMap.put("/protected/*", constraints);
+
+        constraints = new LinkedList();
+        constraint = new SecurityConstraint();
+        constraint.setAuthenticate(true);
+        constraints.add(constraint);
+        legacySecurityConstraintMap.put("/auth/logon.html", constraints);
 
         startWebApp(securityConfig, uncheckedPermissions, excludedPermissions, rolePermissions,
securityRoles, legacySecurityConstraintMap);
 
@@ -264,7 +312,7 @@
      *
      * @throws Exception thrown if an error in the test occurs
      */
-    public void xtestMixedMapping() throws Exception {
+    public void testMixedMapping() throws Exception {
         Security securityConfig = new Security();
         securityConfig.setUseContextHandler(false);
 
@@ -304,10 +352,39 @@
         securityConfig.append(role);
 
         Set uncheckedPermissions = new HashSet();
+
         Set excludedPermissions = new HashSet();
+        excludedPermissions.add(new WebResourcePermission("/auth/login.html", ""));
+        excludedPermissions.add(new WebUserDataPermission("/auth/login.html", ""));
+
         Map rolePermissions = new HashMap();
+        Set permissions = new HashSet();
+        permissions.add(new WebUserDataPermission("/protected/*", ""));
+        permissions.add(new WebResourcePermission("/protected/*", ""));
+        rolePermissions.put("content-administrator", permissions);
+        rolePermissions.put("auto-administrator", permissions);
+
         Set securityRoles = new HashSet();
+        securityRoles.add("content-administrator");
+        securityRoles.add("auto-administrator");
+
+        /**
+         * TODO Remove the legacySecurityConstraintMap
+         */
         Map legacySecurityConstraintMap = new HashMap();
+        List constraints = new LinkedList();
+        SecurityConstraint constraint = new SecurityConstraint();
+        constraint.setAuthenticate(true);
+        constraint.addRole("content-administrator");
+        constraint.addRole("auto-administrator");
+        constraints.add(constraint);
+        legacySecurityConstraintMap.put("/protected/*", constraints);
+
+        constraints = new LinkedList();
+        constraint = new SecurityConstraint();
+        constraint.setAuthenticate(true);
+        constraints.add(constraint);
+        legacySecurityConstraintMap.put("/auth/logon.html", constraints);
 
         startWebApp(securityConfig, uncheckedPermissions, excludedPermissions, rolePermissions,
securityRoles, legacySecurityConstraintMap);
 

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java?view=diff&rev=111366&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java&r1=111365&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java&r2=111366
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfiguration.java
Thu Dec  9 00:43:32 2004
@@ -29,6 +29,6 @@
 public interface GeronimoPolicyConfiguration extends RoleMappingConfiguration {
     public boolean implies(ProtectionDomain domain, Permission permission);
 
-    public void open(boolean remove);
+    public void open();
 
 }

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java?view=diff&rev=111366&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java&r1=111365&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java&r2=111366
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicyConfigurationFactory.java
Thu Dec  9 00:43:32 2004
@@ -51,11 +51,11 @@
     public PolicyConfiguration getPolicyConfiguration(String contextID, boolean remove) throws
PolicyContextException {
         GeronimoPolicyConfiguration configuration = (GeronimoPolicyConfiguration) configurations.get(contextID);
 
-        if (configuration == null) {
+        if (configuration == null || remove) {
             configuration = new PolicyConfigurationGeneric(contextID);
             configurations.put(contextID, configuration);
         } else {
-            configuration.open(remove);
+            configuration.open();
         }
 
         return configuration;

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java?view=diff&rev=111366&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java&r1=111365&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java&r2=111366
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/PolicyConfigurationGeneric.java
Thu Dec  9 00:43:32 2004
@@ -222,14 +222,7 @@
 
     //TODO I have no idea what side effects this might have, but it's needed in some form
from GeronimoPolicyConfigurationFactory.
     //see JACC spec 1.0 section 3.1.1.1 discussion of in service and deleted.
-    public void open(boolean remove) {
-        if (remove) {
-            rolePermissionsMap.clear();
-            principalRoleMapping.clear();
-            unchecked = null;
-            excluded = null;
-            principalPermissionsMap.clear();
-        }
+    public void open() {
         state = OPEN;
     }
 }

Mime
View raw message