Author: lcycon-guest Date: 2010-01-06 23:43:08 +0000 (Wed, 06 Jan 2010) New Revision: 11330
Modified: trunk/libjboss-remoting-java/debian/changelog trunk/libjboss-remoting-java/debian/patches/concurrent.diff Log: * New Upstream release * Updated patch concurrent.diff Modified: trunk/libjboss-remoting-java/debian/changelog =================================================================== --- trunk/libjboss-remoting-java/debian/changelog 2010-01-06 23:37:10 UTC (rev 11329) +++ trunk/libjboss-remoting-java/debian/changelog 2010-01-06 23:43:08 UTC (rev 11330) @@ -1,3 +1,10 @@ +libjboss-remoting-java (2.5.2.SP1-1) unstable; urgency=low + + * New Upstream release + * Updated patch concurrent.diff + + -- Luke Cycon <[email protected]> Wed, 06 Jan 2010 15:13:37 -0800 + libjboss-remoting-java (2.5.1-1) unstable; urgency=low [ Luke Cycon ] Modified: trunk/libjboss-remoting-java/debian/patches/concurrent.diff =================================================================== --- trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2010-01-06 23:37:10 UTC (rev 11329) +++ trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2010-01-06 23:43:08 UTC (rev 11330) @@ -1,9 +1,7 @@ A patch to transition to the official Java concurrent packages -Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/LeasePinger.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/LeasePinger.java 2009-06-15 21:03:16.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/LeasePinger.java 2009-06-15 21:25:08.000000000 +0200 -@@ -9,7 +9,7 @@ +--- 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; @@ -12,10 +10,8 @@ /** * Internal agent class to ping the remote server to keep lease alive. -Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/ServerInvoker.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/ServerInvoker.java 2009-06-15 21:03:16.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/ServerInvoker.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -25,10 +21,8 @@ import javax.management.MBeanServer; import javax.management.MBeanServerInvocationHandler; -Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2009-06-15 21:03:16.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -38,10 +32,8 @@ import org.jboss.logging.Logger; import javax.crypto.Cipher; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2009-06-15 21:03:16.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2009-06-15 21:25:08.000000000 +0200 +--- 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", @@ -51,10 +43,8 @@ "org.jboss.logging.Logger"}; URL[] urls = getLibUrls(classUrls); URLClassLoader urlclassloader = new URLClassLoader(urls, null); -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -71,10 +61,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -91,10 +79,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -111,10 +97,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -131,10 +115,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -151,10 +133,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -171,10 +151,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -191,10 +169,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -211,10 +187,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -224,10 +198,8 @@ import org.jboss.remoting.callback.InvokerCallbackHandler; import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -237,10 +209,8 @@ import org.jboss.remoting.callback.Callback; import org.jboss.remoting.callback.HandleCallbackException; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -250,10 +220,8 @@ import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -263,10 +231,8 @@ import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -276,10 +242,8 @@ import org.jboss.remoting.callback.InvokerCallbackHandler; import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -289,10 +253,8 @@ import org.jboss.remoting.callback.Callback; import org.jboss.remoting.callback.HandleCallbackException; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -302,10 +264,8 @@ import junit.framework.Test; import org.jboss.jrunit.decorators.ThreadLocalDecorator; import org.jboss.logging.Logger; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -315,10 +275,8 @@ import org.jboss.test.remoting.performance.synchronous.CallTracker; import org.jboss.test.remoting.performance.synchronous.Payload; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -335,10 +293,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -355,10 +311,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -375,10 +329,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -395,10 +347,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -415,10 +365,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -435,10 +383,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -450,10 +396,8 @@ import junit.framework.Test; import junit.framework.TestCase; import org.jboss.jrunit.controller.ThreadLocalBenchmark; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -463,10 +407,8 @@ /** * @author <a href="mailto:[email protected]";>Tom Elrod</a> -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -476,10 +418,8 @@ import junit.framework.Test; import junit.framework.TestCase; import org.jboss.jrunit.controller.ThreadLocalBenchmark; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -500,10 +440,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -512,10 +450,8 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; import org.jboss.remoting.Client; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -524,10 +460,8 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; import org.jboss.remoting.Client; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -536,10 +470,8 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; import org.jboss.remoting.Client; -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/util/PortUtilTestCase.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -556,10 +488,8 @@ -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-06-15 21:03:16.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; @@ -569,28 +499,26 @@ /** * The bisocket transport, an extension of the socket transport, is designed to allow -@@ -716,4 +716,4 @@ +@@ -781,4 +781,4 @@ throw (NoSuchMethodException) e.getCause(); } } -} \ No newline at end of file +} -Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-06-15 21:03:16.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-06-15 21:47:56.000000000 +0200 -@@ -40,7 +40,8 @@ - import java.util.List; - import java.util.Map; +--- 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 -@@ -474,7 +475,7 @@ +@@ -511,7 +512,7 @@ if (semaphore == null) return 0; @@ -599,7 +527,7 @@ } public int getNumberOfAvailableConnections() -@@ -482,7 +483,7 @@ +@@ -519,7 +520,7 @@ if (semaphore == null) return 0; @@ -608,7 +536,7 @@ } // Package protected ---------------------------------------------------------------------------- -@@ -764,7 +765,7 @@ +@@ -819,7 +820,7 @@ catch (InterruptedException e) { semaphore.release(); @@ -617,7 +545,7 @@ throw new RuntimeException(e); } catch (Exception e) -@@ -772,7 +773,7 @@ +@@ -827,7 +828,7 @@ // if (bailOut) // return null; semaphore.release(); @@ -626,17 +554,8 @@ sockEx = new CannotConnectException( "Can not get connection to server. Problem establishing " + "socket connection for " + locator, e); -@@ -878,7 +879,7 @@ - try - { - semaphore.release(); -- if (trace) log.trace(this + " released semaphore: " + semaphore.permits()); -+ if (trace) log.trace(this + " released semaphore: " + semaphore.availablePermits()); - socketWrapper.close(); +@@ -987,7 +988,7 @@ } - catch (Exception ignored) -@@ -932,7 +933,7 @@ - } } semaphore.release(); - if (trace) log.trace(this + " released semaphore: " + semaphore.permits()); @@ -644,7 +563,7 @@ } if (trace && !oneway) { log.trace(this + " received response " + response); } -@@ -971,7 +972,7 @@ +@@ -1026,7 +1027,7 @@ try { semaphore.release(); @@ -653,7 +572,16 @@ socketWrapper.close(); } catch (Exception ex) -@@ -1045,8 +1046,8 @@ +@@ -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; @@ -664,10 +592,8 @@ if (timedout) { -Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java -=================================================================== ---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2009-06-15 21:03:17.000000000 +0200 -+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2009-06-15 21:25:08.000000000 +0200 +--- 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; _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
