[pkg-java] r4649 - trunk/jbossas4/debian/patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Tue Nov 6 22:04:56 UTC 2007
Author: twerner
Date: 2007-11-06 22:04:56 +0000 (Tue, 06 Nov 2007)
New Revision: 4649
Modified:
trunk/jbossas4/debian/patches/concurrent.diff
Log:
do not fully migrate to java.util.concurrent but just the classes
missing in Debian's libconcurrent-java
Modified: trunk/jbossas4/debian/patches/concurrent.diff
===================================================================
--- trunk/jbossas4/debian/patches/concurrent.diff 2007-11-06 21:33:52 UTC (rev 4648)
+++ trunk/jbossas4/debian/patches/concurrent.diff 2007-11-06 22:04:56 UTC (rev 4649)
@@ -1,279 +1,366 @@
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
+Index: jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-10-22 16:58:12.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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)
- {
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2007-10-22 16:57:26.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 22:59:39.000000000 +0100
+@@ -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.
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-10-22 16:58:16.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,7 +21,7 @@
- */
- package org.jboss.aspects.asynch;
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-10-22 17:00:41.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 22:59:39.000000000 +0100
+@@ -29,7 +29,7 @@
+ import org.jboss.logging.Logger;
--import EDU.oswego.cs.dl.util.concurrent.FutureResult;
-+import java.util.concurrent.FutureResult;
- import org.jboss.aop.Dispatcher;
- import org.jboss.util.id.GUID;
+ import EDU.oswego.cs.dl.util.concurrent.Channel;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.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;
+Index: 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-10-22 17:00:45.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 22:59:39.000000000 +0100
+@@ -35,7 +35,7 @@
+ import org.jboss.util.stream.NotifyingBufferedInputStream;
+ import org.jboss.util.stream.NotifyingBufferedOutputStream;
-@@ -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);
- }
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.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;
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-10-22 16:58:15.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,10 +21,10 @@
- */
- package org.jboss.aspects.asynch;
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-10-22 17:00:36.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 23:01:31.000000000 +0100
+@@ -33,8 +33,8 @@
+ import org.jboss.mq.Recoverable;
+ import org.jboss.mq.SpyJMSException;
--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;
+-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;
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java
+ /**
+ * This class allows provides the base for user supplied persistence packages.
+@@ -476,4 +476,4 @@
+ return txids.isEmpty();
+ }
+ }
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-10-22 16:58:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,7 +21,7 @@
- */
- package org.jboss.aspects.asynchronous.concurrent;
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 22:59:39.000000000 +0100
+@@ -33,7 +33,7 @@
+ import org.jboss.mq.server.MessageReference;
+ import org.jboss.system.ServiceMBeanSupport;
--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;
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
+
+ /**
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-10-22 16:58:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,9 +21,9 @@
- */
- package org.jboss.aspects.asynchronous.concurrent;
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 23:01:34.000000000 +0100
+@@ -50,8 +50,8 @@
+ import org.jboss.util.timeout.Timeout;
+ import org.jboss.util.timeout.TimeoutTarget;
--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 @@
+-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;
- if (e.getTargetException()
+ /**
+ * This class represents a queue which provides it's messages exclusively to one
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2007-10-22 16:59:41.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2007-11-06 22:59:39.000000000 +0100
+@@ -32,8 +32,8 @@
+ import java.util.Map;
+ import java.util.WeakHashMap;
-- instanceof EDU.oswego.cs.dl.util.concurrent.TimeoutException)
-+ instanceof java.util.concurrent.TimeoutException)
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
- errorCode = TIMEOUT;
+ /**
+ * An ObjectInputStream subclass used by the MarshalledValue class to
+@@ -49,7 +49,7 @@
+ {
+ /** A class wide cache of proxy classes populated by resolveProxyClass */
+ private static Map classCache;
+- private static ConcurrentReaderHashMap objectStreamClassCache;
++ private static ConcurrentHashMap objectStreamClassCache;
+ private static Method lookupStreamClass = null;
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java
+ static
+@@ -76,7 +76,7 @@
+ if (flag == true)
+ {
+ classCache = Collections.synchronizedMap(new WeakHashMap());
+- objectStreamClassCache = new ConcurrentReaderHashMap();
++ objectStreamClassCache = new ConcurrentHashMap();
+ }
+ else
+ {
+Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-10-22 16:58:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,8 +21,8 @@
- */
- package org.jboss.aspects.asynchronous.concurrent;
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-10-22 16:49:37.000000000 +0200
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 22:59:39.000000000 +0100
+@@ -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.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;
-Index: 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-10-22 16:58:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,9 +21,9 @@
- */
- package org.jboss.aspects.asynchronous.concurrent;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
--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;
+ /**
+@@ -1310,4 +1310,4 @@
+ return valid;
+ }
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-10-22 16:58:13.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-11-06 14:52:09.000000000 +0100
-@@ -22,8 +22,8 @@
- package org.jboss.aspects.patterns.readwritelock;
+--- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-10-22 16:49:29.000000000 +0200
++++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 22:59:39.000000000 +0100
+@@ -33,7 +33,7 @@
+ import org.jboss.util.NestedRuntimeException;
--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;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
/**
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java
+Index: 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/aspects/versioned/StateManager.java 2007-10-22 16:58:23.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,8 +21,8 @@
- */
- package org.jboss.aspects.versioned;
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-10-22 16:58:12.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 22:59:39.000000000 +0100
+@@ -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 ConcurrentReaderHashMap();
++ ConcurrentHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
+
+ public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
+ {
+Index: jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2007-10-22 16:43:12.000000000 +0200
++++ jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2007-11-06 22:59:39.000000000 +0100
+@@ -37,7 +37,7 @@
+ import javax.management.ObjectName;
--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 EDU.oswego.cs.dl.util.concurrent.Latch;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
import org.jboss.logging.Logger;
-Index: 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-10-22 16:58:23.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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;
-Index: jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java
+@@ -68,9 +68,9 @@
+ // Attributes ----------------------------------------------------
+ protected static int threadID;
+
+- protected ConcurrentReaderHashMap localReplicants = new ConcurrentReaderHashMap();
+- protected ConcurrentReaderHashMap replicants = new ConcurrentReaderHashMap();
+- protected ConcurrentReaderHashMap keyListeners = new ConcurrentReaderHashMap();
++ protected ConcurrentHashMap localReplicants = new ConcurrentReaderHashMap();
++ protected ConcurrentHashMap replicants = new ConcurrentReaderHashMap();
++ protected ConcurrentHashMap keyListeners = new ConcurrentReaderHashMap();
+ protected HashMap intraviewIdCache = new HashMap();
+ protected HAPartition partition;
+ /** The handler used to send replicant change notifications asynchronously */
+Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java
===================================================================
---- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-10-22 16:44:13.000000000 +0200
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-11-06 14:52:09.000000000 +0100
-@@ -29,7 +29,7 @@
- import javax.jms.Message;
- import javax.jms.ObjectMessage;
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2007-10-22 16:56:40.000000000 +0200
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2007-11-06 22:59:39.000000000 +0100
+@@ -37,7 +37,7 @@
+ import org.jboss.resource.adapter.jms.inflow.JmsActivation;
+ import org.jboss.resource.adapter.jms.inflow.JmsActivationSpec;
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
- import org.jboss.logging.Logger;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
/**
-Index: 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-10-22 16:44:13.000000000 +0200
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-11-06 14:52:09.000000000 +0100
-@@ -22,7 +22,7 @@
- package org.jboss.ejb3.test.strictpool;
+ * A generic resource adapter for any JMS server.
+@@ -54,7 +54,7 @@
+ private BootstrapContext ctx;
+ /** The activations by activation spec */
+- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap activations = new ConcurrentHashMap();
+
+ /**
+ * Get the work manager
+Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2007-10-22 16:56:38.000000000 +0200
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2007-11-06 22:59:39.000000000 +0100
+@@ -35,7 +35,7 @@
+ import org.jboss.resource.adapter.mail.inflow.MailActivationSpec;
+ import org.jboss.resource.adapter.mail.inflow.NewMsgsWorker;
import org.jboss.logging.Logger;
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
- /** Invoker thread for StatelessSession tests.
- * Adapted from the EJB 2.1 tests (org.jboss.test.cts.test.SessionInvoker)
-Index: 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-10-22 16:44:12.000000000 +0200
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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;
+ /**
+ * @author Scott.Stark at jboss.org
+@@ -48,7 +48,7 @@
+ private BootstrapContext ctx;
+ /** The activations by activation spec */
+- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap activations = new ConcurrentHashMap();
+ /** */
+ private NewMsgsWorker newMsgsWorker;
-Index: jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java
+Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-10-22 16:49:57.000000000 +0200
-+++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-11-06 14:52:09.000000000 +0100
-@@ -31,8 +31,8 @@
- import org.jboss.jms.server.list.MessageList;
- import org.jboss.jms.server.list.StandardMessageComparator;
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2007-10-22 16:56:44.000000000 +0200
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2007-11-06 22:59:39.000000000 +0100
+@@ -45,7 +45,7 @@
+ import org.jboss.system.ServiceMBeanSupport;
+ import org.jboss.tm.TransactionLocal;
--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;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
/**
- * An in memory implementation of the message list
-Index: jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java
+ * The JBossManagedConnectionPool mbean configures and supplies pooling of
+@@ -409,7 +409,7 @@
+ public abstract static class BasePool implements ManagedConnectionPool, PreFillPoolSupport
+ {
+ /** The subpools */
+- private final Map subPools = new ConcurrentReaderHashMap();
++ private final Map subPools = new ConcurrentHashMap();
+
+ /** The managed connection factory */
+ private final ManagedConnectionFactory mcf;
+Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-10-22 16:50:04.000000000 +0200
-+++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-11-06 14:52:09.000000000 +0100
-@@ -30,7 +30,7 @@
- import org.jboss.messaging.interfaces.MessageReference;
- import org.jboss.messaging.interfaces.MessageSet;
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2007-10-22 16:56:42.000000000 +0200
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2007-11-06 22:59:39.000000000 +0100
+@@ -25,7 +25,7 @@
+ import java.util.Iterator;
+ import java.util.Locale;
--import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-+import java.util.concurrent.locks.ReentrantLock;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
/**
- * An in memory message set
-Index: jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java
+ * Connector meta data
+@@ -59,7 +59,7 @@
+ private LicenseMetaData lmd = new LicenseMetaData();
+
+ /** The descriptions */
+- private ConcurrentReaderHashMap descriptions = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap descriptions = new ConcurrentHashMap();
+
+ /** The connection definitions */
+ private HashSet connectionDefinitions = new HashSet();
+Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-10-22 16:49:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-11-06 14:52:09.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2007-10-22 16:56:42.000000000 +0200
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2007-11-06 22:59:39.000000000 +0100
@@ -26,7 +26,7 @@
- import org.jboss.messaging.interfaces.MessageAddress;
- import org.jboss.messaging.interfaces.MessageReference;
+ import java.util.Iterator;
+ import java.util.Locale;
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.SynchronizedLong;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
/**
- * A simple implementation of a message reference
-Index: 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-10-22 16:57:26.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 14:52:09.000000000 +0100
-@@ -33,7 +33,7 @@
+ * An abstract class for meta data that has descriptions
+@@ -39,7 +39,7 @@
+ private static final long serialVersionUID = 2831943526217092377L;
- import org.jboss.mx.util.ObservedObject;
+ /** The descriptions */
+- private ConcurrentReaderHashMap descriptions = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap descriptions = new ConcurrentHashMap();
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+ public DescriptionMetaDataContainer()
+ {
+Index: jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2007-10-22 16:45:20.000000000 +0200
++++ jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2007-11-06 22:59:39.000000000 +0100
+@@ -27,7 +27,7 @@
+ import java.util.Iterator;
+ import java.util.Map;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /** A method invocation statistics collection class.
+ *
+@@ -65,7 +65,7 @@
+
+ public InvocationStatistics()
+ {
+- methodStats = new ConcurrentReaderHashMap();
++ methodStats = new ConcurrentHashMap();
+ }
+
+ /** Update the TimeStatistic for the given method. This synchronizes on
+Index: jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2007-10-22 16:43:43.000000000 +0200
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2007-11-06 22:59:39.000000000 +0100
+@@ -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;
/**
- * The monitor service.
+ * A TestResourceAdapter.
+@@ -52,7 +52,7 @@
+
+ BootstrapContext ctx;
+
+- ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
++ ConcurrentHashMap endpoints = new ConcurrentHashMap();
+
+ public TestResourceAdapterInflowResults testInflow() throws Exception
+ {
Index: 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-10-22 16:57:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 22:59:39.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.mx.loading;
@@ -295,20 +382,17 @@
Index: 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-10-22 16:57:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 14:52:09.000000000 +0100
-@@ -45,8 +45,9 @@
- import org.jboss.util.loading.Translator;
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 22:59:39.000000000 +0100
+@@ -46,7 +46,7 @@
import org.jboss.util.collection.SoftSet;
--import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
+ import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.locks.ReentrantLock;
-+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A RepositoryClassLoader.
-@@ -82,7 +83,7 @@
+@@ -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 */
@@ -317,81 +401,10 @@
/** Lock */
protected ReentrantLock loadLock = new ReentrantLock();
-@@ -509,7 +510,7 @@
- {
- Thread t = Thread.currentThread();
- // Register this thread as owning this UCL
-- if( loadLock.holds() == 1 )
-+ if( loadLock.getHoldCount() == 1 )
- LoadMgr3.registerLoaderThread(this, t);
-
- // Create a class loading task and submit it to the repository
-@@ -537,7 +538,7 @@
- finally
- {
- // Unregister as the UCL owner to reschedule any remaining load tasks
-- if( loadLock.holds() == 1 )
-+ if( loadLock.getHoldCount() == 1 )
- LoadMgr3.endLoadTask(task);
- // Notify any threads waiting to use this UCL
- this.release();
-@@ -808,7 +809,7 @@
- boolean threadWasInterrupted = Thread.interrupted();
- try
- {
-- acquired = loadLock.attempt(waitMS);
-+ acquired = loadLock.tryLock(waitMS, TimeUnit.MILLISECONDS);
- }
- catch(InterruptedException e)
- {
-@@ -820,7 +821,7 @@
- Thread.currentThread().interrupt();
- }
- if( trace )
-- log.trace("attempt("+loadLock.holds()+") was: "+acquired+" for :"+this);
-+ log.trace("attempt("+loadLock.getHoldCount()+") was: "+acquired+" for :"+this);
- return acquired;
- }
-
-@@ -834,10 +835,7 @@
- boolean threadWasInterrupted = Thread.interrupted();
- try
- {
-- loadLock.acquire();
-- }
-- catch(InterruptedException e)
-- {
-+ loadLock.lock();
- }
- finally
- {
-@@ -846,7 +844,7 @@
- Thread.currentThread().interrupt();
- }
- if( log.isTraceEnabled() )
-- log.trace("acquired("+loadLock.holds()+") for :"+this);
-+ log.trace("acquired("+loadLock.getHoldCount()+") for :"+this);
- }
- /** Release the class loading lock previous acquired through the acquire
- * method.
-@@ -854,10 +852,10 @@
- protected void release()
- {
- if( log.isTraceEnabled() )
-- log.trace("release("+loadLock.holds()+") for :"+this);
-- loadLock.release();
-+ log.trace("release("+loadLock.getHoldCount()+") for :"+this);
-+ loadLock.unlock();
- if( log.isTraceEnabled() )
-- log.trace("released, holds: "+loadLock.holds());
-+ log.trace("released, holds: "+loadLock.getHoldCount());
- }
-
- /** Obtain the bytecode for the indicated class from this class loaders
Index: 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-10-22 16:57:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 23:01:26.000000000 +0100
@@ -49,8 +49,8 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
@@ -424,18 +437,16 @@
Index: 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-10-22 16:57:16.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 14:52:09.000000000 +0100
-@@ -49,8 +49,8 @@
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 22:59:39.000000000 +0100
+@@ -49,7 +49,7 @@
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.atomic.AtomicLong;
+ import EDU.oswego.cs.dl.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
@@ -445,39 +456,6 @@
/**
* The default domain for this registry
-@@ -116,12 +116,12 @@
- /**
- * Sequence number for the MBean server registration notifications.
- */
-- protected final SynchronizedLong registrationNotificationSequence = new SynchronizedLong (1);
-+ protected final AtomicLong registrationNotificationSequence = new AtomicLong (1);
-
- /**
- * Sequence number for the MBean server unregistration notifications.
- */
-- protected final SynchronizedLong unregistrationNotificationSequence = new SynchronizedLong (1);
-+ protected final AtomicLong unregistrationNotificationSequence = new AtomicLong (1);
-
- /**
- * Direct reference to the mandatory MBean server delegate MBean.
-@@ -384,7 +384,7 @@
- */
- protected void sendRegistrationNotification (ObjectName regName)
- {
-- long sequence = registrationNotificationSequence.increment ();
-+ long sequence = registrationNotificationSequence.incrementAndGet ();
- delegate.sendNotification (
- new MBeanServerNotification (
- MBeanServerNotification.REGISTRATION_NOTIFICATION,
-@@ -490,7 +490,7 @@
- */
- protected void sendUnRegistrationNotification (ObjectName name)
- {
-- long sequence = unregistrationNotificationSequence.increment ();
-+ long sequence = unregistrationNotificationSequence.incrementAndGet ();
-
- delegate.sendNotification (
- new MBeanServerNotification (
@@ -959,9 +959,9 @@
Map mbeanMap = (Map) domainMap.get(domain);
if (mbeanMap == null && createIfMissing)
@@ -491,106 +469,10 @@
-}
\ No newline at end of file
+}
-Index: 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-10-22 16:57:19.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-11-06 14:52:09.000000000 +0100
-@@ -30,7 +30,7 @@
- import javax.management.MBeanServer;
- import javax.management.ObjectName;
-
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.atomic.AtomicLong;
-
- import org.jboss.mx.server.ServerConstants;
-
-@@ -49,7 +49,7 @@
- implements ServerConstants
- {
- // Static ----------------------------------------------------
-- private static SynchronizedLong id = new SynchronizedLong(0);
-+ private static AtomicLong id = new AtomicLong(0);
-
- private static final Random rand = new Random(System.currentTimeMillis());
-
-@@ -85,7 +85,7 @@
- // MBeanServerID is unique across multiple JVMs, even on the same host
- String vmid = new java.rmi.dgc.VMID().toString().replace(':','x').replace('-','X') + rand.nextInt(100);
-
-- return ipAddress + "/" + System.currentTimeMillis() + "/" + vmid + "/"+ (id.increment());
-+ return ipAddress + "/" + System.currentTimeMillis() + "/" + vmid + "/"+ (id.incrementAndGet());
- }
- /**
- * test
-Index: 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-10-22 16:57:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.atomic.AtomicLong;
-
- /**
- * A helper class for notification broadcasters/emitters
-@@ -54,7 +54,7 @@
- private ListenerRegistry registry = new ListenerRegistry();
-
- /** Sequence number for jmx notifications we send out */
-- private SynchronizedLong sequenceNumber = new SynchronizedLong(0);
-+ private AtomicLong sequenceNumber = new AtomicLong(0);
-
- /**
- * Construct the new notification broadcaster support object
-@@ -140,6 +140,6 @@
- */
- public long nextNotificationSequenceNumber()
- {
-- return sequenceNumber.increment();
-+ return sequenceNumber.incrementAndGet();
- }
- }
-Index: 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 14:52:09.000000000 +0100
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
-Index: 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-10-22 16:57:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-11-06 14:52:09.000000000 +0100
-@@ -21,7 +21,7 @@
- */
- package org.jboss.mx.util;
-
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.atomic.AtomicLong;
-
- /**
- * A schedulable runnable.<p>
-@@ -52,7 +52,7 @@
- /**
- * The next run timestamp
- */
-- private SynchronizedLong nextRun = new SynchronizedLong(0);
-+ private AtomicLong nextRun = new AtomicLong(0);
-
- /**
- * The current scheduler
Index: 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-10-22 17:00:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 22:59:39.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.SessionMetaData;
@@ -613,174 +495,32 @@
static ObjectName getEJBModuleName(ObjectName ejbModuleService)
{
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java
+Index: 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/Connection.java 2007-10-22 17:00:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java 2007-11-06 14:52:09.000000000 +0100
-@@ -44,10 +44,10 @@
- import org.jboss.mq.il.ServerIL;
- import org.jboss.util.UnreachableStatementException;
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-10-22 17:00:47.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 22:59:39.000000000 +0100
+@@ -25,7 +25,7 @@
+ import java.util.Map;
+ import java.util.ArrayList;
--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.
-Index: 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-10-22 17:00:39.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
-Index: 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-10-22 17:00:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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 EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+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
-Index: 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-10-22 17:00:45.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 17:00:45.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 17:00:45.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
- *
-Index: 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-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
-Index: 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-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 17:00:36.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
+ 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;
+
Index: 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-10-22 17:00:34.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 22:59:39.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.il.jvm.JVMClientIL;
@@ -802,7 +542,7 @@
Index: 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-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 22:59:39.000000000 +0100
@@ -56,7 +56,7 @@
import org.jboss.util.threadpool.ThreadPool;
import org.jboss.util.timeout.TimeoutFactory;
@@ -837,7 +577,7 @@
Index: 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-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 22:59:39.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.pm.PersistenceManager;
import org.jboss.mq.pm.Tx;
@@ -858,333 +598,272 @@
public JMSTopic(SpyDestination dest, ClientConsumer temporary, JMSDestinationManager server, BasicQueueParameters parameters) throws JMSException
{
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java
+Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-10-22 17:00:34.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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;
+--- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2007-10-22 17:00:06.000000000 +0200
++++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2007-11-06 22:59:39.000000000 +0100
+@@ -40,7 +40,7 @@
+ import javax.security.auth.Subject;
- /**
- * This class implements a Message cache so that larger amounts of messages
-Index: 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-10-22 17:00:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-11-06 14:52:09.000000000 +0100
-@@ -32,7 +32,7 @@
-
import org.jboss.logging.Logger;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-+import java.util.concurrent.SynchronizedInt;
-
/**
- * This class implements javax.jms.ConnectionConsumer
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java
+ * A JAAC Policy provider implementation that delegates any non-JACC permissions
+@@ -62,12 +62,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
+ */
+Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-10-22 17:00:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-11-06 14:52:09.000000000 +0100
-@@ -35,7 +35,7 @@
- import org.jboss.logging.Logger;
- import org.jboss.util.UnreachableStatementException;
+--- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2007-10-22 17:00:06.000000000 +0200
++++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2007-11-06 22:59:39.000000000 +0100
+@@ -27,7 +27,7 @@
+ import javax.security.jacc.PolicyConfiguration;
+ import javax.security.jacc.PolicyContextException;
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-+import java.util.concurrent.SynchronizedBoolean;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.util.state.StateMachine;
+ import org.jboss.util.state.xml.StateMachineParser;
- /**
- * This class implements <tt>javax.jms.MessageConsumer</tt>.
-Index: 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-10-22 17:00:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-11-06 14:52:09.000000000 +0100
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
+ extends PolicyConfigurationFactory
+ {
+ private StateMachine configStateMachine;
+- private ConcurrentReaderHashMap policyConfigMap = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap policyConfigMap = new ConcurrentHashMap();
+ private DelegatingPolicy policy;
- import org.jboss.logging.Logger;
-
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-+import java.util.concurrent.SynchronizedBoolean;
-
- /**
- * This class implements javax.jms.MessageProducer
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java
+ /** Build the JACC policy configuration state machine from the
+Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpySession.java 2007-10-22 17:00:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java 2007-11-06 14:52:09.000000000 +0100
-@@ -56,7 +56,7 @@
+--- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2007-10-22 17:00:05.000000000 +0200
++++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2007-11-06 22:59:39.000000000 +0100
+@@ -63,7 +63,7 @@
+ import org.jboss.system.ServiceMBeanSupport;
+ import org.jboss.util.CachePolicy;
+ import org.jboss.util.TimedCachePolicy;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
- 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
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
+ * This is a JMX service which manages JAAS based SecurityManagers.
+@@ -109,7 +109,7 @@
+ private static String securityProxyFactoryClassName = "org.jboss.security.SubjectSecurityProxyFactory";
+ private static Class securityProxyFactoryClass = org.jboss.security.SubjectSecurityProxyFactory.class;
+ /** A mapping from security domain name to a SecurityDomainContext object */
+- private static ConcurrentReaderHashMap securityDomainCtxMap = new ConcurrentReaderHashMap();
++ private static ConcurrentHashMap securityDomainCtxMap = new ConcurrentHashMap();
+ private static NameParser parser;
+ /** A flag indicating if the SecurityAssociation.setServer should be called */
+ private boolean serverMode = true;
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/deployment/EARDeployment.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-10-22 17:00:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 14:52:09.000000000 +0100
-@@ -25,7 +25,7 @@
- import java.util.Map;
- import java.util.ArrayList;
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/deployment/EARDeployment.java 2007-10-22 16:59:06.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/deployment/EARDeployment.java 2007-11-06 22:59:39.000000000 +0100
+@@ -28,7 +28,7 @@
+ import org.jboss.mx.util.ObjectNameFactory;
+ import org.jboss.system.ServiceMBeanSupport;
-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;
-
-Index: 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-10-22 16:50:15.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:50:15.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -57,7 +57,7 @@
- import org.jgroups.stack.GossipRouter;
- import org.jgroups.stack.IpAddress;
+ * An EAR Deployment
+@@ -53,7 +53,7 @@
+ // Attributes ----------------------------------------------------
--import EDU.oswego.cs.dl.util.concurrent.Semaphore;
-+import java.util.concurrent.Semaphore;
+ private DeploymentInfo deploymentInfo;
+- private ConcurrentReaderHashMap metadata = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap metadata = new ConcurrentHashMap();
- /** Tests of the DistributedReplicantManagerImpl
- *
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java
+ // Static --------------------------------------------------------
+
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-10-22 16:50:15.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -29,7 +29,7 @@
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2007-10-22 16:59:33.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2007-11-06 22:59:39.000000000 +0100
+@@ -33,7 +33,7 @@
+ import org.jboss.ejb.EnterpriseContext;
+ import org.jboss.ejb.StatefulSessionEnterpriseContext;
+ import org.jboss.ejb.StatefulSessionPersistenceManager;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
- 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.
-Index: 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-10-22 16:50:24.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-11-06 14:52:09.000000000 +0100
-@@ -29,7 +29,7 @@
- import javax.jms.Message;
- import javax.jms.ObjectMessage;
+ * Cache for stateful session beans.
+@@ -54,7 +54,7 @@
+ /** The map<id, Long> that holds passivated bean ids that have been removed
+ * from the cache and passivated to the pm along with the time of passivation
+ */
+- private ConcurrentReaderHashMap passivatedIDs = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap passivatedIDs = new ConcurrentHashMap();
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
- import org.apache.log4j.Category;
+ /* Ids that are currently being activated */
+ private HashSet activating = new HashSet();
+@@ -250,4 +250,4 @@
- /**
-Index: 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-10-22 16:50:24.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -28,7 +28,7 @@
- import javax.jms.QueueSession;
- import javax.naming.InitialContext;
+ // Inner classes -------------------------------------------------
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
- import junit.framework.Test;
- import org.jboss.test.JBossTestCase;
-
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-10-22 16:50:24.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-11-06 14:52:09.000000000 +0100
-@@ -25,7 +25,7 @@
- import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/InvocationStatistics.java 2007-10-22 16:59:44.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java 2007-11-06 22:59:39.000000000 +0100
+@@ -27,7 +27,7 @@
+ import java.util.Iterator;
+ import java.util.Map;
- import org.apache.log4j.Category;
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
- /** Invoker thread for StatelessSession tests.
- * @author Scott.Stark at jboss.org
-Index: 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-10-22 16:50:24.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
-Index: 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-10-22 16:50:24.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
+ /** A method invocation statistics collection class.
*
-Index: 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-10-22 16:50:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 14:52:09.000000000 +0100
-@@ -34,8 +34,8 @@
- import javax.security.auth.Subject;
- import javax.transaction.xa.XAResource;
+@@ -69,7 +69,7 @@
--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 InvocationStatistics()
+ {
+- methodStats = new ConcurrentReaderHashMap();
++ methodStats = new ConcurrentHashMap();
+ }
- public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
- {
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java
+ /** Update the TimeStatistic for the given method. This synchronizes on
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-10-22 16:51:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-11-06 14:52:09.000000000 +0100
-@@ -39,7 +39,7 @@
- import org.apache.log4j.Category;
- import org.jboss.test.JBossTestCase;
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2007-10-22 16:59:41.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2007-11-06 22:59:39.000000000 +0100
+@@ -55,7 +55,7 @@
+ import org.jboss.invocation.Invoker;
+ import org.jboss.tm.TransactionPropagationContextFactory;
+ import org.jboss.logging.Logger;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
--import EDU.oswego.cs.dl.util.concurrent.Semaphore;
-+import java.util.concurrent.Semaphore;
/**
- * JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
-Index: 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-10-22 16:51:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -22,7 +22,7 @@
- package org.jboss.test.jbossmq.perf;
+@@ -117,7 +117,7 @@
+ public static int MAX_RETRIES = 10;
- import junit.textui.TestRunner;
--import EDU.oswego.cs.dl.util.concurrent.Semaphore;
-+import java.util.concurrent.Semaphore;
+ /** A class wide pool Map<ServerAddres, LinkedList<ClientSocket>> */
+- protected static final Map connectionPools = new ConcurrentReaderHashMap();
++ protected static final Map connectionPools = new ConcurrentHashMap();
- /**
- * JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java
+ /**
+ * connection information
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-10-22 16:51:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -22,7 +22,7 @@
- package org.jboss.test.jbossmq.perf;
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-10-22 16:59:05.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-11-06 22:59:39.000000000 +0100
+@@ -40,7 +40,7 @@
+ import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
+ import org.w3c.dom.Element;
- import junit.textui.TestRunner;
--import EDU.oswego.cs.dl.util.concurrent.Semaphore;
-+import java.util.concurrent.Semaphore;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
- /**
- * JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
-Index: 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-10-22 16:51:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java
+@@ -126,13 +126,13 @@
+ private HashMap messageDestinationReferences = new HashMap();
+ /** The method attributes */
+ private ArrayList methodAttributes = new ArrayList();
+- private ConcurrentReaderHashMap cachedMethodAttributes = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap cachedMethodAttributes = new ConcurrentHashMap();
+ /** The assembly-descriptor/method-permission element(s) info */
+ private ArrayList permissionMethods = new ArrayList();
+ /** The assembly-descriptor/container-transaction element(s) info */
+ private ArrayList transactionMethods = new ArrayList();
+ /** A cache mapping methods to transaction attributes. */
+- private ConcurrentReaderHashMap methodTx = new ConcurrentReaderHashMap();
++ private ConcurrentHashMap methodTx = new ConcurrentHashMap();
+ /** The assembly-descriptor/exclude-list method(s) */
+ private ArrayList excludedMethods = new ArrayList();
+ /** The invoker names to JNDI name mapping */
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/web/WebServer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-10-22 16:51:45.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-11-06 14:52:09.000000000 +0100
-@@ -30,7 +30,7 @@
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/web/WebServer.java 2007-10-22 16:59:46.000000000 +0200
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/web/WebServer.java 2007-11-06 22:59:39.000000000 +0100
+@@ -39,7 +39,7 @@
+ import org.jboss.util.threadpool.BasicThreadPool;
+ import org.jboss.util.threadpool.BasicThreadPoolMBean;
- import org.jboss.test.JBossTestCase;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
--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
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
+ * A mini webserver that should be embedded in another application. It can
+@@ -84,7 +84,7 @@
+ /**
+ * The map of class loaders registered with the web server
+ */
+- private final ConcurrentReaderHashMap loaderMap = new ConcurrentReaderHashMap();
++ private final ConcurrentHashMap loaderMap = new ConcurrentHashMap();
+
+ /**
+ * The web server http listening socket
+Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-10-22 16:51:45.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-11-06 14:52:09.000000000 +0100
-@@ -57,7 +57,7 @@
- import org.apache.log4j.Category;
- import org.jboss.test.JBossTestCase;
+--- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2007-10-22 16:48:52.000000000 +0200
++++ jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2007-11-06 22:59:39.000000000 +0100
+@@ -60,7 +60,7 @@
+ import org.w3c.dom.NodeList;
+ import org.xml.sax.InputSource;
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
/**
- * Basic jms tests.
-Index: 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-10-22 16:51:46.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-11-06 14:52:09.000000000 +0100
-@@ -46,7 +46,7 @@
- import javax.naming.Context;
- import javax.naming.InitialContext;
+ * This is the main Service Deployer API.
+@@ -109,7 +109,7 @@
+ * A Map<String, List<String>> of the suffix to accepted archive META-INF descriptor name
+ * @todo externalize this
+ */
+- private Map suffixToDescriptorMap = new ConcurrentReaderHashMap();
++ private Map suffixToDescriptorMap = new ConcurrentHashMap();
--import EDU.oswego.cs.dl.util.concurrent.CountDown;
-+import java.util.concurrent.CountDown;
- import org.apache.log4j.Category;
- import org.jboss.test.JBossTestCase;
-
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
+ /** A flag indicating if the parser used for the service descriptor should be configured for namespaces */
+ private boolean useNamespaceAwareParser;
+Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-10-22 16:50:34.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-11-06 14:52:09.000000000 +0100
-@@ -37,7 +37,7 @@
+--- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/system/Registry.java 2007-10-22 16:48:55.000000000 +0200
++++ jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java 2007-11-06 22:59:39.000000000 +0100
+@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-+import java.util.concurrent.SynchronizedInt;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
/**
- * ManagedConnectionFactory.java
-Index: 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-10-22 16:50:34.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
+ * A registry, really, a registry.
+@@ -41,7 +41,7 @@
+ {
+ private static final Logger log = Logger.getLogger(Registry.class);
+
+- public static Map entries = new ConcurrentReaderHashMap();
++ public static Map entries = new ConcurrentHashMap();
+
+ public static void bind(final Object key, final Object value)
+ {
Index: 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-10-22 16:50:37.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 22:59:39.000000000 +0100
@@ -31,7 +31,7 @@
import javax.transaction.xa.XAResource;
@@ -1206,7 +885,7 @@
Index: 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-10-22 16:50:40.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 22:59:39.000000000 +0100
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
@@ -1225,131 +904,10 @@
public TestResourceAdapterInflowResults testInflow() throws Exception
{
-Index: 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-10-22 16:50:33.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:50:12.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:51:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:51:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:51:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:51:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.
-Index: 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-10-22 16:51:01.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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.locks.ReentrantLock;
-
- /**
- * Test of the TreeCacheSSOClusterManager class.
-Index: 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-10-22 16:49:40.000000000 +0200
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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>
-Index: 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-10-22 16:49:37.000000000 +0200
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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;
-
-
- /**
Index: 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-10-22 16:49:40.000000000 +0200
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 22:59:39.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
@@ -1377,127 +935,29 @@
}
public void updatePassivationStats(String ctx, long elapsed)
-Index: jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
===================================================================
---- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-10-22 16:49:29.000000000 +0200
-+++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 14:52:09.000000000 +0100
-@@ -33,8 +33,8 @@
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 23:00:53.000000000 +0100
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 23:01:36.000000000 +0100
+@@ -34,7 +34,7 @@
+ import javax.security.auth.Subject;
+ import javax.transaction.xa.XAResource;
- import org.jboss.util.NestedRuntimeException;
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.CopyOnWriteArraySet;
+ import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
--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.locks.ReentrantLock;
-
- /**
- * An implementation of the transaction local implementation
-Index: jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java
+ public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
===================================================================
---- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-10-22 16:58:49.000000000 +0200
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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 $
- *
-Index: 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-10-22 16:58:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-11-06 14:52:09.000000000 +0100
-@@ -31,7 +31,7 @@
-
- import org.jboss.system.ServiceMBeanSupport;
-
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.SynchronizedLong;
-
- /**
- * AlarmTable
-Index: 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-10-22 16:58:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
-Index: 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-10-22 16:58:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-11-06 14:52:09.000000000 +0100
-@@ -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
-Index: 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-10-22 16:58:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-11-06 14:52:09.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 23:00:53.000000000 +0100
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 23:01:39.000000000 +0100
@@ -34,7 +34,7 @@
- import org.jboss.monitor.alarm.AlarmManager;
- import org.jboss.system.ListenerServiceMBeanSupport;
+ import javax.security.auth.Subject;
+ import javax.transaction.xa.XAResource;
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.SynchronizedLong;
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.CopyOnWriteArraySet;
+ import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
/**
- * A simple listener that can subscribe for any combination
-Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java
-===================================================================
---- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2007-11-06 14:55:57.000000000 +0100
-+++ jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2007-11-06 14:56:49.000000000 +0100
-@@ -60,7 +60,7 @@
- import org.w3c.dom.NodeList;
- import org.xml.sax.InputSource;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
-
- /**
- * This is the main Service Deployer API.
-@@ -109,7 +109,7 @@
- * A Map<String, List<String>> of the suffix to accepted archive META-INF descriptor name
- * @todo externalize this
- */
-- private Map suffixToDescriptorMap = new ConcurrentReaderHashMap();
-+ private Map suffixToDescriptorMap = new ConcurrentHashMap();
-
- /** A flag indicating if the parser used for the service descriptor should be configured for namespaces */
- private boolean useNamespaceAwareParser;
-Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java
-===================================================================
---- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/system/Registry.java 2007-11-06 14:56:58.000000000 +0100
-+++ jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java 2007-11-06 14:57:16.000000000 +0100
-@@ -25,7 +25,7 @@
-
- import org.jboss.logging.Logger;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
-
- /**
- * A registry, really, a registry.
-@@ -41,7 +41,7 @@
- {
- private static final Logger log = Logger.getLogger(Registry.class);
-
-- public static Map entries = new ConcurrentReaderHashMap();
-+ public static Map entries = new ConcurrentHashMap();
-
- public static void bind(final Object key, final Object value)
- {
More information about the pkg-java-commits
mailing list