Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/Node.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/Node.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/Node.java	2007-11-06 21:53:38.000000000 +0100
@@ -7,7 +7,7 @@
 package org.jboss.cache;
 
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.factories.NodeFactory;
@@ -149,11 +149,11 @@
       {
          if (getFqn().isRoot())
          {
-            children = new ConcurrentReaderHashMap(64);
+            children = new ConcurrentHashMap(64);
          }
          else
          {
-            children = new ConcurrentReaderHashMap(4);
+            children = new ConcurrentHashMap(4);
          }
       }
       return children;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/buddyreplication/BuddyManager.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/buddyreplication/BuddyManager.java	2007-11-06 21:53:38.000000000 +0100
@@ -7,7 +7,7 @@
 package org.jboss.cache.buddyreplication;
 
 import EDU.oswego.cs.dl.util.concurrent.BoundedLinkedQueue;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -73,7 +73,7 @@
    /**
     * Map of buddy pools received from broadcasts
     */
-   Map buddyPool = new ConcurrentReaderHashMap();
+   Map buddyPool = new ConcurrentHashMap();
    /**
     * The nullBuddyPool is a set of addresses that have not specified buddy pools.
     */
@@ -92,7 +92,7 @@
     * Keyed on String group name, values are BuddyGroup objects.
     * Needs to deal with concurrent access - concurrent assignTo/removeFrom buddy grp
     */
-   Map buddyGroupsIParticipateIn = new ConcurrentReaderHashMap();
+   Map buddyGroupsIParticipateIn = new ConcurrentHashMap();
 
    /**
     * Queue to deal with queued up view change requests - which are handled asynchronously
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java	2007-11-06 21:53:38.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.optimistic;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.DataNode;
@@ -88,7 +88,7 @@
         }
         else
         {
-            optimisticChildNodeMap = new ConcurrentReaderHashMap(node.getChildren());
+            optimisticChildNodeMap = new ConcurrentHashMap(node.getChildren());
         }
         this.version = ((OptimisticTreeNode) node).getVersion();
     }
@@ -239,7 +239,7 @@
         {
             child = NodeFactory.getInstance().createNodeOfType(parent, child_name, fqn, parent, null, cache, version);
             if (optimisticChildNodeMap == Collections.EMPTY_MAP)
-                optimisticChildNodeMap = new ConcurrentReaderHashMap();
+                optimisticChildNodeMap = new ConcurrentHashMap();
             optimisticChildNodeMap.put(child_name, child);
            if (trace) log.trace("Adding child " + child_name);
            childrenAdded.add(child);
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TransactionTable.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/TransactionTable.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TransactionTable.java	2007-11-06 21:53:38.000000000 +0100
@@ -7,7 +7,7 @@
 package org.jboss.cache;
 
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.lock.IdentityLock;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TreeCache.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/TreeCache.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TreeCache.java	2007-11-06 21:54:39.000000000 +0100
@@ -6,8 +6,8 @@
  */
 package org.jboss.cache;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.buddyreplication.BuddyGroup;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/eviction/RegionManager.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/eviction/RegionManager.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/eviction/RegionManager.java	2007-11-06 21:53:38.000000000 +0100
@@ -29,7 +29,7 @@
 import java.util.TreeSet;
 import java.util.Iterator;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Factory to create region from configuration, to track region,
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/ActivationInterceptor.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/ActivationInterceptor.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/ActivationInterceptor.java	2007-11-06 21:53:38.000000000 +0100
@@ -1,6 +1,6 @@
 package org.jboss.cache.interceptors;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jboss.cache.DataNode;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.GlobalTransaction;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java	2007-11-06 21:53:38.000000000 +0100
@@ -1,6 +1,6 @@
 package org.jboss.cache.interceptors;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.GlobalTransaction;
 import org.jboss.cache.Modification;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java	2007-11-06 21:53:38.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java	2007-11-06 21:53:38.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.GlobalTransaction;
@@ -329,4 +329,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/TxInterceptor.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/TxInterceptor.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/TxInterceptor.java	2007-11-06 21:53:38.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.GlobalTransaction;
 import org.jboss.cache.InvocationContext;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/FileCacheLoader.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/FileCacheLoader.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/FileCacheLoader.java	2007-11-06 21:53:38.000000000 +0100
@@ -1,6 +1,6 @@
 package org.jboss.cache.loader;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java	2007-11-06 21:53:38.000000000 +0100
@@ -1,6 +1,6 @@
 package org.jboss.cache.loader.bdbje;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import com.sleepycat.bind.serial.SerialBinding;
 import com.sleepycat.bind.serial.StoredClassCatalog;
 import com.sleepycat.bind.tuple.TupleBinding;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java	2007-11-06 21:53:38.000000000 +0100
@@ -1,6 +1,6 @@
 package org.jboss.cache.loader.jdbm;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import jdbm.RecordManager;
 import jdbm.RecordManagerFactory;
 import jdbm.btree.BTree;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/Marshaller.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/marshall/Marshaller.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/Marshaller.java	2007-11-06 21:53:38.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.marshall;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/RegionManager.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/marshall/RegionManager.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/RegionManager.java	2007-11-06 21:53:38.000000000 +0100
@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Factory to create region from configuration, to track region,
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/TreeCacheMarshaller.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/marshall/TreeCacheMarshaller.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/TreeCacheMarshaller.java	2007-11-06 21:53:38.000000000 +0100
@@ -7,7 +7,7 @@
 
 package org.jboss.cache.marshall;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java	2007-11-01 18:22:40.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java	2007-11-06 21:53:38.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.optimistic;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.TreeCache;
 
Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/lock/LockMap.java
===================================================================
--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/lock/LockMap.java	2007-11-06 21:54:34.000000000 +0100
+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/lock/LockMap.java	2007-11-06 21:54:44.000000000 +0100
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.lock;
 
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 // See IdentityLockPerfTest --
 // oswego read/write acquire/release locks/sec: 2000000, 2840909