[pkg-java] r14783 - in trunk/libjboss-remoting-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Fri Sep 9 13:01:33 UTC 2011
Author: twerner
Date: 2011-09-09 13:01:33 +0000 (Fri, 09 Sep 2011)
New Revision: 14783
Modified:
trunk/libjboss-remoting-java/debian/ant.properties
trunk/libjboss-remoting-java/debian/build.xml
trunk/libjboss-remoting-java/debian/changelog
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
Log:
Newer but not newest upstream release. Do not build samples.
Modified: trunk/libjboss-remoting-java/debian/ant.properties
===================================================================
--- trunk/libjboss-remoting-java/debian/ant.properties 2011-09-09 12:03:34 UTC (rev 14782)
+++ trunk/libjboss-remoting-java/debian/ant.properties 2011-09-09 13:01:33 UTC (rev 14783)
@@ -1,4 +1,4 @@
project.name=jboss-remoting
class.dir=class
-source.dir=src
+source.dir=src/main
jar.name=jboss-remoting.jar
Modified: trunk/libjboss-remoting-java/debian/build.xml
===================================================================
--- trunk/libjboss-remoting-java/debian/build.xml 2011-09-09 12:03:34 UTC (rev 14782)
+++ trunk/libjboss-remoting-java/debian/build.xml 2011-09-09 13:01:33 UTC (rev 14783)
@@ -10,7 +10,8 @@
<target name="compile">
<mkdir dir="${class.dir}"/>
<javac srcdir="${source.dir}" destdir="${class.dir}"
- deprecation="false" debug="true" optimize="true" nowarn="true"/>
+ deprecation="false" debug="true" optimize="true" nowarn="true"
+ excludes="org/jboss/remoting/samples/**"/>
</target>
<target name="jar" description="o Create the jar" depends="compile">
Modified: trunk/libjboss-remoting-java/debian/changelog
===================================================================
--- trunk/libjboss-remoting-java/debian/changelog 2011-09-09 12:03:34 UTC (rev 14782)
+++ trunk/libjboss-remoting-java/debian/changelog 2011-09-09 13:01:33 UTC (rev 14783)
@@ -1,6 +1,7 @@
-libjboss-remoting-java (2.5.2.SP1-3) unstable; urgency=low
+libjboss-remoting-java (2.5.2.SP3-1) unstable; urgency=low
UNRELEASED
+ * Newer but not newest upstream release. Do not build samples.
* Change debian/watch to upstream's svn repo.
* Add patch to fix compile error caused by tomcat update.
(Closes: #628303)
Modified: trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch 2011-09-09 12:03:34 UTC (rev 14782)
+++ trunk/libjboss-remoting-java/debian/patches/0001-convert-to-official-Java-concurrent-packages.patch 2011-09-09 13:01:33 UTC (rev 14783)
@@ -3,8 +3,8 @@
Subject: convert to official Java concurrent packages
---
- src/org/jboss/remoting/LeasePinger.java | 2 +-
- src/org/jboss/remoting/ServerInvoker.java | 2 +-
+ src/main/org/jboss/remoting/LeasePinger.java | 2 +-
+ src/main/org/jboss/remoting/ServerInvoker.java | 2 +-
.../marshal/encryption/EncryptionManager.java | 2 +-
.../transport/bisocket/BisocketClientInvoker.java | 4 +-
.../transport/socket/MicroSocketClientInvoker.java | 21 ++++++++++---------
@@ -26,7 +26,6 @@
.../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 +-
@@ -40,12 +39,12 @@
.../socket/timeout/idle/IdleTimeoutClientTest.java | 2 +-
.../idle/InactiveIdleTimeoutClientTest.java | 2 +-
.../jboss/test/remoting/util/PortUtilTestCase.java | 4 +-
- 37 files changed, 67 insertions(+), 66 deletions(-)
+ 36 files changed, 65 insertions(+), 64 deletions(-)
-diff --git a/src/org/jboss/remoting/LeasePinger.java b/src/org/jboss/remoting/LeasePinger.java
+diff --git a/src/main/org/jboss/remoting/LeasePinger.java b/src/main/org/jboss/remoting/LeasePinger.java
index 0ce0dfc..fc0d6be 100644
---- a/src/org/jboss/remoting/LeasePinger.java
-+++ b/src/org/jboss/remoting/LeasePinger.java
+--- a/src/main/org/jboss/remoting/LeasePinger.java
++++ b/src/main/org/jboss/remoting/LeasePinger.java
@@ -8,7 +8,7 @@ import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
@@ -55,10 +54,10 @@
/**
* 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
+diff --git a/src/main/org/jboss/remoting/ServerInvoker.java b/src/main/org/jboss/remoting/ServerInvoker.java
index 2587c7a..49064bb 100644
---- a/src/org/jboss/remoting/ServerInvoker.java
-+++ b/src/org/jboss/remoting/ServerInvoker.java
+--- a/src/main/org/jboss/remoting/ServerInvoker.java
++++ b/src/main/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;
@@ -68,10 +67,10 @@
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
+diff --git a/src/main/org/jboss/remoting/marshal/encryption/EncryptionManager.java b/src/main/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
+--- a/src/main/org/jboss/remoting/marshal/encryption/EncryptionManager.java
++++ b/src/main/org/jboss/remoting/marshal/encryption/EncryptionManager.java
@@ -21,7 +21,7 @@
*/
package org.jboss.remoting.marshal.encryption;
@@ -81,10 +80,10 @@
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
+diff --git a/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java b/src/main/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
+--- a/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
++++ b/src/main/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;
@@ -101,10 +100,10 @@
-}
\ 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
+diff --git a/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java b/src/main/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
+--- a/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
++++ b/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
@@ -43,7 +43,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.regex.Pattern;
@@ -189,10 +188,10 @@
if (timedout)
{
-diff --git a/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java b/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
+diff --git a/src/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
++++ b/src/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
@@ -58,7 +58,7 @@ public class InvokerClientTest extends TestCase
"javax.servlet.ServletInputStream",
"org.apache.coyote.Adapter",
@@ -202,10 +201,10 @@
"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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -222,10 +221,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
++++ b/src/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;
@@ -242,10 +241,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -262,10 +261,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -282,10 +281,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -302,10 +301,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -322,10 +321,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -342,10 +341,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
++++ b/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -362,10 +361,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -375,10 +374,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -388,10 +387,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -401,10 +400,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.web;
@@ -414,10 +413,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -427,10 +426,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -440,10 +439,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -453,10 +452,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.web;
@@ -466,10 +465,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -486,30 +485,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -526,10 +505,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -546,10 +525,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
++++ b/src/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -566,10 +545,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
++++ b/src/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;
@@ -586,10 +565,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
++++ b/src/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
@@ -22,8 +22,8 @@
package org.jboss.test.remoting.performance.synchronous;
@@ -601,10 +580,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
++++ b/src/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;
@@ -614,10 +593,10 @@
/**
* @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
+diff --git a/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
++++ b/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.synchronous;
@@ -627,10 +606,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
++++ b/src/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;
@@ -651,10 +630,10 @@
-}
\ 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
+diff --git a/src/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
++++ b/src/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;
@@ -664,10 +643,10 @@
/**
* 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
+diff --git a/src/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
++++ b/src/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.load;
@@ -676,10 +655,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
++++ b/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.timeout.idle;
@@ -688,10 +667,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
++++ b/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.timeout.idle;
@@ -700,10 +679,10 @@
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
+diff --git a/src/tests/org/jboss/test/remoting/util/PortUtilTestCase.java b/src/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
+--- a/src/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
++++ b/src/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
@@ -24,7 +24,7 @@ package org.jboss.test.remoting.util;
import org.jboss.remoting.transport.PortUtil;
Modified: trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch 2011-09-09 12:03:34 UTC (rev 14782)
+++ trunk/libjboss-remoting-java/debian/patches/0002-fix-compile-errors-caused-by-tomcat-API-update.patch 2011-09-09 13:01:33 UTC (rev 14783)
@@ -6,10 +6,10 @@
.../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
+diff --git a/src/main/org/jboss/remoting/transport/coyote/OutputBuffer.java b/src/main/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
+--- a/src/main/org/jboss/remoting/transport/coyote/OutputBuffer.java
++++ b/src/main/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.
Modified: 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 2011-09-09 12:03:34 UTC (rev 14782)
+++ trunk/libjboss-remoting-java/debian/patches/0003-Fix-CoyoteInvoker-thanks-to-tomcat-update.patch 2011-09-09 13:01:33 UTC (rev 14783)
@@ -6,10 +6,10 @@
.../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
+diff --git a/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java b/src/main/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
+--- a/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
++++ b/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
@@ -1256,4 +1256,6 @@ public class CoyoteInvoker extends WebServerInvoker implements Adapter
throw (UnknownHostException) e.getCause();
}
More information about the pkg-java-commits
mailing list