Index: libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/LeasePinger.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/src/org/jboss/remoting/LeasePinger.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/LeasePinger.java 2007-11-06 09:50:29.000000000 +0100 @@ -9,7 +9,7 @@ import java.util.Timer; import java.util.TimerTask; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; /** * Internal agent class to ping the remote server to keep lease alive. Index: libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/ServerInvoker.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/src/org/jboss/remoting/ServerInvoker.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/ServerInvoker.java 2007-11-06 09:50:34.000000000 +0100 @@ -43,7 +43,7 @@ import org.jboss.util.threadpool.ThreadPoolMBean; import org.jboss.logging.Logger; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import javax.management.MBeanServer; import javax.management.MBeanServerInvocationHandler; Index: libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2007-11-06 09:50:37.000000000 +0100 @@ -21,7 +21,7 @@ */ package org.jboss.remoting.marshal.encryption; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.jboss.logging.Logger; import javax.crypto.Cipher; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2007-11-06 09:50:44.000000000 +0100 @@ -59,7 +59,7 @@ "javax.servlet.ServletInputStream", "org.apache.coyote.Adapter", "org.jboss.serial.io.JBossObjectOutputStream", - "EDU.oswego.cs.dl.util.concurrent.SynchronizedLong"}; + "java.util.concurrent.SynchronizedLong"}; URL[] urls = getLibUrls(classUrls); URLClassLoader urlclassloader = new URLClassLoader(urls, null); TestClassLoader classloader = new TestClassLoader(urlclassloader); Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2007-11-06 09:50:48.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.rmi; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; @@ -130,4 +130,4 @@ } } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2007-11-06 09:50:52.000000000 +0100 @@ -30,7 +30,7 @@ import org.jboss.remoting.callback.HandleCallbackException; import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; /** * @author Tom Elrod @@ -122,4 +122,4 @@ e.printStackTrace(); } } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2007-11-06 09:50:54.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.rmi; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; @@ -129,4 +129,4 @@ throw new Exception("Was not able to find remote method call for " + method); } } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2007-11-06 09:50:56.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.rmi; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.jboss.logging.Logger; import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; @@ -132,4 +132,4 @@ e.printStackTrace(); } } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2007-11-06 09:50:58.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.socket; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; @@ -196,4 +196,4 @@ } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2007-11-06 09:51:00.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.socket; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.Callback; import org.jboss.remoting.callback.HandleCallbackException; import org.jboss.test.remoting.TestUtil; @@ -181,4 +181,4 @@ } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2007-11-06 09:51:02.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.socket; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; @@ -186,4 +186,4 @@ } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2007-11-06 09:51:03.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.raw.socket; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.jboss.logging.Logger; import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; @@ -283,4 +283,4 @@ e.printStackTrace(); } } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2007-11-06 09:51:05.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.hessian.client; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.InvokerCallbackHandler; import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2007-11-06 09:51:06.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.hessian.client; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.Callback; import org.jboss.remoting.callback.HandleCallbackException; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2007-11-06 09:51:08.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.hessian.client; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2007-11-06 09:51:10.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.hessian.web; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2007-11-06 09:51:11.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.http.client; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.InvokerCallbackHandler; import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2007-11-06 09:51:13.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.http.client; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.Callback; import org.jboss.remoting.callback.HandleCallbackException; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2007-11-06 09:51:15.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.http.client; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2007-11-06 09:51:16.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.http.web; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2007-11-06 09:51:18.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.rmi; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; @@ -208,4 +208,4 @@ } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2007-11-06 09:51:19.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.rmi; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.InvokerCallbackHandler; import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper; @@ -22,4 +22,4 @@ void setClientSessionId(String clientSessionId); void setServerDoneLock(Latch serverDoneLock); -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2007-11-06 09:51:21.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.rmi; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import org.jboss.remoting.callback.Callback; import org.jboss.remoting.callback.HandleCallbackException; @@ -80,4 +80,4 @@ } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2007-11-06 09:51:22.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.rmi; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; @@ -207,4 +207,4 @@ } } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2007-11-06 09:51:25.000000000 +0100 @@ -8,7 +8,7 @@ ***************************************/ package org.jboss.test.remoting.performance.spring.rmi; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; @@ -64,4 +64,4 @@ return new Integer(clientInvokeCallCount); } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2007-11-06 09:50:22.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2007-11-06 09:51:26.000000000 +0100 @@ -26,7 +26,7 @@ import org.jboss.remoting.callback.HandleCallbackException; import org.jboss.remoting.callback.InvokerCallbackHandler; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; +import java.util.concurrent.SynchronizedInt; /** * @author Tom Elrod @@ -132,4 +132,4 @@ return isDuplicate; } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2007-11-06 09:51:29.000000000 +0100 @@ -22,8 +22,8 @@ package org.jboss.test.remoting.performance.synchronous; -import EDU.oswego.cs.dl.util.concurrent.Latch; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; +import java.util.concurrent.Latch; +import java.util.concurrent.SynchronizedInt; import junit.framework.Test; import junit.framework.TestCase; import org.jboss.jrunit.controller.ThreadLocalBenchmark; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2007-11-06 09:51:31.000000000 +0100 @@ -26,7 +26,7 @@ import org.jboss.remoting.callback.HandleCallbackException; import org.jboss.remoting.callback.InvokerCallbackHandler; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; /** * @author Tom Elrod Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2007-11-06 09:51:33.000000000 +0100 @@ -22,7 +22,7 @@ package org.jboss.test.remoting.performance.synchronous; -import EDU.oswego.cs.dl.util.concurrent.Latch; +import java.util.concurrent.Latch; import junit.framework.Test; import junit.framework.TestCase; import org.jboss.jrunit.controller.ThreadLocalBenchmark; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2007-11-06 09:51:36.000000000 +0100 @@ -34,9 +34,9 @@ import org.jboss.remoting.callback.ServerInvokerCallbackHandler; import org.jboss.remoting.invocation.RemoteInvocation; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; -import EDU.oswego.cs.dl.util.concurrent.FIFOReadWriteLock; -import EDU.oswego.cs.dl.util.concurrent.SyncList; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.FIFOReadWriteLock; +import java.util.concurrent.SyncList; /** * @author Tom Elrod @@ -187,4 +187,4 @@ // and then remove from tracker or kill tracker all together. listeners.remove(callbackHandler); } -} \ No newline at end of file +} Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2007-11-06 09:51:40.000000000 +0100 @@ -1,6 +1,6 @@ package org.jboss.test.remoting.transport.socket.load; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; +import java.util.concurrent.SynchronizedInt; import junit.framework.TestCase; import org.apache.log4j.Logger; import org.jboss.remoting.Client; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2007-11-06 09:51:41.000000000 +0100 @@ -1,6 +1,6 @@ package org.jboss.test.remoting.transport.socket.timeout.idle; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; +import java.util.concurrent.SynchronizedInt; import junit.framework.TestCase; import org.apache.log4j.Logger; import org.jboss.remoting.Client; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2007-11-06 09:50:23.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2007-11-06 09:51:43.000000000 +0100 @@ -1,6 +1,6 @@ package org.jboss.test.remoting.transport.socket.timeout.idle; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; +import java.util.concurrent.SynchronizedInt; import junit.framework.TestCase; import org.apache.log4j.Logger; import org.jboss.remoting.Client; Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/util/PortUtilTestCase.java =================================================================== --- libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2007-11-06 09:49:30.000000000 +0100 +++ libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2007-11-06 09:49:57.000000000 +0100 @@ -24,7 +24,7 @@ import org.jboss.remoting.transport.PortUtil; import junit.framework.TestCase; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; +import java.util.concurrent.SynchronizedInt; /** * @author Tom Elrod @@ -111,4 +111,4 @@ } -} \ No newline at end of file +}