[jboss-cvs] JBossAS SVN: r76092 - in trunk/testsuite/src/main/org/jboss/test: jca/adapter and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 22 05:41:35 EDT 2008
Author: jesper.pedersen
Date: 2008-07-22 05:41:35 -0400 (Tue, 22 Jul 2008)
New Revision: 76092
Modified:
trunk/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
trunk/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java
trunk/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
Log:
[JBAS-5788] Replace Oswego usage with java.util.concurrent
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -23,6 +23,8 @@
import java.io.PrintWriter;
import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionEvent;
@@ -34,12 +36,9 @@
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;
-
public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
{
- private SynchronizedBoolean destroyed = new SynchronizedBoolean(false);
+ private AtomicBoolean destroyed = new AtomicBoolean(false);
private CopyOnWriteArraySet connections = new CopyOnWriteArraySet();
private CopyOnWriteArraySet listeners = new CopyOnWriteArraySet();
//private MCF1ManagedConnectionFactory mcf;
Modified: trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -28,6 +28,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionEvent;
@@ -45,8 +46,6 @@
import org.jboss.logging.Logger;
import org.jboss.tm.TxUtils;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-
/**
* TestManagedConnection.java
*
@@ -75,7 +74,7 @@
private GlobalXID currentXid;
- private SynchronizedBoolean destroyed = new SynchronizedBoolean(false);
+ private AtomicBoolean destroyed = new AtomicBoolean(false);
private boolean failInPrepare = false;
private boolean failInCommit = false;
Modified: trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -27,6 +27,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionManager;
import javax.resource.spi.ConnectionRequestInfo;
@@ -36,8 +38,6 @@
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
/**
* ManagedConnectionFactory.java
*
@@ -53,7 +53,7 @@
private Logger log = Logger.getLogger(TestManagedConnectionFactory.class);
//number the managed connections
- SynchronizedInt id = new SynchronizedInt(0);
+ AtomicInteger id = new AtomicInteger(0);
String failure;
@@ -141,7 +141,7 @@
throw new ResourceException("");
if (failure != null && failure.equals("createManagedConnectionRuntime"))
throw new RuntimeException("");
- return new TestManagedConnection(this, subject, (TestConnectionRequestInfo)cri, id.increment());
+ return new TestManagedConnection(this, subject, (TestConnectionRequestInfo)cri, id.incrementAndGet());
}
public ManagedConnection matchManagedConnections(Set candidates, Subject subject, ConnectionRequestInfo cri) throws ResourceException
Modified: trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.jca.fs;
+import java.util.concurrent.ConcurrentHashMap;
+
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.BootstrapContext;
@@ -31,7 +33,6 @@
import javax.transaction.xa.XAResource;
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
/** The ResourceAdapter for the file system based DirContext
*
@@ -44,7 +45,7 @@
private BootstrapContext ctx;
/** The activations by activation spec */
- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap activations = new ConcurrentHashMap();
/**
* Get the work manager
Modified: trunk/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -38,8 +39,6 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-
/**
* A TestResourceAdapter.
*
@@ -52,7 +51,7 @@
BootstrapContext ctx;
- ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
+ ConcurrentHashMap endpoints = new ConcurrentHashMap();
public TestResourceAdapterInflowResults testInflow() throws Exception
{
Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -22,12 +22,11 @@
package org.jboss.test.jca.test;
import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.logging.Logger;
import org.jboss.test.util.ejb.EJBTestCase;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
/**
* Abstract concurrent stress test.
*
@@ -41,7 +40,7 @@
private ArrayList done = new ArrayList();
private int total;
private Throwable failed = null;
- private SynchronizedInt nextId = new SynchronizedInt(0);
+ private AtomicInteger nextId = new AtomicInteger(0);
public interface ConcurrentTestCallback
{
@@ -77,7 +76,7 @@
public ConcurrentRunnable()
{
- id = nextId.increment();
+ id = nextId.incrementAndGet();
}
public abstract void doStart() throws Throwable;
Modified: trunk/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-07-22 09:18:37 UTC (rev 76091)
+++ trunk/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-07-22 09:41:35 UTC (rev 76092)
@@ -23,6 +23,8 @@
import java.io.PrintWriter;
import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionEvent;
@@ -34,9 +36,6 @@
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;
-
/**
* A PropertyTestManagedConnection.
*
@@ -45,7 +44,7 @@
*/
public class PropertyTestManagedConnection implements ManagedConnection, LocalTransaction
{
- private SynchronizedBoolean destroyed = new SynchronizedBoolean(false);
+ private AtomicBoolean destroyed = new AtomicBoolean(false);
private CopyOnWriteArraySet connections = new CopyOnWriteArraySet();
private CopyOnWriteArraySet listeners = new CopyOnWriteArraySet();
//private PropertyTestManagedConnectionFactory mcf;
More information about the jboss-cvs-commits
mailing list