[pkg-java] r7518 - in trunk/libjboss-remoting-java/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Thu Dec 4 23:13:45 UTC 2008
Author: twerner
Date: 2008-12-04 23:13:45 +0000 (Thu, 04 Dec 2008)
New Revision: 7518
Modified:
trunk/libjboss-remoting-java/debian/changelog
trunk/libjboss-remoting-java/debian/patches/concurrent.diff
Log:
UNRELEASED - does not build with tomcat 5.5
* New upstream release
* Refresh patch concurrent.diff.
Modified: trunk/libjboss-remoting-java/debian/changelog
===================================================================
--- trunk/libjboss-remoting-java/debian/changelog 2008-12-04 22:58:25 UTC (rev 7517)
+++ trunk/libjboss-remoting-java/debian/changelog 2008-12-04 23:13:45 UTC (rev 7518)
@@ -1,3 +1,11 @@
+libjboss-remoting-java (2.5.0.SP1-1) unstable; urgency=low
+
+ UNRELEASED - does not build with tomcat 5.5
+ * New upstream release
+ * Refresh patch concurrent.diff.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 05 Dec 2008 00:07:04 +0100
+
libjboss-remoting-java (2.4.0.SP1+dak1-1) unstable; urgency=low
* Move package to main.
Modified: trunk/libjboss-remoting-java/debian/patches/concurrent.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2008-12-04 22:58:25 UTC (rev 7517)
+++ trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2008-12-04 23:13:45 UTC (rev 7518)
@@ -1,7 +1,7 @@
-Index: libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/LeasePinger.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/src/org/jboss/remoting/LeasePinger.java 2008-12-05 00:01:50.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/LeasePinger.java 2008-12-05 00:08:16.000000000 +0100
@@ -9,7 +9,7 @@
import java.util.Timer;
import java.util.TimerTask;
@@ -11,11 +11,11 @@
/**
* 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
+Index: libjboss-remoting-java-2.5.0.SP1/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 @@
+--- libjboss-remoting-java-2.5.0.SP1.orig/src/org/jboss/remoting/ServerInvoker.java 2008-12-05 00:01:50.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/ServerInvoker.java 2008-12-05 00:08:16.000000000 +0100
+@@ -44,7 +44,7 @@
import org.jboss.util.threadpool.ThreadPoolMBean;
import org.jboss.logging.Logger;
@@ -24,10 +24,10 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerInvocationHandler;
-Index: libjboss-remoting-java-2.2.0.GA/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2008-12-05 00:01:50.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2008-12-05 00:08:16.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.remoting.marshal.encryption;
@@ -37,23 +37,23 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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 @@
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2008-12-05 00:01:50.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2008-12-05 00:08:30.000000000 +0100
+@@ -58,7 +58,7 @@
"javax.servlet.ServletInputStream",
"org.apache.coyote.Adapter",
"org.jboss.serial.io.JBossObjectOutputStream",
-- "EDU.oswego.cs.dl.util.concurrent.SynchronizedLong"};
-+ "java.util.concurrent.SynchronizedLong"};
+- "EDU.oswego.cs.dl.util.concurrent.SynchronizedLong",
++ "java.util.concurrent.SynchronizedLong",
+ "org.jboss.logging.Logger"};
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -70,10 +70,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -30,7 +30,7 @@
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
@@ -90,10 +90,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -110,10 +110,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -130,10 +130,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -150,10 +150,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -170,10 +170,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -190,10 +190,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -210,10 +210,10 @@
-}
\ 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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -223,10 +223,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -236,10 +236,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -249,10 +249,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.web;
@@ -262,10 +262,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -275,10 +275,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -288,10 +288,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -301,10 +301,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.web;
@@ -314,10 +314,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -334,10 +334,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -354,10 +354,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -374,10 +374,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -394,10 +394,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2008-12-05 00:08:16.000000000 +0100
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -414,10 +414,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2008-12-05 00:08:16.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.remoting.callback.InvokerCallbackHandler;
@@ -434,10 +434,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,8 +22,8 @@
package org.jboss.test.remoting.performance.synchronous;
@@ -449,10 +449,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2008-12-05 00:08:16.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.remoting.callback.InvokerCallbackHandler;
@@ -462,10 +462,10 @@
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2008-12-05 00:08:16.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.synchronous;
@@ -475,10 +475,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2008-12-05 00:08:16.000000000 +0100
@@ -34,9 +34,9 @@
import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
import org.jboss.remoting.invocation.RemoteInvocation;
@@ -499,10 +499,10 @@
-}
\ No newline at end of file
+}
-Index: libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2008-12-05 00:01:51.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2008-12-05 00:08:16.000000000 +0100
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.load;
@@ -511,10 +511,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2008-12-05 00:01:52.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2008-12-05 00:08:16.000000000 +0100
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.timeout.idle;
@@ -523,10 +523,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2008-12-05 00:01:52.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2008-12-05 00:08:16.000000000 +0100
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.timeout.idle;
@@ -535,10 +535,10 @@
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
+Index: libjboss-remoting-java-2.5.0.SP1/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
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2008-12-05 00:01:52.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2008-12-05 00:08:16.000000000 +0100
@@ -24,7 +24,7 @@
import org.jboss.remoting.transport.PortUtil;
@@ -555,3 +555,49 @@
-}
\ No newline at end of file
+}
+Index: libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
+===================================================================
+--- libjboss-remoting-java-2.5.0.SP1.orig/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2008-12-05 00:09:29.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2008-12-05 00:09:36.000000000 +0100
+@@ -49,7 +49,7 @@
+ import org.jboss.remoting.transport.socket.SocketWrapper;
+ import org.jboss.remoting.util.SecurityUtility;
+
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * The bisocket transport, an extension of the socket transport, is designed to allow
+@@ -685,4 +685,4 @@
+ this.flag = flag;
+ }
+ }
+-}
+\ No newline at end of file
++}
+Index: libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
+===================================================================
+--- libjboss-remoting-java-2.5.0.SP1.orig/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2008-12-05 00:09:09.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2008-12-05 00:09:19.000000000 +0100
+@@ -35,7 +35,7 @@
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Properties;
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
+
+ /**
+ * SocketClientInvoker uses Sockets to remotely connect to the a remote ServerInvoker, which must be
+Index: libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
+===================================================================
+--- libjboss-remoting-java-2.5.0.SP1.orig/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2008-12-05 00:08:54.000000000 +0100
++++ libjboss-remoting-java-2.5.0.SP1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2008-12-05 00:09:01.000000000 +0100
+@@ -32,7 +32,7 @@
+ import org.jboss.remoting.transport.socket.MicroSocketClientInvoker;
+ import org.jboss.remoting.transport.socket.SocketWrapper;
+
+-import EDU.oswego.cs.dl.util.concurrent.CountDown;
++import java.util.concurrent.CountDown;
+
+ /**
+ * Unit test for JBREM-955.
More information about the pkg-java-commits
mailing list