[jboss-cvs] JBossAS SVN: r62990 - in projects/security/security-jboss-sx/trunk: src/main/org/jboss/security/audit and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2007-05-11 10:43:45 -0400 (Fri, 11 May 2007)
New Revision: 62990

Modified:
   projects/security/security-jboss-sx/trunk/.classpath
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/JBossAuditManager.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
Log:
remove oswego and use jdk5 concurrent stuff

Modified: projects/security/security-jboss-sx/trunk/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/.classpath	2007-05-11 14:32:10 UTC (rev 62989)
+++ projects/security/security-jboss-sx/trunk/.classpath	2007-05-11 14:43:45 UTC (rev 62990)
@@ -5,7 +5,6 @@
 	<classpathentry kind="src" path="target/generated-sources/javacc"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-	<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/sun-xacml/sun-xacml/2.0/sun-xacml-2.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/jbossxb/1.0.0.CR8/jbossxb-1.0.0.CR8.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/jboss-security-spi/2.0.0.snapshot/jboss-security-spi-2.0.0.snapshot.jar"/>

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/JBossAuditManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/JBossAuditManager.java	2007-05-11 14:32:10 UTC (rev 62989)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/JBossAuditManager.java	2007-05-11 14:43:45 UTC (rev 62990)
@@ -8,15 +8,14 @@
 
 import java.security.PrivilegedActionException;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.jboss.security.audit.config.AuditProviderEntry;
 import org.jboss.security.audit.providers.LogAuditProvider;
 import org.jboss.security.config.ApplicationPolicy;
 import org.jboss.security.config.AuditInfo;
-import org.jboss.security.config.SecurityConfiguration;
+import org.jboss.security.config.SecurityConfiguration; 
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-
 /**
  *  Manages a set of AuditContext
  *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java	2007-05-11 14:32:10 UTC (rev 62989)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java	2007-05-11 14:43:45 UTC (rev 62990)
@@ -28,6 +28,8 @@
 import java.security.ProtectionDomain;
 import java.util.Iterator;
 import java.util.Enumeration;
+import java.util.concurrent.ConcurrentHashMap;
+
 import javax.security.jacc.EJBMethodPermission;
 import javax.security.jacc.EJBRoleRefPermission;
 import javax.security.jacc.PolicyConfiguration;
@@ -40,9 +42,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityConstants;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-
+ 
 /**
  * A JAAC Policy provider implementation that delegates any non-JACC permissions
  * to the java.security.Policy either passed in to the ctor, or the pre existing
@@ -63,12 +63,12 @@
     * Map<String, ContextPolicy> for the JACC context IDs that have been
     * committed.
     */
-   private ConcurrentReaderHashMap activePolicies = new ConcurrentReaderHashMap();
+   private ConcurrentHashMap activePolicies = new ConcurrentHashMap();
    /**
     * Map<String, ContextPolicy> for the JACC policies that are in the open
     * state and should be excluded from the active permission set.
     */ 
-   private ConcurrentReaderHashMap openPolicies = new ConcurrentReaderHashMap(); 
+   private ConcurrentHashMap openPolicies = new ConcurrentHashMap(); 
    /**
     * Flag indicating if our category is at trace level for logging
     */

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java	2007-05-11 14:32:10 UTC (rev 62989)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java	2007-05-11 14:43:45 UTC (rev 62990)
@@ -23,11 +23,12 @@
 
 import java.net.URL;
 import java.security.Policy;
+import java.util.concurrent.ConcurrentHashMap;
+
 import javax.security.jacc.PolicyConfigurationFactory;
 import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyContextException;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+ 
 import org.jboss.util.state.StateMachine;
 import org.jboss.util.state.xml.StateMachineParser;
 
@@ -40,7 +41,7 @@
    extends PolicyConfigurationFactory
 {
    private StateMachine configStateMachine;
-   private ConcurrentReaderHashMap policyConfigMap = new ConcurrentReaderHashMap();
+   private ConcurrentHashMap policyConfigMap = new ConcurrentHashMap();
    private DelegatingPolicy policy;
 
    /** Build the JACC policy configuration state machine from the