[pkg-java] r4633 - in trunk/jbossas4/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Tue Nov 6 13:59:41 UTC 2007
Author: twerner
Date: 2007-11-06 13:59:41 +0000 (Tue, 06 Nov 2007)
New Revision: 4633
Removed:
trunk/jbossas4/debian/patches/messagecontext.diff
Modified:
trunk/jbossas4/debian/control
trunk/jbossas4/debian/patches/concurrent.diff
trunk/jbossas4/debian/patches/series
trunk/jbossas4/debian/rules
Log:
* activate and fix patches/concurrent.diff
* remove messagecontext.diff and add jaxrpc to DEB_JARS
Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control 2007-11-06 12:49:12 UTC (rev 4632)
+++ trunk/jbossas4/debian/control 2007-11-06 13:59:41 UTC (rev 4633)
@@ -7,7 +7,8 @@
Build-Depends-Indep: ant, java-gcj-compat-dev, junit, libgetopt-java,
libbcel-java, libdom4j-java, libjboss-common-java, libjboss-profiler-java,
libjboss-xml-binding-java, liblog4j1.2-java, libservlet2.4-java,
- glassfish-javaee, libconcurrent-java, libcommons-httpclient-java
+ glassfish-javaee, libconcurrent-java, libcommons-httpclient-java,
+ libaxis-java
Standards-Version: 3.7.2
Homepage: http://labs.jboss.com/jbossas/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jbossas4
Modified: trunk/jbossas4/debian/patches/concurrent.diff
===================================================================
--- trunk/jbossas4/debian/patches/concurrent.diff 2007-11-06 12:49:12 UTC (rev 4632)
+++ trunk/jbossas4/debian/patches/concurrent.diff 2007-11-06 13:59:41 UTC (rev 4633)
@@ -1,6 +1,7 @@
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-10-22 16:58:12.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-06 14:52:09.000000000 +0100
@@ -30,7 +30,7 @@
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -21,9 +22,10 @@
public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
{
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-10-22 16:58:16.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/FutureImpl.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.aspects.asynch;
@@ -42,9 +44,10 @@
{
throw new TimeoutException(e);
}
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-10-22 16:58:15.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynch/ThreadPoolExecutor.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,10 +21,10 @@
*/
package org.jboss.aspects.asynch;
@@ -60,9 +63,10 @@
import org.jboss.aop.Advisor;
import org.jboss.aop.joinpoint.MethodInvocation;
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-10-22 16:58:20.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.aspects.asynchronous.concurrent;
@@ -72,9 +76,10 @@
import org.jboss.aspects.asynchronous.AsynchronousConstants;
import org.jboss.aspects.asynchronous.AsynchronousParameters;
import org.jboss.aspects.asynchronous.AsynchronousResponse;
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-10-22 16:58:20.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,9 +21,9 @@
*/
package org.jboss.aspects.asynchronous.concurrent;
@@ -97,9 +102,10 @@
errorCode = TIMEOUT;
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-10-22 16:58:20.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/ThreadManagerImpl.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,8 +21,8 @@
*/
package org.jboss.aspects.asynchronous.concurrent;
@@ -111,9 +117,10 @@
import org.jboss.aspects.asynchronous.AsynchronousConstants;
import org.jboss.aspects.asynchronous.AsynchronousParameters;
import org.jboss.aspects.asynchronous.AsynchronousTask;
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-11-06 02:12:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-10-22 16:58:20.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,9 +21,9 @@
*/
package org.jboss.aspects.asynchronous.concurrent;
@@ -127,9 +134,10 @@
import org.jboss.aspects.asynchronous.ProcessingTime;
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-11-06 02:12:02.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-10-22 16:58:13.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/patterns/readwritelock/ReadWriteLockAspect.java 2007-11-06 14:52:09.000000000 +0100
@@ -22,8 +22,8 @@
package org.jboss.aspects.patterns.readwritelock;
@@ -141,9 +149,10 @@
import org.jboss.aop.joinpoint.MethodInvocation;
/**
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/StateManager.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-11-06 02:12:02.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-10-22 16:58:23.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,8 +21,8 @@
*/
package org.jboss.aspects.versioned;
@@ -155,9 +164,10 @@
import org.jboss.aop.InstanceAdvised;
import org.jboss.aop.util.PayloadKey;
import org.jboss.logging.Logger;
-diff -urN jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-11-06 02:12:02.000000000 +0530
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-10-22 16:58:23.000000000 +0200
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.aspects.versioned;
@@ -167,9 +177,10 @@
import org.jboss.aop.Advised;
import org.jboss.aop.util.MarshalledValue;
import org.jboss.tm.TransactionLocal;
-diff -urN jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java
---- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-11-06 02:12:30.000000000 +0530
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-10-22 16:44:13.000000000 +0200
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java 2007-11-06 14:52:09.000000000 +0100
@@ -29,7 +29,7 @@
import javax.jms.Message;
import javax.jms.ObjectMessage;
@@ -179,9 +190,10 @@
import org.jboss.logging.Logger;
/**
-diff -urN jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java
---- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-11-06 02:12:30.000000000 +0530
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-10-22 16:44:13.000000000 +0200
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java 2007-11-06 14:52:09.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.ejb3.test.strictpool;
@@ -191,9 +203,10 @@
/** Invoker thread for StatelessSession tests.
* Adapted from the EJB 2.1 tests (org.jboss.test.cts.test.SessionInvoker)
-diff -urN jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
---- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-11-06 02:12:30.000000000 +0530
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-11-06 02:15:08.000000000 +0530
+Index: jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-10-22 16:44:12.000000000 +0200
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -28,7 +28,7 @@
import org.jboss.ejb3.test.strictpool.StrictlyPooledSession;
import org.jboss.ejb3.test.strictpool.Counter;
@@ -203,9 +216,10 @@
import junit.framework.Test;
-diff -urN jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java
---- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-11-06 02:12:33.000000000 +0530
-+++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-10-22 16:49:57.000000000 +0200
++++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/jms/server/list/memory/MemoryMessageList.java 2007-11-06 14:52:09.000000000 +0100
@@ -31,8 +31,8 @@
import org.jboss.jms.server.list.MessageList;
import org.jboss.jms.server.list.StandardMessageComparator;
@@ -217,21 +231,23 @@
/**
* An in memory implementation of the message list
-diff -urN jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java
---- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-11-06 02:12:33.000000000 +0530
-+++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-10-22 16:50:04.000000000 +0200
++++ jbossas4-4.2.2.GA/jms/src/main/org/jboss/messaging/memory/MemoryMessageSet.java 2007-11-06 14:52:09.000000000 +0100
@@ -30,7 +30,7 @@
import org.jboss.messaging.interfaces.MessageReference;
import org.jboss.messaging.interfaces.MessageSet;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-+import java.util.concurrent.ReentrantLock;
++import java.util.concurrent.locks.ReentrantLock;
/**
* An in memory message set
-diff -urN jbossas4-4.2.2.GA.orig/jms/src/test/org/jboss/test/messaging/TestMessageReference.java jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java
---- jbossas4-4.2.2.GA.orig/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-11-06 02:12:33.000000000 +0530
-+++ jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-10-22 16:49:48.000000000 +0200
++++ jbossas4-4.2.2.GA/jms/src/test/org/jboss/test/messaging/TestMessageReference.java 2007-11-06 14:52:09.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.messaging.interfaces.MessageAddress;
import org.jboss.messaging.interfaces.MessageReference;
@@ -241,9 +257,10 @@
/**
* A simple implementation of a message reference
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 02:12:33.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2007-10-22 16:57:26.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-06 14:52:09.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.mx.util.ObservedObject;
@@ -253,9 +270,10 @@
/**
* The monitor service.
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-10-22 16:57:18.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.mx.loading;
@@ -274,21 +292,23 @@
/**
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 02:15:09.000000000 +0530
-@@ -45,8 +45,8 @@
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-10-22 16:57:18.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-06 14:52:09.000000000 +0100
+@@ -45,8 +45,9 @@
import org.jboss.util.loading.Translator;
import org.jboss.util.collection.SoftSet;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.ReentrantLock;
++import java.util.concurrent.locks.ReentrantLock;
++import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A RepositoryClassLoader.
-@@ -82,7 +82,7 @@
+@@ -82,7 +83,7 @@
/** Names of resources that were not found in loadResourceLocally */
private Set resourceBlackList = Collections.synchronizedSet(new HashSet());
/** A HashMap<String, URL> for resource found in loadResourceLocally */
@@ -297,9 +317,81 @@
/** Lock */
protected ReentrantLock loadLock = new ReentrantLock();
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 02:15:09.000000000 +0530
+@@ -509,7 +510,7 @@
+ {
+ Thread t = Thread.currentThread();
+ // Register this thread as owning this UCL
+- if( loadLock.holds() == 1 )
++ if( loadLock.isLocked() )
+ LoadMgr3.registerLoaderThread(this, t);
+
+ // Create a class loading task and submit it to the repository
+@@ -537,7 +538,7 @@
+ finally
+ {
+ // Unregister as the UCL owner to reschedule any remaining load tasks
+- if( loadLock.holds() == 1 )
++ if( loadLock.isLocked() )
+ LoadMgr3.endLoadTask(task);
+ // Notify any threads waiting to use this UCL
+ this.release();
+@@ -808,7 +809,7 @@
+ boolean threadWasInterrupted = Thread.interrupted();
+ try
+ {
+- acquired = loadLock.attempt(waitMS);
++ acquired = loadLock.tryLock(waitMS, TimeUnit.MILLISECONDS);
+ }
+ catch(InterruptedException e)
+ {
+@@ -820,7 +821,7 @@
+ Thread.currentThread().interrupt();
+ }
+ if( trace )
+- log.trace("attempt("+loadLock.holds()+") was: "+acquired+" for :"+this);
++ log.trace("attempt("+loadLock.isLocked()+") was: "+acquired+" for :"+this);
+ return acquired;
+ }
+
+@@ -834,10 +835,7 @@
+ boolean threadWasInterrupted = Thread.interrupted();
+ try
+ {
+- loadLock.acquire();
+- }
+- catch(InterruptedException e)
+- {
++ loadLock.lock();
+ }
+ finally
+ {
+@@ -846,7 +844,7 @@
+ Thread.currentThread().interrupt();
+ }
+ if( log.isTraceEnabled() )
+- log.trace("acquired("+loadLock.holds()+") for :"+this);
++ log.trace("acquired("+loadLock.isLocked()+") for :"+this);
+ }
+ /** Release the class loading lock previous acquired through the acquire
+ * method.
+@@ -854,10 +852,10 @@
+ protected void release()
+ {
+ if( log.isTraceEnabled() )
+- log.trace("release("+loadLock.holds()+") for :"+this);
+- loadLock.release();
++ log.trace("release("+loadLock.isLocked()+") for :"+this);
++ loadLock.unlock();
+ if( log.isTraceEnabled() )
+- log.trace("released, holds: "+loadLock.holds());
++ log.trace("released, holds: "+loadLock.isLocked());
+ }
+
+ /** Obtain the bytecode for the indicated class from this class loaders
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-10-22 16:57:18.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-06 14:52:09.000000000 +0100
@@ -49,8 +49,8 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
@@ -329,9 +421,10 @@
/** A HashMap<UCL, String[]> of class loaders to the array of pckages names
* they serve
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-10-22 16:57:16.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-06 14:52:09.000000000 +0100
@@ -49,8 +49,8 @@
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
@@ -339,7 +432,7 @@
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.SynchronizedLong;
++import java.util.concurrent.atomic.AtomicLong;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -352,7 +445,40 @@
/**
* The default domain for this registry
-@@ -959,7 +959,7 @@
+@@ -116,12 +116,12 @@
+ /**
+ * Sequence number for the MBean server registration notifications.
+ */
+- protected final SynchronizedLong registrationNotificationSequence = new SynchronizedLong (1);
++ protected final AtomicLong registrationNotificationSequence = new AtomicLong (1);
+
+ /**
+ * Sequence number for the MBean server unregistration notifications.
+ */
+- protected final SynchronizedLong unregistrationNotificationSequence = new SynchronizedLong (1);
++ protected final AtomicLong unregistrationNotificationSequence = new AtomicLong (1);
+
+ /**
+ * Direct reference to the mandatory MBean server delegate MBean.
+@@ -384,7 +384,7 @@
+ */
+ protected void sendRegistrationNotification (ObjectName regName)
+ {
+- long sequence = registrationNotificationSequence.increment ();
++ long sequence = registrationNotificationSequence.incrementAndGet ();
+ delegate.sendNotification (
+ new MBeanServerNotification (
+ MBeanServerNotification.REGISTRATION_NOTIFICATION,
+@@ -490,7 +490,7 @@
+ */
+ protected void sendUnRegistrationNotification (ObjectName name)
+ {
+- long sequence = unregistrationNotificationSequence.increment ();
++ long sequence = unregistrationNotificationSequence.incrementAndGet ();
+
+ delegate.sendNotification (
+ new MBeanServerNotification (
+@@ -959,9 +959,9 @@
Map mbeanMap = (Map) domainMap.get(domain);
if (mbeanMap == null && createIfMissing)
{
@@ -361,33 +487,75 @@
domainMap.put(domain, mbeanMap);
}
return mbeanMap;
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/AgentID.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-11-06 02:15:09.000000000 +0530
+ }
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-10-22 16:57:19.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/AgentID.java 2007-11-06 14:52:09.000000000 +0100
@@ -30,7 +30,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.SynchronizedLong;
++import java.util.concurrent.atomic.AtomicLong;
import org.jboss.mx.server.ServerConstants;
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-11-06 02:15:09.000000000 +0530
+@@ -49,7 +49,7 @@
+ implements ServerConstants
+ {
+ // Static ----------------------------------------------------
+- private static SynchronizedLong id = new SynchronizedLong(0);
++ private static AtomicLong id = new AtomicLong(0);
+
+ private static final Random rand = new Random(System.currentTimeMillis());
+
+@@ -85,7 +85,7 @@
+ // MBeanServerID is unique across multiple JVMs, even on the same host
+ String vmid = new java.rmi.dgc.VMID().toString().replace(':','x').replace('-','X') + rand.nextInt(100);
+
+- return ipAddress + "/" + System.currentTimeMillis() + "/" + vmid + "/"+ (id.increment());
++ return ipAddress + "/" + System.currentTimeMillis() + "/" + vmid + "/"+ (id.incrementAndGet());
+ }
+ /**
+ * test
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-10-22 16:57:20.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationBroadcasterSupport.java 2007-11-06 14:52:09.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.mx.notification.ListenerRegistration;
import org.jboss.mx.notification.ListenerRegistry;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.SynchronizedLong;
++import java.util.concurrent.atomic.AtomicLong;
/**
* A helper class for notification broadcasters/emitters
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 02:15:09.000000000 +0530
+@@ -54,7 +54,7 @@
+ private ListenerRegistry registry = new ListenerRegistry();
+
+ /** Sequence number for jmx notifications we send out */
+- private SynchronizedLong sequenceNumber = new SynchronizedLong(0);
++ private AtomicLong sequenceNumber = new AtomicLong(0);
+
+ /**
+ * Construct the new notification broadcaster support object
+@@ -140,6 +140,6 @@
+ */
+ public long nextNotificationSequenceNumber()
+ {
+- return sequenceNumber.increment();
++ return sequenceNumber.incrementAndGet();
+ }
+ }
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 14:52:09.000000000 +0100
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/JBossNotificationFilterSupport.java 2007-11-06 14:52:09.000000000 +0100
@@ -40,7 +40,7 @@
*
* Mutating operations synchronize on 'this', only because of the
@@ -397,21 +565,32 @@
* directly, rather than org.jboss.util.CollectionsFactory.
*
* In any case, mutating operations are rare when dealing with
-diff -urN jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-11-06 02:12:34.000000000 +0530
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-11-06 02:15:09.000000000 +0530
+Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-10-22 16:57:20.000000000 +0200
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/util/SchedulableRunnable.java 2007-11-06 14:52:09.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.mx.util;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-+import java.util.concurrent.SynchronizedLong;
++import java.util.concurrent.atomic.AtomicLong;
/**
* A schedulable runnable.<p>
-diff -urN jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java
---- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 02:12:37.000000000 +0530
-+++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 02:15:10.000000000 +0530
+@@ -52,7 +52,7 @@
+ /**
+ * The next run timestamp
+ */
+- private SynchronizedLong nextRun = new SynchronizedLong(0);
++ private AtomicLong nextRun = new AtomicLong(0);
+
+ /**
+ * The current scheduler
+Index: jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-10-22 17:00:18.000000000 +0200
++++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-06 14:52:09.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.SessionMetaData;
@@ -434,9 +613,10 @@
static ObjectName getEJBModuleName(ObjectName ejbModuleService)
{
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/Connection.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/Connection.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/Connection.java 2007-10-22 17:00:47.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/Connection.java 2007-11-06 14:52:09.000000000 +0100
@@ -44,10 +44,10 @@
import org.jboss.mq.il.ServerIL;
import org.jboss.util.UnreachableStatementException;
@@ -452,9 +632,10 @@
/**
* This class implements javax.jms.Connection.
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-11-06 02:12:37.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-10-22 17:00:39.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/http/HTTPClientILStorageQueue.java 2007-11-06 14:52:09.000000000 +0100
@@ -28,7 +28,7 @@
import org.jboss.logging.Logger;
@@ -464,9 +645,10 @@
/**
* Stores requests on behalf of clients. This could of course, be done
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-10-22 17:00:41.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-06 14:52:09.000000000 +0100
@@ -28,12 +28,12 @@
import org.jboss.logging.Logger;
@@ -486,9 +668,10 @@
/**
* The OIL2 implementation of the ServerIL object
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-10-22 17:00:45.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/ServerSocketManagerHandler.java 2007-11-06 14:52:09.000000000 +0100
@@ -55,7 +55,7 @@
import org.jboss.mq.il.uil2.msgs.PingMsg;
import org.jboss.mq.il.Invoker;
@@ -498,9 +681,10 @@
/** This is the SocketManager callback handler for the UIL2 server side
* socket. This handles messages that are requests from clients.
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-10-22 17:00:45.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -35,12 +35,12 @@
import org.jboss.util.stream.NotifyingBufferedInputStream;
import org.jboss.util.stream.NotifyingBufferedOutputStream;
@@ -520,9 +704,10 @@
/** Used to manage the client/server and server/client communication in an
* asynchrounous manner.
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-10-22 17:00:45.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-06 14:52:09.000000000 +0100
@@ -41,8 +41,8 @@
import org.jboss.security.SecurityDomain;
import org.jboss.system.server.ServerConfigUtil;
@@ -534,9 +719,10 @@
/** This is the server side MBean for the UIL2 transport layer.
*
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -64,7 +64,7 @@
import org.jboss.tm.TransactionTimeoutConfiguration;
import org.jboss.util.UnreachableStatementException;
@@ -546,9 +732,10 @@
/**
* This class manages all persistence related services for JDBC based
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -33,8 +33,8 @@
import org.jboss.mq.server.MessageReference;
import org.jboss.system.ServiceMBeanSupport;
@@ -560,9 +747,10 @@
/**
* A persistence manager and cache store that does not persistence.
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-10-22 17:00:36.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -33,8 +33,8 @@
import org.jboss.mq.Recoverable;
import org.jboss.mq.SpyJMSException;
@@ -574,9 +762,10 @@
/**
* This class allows provides the base for user supplied persistence packages.
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-06 14:52:09.000000000 +0100
@@ -50,8 +50,8 @@
import org.jboss.util.timeout.Timeout;
import org.jboss.util.timeout.TimeoutTarget;
@@ -588,9 +777,10 @@
/**
* This class represents a queue which provides it's messages exclusively to one
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-10-22 17:00:34.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-06 14:52:09.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.il.jvm.JVMClientIL;
@@ -609,9 +799,10 @@
private static class ClientStats
{
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -56,7 +56,7 @@
import org.jboss.util.threadpool.ThreadPool;
import org.jboss.util.timeout.TimeoutFactory;
@@ -643,9 +834,10 @@
/** last id given to a client */
private int lastID = 1;
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-10-22 17:00:35.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-06 14:52:09.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.pm.PersistenceManager;
import org.jboss.mq.pm.Tx;
@@ -666,9 +858,10 @@
public JMSTopic(SpyDestination dest, ClientConsumer temporary, JMSDestinationManager server, BasicQueueParameters parameters) throws JMSException
{
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/MessageCache.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-10-22 17:00:34.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/MessageCache.java 2007-11-06 14:52:09.000000000 +0100
@@ -31,7 +31,7 @@
import org.jboss.mq.SpyMessage;
import org.jboss.mq.pm.CacheStore;
@@ -678,9 +871,10 @@
/**
* This class implements a Message cache so that larger amounts of messages
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-10-22 17:00:48.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyConnectionConsumer.java 2007-11-06 14:52:09.000000000 +0100
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
@@ -690,9 +884,10 @@
/**
* This class implements javax.jms.ConnectionConsumer
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-10-22 17:00:48.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageConsumer.java 2007-11-06 14:52:09.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.UnreachableStatementException;
@@ -702,9 +897,10 @@
/**
* This class implements <tt>javax.jms.MessageConsumer</tt>.
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageProducer.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-10-22 17:00:48.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyMessageProducer.java 2007-11-06 14:52:09.000000000 +0100
@@ -41,7 +41,7 @@
import org.jboss.logging.Logger;
@@ -714,9 +910,10 @@
/**
* This class implements javax.jms.MessageProducer
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpySession.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpySession.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpySession.java 2007-10-22 17:00:47.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpySession.java 2007-11-06 14:52:09.000000000 +0100
@@ -56,7 +56,7 @@
import org.jboss.logging.Logger;
@@ -726,9 +923,10 @@
/**
* This class implements javax.jms.Session and javax.jms.XASession
-diff -urN jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 02:12:38.000000000 +0530
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-10-22 17:00:47.000000000 +0200
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-06 14:52:09.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.ArrayList;
@@ -747,9 +945,10 @@
/** The next xid */
private long nextInternalXid = Long.MIN_VALUE;
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-11-06 02:12:49.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-10-22 16:50:15.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/AttributeBasedConcurrentTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -29,7 +29,7 @@
import java.util.Random;
@@ -759,9 +958,10 @@
/**
* Simple clustering test case of get/set. It is attribute based granularity with concurrent access.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-11-06 02:12:49.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-10-22 16:50:15.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -57,7 +57,7 @@
import org.jgroups.stack.GossipRouter;
import org.jgroups.stack.IpAddress;
@@ -771,9 +971,10 @@
/** Tests of the DistributedReplicantManagerImpl
*
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-11-06 02:12:49.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-10-22 16:50:15.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cluster/test/SessionBasedConcurrentTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -29,7 +29,7 @@
import java.util.Random;
@@ -783,9 +984,10 @@
/**
* Simple clustering test case of get/set. It is session based granularity with concurrent access.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-11-06 02:12:51.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-10-22 16:50:24.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2007-11-06 14:52:09.000000000 +0100
@@ -29,7 +29,7 @@
import javax.jms.Message;
import javax.jms.ObjectMessage;
@@ -795,9 +997,10 @@
import org.apache.log4j.Category;
/**
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-11-06 02:12:51.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-10-22 16:50:24.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -28,7 +28,7 @@
import javax.jms.QueueSession;
import javax.naming.InitialContext;
@@ -807,9 +1010,10 @@
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-11-06 02:12:51.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-10-22 16:50:24.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2007-11-06 14:52:09.000000000 +0100
@@ -25,7 +25,7 @@
import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
@@ -819,9 +1023,10 @@
/** Invoker thread for StatelessSession tests.
* @author Scott.Stark at jboss.org
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-11-06 02:12:51.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-10-22 16:50:24.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -48,7 +48,7 @@
import org.jboss.test.cts.keys.AccountPK;
import org.jboss.tm.TransactionManagerServiceMBean;
@@ -831,9 +1036,10 @@
/** Tests of stateful session beans
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-11-06 02:12:51.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-10-22 16:50:24.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -40,7 +40,7 @@
import org.jboss.test.cts.interfaces.StatelessSessionHome;
import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
@@ -843,9 +1049,10 @@
/** Basic conformance tests for stateless sessions
*
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 02:12:51.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 02:15:10.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-10-22 16:50:48.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-06 14:52:09.000000000 +0100
@@ -34,8 +34,8 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
@@ -857,9 +1064,10 @@
public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
{
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-10-22 16:51:47.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2007-11-06 14:52:09.000000000 +0100
@@ -39,7 +39,7 @@
import org.apache.log4j.Category;
import org.jboss.test.JBossTestCase;
@@ -869,9 +1077,10 @@
/**
* JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-10-22 16:51:47.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/OILInvocationLayerStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.jbossmq.perf;
@@ -881,9 +1090,10 @@
/**
* JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-10-22 16:51:47.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/perf/UIL2InvocationLayerStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -22,7 +22,7 @@
package org.jboss.test.jbossmq.perf;
@@ -893,9 +1103,10 @@
/**
* JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-10-22 16:51:48.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/support/MockClientIL.java 2007-11-06 14:52:09.000000000 +0100
@@ -27,7 +27,7 @@
import org.jboss.mq.SpyDestination;
import org.jboss.mq.il.ClientIL;
@@ -905,9 +1116,10 @@
/**
* MonitorCloseTestClientIL.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-10-22 16:51:45.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/AbstractRestartDisconnectClientsTest.java 2007-11-06 14:52:09.000000000 +0100
@@ -30,7 +30,7 @@
import org.jboss.test.JBossTestCase;
@@ -917,9 +1129,10 @@
/**
* A test to make sure exception listeners are fired when a service is restarted
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-10-22 16:51:45.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2007-11-06 14:52:09.000000000 +0100
@@ -57,7 +57,7 @@
import org.apache.log4j.Category;
import org.jboss.test.JBossTestCase;
@@ -929,9 +1142,10 @@
/**
* Basic jms tests.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-11-06 02:12:54.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-10-22 16:51:46.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2007-11-06 14:52:09.000000000 +0100
@@ -46,7 +46,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -941,9 +1155,10 @@
import org.apache.log4j.Category;
import org.jboss.test.JBossTestCase;
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-11-06 02:12:55.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-10-22 16:50:34.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java 2007-11-06 14:52:09.000000000 +0100
@@ -37,7 +37,7 @@
import org.jboss.logging.Logger;
@@ -953,9 +1168,10 @@
/**
* ManagedConnectionFactory.java
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-11-06 02:12:55.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-10-22 16:50:34.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java 2007-11-06 14:52:09.000000000 +0100
@@ -44,7 +44,7 @@
import org.jboss.logging.Logger;
import org.jboss.tm.TxUtils;
@@ -965,9 +1181,10 @@
/**
* TestManagedConnection.java
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 02:12:55.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-10-22 16:50:37.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-06 14:52:09.000000000 +0100
@@ -31,7 +31,7 @@
import javax.transaction.xa.XAResource;
@@ -986,9 +1203,10 @@
/**
* Get the work manager
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 02:12:55.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-10-22 16:50:40.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-06 14:52:09.000000000 +0100
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
@@ -1007,9 +1225,10 @@
public TestResourceAdapterInflowResults testInflow() throws Exception
{
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-11-06 02:12:55.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-10-22 16:50:33.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/test/AbstractConcurrentStressTest.java 2007-11-06 14:52:09.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.test.util.ejb.EJBTestCase;
@@ -1019,9 +1238,10 @@
/**
* Abstract concurrent stress test.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 02:12:55.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-10-22 16:50:12.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-06 14:52:09.000000000 +0100
@@ -34,8 +34,8 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
@@ -1033,9 +1253,10 @@
/**
* A PropertyTestManagedConnection.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-11-06 02:13:00.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-10-22 16:51:42.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryCancelStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.util.timeout.TimeoutFactory;
import org.jboss.util.timeout.TimeoutTarget;
@@ -1045,9 +1266,10 @@
/**
* TimeoutFactoryCancelStressTestCase.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-11-06 02:13:00.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-10-22 16:51:42.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryMixedStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.util.timeout.TimeoutFactory;
import org.jboss.util.timeout.TimeoutTarget;
@@ -1057,9 +1279,10 @@
/**
* TimeoutFactoryMixedStressTestCase.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-11-06 02:13:00.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-10-22 16:51:42.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryStressTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -26,7 +26,7 @@
import org.jboss.util.timeout.TimeoutFactory;
import org.jboss.util.timeout.TimeoutTarget;
@@ -1069,9 +1292,10 @@
/**
* TimeoutFactoryStressTestCase.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-11-06 02:13:00.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-10-22 16:51:42.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/util/test/TimeoutFactoryTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -28,7 +28,7 @@
import org.jboss.util.timeout.TimeoutFactory;
import org.jboss.util.timeout.TimeoutTarget;
@@ -1081,21 +1305,23 @@
/**
* Unit tests for TimeoutFactory class.
-diff -urN jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-11-06 02:13:01.000000000 +0530
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-11-06 02:15:11.000000000 +0530
+Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-10-22 16:51:01.000000000 +0200
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-11-06 14:52:09.000000000 +0100
@@ -49,7 +49,7 @@
import org.jgroups.ViewId;
import org.jgroups.stack.IpAddress;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-+import java.util.concurrent.ReentrantLock;
++import java.util.concurrent.locks.ReentrantLock;
/**
* Test of the TreeCacheSSOClusterManager class.
-diff -urN jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java
---- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-11-06 02:13:14.000000000 +0530
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-10-22 16:49:40.000000000 +0200
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/filters/SemaphoreValve.java 2007-11-06 14:52:09.000000000 +0100
@@ -31,8 +31,8 @@
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
@@ -1107,9 +1333,10 @@
/**
* <p>Implementation of a Valve that limits concurrency.</p>
-diff -urN jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
---- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 02:13:14.000000000 +0530
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-10-22 16:49:37.000000000 +0200
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-06 14:52:09.000000000 +0100
@@ -43,7 +43,7 @@
import org.jboss.web.tomcat.service.JBossWeb;
import org.jboss.web.tomcat.service.session.JBossManager;
@@ -1119,9 +1346,10 @@
/**
-diff -urN jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java
---- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 02:13:14.000000000 +0530
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-10-22 16:49:40.000000000 +0200
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-06 14:52:09.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
@@ -1149,9 +1377,10 @@
}
public void updatePassivationStats(String ctx, long elapsed)
-diff -urN jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
---- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 02:13:15.000000000 +0530
-+++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-10-22 16:49:29.000000000 +0200
++++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-06 14:52:09.000000000 +0100
@@ -33,8 +33,8 @@
import org.jboss.util.NestedRuntimeException;
@@ -1159,13 +1388,14 @@
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ReentrantLock;
++import java.util.concurrent.locks.ReentrantLock;
/**
* An implementation of the transaction local implementation
-diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java
---- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-11-06 02:13:15.000000000 +0530
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-10-22 16:58:49.000000000 +0200
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/jmx/adaptor/snmp/agent/Counter.java 2007-11-06 14:52:09.000000000 +0100
@@ -22,7 +22,7 @@
/**
* Simple, thread safe counter implementattion with accessor methods.
@@ -1175,9 +1405,10 @@
*
* @version $Revision: 44599 $
*
-diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java
---- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-11-06 02:13:15.000000000 +0530
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-10-22 16:58:42.000000000 +0200
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/alarm/AlarmTable.java 2007-11-06 14:52:09.000000000 +0100
@@ -31,7 +31,7 @@
import org.jboss.system.ServiceMBeanSupport;
@@ -1187,9 +1418,10 @@
/**
* AlarmTable
-diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java
---- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-11-06 02:13:15.000000000 +0530
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-10-22 16:58:41.000000000 +0200
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ActiveAlarmTable.java 2007-11-06 14:52:09.000000000 +0100
@@ -32,7 +32,7 @@
import org.jboss.system.ListenerServiceMBeanSupport;
import org.jboss.util.Strings;
@@ -1199,9 +1431,10 @@
/**
* ActiveAlarmTable
-diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/NotificationListener.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java
---- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-11-06 02:13:15.000000000 +0530
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-10-22 16:58:41.000000000 +0200
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/NotificationListener.java 2007-11-06 14:52:09.000000000 +0100
@@ -27,7 +27,7 @@
import org.jboss.logging.DynamicLogger;
import org.jboss.system.ListenerServiceMBeanSupport;
@@ -1211,9 +1444,10 @@
/**
* A simple JMX notification listener that outputs notifications as log.INFO
-diff -urN jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ScriptingListener.java jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java
---- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-11-06 02:13:15.000000000 +0530
-+++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-11-06 02:15:12.000000000 +0530
+Index: jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-10-22 16:58:41.000000000 +0200
++++ jbossas4-4.2.2.GA/varia/src/main/org/jboss/monitor/services/ScriptingListener.java 2007-11-06 14:52:09.000000000 +0100
@@ -34,7 +34,7 @@
import org.jboss.monitor.alarm.AlarmManager;
import org.jboss.system.ListenerServiceMBeanSupport;
@@ -1223,3 +1457,47 @@
/**
* A simple listener that can subscribe for any combination
+Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2007-11-06 14:55:57.000000000 +0100
++++ jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2007-11-06 14:56:49.000000000 +0100
+@@ -60,7 +60,7 @@
+ import org.w3c.dom.NodeList;
+ import org.xml.sax.InputSource;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * This is the main Service Deployer API.
+@@ -109,7 +109,7 @@
+ * A Map<String, List<String>> of the suffix to accepted archive META-INF descriptor name
+ * @todo externalize this
+ */
+- private Map suffixToDescriptorMap = new ConcurrentReaderHashMap();
++ private Map suffixToDescriptorMap = new ConcurrentHashMap();
+
+ /** A flag indicating if the parser used for the service descriptor should be configured for namespaces */
+ private boolean useNamespaceAwareParser;
+Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/system/Registry.java 2007-11-06 14:56:58.000000000 +0100
++++ jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java 2007-11-06 14:57:16.000000000 +0100
+@@ -25,7 +25,7 @@
+
+ import org.jboss.logging.Logger;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * A registry, really, a registry.
+@@ -41,7 +41,7 @@
+ {
+ private static final Logger log = Logger.getLogger(Registry.class);
+
+- public static Map entries = new ConcurrentReaderHashMap();
++ public static Map entries = new ConcurrentHashMap();
+
+ public static void bind(final Object key, final Object value)
+ {
Deleted: trunk/jbossas4/debian/patches/messagecontext.diff
===================================================================
--- trunk/jbossas4/debian/patches/messagecontext.diff 2007-11-06 12:49:12 UTC (rev 4632)
+++ trunk/jbossas4/debian/patches/messagecontext.diff 2007-11-06 13:59:41 UTC (rev 4633)
@@ -1,13 +0,0 @@
-Index: jbossas4-4.2.2.GA/j2ee/src/main/javax/ejb/SessionContext.java
-===================================================================
---- jbossas4-4.2.2.GA.orig/j2ee/src/main/javax/ejb/SessionContext.java 2007-11-03 03:28:20.000000000 +0530
-+++ jbossas4-4.2.2.GA/j2ee/src/main/javax/ejb/SessionContext.java 2007-11-03 03:28:30.000000000 +0530
-@@ -21,7 +21,7 @@
- */
- package javax.ejb;
-
--import javax.xml.rpc.handler.MessageContext;
-+import javax.mail.MessageContext;
-
- /**
- * The SessionContext interface provides access to the runtime session
Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series 2007-11-06 12:49:12 UTC (rev 4632)
+++ trunk/jbossas4/debian/patches/series 2007-11-06 13:59:41 UTC (rev 4633)
@@ -1,3 +1,3 @@
-messagecontext.diff
dom4j.diff
collection.diff
+concurrent.diff
Modified: trunk/jbossas4/debian/rules
===================================================================
--- trunk/jbossas4/debian/rules 2007-11-06 12:49:12 UTC (rev 4632)
+++ trunk/jbossas4/debian/rules 2007-11-06 13:59:41 UTC (rev 4633)
@@ -9,7 +9,7 @@
DEB_ANT_BUILDFILE := debian/build.xml
DEB_JARS := jboss-common junit log4j-1.2 jboss-profiler ant-junit commons-httpclient \
bcel concurrent dom4j jboss-xml-binding servlet-api gnu-getopt glassfish-javaee \
- glassfish-activation glassfish-ejb-api
+ glassfish-activation glassfish-ejb-api jaxrpc
ALL_JARS = $(wildcard *.jar)
DEST_DIR = $(DEB_DESTDIR)/usr/share/java
More information about the pkg-java-commits
mailing list