[pkg-java] r4632 - trunk/jbossas4/debian/patches
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Tue Nov 6 12:49:12 UTC 2007
Author: varun-guest
Date: 2007-11-06 12:49:12 +0000 (Tue, 06 Nov 2007)
New Revision: 4632
Added:
trunk/jbossas4/debian/patches/concurrent.diff
Log:
* Add concurrent.diff to use java.util.concurrent,
but doesn't work yet because of some missing classes.
Added: trunk/jbossas4/debian/patches/concurrent.diff
===================================================================
--- trunk/jbossas4/debian/patches/concurrent.diff (rev 0)
+++ trunk/jbossas4/debian/patches/concurrent.diff 2007-11-06 12:49:12 UTC (rev 4632)
@@ -0,0 +1,1225 @@
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 02:15:08.000000000 +0530
+@@ -30,7 +30,7 @@
+ import org.jboss.mx.loading.LoaderRepository;
+ import org.jboss.mx.loading.RepositoryClassLoader;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * A domain that is used for scoped classloaders
+@@ -43,8 +43,8 @@
+
+ WeakReference loader;
+ boolean parentDelegation;
+- ConcurrentReaderHashMap myPerVMAspects = new ConcurrentReaderHashMap();
+- ConcurrentReaderHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
++ ConcurrentHashMap myPerVMAspects = new ConcurrentHashMap();
++ ConcurrentHashMap notMyPerVMAspects = new ConcurrentHashMap();
+
+ public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
+ {
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,7 +21,7 @@
+ */
+ package org.jboss.aspects.asynch;
+
+-import EDU.oswego.cs.dl.util.concurrent.FutureResult;
++import java.util.concurrent.FutureResult;
+ import org.jboss.aop.Dispatcher;
+ import org.jboss.util.id.GUID;
+
+@@ -80,7 +80,7 @@
+ release();
+ return rtn;
+ }
+- catch (EDU.oswego.cs.dl.util.concurrent.TimeoutException e)
++ catch (java.util.concurrent.TimeoutException e)
+ {
+ throw new TimeoutException(e);
+ }
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,10 +21,10 @@
+ */
+ package org.jboss.aspects.asynch;
+
+-import EDU.oswego.cs.dl.util.concurrent.Callable;
+-import EDU.oswego.cs.dl.util.concurrent.Executor;
+-import EDU.oswego.cs.dl.util.concurrent.FutureResult;
+-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
++import java.util.concurrent.Callable;
++import java.util.concurrent.Executor;
++import java.util.concurrent.FutureResult;
++import java.util.concurrent.PooledExecutor;
+ import org.jboss.aop.Advisor;
+ import org.jboss.aop.joinpoint.MethodInvocation;
+
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,7 +21,7 @@
+ */
+ package org.jboss.aspects.asynchronous.concurrent;
+
+-import EDU.oswego.cs.dl.util.concurrent.Callable;
++import java.util.concurrent.Callable;
+ import org.jboss.aspects.asynchronous.AsynchronousConstants;
+ import org.jboss.aspects.asynchronous.AsynchronousParameters;
+ import org.jboss.aspects.asynchronous.AsynchronousResponse;
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,9 +21,9 @@
+ */
+ package org.jboss.aspects.asynchronous.concurrent;
+
+-import EDU.oswego.cs.dl.util.concurrent.Callable;
+-import EDU.oswego.cs.dl.util.concurrent.FutureResult;
+-import EDU.oswego.cs.dl.util.concurrent.TimeoutException;
++import java.util.concurrent.Callable;
++import java.util.concurrent.FutureResult;
++import java.util.concurrent.TimeoutException;
+ import org.jboss.aspects.asynchronous.AsynchronousConstants;
+ import org.jboss.aspects.asynchronous.AsynchronousParameters;
+ import org.jboss.aspects.asynchronous.AsynchronousUserTask;
+@@ -201,7 +201,7 @@
+
+ if (e.getTargetException()
+
+- instanceof EDU.oswego.cs.dl.util.concurrent.TimeoutException)
++ instanceof java.util.concurrent.TimeoutException)
+
+ errorCode = TIMEOUT;
+
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,8 +21,8 @@
+ */
+ package org.jboss.aspects.asynchronous.concurrent;
+
+-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
+-import EDU.oswego.cs.dl.util.concurrent.ThreadFactoryUser;
++import java.util.concurrent.PooledExecutor;
++import java.util.concurrent.ThreadFactoryUser;
+ import org.jboss.aspects.asynchronous.AsynchronousConstants;
+ import org.jboss.aspects.asynchronous.AsynchronousParameters;
+ import org.jboss.aspects.asynchronous.AsynchronousTask;
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-11-06 02:12:01.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,9 +21,9 @@
+ */
+ package org.jboss.aspects.asynchronous.concurrent;
+
+-import EDU.oswego.cs.dl.util.concurrent.Callable;
+-import EDU.oswego.cs.dl.util.concurrent.FutureResult;
+-import EDU.oswego.cs.dl.util.concurrent.ThreadFactoryUser;
++import java.util.concurrent.Callable;
++import java.util.concurrent.FutureResult;
++import java.util.concurrent.ThreadFactoryUser;
+ import org.jboss.aspects.asynchronous.ProcessingTime;
+
+
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-11-06 02:12:02.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-11-06 02:15:08.000000000 +0530
+@@ -22,8 +22,8 @@
+ package org.jboss.aspects.patterns.readwritelock;
+
+
+-import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
+-import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
++import java.util.concurrent.ReadWriteLock;
++import java.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
+ import org.jboss.aop.joinpoint.MethodInvocation;
+
+ /**
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/StateManager.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-11-06 02:12:02.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,8 +21,8 @@
+ */
+ package org.jboss.aspects.versioned;
+
+-import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
+-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
++import java.util.concurrent.ReadWriteLock;
++import java.util.concurrent.WriterPreferenceReadWriteLock;
+ import org.jboss.aop.InstanceAdvised;
+ import org.jboss.aop.util.PayloadKey;
+ import org.jboss.logging.Logger;
+diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-11-06 02:12:02.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-11-06 02:15:08.000000000 +0530
+@@ -21,7 +21,7 @@
+ */
+ package org.jboss.aspects.versioned;
+
+-import EDU.oswego.cs.dl.util.concurrent.FIFOSemaphore;
++import java.util.concurrent.FIFOSemaphore;
+ import org.jboss.aop.Advised;
+ import org.jboss.aop.util.MarshalledValue;
+ import org.jboss.tm.TransactionLocal;
+diff -urN jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-11-06 02:12:30.000000000 +0530
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-11-06 02:15:08.000000000 +0530
+@@ -29,7 +29,7 @@
+ import javax.jms.Message;
+ import javax.jms.ObjectMessage;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+ import org.jboss.logging.Logger;
+
+ /**
+diff -urN jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-11-06 02:12:30.000000000 +0530
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-11-06 02:15:08.000000000 +0530
+@@ -22,7 +22,7 @@
+ package org.jboss.ejb3.test.strictpool;
+
+ import org.jboss.logging.Logger;
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+
+ /** Invoker thread for StatelessSession tests.
+ * Adapted from the EJB 2.1 tests (org.jboss.test.cts.test.SessionInvoker)
+diff -urN jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-11-06 02:12:30.000000000 +0530
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-11-06 02:15:08.000000000 +0530
+@@ -28,7 +28,7 @@
+ import org.jboss.ejb3.test.strictpool.StrictlyPooledSession;
+ import org.jboss.ejb3.test.strictpool.Counter;
+ import org.jboss.test.JBossTestCase;
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+ import junit.framework.Test;
+
+
+diff -urN jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java
+--- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-11-06 02:12:33.000000000 +0530
++++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-11-06 02:15:09.000000000 +0530
+@@ -31,8 +31,8 @@
+ import org.jboss.jms.server.list.MessageList;
+ import org.jboss.jms.server.list.StandardMessageComparator;
+
+-import EDU.oswego.cs.dl.util.concurrent.FIFOReadWriteLock;
+-import EDU.oswego.cs.dl.util.concurrent.SyncSet;
++import java.util.concurrent.FIFOReadWriteLock;
++import java.util.concurrent.SyncSet;
+
+ /**
+ * An in memory implementation of the message list
+diff -urN jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java
+--- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-11-06 02:12:33.000000000 +0530
++++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-11-06 02:15:09.000000000 +0530
+@@ -30,7 +30,7 @@
+ import org.jboss.messaging.interfaces.MessageReference;
+ import org.jboss.messaging.interfaces.MessageSet;
+
+-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
++import java.util.concurrent.ReentrantLock;
+
+ /**
+ * An in memory message set
+diff -urN jbossas4-4.2.2.GA.orig/jms/src/test/org/jboss/test/messaging/TestMessageReference.java jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java
+--- jbossas4-4.2.2.GA.orig/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-11-06 02:12:33.000000000 +0530
++++ jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-11-06 02:15:09.000000000 +0530
+@@ -26,7 +26,7 @@
+ import org.jboss.messaging.interfaces.MessageAddress;
+ import org.jboss.messaging.interfaces.MessageReference;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * A simple implementation of a message reference
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 02:12:33.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 02:15:09.000000000 +0530
+@@ -33,7 +33,7 @@
+
+ import org.jboss.mx.util.ObservedObject;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * The monitor service.
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 02:15:09.000000000 +0530
+@@ -21,7 +21,7 @@
+ */
+ package org.jboss.mx.loading;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.logging.Logger;
+ import org.jboss.mx.server.ServerConstants;
+ import org.jboss.util.loading.Translator;
+@@ -52,7 +52,7 @@
+ /** The loaded classes cache, HashMap<String, Class>.
+ * Access synchronized via this.classes monitor.
+ */
+- private ConcurrentReaderHashMap classes = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap classes = new ConcurrentHashMap();
+
+
+ /**
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 02:15:09.000000000 +0530
+@@ -45,8 +45,8 @@
+ import org.jboss.util.loading.Translator;
+ import org.jboss.util.collection.SoftSet;
+
+-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ReentrantLock;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * A RepositoryClassLoader.
+@@ -82,7 +82,7 @@
+ /** Names of resources that were not found in loadResourceLocally */
+ private Set resourceBlackList = Collections.synchronizedSet(new HashSet());
+ /** A HashMap<String, URL> for resource found in loadResourceLocally */
+- private ConcurrentReaderHashMap resourceCache = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap resourceCache = new ConcurrentHashMap();
+
+ /** Lock */
+ protected ReentrantLock loadLock = new ReentrantLock();
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 02:15:09.000000000 +0530
+@@ -49,8 +49,8 @@
+ import org.jboss.logging.Logger;
+ import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.CopyOnWriteArraySet;
+
+ /** A repository of class loaders that form a flat namespace of classes
+ * and resources. This version uses UnifiedClassLoader3 instances. Class
+@@ -113,7 +113,7 @@
+ /** The loaded classes cache, HashMap<String, Class>.
+ * Access synchronized via this.classes monitor.
+ */
+- private ConcurrentReaderHashMap classes = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap classes = new ConcurrentHashMap();
+
+ /** HashMap<UCL, HashSet<String>> class loaders to the set of class names
+ * loaded via the UCL.
+@@ -137,7 +137,7 @@
+ * ClassLoaders which have classes in the package.
+ * Access synchronized via this.packagesMap monitor.
+ */
+- private ConcurrentReaderHashMap packagesMap = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap packagesMap = new ConcurrentHashMap();
+
+ /** A HashMap<UCL, String[]> of class loaders to the array of pckages names
+ * they serve
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 02:15:09.000000000 +0530
+@@ -49,8 +49,8 @@
+ import javax.management.modelmbean.ModelMBeanInfo;
+ import javax.management.modelmbean.RequiredModelMBean;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.SynchronizedLong;
+ import org.jboss.logging.Logger;
+ import org.jboss.mx.loading.LoaderRepository;
+ import org.jboss.mx.loading.RepositoryClassLoader;
+@@ -96,7 +96,7 @@
+ * key properties to registry entries.
+ * domain -> canonicalKeyProperties -> MBeanEntry
+ */
+- private Map domainMap = new ConcurrentReaderHashMap();
++ private Map domainMap = new ConcurrentHashMap();
+
+ /**
+ * The default domain for this registry
+@@ -959,7 +959,7 @@
+ Map mbeanMap = (Map) domainMap.get(domain);
+ if (mbeanMap == null && createIfMissing)
+ {
+- mbeanMap = new ConcurrentReaderHashMap();
++ mbeanMap = new ConcurrentHashMap();
+ domainMap.put(domain, mbeanMap);
+ }
+ return mbeanMap;
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/AgentID.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-11-06 02:15:09.000000000 +0530
+@@ -30,7 +30,7 @@
+ import javax.management.MBeanServer;
+ import javax.management.ObjectName;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ import org.jboss.mx.server.ServerConstants;
+
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-11-06 02:15:09.000000000 +0530
+@@ -33,7 +33,7 @@
+ import org.jboss.mx.notification.ListenerRegistration;
+ import org.jboss.mx.notification.ListenerRegistry;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * A helper class for notification broadcasters/emitters
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 02:15:09.000000000 +0530
+@@ -40,7 +40,7 @@
+ *
+ * Mutating operations synchronize on 'this', only because of the
+ * addIfAbsent logic in enableType(). This could be avoided by
+- * using java.util.concurrent or EDU.oswego.cs.dl.util.concurrent
++ * using java.util.concurrent or java.util.concurrent
+ * directly, rather than org.jboss.util.CollectionsFactory.
+ *
+ * In any case, mutating operations are rare when dealing with
+diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-11-06 02:12:34.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-11-06 02:15:09.000000000 +0530
+@@ -21,7 +21,7 @@
+ */
+ package org.jboss.mx.util;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * A schedulable runnable.<p>
+diff -urN jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java
+--- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 02:12:37.000000000 +0530
++++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 02:15:10.000000000 +0530
+@@ -35,7 +35,7 @@
+ import org.jboss.metadata.BeanMetaData;
+ import org.jboss.metadata.SessionMetaData;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * A factory for mapping EJBDeployer deployments to EJBModule
+@@ -47,9 +47,9 @@
+ implements ManagedObjectFactory
+ {
+ private static Logger log = Logger.getLogger(EJBModuleFactory.class);
+- private static Map moduleServiceToMgmtMap = new ConcurrentReaderHashMap();
+- private Map deploymentToModuleNameMap = new ConcurrentReaderHashMap();
+- private Map containerToModuleNameMap = new ConcurrentReaderHashMap();
++ private static Map moduleServiceToMgmtMap = new ConcurrentHashMap();
++ private Map deploymentToModuleNameMap = new ConcurrentHashMap();
++ private Map containerToModuleNameMap = new ConcurrentHashMap();
+
+ static ObjectName getEJBModuleName(ObjectName ejbModuleService)
+ {
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/Connection.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/Connection.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java 2007-11-06 02:15:10.000000000 +0530
+@@ -44,10 +44,10 @@
+ import org.jboss.mq.il.ServerIL;
+ import org.jboss.util.UnreachableStatementException;
+
+-import EDU.oswego.cs.dl.util.concurrent.ClockDaemon;
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
+-import EDU.oswego.cs.dl.util.concurrent.ThreadFactory;
++import java.util.concurrent.ClockDaemon;
++import java.util.concurrent.Semaphore;
++import java.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.ThreadFactory;
+
+ /**
+ * This class implements javax.jms.Connection.
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-11-06 02:12:37.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-11-06 02:15:10.000000000 +0530
+@@ -28,7 +28,7 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
++import java.util.concurrent.LinkedQueue;
+
+ /**
+ * Stores requests on behalf of clients. This could of course, be done
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 02:15:10.000000000 +0530
+@@ -28,12 +28,12 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.Channel;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
+-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
+-import EDU.oswego.cs.dl.util.concurrent.Slot;
+-import EDU.oswego.cs.dl.util.concurrent.ThreadFactory;
++import java.util.concurrent.Channel;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.LinkedQueue;
++import java.util.concurrent.PooledExecutor;
++import java.util.concurrent.Slot;
++import java.util.concurrent.ThreadFactory;
+
+ /**
+ * The OIL2 implementation of the ServerIL object
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-11-06 02:15:10.000000000 +0530
+@@ -55,7 +55,7 @@
+ import org.jboss.mq.il.uil2.msgs.PingMsg;
+ import org.jboss.mq.il.Invoker;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /** This is the SocketManager callback handler for the UIL2 server side
+ * socket. This handles messages that are requests from clients.
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 02:15:10.000000000 +0530
+@@ -35,12 +35,12 @@
+ import org.jboss.util.stream.NotifyingBufferedInputStream;
+ import org.jboss.util.stream.NotifyingBufferedOutputStream;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
+-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+-import EDU.oswego.cs.dl.util.concurrent.ThreadFactory;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.LinkedQueue;
++import java.util.concurrent.PooledExecutor;
++import java.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedInt;
++import java.util.concurrent.ThreadFactory;
+
+ /** Used to manage the client/server and server/client communication in an
+ * asynchrounous manner.
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-06 02:15:10.000000000 +0530
+@@ -41,8 +41,8 @@
+ import org.jboss.security.SecurityDomain;
+ import org.jboss.system.server.ServerConfigUtil;
+
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /** This is the server side MBean for the UIL2 transport layer.
+ *
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-11-06 02:15:10.000000000 +0530
+@@ -64,7 +64,7 @@
+ import org.jboss.tm.TransactionTimeoutConfiguration;
+ import org.jboss.util.UnreachableStatementException;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * This class manages all persistence related services for JDBC based
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 02:15:10.000000000 +0530
+@@ -33,8 +33,8 @@
+ import org.jboss.mq.server.MessageReference;
+ import org.jboss.system.ServiceMBeanSupport;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * A persistence manager and cache store that does not persistence.
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 02:15:10.000000000 +0530
+@@ -33,8 +33,8 @@
+ import org.jboss.mq.Recoverable;
+ import org.jboss.mq.SpyJMSException;
+
+-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;
+
+ /**
+ * This class allows provides the base for user supplied persistence packages.
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 02:15:10.000000000 +0530
+@@ -50,8 +50,8 @@
+ import org.jboss.util.timeout.Timeout;
+ import org.jboss.util.timeout.TimeoutTarget;
+
+-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;
+
+ /**
+ * This class represents a queue which provides it's messages exclusively to one
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 02:15:10.000000000 +0530
+@@ -39,7 +39,7 @@
+ import org.jboss.mq.TransactionRequest;
+ import org.jboss.mq.il.jvm.JVMClientIL;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * A pass through Interceptor, which keeps track of when a
+@@ -54,7 +54,7 @@
+ public class ClientMonitorInterceptor extends JMSServerInterceptorSupport
+ {
+ //The list of Clients by ConnectionTokens
+- ConcurrentReaderHashMap clients = new ConcurrentReaderHashMap();
++ ConcurrentHashMap clients = new ConcurrentHashMap();
+
+ private static class ClientStats
+ {
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 02:15:10.000000000 +0530
+@@ -56,7 +56,7 @@
+ import org.jboss.util.threadpool.ThreadPool;
+ import org.jboss.util.timeout.TimeoutFactory;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * This class implements the JMS provider
+@@ -73,10 +73,10 @@
+ public final static String JBOSS_VERSION = "JBossMQ Version 4.0";
+
+ /** Destinations SpyDestination -> JMSDestination */
+- public Map destinations = new ConcurrentReaderHashMap();
++ public Map destinations = new ConcurrentHashMap();
+
+ /** Destinations being closed SpyDestination -> JMSDestination */
+- public Map closingDestinations = new ConcurrentReaderHashMap();
++ public Map closingDestinations = new ConcurrentHashMap();
+
+ /** Thread pool */
+ public ThreadPool threadPool;
+@@ -88,7 +88,7 @@
+ public TimeoutFactory timeoutFactory;
+
+ /** The list of ClientConsumers hased by ConnectionTokens */
+- Map clientConsumers = new ConcurrentReaderHashMap();
++ Map clientConsumers = new ConcurrentHashMap();
+
+ /** last id given to a client */
+ private int lastID = 1;
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 02:15:10.000000000 +0530
+@@ -39,7 +39,7 @@
+ import org.jboss.mq.pm.PersistenceManager;
+ import org.jboss.mq.pm.Tx;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * This class is a message queue which is stored (hashed by Destination) on the
+@@ -56,8 +56,8 @@
+ {
+
+ //Hashmap of ExclusiveQueues
+- ConcurrentReaderHashMap durQueues = new ConcurrentReaderHashMap();
+- ConcurrentReaderHashMap tempQueues = new ConcurrentReaderHashMap();
++ ConcurrentHashMap durQueues = new ConcurrentHashMap();
++ ConcurrentHashMap tempQueues = new ConcurrentHashMap();
+
+ public JMSTopic(SpyDestination dest, ClientConsumer temporary, JMSDestinationManager server, BasicQueueParameters parameters) throws JMSException
+ {
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/MessageCache.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-11-06 02:15:10.000000000 +0530
+@@ -31,7 +31,7 @@
+ import org.jboss.mq.SpyMessage;
+ import org.jboss.mq.pm.CacheStore;
+ import org.jboss.system.ServiceMBeanSupport;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * This class implements a Message cache so that larger amounts of messages
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-11-06 02:15:10.000000000 +0530
+@@ -32,7 +32,7 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
++import java.util.concurrent.SynchronizedInt;
+
+ /**
+ * This class implements javax.jms.ConnectionConsumer
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-11-06 02:15:10.000000000 +0530
+@@ -35,7 +35,7 @@
+ import org.jboss.logging.Logger;
+ import org.jboss.util.UnreachableStatementException;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * This class implements <tt>javax.jms.MessageConsumer</tt>.
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageProducer.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-11-06 02:15:10.000000000 +0530
+@@ -41,7 +41,7 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * This class implements javax.jms.MessageProducer
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpySession.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpySession.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java 2007-11-06 02:15:10.000000000 +0530
+@@ -56,7 +56,7 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * This class implements javax.jms.Session and javax.jms.XASession
+diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 02:12:38.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 02:15:10.000000000 +0530
+@@ -25,7 +25,7 @@
+ import java.util.Map;
+ import java.util.ArrayList;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import javax.jms.JMSException;
+ import javax.transaction.xa.XAException;
+@@ -62,7 +62,7 @@
+ /** The connection */
+ private Connection connection;
+ /** The transactions */
+- private Map transactions = new ConcurrentReaderHashMap();
++ private Map transactions = new ConcurrentHashMap();
+ /** The next xid */
+ private long nextInternalXid = Long.MIN_VALUE;
+
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-11-06 02:12:49.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-11-06 02:15:10.000000000 +0530
+@@ -29,7 +29,7 @@
+
+ import java.util.Random;
+
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * Simple clustering test case of get/set. It is attribute based granularity with concurrent access.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-11-06 02:12:49.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-11-06 02:15:10.000000000 +0530
+@@ -57,7 +57,7 @@
+ import org.jgroups.stack.GossipRouter;
+ import org.jgroups.stack.IpAddress;
+
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /** Tests of the DistributedReplicantManagerImpl
+ *
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-11-06 02:12:49.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-11-06 02:15:10.000000000 +0530
+@@ -29,7 +29,7 @@
+
+ import java.util.Random;
+
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * Simple clustering test case of get/set. It is session based granularity with concurrent access.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-11-06 02:12:51.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-11-06 02:15:10.000000000 +0530
+@@ -29,7 +29,7 @@
+ import javax.jms.Message;
+ import javax.jms.ObjectMessage;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+ import org.apache.log4j.Category;
+
+ /**
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-11-06 02:12:51.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-11-06 02:15:10.000000000 +0530
+@@ -28,7 +28,7 @@
+ import javax.jms.QueueSession;
+ import javax.naming.InitialContext;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+ import junit.framework.Test;
+ import org.jboss.test.JBossTestCase;
+
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-11-06 02:12:51.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-11-06 02:15:10.000000000 +0530
+@@ -25,7 +25,7 @@
+ import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
+
+ import org.apache.log4j.Category;
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+
+ /** Invoker thread for StatelessSession tests.
+ * @author Scott.Stark at jboss.org
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-11-06 02:12:51.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-11-06 02:15:10.000000000 +0530
+@@ -48,7 +48,7 @@
+ import org.jboss.test.cts.keys.AccountPK;
+ import org.jboss.tm.TransactionManagerServiceMBean;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+
+
+ /** Tests of stateful session beans
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-11-06 02:12:51.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-11-06 02:15:10.000000000 +0530
+@@ -40,7 +40,7 @@
+ import org.jboss.test.cts.interfaces.StatelessSessionHome;
+ import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
+ import org.jboss.test.cts.interfaces.StrictlyPooledSession;
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+
+ /** Basic conformance tests for stateless sessions
+ *
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 02:12:51.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 02:15:10.000000000 +0530
+@@ -34,8 +34,8 @@
+ import javax.security.auth.Subject;
+ import javax.transaction.xa.XAResource;
+
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.SynchronizedBoolean;
+
+ public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
+ {
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-11-06 02:15:11.000000000 +0530
+@@ -39,7 +39,7 @@
+ import org.apache.log4j.Category;
+ import org.jboss.test.JBossTestCase;
+
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -22,7 +22,7 @@
+ package org.jboss.test.jbossmq.perf;
+
+ import junit.textui.TestRunner;
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -22,7 +22,7 @@
+ package org.jboss.test.jbossmq.perf;
+
+ import junit.textui.TestRunner;
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-11-06 02:15:11.000000000 +0530
+@@ -27,7 +27,7 @@
+ import org.jboss.mq.SpyDestination;
+ import org.jboss.mq.il.ClientIL;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * MonitorCloseTestClientIL.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-11-06 02:15:11.000000000 +0530
+@@ -30,7 +30,7 @@
+
+ import org.jboss.test.JBossTestCase;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * A test to make sure exception listeners are fired when a service is restarted
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-11-06 02:15:11.000000000 +0530
+@@ -57,7 +57,7 @@
+ import org.apache.log4j.Category;
+ import org.jboss.test.JBossTestCase;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+
+ /**
+ * Basic jms tests.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-11-06 02:12:54.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-11-06 02:15:11.000000000 +0530
+@@ -46,7 +46,7 @@
+ import javax.naming.Context;
+ import javax.naming.InitialContext;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+ import org.apache.log4j.Category;
+ import org.jboss.test.JBossTestCase;
+
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-11-06 02:12:55.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-11-06 02:15:11.000000000 +0530
+@@ -37,7 +37,7 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
++import java.util.concurrent.SynchronizedInt;
+
+ /**
+ * ManagedConnectionFactory.java
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-11-06 02:12:55.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-11-06 02:15:11.000000000 +0530
+@@ -44,7 +44,7 @@
+ import org.jboss.logging.Logger;
+ import org.jboss.tm.TxUtils;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * TestManagedConnection.java
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 02:12:55.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 02:15:11.000000000 +0530
+@@ -31,7 +31,7 @@
+ import javax.transaction.xa.XAResource;
+
+ import org.jboss.logging.Logger;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /** The ResourceAdapter for the file system based DirContext
+ *
+@@ -44,7 +44,7 @@
+
+ private BootstrapContext ctx;
+ /** The activations by activation spec */
+- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap activations = new ConcurrentHashMap();
+
+ /**
+ * Get the work manager
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 02:12:55.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 02:15:11.000000000 +0530
+@@ -38,7 +38,7 @@
+ import org.jboss.mx.util.MBeanServerLocator;
+ import org.jboss.mx.util.ObjectNameFactory;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * A TestResourceAdapter.
+@@ -52,7 +52,7 @@
+
+ BootstrapContext ctx;
+
+- ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
++ ConcurrentHashMap endpoints = new ConcurrentHashMap();
+
+ public TestResourceAdapterInflowResults testInflow() throws Exception
+ {
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-11-06 02:12:55.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-11-06 02:15:11.000000000 +0530
+@@ -26,7 +26,7 @@
+ import org.jboss.logging.Logger;
+ import org.jboss.test.util.ejb.EJBTestCase;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
++import java.util.concurrent.SynchronizedInt;
+
+ /**
+ * Abstract concurrent stress test.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 02:12:55.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 02:15:11.000000000 +0530
+@@ -34,8 +34,8 @@
+ import javax.security.auth.Subject;
+ import javax.transaction.xa.XAResource;
+
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
++import java.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.SynchronizedBoolean;
+
+ /**
+ * A PropertyTestManagedConnection.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-11-06 02:13:00.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -26,7 +26,7 @@
+ import org.jboss.util.timeout.TimeoutFactory;
+ import org.jboss.util.timeout.TimeoutTarget;
+
+-import EDU.oswego.cs.dl.util.concurrent.WaitableInt;
++import java.util.concurrent.WaitableInt;
+
+ /**
+ * TimeoutFactoryCancelStressTestCase.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-11-06 02:13:00.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -26,7 +26,7 @@
+ import org.jboss.util.timeout.TimeoutFactory;
+ import org.jboss.util.timeout.TimeoutTarget;
+
+-import EDU.oswego.cs.dl.util.concurrent.WaitableLong;
++import java.util.concurrent.WaitableLong;
+
+ /**
+ * TimeoutFactoryMixedStressTestCase.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-11-06 02:13:00.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -26,7 +26,7 @@
+ import org.jboss.util.timeout.TimeoutFactory;
+ import org.jboss.util.timeout.TimeoutTarget;
+
+-import EDU.oswego.cs.dl.util.concurrent.WaitableInt;
++import java.util.concurrent.WaitableInt;
+
+ /**
+ * TimeoutFactoryStressTestCase.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-11-06 02:13:00.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -28,7 +28,7 @@
+ import org.jboss.util.timeout.TimeoutFactory;
+ import org.jboss.util.timeout.TimeoutTarget;
+
+-import EDU.oswego.cs.dl.util.concurrent.WaitableInt;
++import java.util.concurrent.WaitableInt;
+
+ /**
+ * Unit tests for TimeoutFactory class.
+diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-11-06 02:13:01.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-11-06 02:15:11.000000000 +0530
+@@ -49,7 +49,7 @@
+ import org.jgroups.ViewId;
+ import org.jgroups.stack.IpAddress;
+
+-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
++import java.util.concurrent.ReentrantLock;
+
+ /**
+ * Test of the TreeCacheSSOClusterManager class.
+diff -urN jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-11-06 02:13:14.000000000 +0530
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-11-06 02:15:12.000000000 +0530
+@@ -31,8 +31,8 @@
+ import org.apache.catalina.util.StringManager;
+ import org.apache.catalina.valves.ValveBase;
+
+-import EDU.oswego.cs.dl.util.concurrent.FIFOSemaphore;
+-import EDU.oswego.cs.dl.util.concurrent.Sync;
++import java.util.concurrent.FIFOSemaphore;
++import java.util.concurrent.Sync;
+
+ /**
+ * <p>Implementation of a Valve that limits concurrency.</p>
+diff -urN jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 02:13:14.000000000 +0530
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 02:15:12.000000000 +0530
+@@ -43,7 +43,7 @@
+ import org.jboss.web.tomcat.service.JBossWeb;
+ import org.jboss.web.tomcat.service.session.JBossManager;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+
+ /**
+diff -urN jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 02:13:14.000000000 +0530
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 02:15:12.000000000 +0530
+@@ -25,7 +25,7 @@
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /** A session replication statistics collection class.
+ *
+@@ -38,7 +38,7 @@
+ private static final long serialVersionUID = 9153807780893455734L;
+
+ /** A HashMap<String, TimeStatistic> of the method invocations */
+- private ConcurrentReaderHashMap ctxStats;
++ private ConcurrentHashMap ctxStats;
+ /** Time of the last resetStats call */
+ public long lastResetTime = System.currentTimeMillis();
+
+@@ -75,7 +75,7 @@
+
+ public ReplicationStatistics()
+ {
+- ctxStats = new ConcurrentReaderHashMap();
++ ctxStats = new ConcurrentHashMap();
+ }
+
+ public void updatePassivationStats(String ctx, long elapsed)
+diff -urN jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
+--- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 02:13:15.000000000 +0530
++++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 02:15:12.000000000 +0530
+@@ -33,8 +33,8 @@
+
+ import org.jboss.util.NestedRuntimeException;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ReentrantLock;
+
+ /**
+ * An implementation of the transaction local implementation
+diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-11-06 02:13:15.000000000 +0530
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-11-06 02:15:12.000000000 +0530
+@@ -22,7 +22,7 @@
+ /**
+ * Simple, thread safe counter implementattion with accessor methods.
+ *
+- * (Maybe replace with EDU.oswego.cs.dl.util.concurrent.SynchronizedLong?)
++ * (Maybe replace with java.util.concurrent.SynchronizedLong?)
+ *
+ * @version $Revision: 44599 $
+ *
+diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-11-06 02:13:15.000000000 +0530
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-11-06 02:15:12.000000000 +0530
+@@ -31,7 +31,7 @@
+
+ import org.jboss.system.ServiceMBeanSupport;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * AlarmTable
+diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-11-06 02:13:15.000000000 +0530
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-11-06 02:15:12.000000000 +0530
+@@ -32,7 +32,7 @@
+ import org.jboss.system.ListenerServiceMBeanSupport;
+ import org.jboss.util.Strings;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * ActiveAlarmTable
+diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/NotificationListener.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-11-06 02:13:15.000000000 +0530
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-11-06 02:15:12.000000000 +0530
+@@ -27,7 +27,7 @@
+ import org.jboss.logging.DynamicLogger;
+ import org.jboss.system.ListenerServiceMBeanSupport;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * A simple JMX notification listener that outputs notifications as log.INFO
+diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ScriptingListener.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-11-06 02:13:15.000000000 +0530
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-11-06 02:15:12.000000000 +0530
+@@ -34,7 +34,7 @@
+ import org.jboss.monitor.alarm.AlarmManager;
+ import org.jboss.system.ListenerServiceMBeanSupport;
+
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
++import java.util.concurrent.SynchronizedLong;
+
+ /**
+ * A simple listener that can subscribe for any combination
More information about the pkg-java-commits
mailing list