[jboss-cvs] JBossAS SVN: r63094 - in projects/microcontainer/trunk: container/src/main/org/jboss/reflect/plugins/javassist and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 16 07:49:35 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-16 07:49:35 -0400 (Wed, 16 May 2007)
New Revision: 63094
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/Ordering.java
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/OtherDelegate.java
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/TestDelegate.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithComplicatedLifecycle.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithLifecycle.java
Log:
Replace EDU.oswego classes with their java.util counterparts
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -23,12 +23,11 @@
import java.net.URL;
import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.jboss.aop.AspectXmlLoader;
import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList;
-
/**
*
* An AOPMicrocontainerTestDelegate.
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistReflectionFactory.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -24,6 +24,7 @@
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.concurrent.atomic.AtomicInteger;
import javassist.ClassPool;
import javassist.CtClass;
@@ -37,8 +38,6 @@
import org.jboss.util.JBossStringBuilder;
import org.jboss.util.UnreachableStatementException;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
/**
* JavassistReflectionFactory.
*
@@ -50,7 +49,7 @@
public class JavassistReflectionFactory
{
/** The method class counter */
- private static final SynchronizedInt counter = new SynchronizedInt(0);
+ private static final AtomicInteger counter = new AtomicInteger(0);
/** Whether to check arguments */
private final boolean check;
@@ -75,7 +74,7 @@
public JavassistMethod createMethod(CtMethod ctMethod) throws Throwable
{
ClassPool pool = JavassistTypeInfoFactoryImpl.pool;
- final CtClass result = pool.makeClass(JavassistMethod.class.getName() + counter.increment());
+ final CtClass result = pool.makeClass(JavassistMethod.class.getName() + counter.incrementAndGet());
/* TODO JBMICROCONT-133 figure out how to do this on all JDKs
try
{
@@ -256,7 +255,7 @@
public JavassistConstructor createConstructor(CtConstructor ctConstructor) throws Throwable
{
ClassPool pool = JavassistTypeInfoFactoryImpl.pool;
- final CtClass result = pool.makeClass(JavassistConstructor.class.getName() + counter.increment());
+ final CtClass result = pool.makeClass(JavassistConstructor.class.getName() + counter.incrementAndGet());
try
{
CtClass magic = pool.get("sun.reflect.MagicAccessorImpl");
@@ -381,7 +380,7 @@
public JavassistField createField(CtField ctField) throws Throwable
{
ClassPool pool = JavassistTypeInfoFactoryImpl.pool;
- final CtClass result = pool.makeClass(JavassistField.class.getName() + counter.increment());
+ final CtClass result = pool.makeClass(JavassistField.class.getName() + counter.incrementAndGet());
try
{
CtClass magic = pool.get("sun.reflect.MagicAccessorImpl");
Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/Ordering.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/Ordering.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/Ordering.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.dependency.controller.support;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* A Ordering.
@@ -31,7 +31,7 @@
*/
public class Ordering
{
- protected static final SynchronizedInt order = new SynchronizedInt(0);
+ protected static final AtomicInteger order = new AtomicInteger(0);
public static void resetOrder()
{
Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/OtherDelegate.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/OtherDelegate.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/OtherDelegate.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -61,62 +61,62 @@
public void describeInstall()
{
- describeInstallOrder = order.increment();
+ describeInstallOrder = order.incrementAndGet();
}
public void describeUninstall()
{
- describeUninstallOrder = order.increment();
+ describeUninstallOrder = order.incrementAndGet();
}
public void instantiateInstall()
{
- instantiateInstallOrder = order.increment();
+ instantiateInstallOrder = order.incrementAndGet();
}
public void instantiateUninstall()
{
- instantiateUninstallOrder = order.increment();
+ instantiateUninstallOrder = order.incrementAndGet();
}
public void configureInstall()
{
- configureInstallOrder = order.increment();
+ configureInstallOrder = order.incrementAndGet();
}
public void configureUninstall()
{
- configureUninstallOrder = order.increment();
+ configureUninstallOrder = order.incrementAndGet();
}
public void createInstall()
{
- createInstallOrder = order.increment();
+ createInstallOrder = order.incrementAndGet();
}
public void createUninstall()
{
- createUninstallOrder = order.increment();
+ createUninstallOrder = order.incrementAndGet();
}
public void startInstall()
{
- startInstallOrder = order.increment();
+ startInstallOrder = order.incrementAndGet();
}
public void startUninstall()
{
- startUninstallOrder = order.increment();
+ startUninstallOrder = order.incrementAndGet();
}
public void installInstall()
{
- installInstallOrder = order.increment();
+ installInstallOrder = order.incrementAndGet();
}
public void installUninstall()
{
- installUninstallOrder = order.increment();
+ installUninstallOrder = order.incrementAndGet();
}
public void addDependency(DependencyItem dependency)
Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/TestDelegate.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/TestDelegate.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/support/TestDelegate.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -85,62 +85,62 @@
public void describeInstall()
{
- describeInstallOrder = order.increment();
+ describeInstallOrder = order.incrementAndGet();
}
public void describeUninstall()
{
- describeUninstallOrder = order.increment();
+ describeUninstallOrder = order.incrementAndGet();
}
public void instantiateInstall()
{
- instantiateInstallOrder = order.increment();
+ instantiateInstallOrder = order.incrementAndGet();
}
public void instantiateUninstall()
{
- instantiateUninstallOrder = order.increment();
+ instantiateUninstallOrder = order.incrementAndGet();
}
public void configureInstall()
{
- configureInstallOrder = order.increment();
+ configureInstallOrder = order.incrementAndGet();
}
public void configureUninstall()
{
- configureUninstallOrder = order.increment();
+ configureUninstallOrder = order.incrementAndGet();
}
public void createInstall()
{
- createInstallOrder = order.increment();
+ createInstallOrder = order.incrementAndGet();
}
public void createUninstall()
{
- createUninstallOrder = order.increment();
+ createUninstallOrder = order.incrementAndGet();
}
public void startInstall()
{
- startInstallOrder = order.increment();
+ startInstallOrder = order.incrementAndGet();
}
public void startUninstall()
{
- startUninstallOrder = order.increment();
+ startUninstallOrder = order.incrementAndGet();
}
public void installInstall()
{
- installInstallOrder = order.increment();
+ installInstallOrder = order.incrementAndGet();
}
public void installUninstall()
{
- installUninstallOrder = order.increment();
+ installUninstallOrder = order.incrementAndGet();
}
public void addDependency(DependencyItem dependency)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithComplicatedLifecycle.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithComplicatedLifecycle.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithComplicatedLifecycle.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -53,27 +53,27 @@
{
createBean = bean;
destroyBean = null;
- createOrder = SimpleBeanWithLifecycle.order.increment();
+ createOrder = SimpleBeanWithLifecycle.order.incrementAndGet();
}
public void notStart(SimpleBeanWithLifecycle bean)
{
startBean = bean;
stopBean = null;
- startOrder = SimpleBeanWithLifecycle.order.increment();
+ startOrder = SimpleBeanWithLifecycle.order.incrementAndGet();
}
public void notStop(SimpleBeanWithLifecycle bean)
{
stopBean = bean;
startBean = null;
- stopOrder = SimpleBeanWithLifecycle.order.increment();
+ stopOrder = SimpleBeanWithLifecycle.order.incrementAndGet();
}
public void notDestroy(SimpleBeanWithLifecycle bean)
{
destroyBean = bean;
createBean = null;
- destroyOrder = SimpleBeanWithLifecycle.order.increment();
+ destroyOrder = SimpleBeanWithLifecycle.order.incrementAndGet();
}
}
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithLifecycle.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithLifecycle.java 2007-05-16 03:48:00 UTC (rev 63093)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/SimpleBeanWithLifecycle.java 2007-05-16 11:49:35 UTC (rev 63094)
@@ -22,9 +22,8 @@
package org.jboss.test.kernel.dependency.support;
import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicInteger;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
/**
* A simple bean with a lifecycle
*
@@ -33,7 +32,7 @@
*/
public class SimpleBeanWithLifecycle implements Serializable
{
- public static SynchronizedInt order = new SynchronizedInt(0);
+ public static AtomicInteger order = new AtomicInteger(0);
private static final long serialVersionUID = 3258132440433243443L;
@@ -52,21 +51,21 @@
public void create()
{
- createOrder = order.increment();
+ createOrder = order.incrementAndGet();
}
public void start()
{
- startOrder = order.increment();
+ startOrder = order.incrementAndGet();
}
public void stop()
{
- stopOrder = order.increment();
+ stopOrder = order.incrementAndGet();
}
public void destroy()
{
- destroyOrder = order.increment();
+ destroyOrder = order.incrementAndGet();
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list