[pkg-java] r14780 - in trunk/libjboss-remoting-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Fri Sep 9 11:57:41 UTC 2011
Author: twerner
Date: 2011-09-09 11:57:41 +0000 (Fri, 09 Sep 2011)
New Revision: 14780
Added:
trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch
trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch
trunk/libjboss-remoting-java/debian/patches/0003-Fix-CoyoteInvoker-thanks-to-tomcat-update.patch
Removed:
trunk/libjboss-remoting-java/debian/patches/concurrent.diff
trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff
Modified:
trunk/libjboss-remoting-java/debian/changelog
trunk/libjboss-remoting-java/debian/patches/series
Log:
UNRELEASED
* Add patch to fix compile error caused by tomcat update.
(Closes: #628303)
Modified: trunk/libjboss-remoting-java/debian/changelog
===================================================================
--- trunk/libjboss-remoting-java/debian/changelog 2011-09-09 05:01:39 UTC (rev 14779)
+++ trunk/libjboss-remoting-java/debian/changelog 2011-09-09 11:57:41 UTC (rev 14780)
@@ -1,9 +1,11 @@
libjboss-remoting-java (2.5.2.SP1-3) unstable; urgency=low
- UNRELEASED (#628303 needs fixing)
+ UNRELEASED
* Change debian/watch to upstream's svn repo.
+ * Add patch to fix compile error caused by tomcat update.
+ (Closes: #628303)
- -- Torsten Werner <twerner at debian.org> Thu, 08 Sep 2011 22:51:14 +0200
+ -- Torsten Werner <twerner at debian.org> Fri, 09 Sep 2011 13:52:46 +0200
libjboss-remoting-java (2.5.2.SP1-2) unstable; urgency=low
Copied: trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch (from rev 14779, trunk/libjboss-remoting-java/debian/patches/concurrent.diff)
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch (rev 0)
+++ trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch 2011-09-09 11:57:41 UTC (rev 14780)
@@ -0,0 +1,723 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Fri, 9 Sep 2011 13:19:39 +0200
+Subject: convert to official Java concurrent packages
+
+---
+ src/org/jboss/remoting/LeasePinger.java | 2 +-
+ src/org/jboss/remoting/ServerInvoker.java | 2 +-
+ .../marshal/encryption/EncryptionManager.java | 2 +-
+ .../transport/bisocket/BisocketClientInvoker.java | 4 +-
+ .../transport/socket/MicroSocketClientInvoker.java | 21 ++++++++++---------
+ .../remoting/classloader/InvokerClientTest.java | 2 +-
+ .../raw/rmi/MultiThreadedRMIPerformanceClient.java | 4 +-
+ .../performance/raw/rmi/RMICallbackServer.java | 4 +-
+ .../performance/raw/rmi/RMIPerformanceClient.java | 4 +-
+ .../remoting/performance/raw/rmi/RMIServer.java | 4 +-
+ .../MultiThreadedSocketPerformanceClient.java | 4 +-
+ .../raw/socket/SocketCallbackServer.java | 4 +-
+ .../raw/socket/SocketPerformanceClient.java | 4 +-
+ .../performance/raw/socket/SocketServer.java | 4 +-
+ .../client/SpringHessianCallbackServer.java | 2 +-
+ .../client/SpringHessianCallbackServerImpl.java | 2 +-
+ .../client/SpringHessianPerformanceClient.java | 2 +-
+ .../hessian/web/SpringHessianServerImpl.java | 2 +-
+ .../http/client/SpringHttpCallbackServer.java | 2 +-
+ .../http/client/SpringHttpCallbackServerImpl.java | 2 +-
+ .../http/client/SpringHttpPerformanceClient.java | 2 +-
+ .../spring/http/web/SpringHttpServerImpl.java | 2 +-
+ .../MultiThreadedSpringRMIPerformanceClient.java | 4 +-
+ .../spring/rmi/SpringRMICallbackServer.java | 4 +-
+ .../spring/rmi/SpringRMICallbackServerImpl.java | 4 +-
+ .../spring/rmi/SpringRMIPerformanceClient.java | 4 +-
+ .../spring/rmi/SpringRMIServerImpl.java | 4 +-
+ .../performance/synchronous/CallTracker.java | 4 +-
+ .../MultiThreadedPerformanceClientTest.java | 4 +-
+ .../synchronous/PerformanceCallbackHandler.java | 2 +-
+ .../synchronous/PerformanceClientTest.java | 2 +-
+ .../synchronous/PerformanceInvocationHandler.java | 8 +++---
+ .../interrupt/MockInvokerInterruptTestCase.java | 2 +-
+ .../socket/load/PooledConnectionTestCase.java | 2 +-
+ .../socket/timeout/idle/IdleTimeoutClientTest.java | 2 +-
+ .../idle/InactiveIdleTimeoutClientTest.java | 2 +-
+ .../jboss/test/remoting/util/PortUtilTestCase.java | 4 +-
+ 37 files changed, 67 insertions(+), 66 deletions(-)
+
+diff --git a/src/org/jboss/remoting/LeasePinger.java b/src/org/jboss/remoting/LeasePinger.java
+index 0ce0dfc..fc0d6be 100644
+--- a/src/org/jboss/remoting/LeasePinger.java
++++ b/src/org/jboss/remoting/LeasePinger.java
+@@ -8,7 +8,7 @@ import java.util.Map;
+ 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.
+diff --git a/src/org/jboss/remoting/ServerInvoker.java b/src/org/jboss/remoting/ServerInvoker.java
+index 2587c7a..49064bb 100644
+--- a/src/org/jboss/remoting/ServerInvoker.java
++++ b/src/org/jboss/remoting/ServerInvoker.java
+@@ -44,7 +44,7 @@ import org.jboss.util.threadpool.ThreadPool;
+ 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;
+diff --git a/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java b/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
+index 60ed0bd..1cf4165 100644
+--- a/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
++++ b/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
+@@ -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;
+diff --git a/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java b/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
+index 8bfbd1c..98534f5 100644
+--- a/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
++++ b/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
+@@ -52,7 +52,7 @@ import org.jboss.remoting.transport.socket.SocketClientInvoker;
+ 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
+@@ -781,4 +781,4 @@ implements BidirectionalClientInvoker
+ throw (NoSuchMethodException) e.getCause();
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java b/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
+index a331ac5..3e7da7e 100644
+--- a/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
++++ b/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
+@@ -43,7 +43,8 @@ import java.util.Map;
+ import java.util.Properties;
+ import java.util.regex.Pattern;
+
+-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
++import java.util.concurrent.Semaphore;
++import java.util.concurrent.TimeUnit;
+
+ /**
+ * SocketClientInvoker uses Sockets to remotely connect to the a remote ServerInvoker, which must be
+@@ -511,7 +512,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ if (semaphore == null)
+ return 0;
+
+- return maxPoolSize - (int) semaphore.permits();
++ return maxPoolSize - (int) semaphore.availablePermits();
+ }
+
+ public int getNumberOfAvailableConnections()
+@@ -519,7 +520,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ if (semaphore == null)
+ return 0;
+
+- return (int) semaphore.permits();
++ return (int) semaphore.availablePermits();
+ }
+
+ // Package protected ----------------------------------------------------------------------------
+@@ -819,7 +820,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ catch (InterruptedException e)
+ {
+ semaphore.release();
+- if (trace) log.trace(this + " released semaphore: " + semaphore.permits(), e);
++ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits(), e);
+ throw new RuntimeException(e);
+ }
+ catch (Exception e)
+@@ -827,7 +828,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ // if (bailOut)
+ // return null;
+ semaphore.release();
+- if (trace) log.trace(this + " released semaphore: " + semaphore.permits(), e);
++ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits(), e);
+ sockEx = new CannotConnectException(
+ "Can not get connection to server. Problem establishing " +
+ "socket connection for " + locator, e);
+@@ -987,7 +988,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ }
+ }
+ semaphore.release();
+- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
++ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits());
+ }
+
+ if (trace && !oneway) { log.trace(this + " received response " + response); }
+@@ -1026,7 +1027,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ try
+ {
+ semaphore.release();
+- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
++ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits());
+ socketWrapper.close();
+ }
+ catch (Exception ex)
+@@ -1066,7 +1067,7 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ try
+ {
+ semaphore.release();
+- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
++ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits());
+ socketWrapper.close();
+ }
+ catch (Exception ignored)
+@@ -1121,8 +1122,8 @@ public class MicroSocketClientInvoker extends RemoteClientInvoker
+ {
+ long start = System.currentTimeMillis();
+ long timeToWait = (timeAllowed > 0) ? timeAllowed : connectionWait;
+- boolean timedout = !semaphore.attempt(timeToWait);
+- if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits());
++ boolean timedout = !semaphore.tryAcquire(timeToWait, TimeUnit.MILLISECONDS);
++ if (trace) log.trace(this + " obtained semaphore: " + semaphore.availablePermits());
+
+ if (timedout)
+ {
+diff --git a/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java b/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
+index 0eae0f7..f1561bb 100644
+--- a/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
++++ b/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
+@@ -58,7 +58,7 @@ public class InvokerClientTest extends TestCase
+ "javax.servlet.ServletInputStream",
+ "org.apache.coyote.Adapter",
+ "org.jboss.serial.io.JBossObjectOutputStream",
+- "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);
+diff --git a/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java b/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
+index ae22fb5..f039c20 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
+@@ -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 @@ public class MultiThreadedRMIPerformanceClient extends MultiThreadedPerformanceC
+ }
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java b/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
+index df8979a..8126f94 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
++++ b/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
+@@ -30,7 +30,7 @@ import org.jboss.remoting.callback.Callback;
+ 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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+@@ -122,4 +122,4 @@ public class RMICallbackServer extends UnicastRemoteObject implements RMICallbac
+ e.printStackTrace();
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java b/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
+index 387c8c4..8cf6020 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
+@@ -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 @@ public class RMIPerformanceClient extends PerformanceClientTest
+ throw new Exception("Was not able to find remote method call for " + method);
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java b/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
+index 8618c4d..3bc34fd 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
++++ b/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
+@@ -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 @@ public class RMIServer extends UnicastRemoteObject implements RMIServerRemote
+ e.printStackTrace();
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java b/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
+index ddeb5cc..07b2ced 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
+@@ -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 @@ public class MultiThreadedSocketPerformanceClient extends MultiThreadedPerforman
+ }
+
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java b/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
+index a847f03..4d41c8d 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
++++ b/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
+@@ -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 @@ public class SocketCallbackServer implements PerformanceCallbackKeeper
+ }
+
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java b/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
+index 279ddc0..8d028db 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
+@@ -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 @@ public class SocketPerformanceClient extends PerformanceClientTest
+ }
+
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java b/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
+index 5aae121..7a26def 100644
+--- a/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
++++ b/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
+@@ -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 @@ public class SocketServer
+ e.printStackTrace();
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
+index b14114d..59e51d5 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
++++ b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
+@@ -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;
+
+diff --git a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
+index 03f2a77..f90870b 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
++++ b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
+@@ -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;
+
+diff --git a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
+index c97a02c..ca8c201 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java b/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
+index 5f67971..b2148c5 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
++++ b/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
+@@ -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;
+
+diff --git a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
+index 988fca4..b8f8909 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
++++ b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
+@@ -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;
+
+diff --git a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
+index 4c0e8ef..8aa6faf 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
++++ b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
+@@ -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;
+
+diff --git a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
+index 5632130..a45ef06 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java b/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
+index eeb8e50..1fe4314 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
++++ b/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
+@@ -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;
+
+diff --git a/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java b/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
+index 05c1a96..404fb74 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
+@@ -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 @@ public class MultiThreadedSpringRMIPerformanceClient extends MultiThreadedPerfor
+ }
+
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
+index ce5a34f..9c40ca7 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
++++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
+@@ -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 @@ public interface SpringRMICallbackServer extends PerformanceCallbackKeeper, Invo
+ void setClientSessionId(String clientSessionId);
+
+ void setServerDoneLock(Latch serverDoneLock);
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
+index 88eb5f4..b39110a 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
++++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
+@@ -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 @@ public class SpringRMICallbackServerImpl implements SpringRMICallbackServer
+
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
+index 746c373..9945eb8 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
++++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
+@@ -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 @@ public class SpringRMIPerformanceClient extends PerformanceClientTest
+ }
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
+index 0186282..3df4d9c 100644
+--- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
++++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
+@@ -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 @@ public class SpringRMIServerImpl implements SpringRMIServer
+ return new Integer(clientInvokeCallCount);
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java b/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
+index a2ffdf9..862aedb 100644
+--- a/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
++++ b/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
+@@ -26,7 +26,7 @@ import org.jboss.remoting.callback.Callback;
+ 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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+@@ -132,4 +132,4 @@ public class CallTracker
+ return isDuplicate;
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java b/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
+index 33518ee..d7323b9 100644
+--- a/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
++++ b/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
+index 2b7c1ef..9e95588 100644
+--- a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
++++ b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
+@@ -26,7 +26,7 @@ import org.jboss.remoting.callback.Callback;
+ 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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+diff --git a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
+index 4a1a052..f771653 100644
+--- a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
++++ b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
+index bec67ec..32f0ecc 100644
+--- a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
++++ b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
+@@ -34,9 +34,9 @@ import org.jboss.remoting.callback.InvokerCallbackHandler;
+ 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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+@@ -187,4 +187,4 @@ public class PerformanceInvocationHandler implements ServerInvocationHandler
+ // and then remove from tracker or kill tracker all together.
+ listeners.remove(callbackHandler);
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java b/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
+index 551678b..2c724d0 100644
+--- a/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
++++ b/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
+@@ -32,7 +32,7 @@ import org.jboss.remoting.marshal.UnMarshaller;
+ 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.
+diff --git a/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java b/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
+index dbd44c2..a2ced7d 100644
+--- a/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
++++ b/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java b/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
+index 45ebab8..74466e1 100644
+--- a/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
++++ b/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java b/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
+index 6c486fa..91ea08d 100644
+--- a/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
++++ b/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
+@@ -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;
+diff --git a/tests/org/jboss/test/remoting/util/PortUtilTestCase.java b/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
+index e8bbe0f..65f160d 100644
+--- a/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
++++ b/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
+@@ -24,7 +24,7 @@ package org.jboss.test.remoting.util;
+ import org.jboss.remoting.transport.PortUtil;
+
+ import junit.framework.TestCase;
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
++import java.util.concurrent.SynchronizedInt;
+
+ /**
+ * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+@@ -111,4 +111,4 @@ public class PortUtilTestCase extends TestCase
+
+ }
+
+-}
+\ No newline at end of file
++}
+--
Copied: trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch (from rev 14779, trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff)
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch (rev 0)
+++ trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch 2011-09-09 11:57:41 UTC (rev 14780)
@@ -0,0 +1,25 @@
+From: Luke Cycon <lcycon at gmail.com>
+Date: Fri, 9 Sep 2011 13:19:39 +0200
+Subject: fix compile errors caused by tomcat API update
+
+---
+ .../remoting/transport/coyote/OutputBuffer.java | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/jboss/remoting/transport/coyote/OutputBuffer.java b/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
+index b56999b..0feb63c 100644
+--- a/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
++++ b/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
+@@ -607,8 +607,9 @@ public class OutputBuffer extends Writer
+
+ // The following has been updated to conform to jbossweb 2.1.
+ cb.setChars(c, off, len);
+- while (cb.getLength() > 0) {
+- conv.convert(cb, bb);
++ while (cb.getLength() > 0) {
++ conv.setByteChunk(bb);
++ conv.convert(cb.getChars(), 0, cb.getLength());
+ if (cb.getLength() > 0) {
+ bb.flushBuffer();
+ }
+--
Added: trunk/libjboss-remoting-java/debian/patches/0003-Fix-CoyoteInvoker-thanks-to-tomcat-update.patch
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/0003-Fix-CoyoteInvoker-thanks-to-tomcat-update.patch (rev 0)
+++ trunk/libjboss-remoting-java/debian/patches/0003-Fix-CoyoteInvoker-thanks-to-tomcat-update.patch 2011-09-09 11:57:41 UTC (rev 14780)
@@ -0,0 +1,20 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Fri, 9 Sep 2011 13:51:08 +0200
+Subject: Fix CoyoteInvoker thanks to tomcat update.
+
+---
+ .../remoting/transport/coyote/CoyoteInvoker.java | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/org/jboss/remoting/transport/coyote/CoyoteInvoker.java b/src/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
+index 050706b..ed7631a 100644
+--- a/src/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
++++ b/src/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
+@@ -1256,4 +1256,6 @@ public class CoyoteInvoker extends WebServerInvoker implements Adapter
+ throw (UnknownHostException) e.getCause();
+ }
+ }
++
++ public void log(Request req, Response res, long time) {}
+ }
+--
Deleted: trunk/libjboss-remoting-java/debian/patches/concurrent.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2011-09-09 05:01:39 UTC (rev 14779)
+++ trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2011-09-09 11:57:41 UTC (rev 14780)
@@ -1,605 +0,0 @@
-A patch to transition to the official Java concurrent packages
---- a/src/org/jboss/remoting/LeasePinger.java
-+++ b/src/org/jboss/remoting/LeasePinger.java
-@@ -8,7 +8,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.
---- a/src/org/jboss/remoting/ServerInvoker.java
-+++ b/src/org/jboss/remoting/ServerInvoker.java
-@@ -44,7 +44,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;
---- a/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
-+++ b/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
-+++ b/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
-@@ -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",
- "org.jboss.logging.Logger"};
- URL[] urls = getLibUrls(classUrls);
- URLClassLoader urlclassloader = new URLClassLoader(urls, null);
---- a/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
-@@ -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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
-@@ -122,4 +122,4 @@
- e.printStackTrace();
- }
- }
--}
-\ No newline at end of file
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
-+++ b/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
-@@ -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;
-
---- a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
-@@ -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;
-
---- a/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
-@@ -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;
-
---- a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
-@@ -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;
-
---- a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
-@@ -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;
-
---- a/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
-@@ -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;
-
---- a/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
-+++ b/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
-@@ -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
-+}
---- a/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
-+++ b/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
-@@ -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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
-@@ -132,4 +132,4 @@
- return isDuplicate;
- }
-
--}
-\ No newline at end of file
-+}
---- a/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
-+++ b/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
-+++ b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
-@@ -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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
---- a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
-+++ b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
-+++ b/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
-@@ -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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
-@@ -187,4 +187,4 @@
- // and then remove from tracker or kill tracker all together.
- listeners.remove(callbackHandler);
- }
--}
-\ No newline at end of file
-+}
---- a/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
-+++ b/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
-+++ b/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
-+++ b/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
-@@ -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;
---- a/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
-+++ b/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
-@@ -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 <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
-@@ -111,4 +111,4 @@
-
- }
-
--}
-\ No newline at end of file
-+}
---- a/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
-+++ b/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
-@@ -52,7 +52,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
-@@ -781,4 +781,4 @@
- throw (NoSuchMethodException) e.getCause();
- }
- }
--}
-\ No newline at end of file
-+}
---- a/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
-+++ b/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
-@@ -43,7 +43,8 @@
- import java.util.Properties;
- import java.util.regex.Pattern;
-
--import EDU.oswego.cs.dl.util.concurrent.Semaphore;
-+import java.util.concurrent.Semaphore;
-+import java.util.concurrent.TimeUnit;
-
- /**
- * SocketClientInvoker uses Sockets to remotely connect to the a remote ServerInvoker, which must be
-@@ -511,7 +512,7 @@
- if (semaphore == null)
- return 0;
-
-- return maxPoolSize - (int) semaphore.permits();
-+ return maxPoolSize - (int) semaphore.availablePermits();
- }
-
- public int getNumberOfAvailableConnections()
-@@ -519,7 +520,7 @@
- if (semaphore == null)
- return 0;
-
-- return (int) semaphore.permits();
-+ return (int) semaphore.availablePermits();
- }
-
- // Package protected ----------------------------------------------------------------------------
-@@ -819,7 +820,7 @@
- catch (InterruptedException e)
- {
- semaphore.release();
-- if (trace) log.trace(this + " released semaphore: " + semaphore.permits(), e);
-+ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits(), e);
- throw new RuntimeException(e);
- }
- catch (Exception e)
-@@ -827,7 +828,7 @@
- // if (bailOut)
- // return null;
- semaphore.release();
-- if (trace) log.trace(this + " released semaphore: " + semaphore.permits(), e);
-+ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits(), e);
- sockEx = new CannotConnectException(
- "Can not get connection to server. Problem establishing " +
- "socket connection for " + locator, e);
-@@ -987,7 +988,7 @@
- }
- }
- semaphore.release();
-- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
-+ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits());
- }
-
- if (trace && !oneway) { log.trace(this + " received response " + response); }
-@@ -1026,7 +1027,7 @@
- try
- {
- semaphore.release();
-- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
-+ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits());
- socketWrapper.close();
- }
- catch (Exception ex)
-@@ -1066,7 +1067,7 @@
- try
- {
- semaphore.release();
-- if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
-+ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits());
- socketWrapper.close();
- }
- catch (Exception ignored)
-@@ -1121,8 +1122,8 @@
- {
- long start = System.currentTimeMillis();
- long timeToWait = (timeAllowed > 0) ? timeAllowed : connectionWait;
-- boolean timedout = !semaphore.attempt(timeToWait);
-- if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits());
-+ boolean timedout = !semaphore.tryAcquire(timeToWait, TimeUnit.MILLISECONDS);
-+ if (trace) log.trace(this + " obtained semaphore: " + semaphore.availablePermits());
-
- if (timedout)
- {
---- a/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
-+++ b/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
-@@ -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.
Modified: trunk/libjboss-remoting-java/debian/patches/series
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/series 2011-09-09 05:01:39 UTC (rev 14779)
+++ trunk/libjboss-remoting-java/debian/patches/series 2011-09-09 11:57:41 UTC (rev 14780)
@@ -1,2 +1,3 @@
-concurrent.diff
-tomcat6-fix.diff
+0001-convert-to-official-Java-concurrent-packages.patch
+0002-fix-compile-errors-caused-by-tomcat-API-update.patch
+0003-Fix-CoyoteInvoker-thanks-to-tomcat-update.patch
Deleted: trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff 2011-09-09 05:01:39 UTC (rev 14779)
+++ trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff 2011-09-09 11:57:41 UTC (rev 14780)
@@ -1,16 +0,0 @@
-A patch by to fix compile errors caused by a tomcat API update
-Patch by Luke Cycon <lcycon at gmail.com>
---- a/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
-+++ b/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
-@@ -607,8 +607,9 @@
-
- // The following has been updated to conform to jbossweb 2.1.
- cb.setChars(c, off, len);
-- while (cb.getLength() > 0) {
-- conv.convert(cb, bb);
-+ while (cb.getLength() > 0) {
-+ conv.setByteChunk(bb);
-+ conv.convert(cb.getChars(), 0, cb.getLength());
- if (cb.getLength() > 0) {
- bb.flushBuffer();
- }
More information about the pkg-java-commits
mailing list