[jboss-cvs] JBossAS SVN: r62730 - in projects/aop/trunk/asintegration/src/main/org/jboss/aop: junit and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2007-05-02 10:38:17 -0400 (Wed, 02 May 2007)
New Revision: 62730

Modified:
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java
Log:
[JBAOP-394] Replace EDU.oswego classes with their java.util.concurrent counterparts

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	2007-05-02 14:21:34 UTC (rev 62729)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	2007-05-02 14:38:17 UTC (rev 62730)
@@ -22,6 +22,7 @@
 package org.jboss.aop.deployment;
 
 import java.lang.ref.WeakReference;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.Domain;
@@ -31,7 +32,6 @@
 import org.jboss.mx.loading.LoaderRepository;
 import org.jboss.mx.loading.RepositoryClassLoader;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
 
 /**
  * A domain that is used for scoped classloaders
@@ -44,8 +44,8 @@
    
    WeakReference loader;
    boolean parentDelegation;
-   ConcurrentReaderHashMap myPerVMAspects = new ConcurrentReaderHashMap();
-   ConcurrentReaderHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
+   ConcurrentHashMap myPerVMAspects = new ConcurrentHashMap();
+   ConcurrentHashMap notMyPerVMAspects = new ConcurrentHashMap();
    InterceptionMarkers interceptionMarkers = new InterceptionMarkers();
    
    public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java	2007-05-02 14:21:34 UTC (rev 62729)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java	2007-05-02 14:38:17 UTC (rev 62730)
@@ -23,12 +23,11 @@
 
 import java.net.URL;
 import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.jboss.aop.AspectXmlLoader;
 import org.jboss.test.AbstractTestDelegate;
 
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList;
-
 /**
  * AOPTestDelegate.
  *