Re: 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

[David Jencks]

Did you mean to revert these to the previous, IMNSHO very broken, code?  
 I don't see any code that assures us that we will always get the same  
PolicyConfiguration instance back from  
PolicyConfigurationFactory.getPolicyConfiguration as required by the  
spec.

Also, please apply any modifications to trunk, not this branch, which I  
want to delete as soon as I'm convinced I didn't miss anything.

thanks
david jencks
On Dec 9, 2004, at 12:43 AM, [EMAIL PROTECTED] wrote:
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;
     }
 }