[jboss-cvs] JBoss Messaging SVN: r2676 - in trunk: src/main/org/jboss/jms and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 14 18:55:42 EDT 2007
Author: timfox
Date: 2007-05-14 18:55:42 -0400 (Mon, 14 May 2007)
New Revision: 2676
Added:
trunk/src/main/org/jboss/jms/client/tx/
trunk/src/main/org/jboss/jms/shared/
trunk/src/main/org/jboss/jms/shared/tx/
Removed:
trunk/src/main/org/jboss/jms/tx/
Modified:
trunk/.classpath
trunk/build-messaging.xml
trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java
trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
trunk/src/main/org/jboss/jms/client/state/SessionState.java
trunk/src/main/org/jboss/jms/client/tx/ClientTransaction.java
trunk/src/main/org/jboss/jms/client/tx/LocalTx.java
trunk/src/main/org/jboss/jms/client/tx/MessagingXAResource.java
trunk/src/main/org/jboss/jms/client/tx/ResourceManager.java
trunk/src/main/org/jboss/jms/client/tx/ResourceManagerFactory.java
trunk/src/main/org/jboss/jms/client/tx/TransactionRequest.java
trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java
trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
Log:
Separating out client classes step 1
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/.classpath 2007-05-14 22:55:42 UTC (rev 2676)
@@ -29,7 +29,6 @@
<classpathentry kind="lib" path="tests/lib/jboss-local-jdbc.jar"/>
<classpathentry kind="lib" path="tests/lib/jboss-mbeans.jar"/>
<classpathentry kind="lib" path="tests/lib/jms-ra.jar"/>
- <classpathentry kind="lib" path="tests/lib/mysql-connector-java-3.1.13-bin.jar"/>
<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/build-messaging.xml 2007-05-14 22:55:42 UTC (rev 2676)
@@ -423,7 +423,7 @@
<jar jarfile="${build.lib}/jboss-messaging-fat-client.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/**"/>
+ <include name="org/jboss/jms/client/**/*.class"/>
</fileset>
<fileset dir="${build.etc}">
<include name="VERSION"/>
@@ -455,7 +455,7 @@
value="jboss-aop.jar jboss-remoting.jar jboss-serialization.jar javassist.jar trove.jar jboss-common-core.jar jboss-common-client.jar jboss-j2ee.jar jboss-j2se.jar jnp-client.jar concurrent.jar log4j.jar commons-logging.jar"/>
</manifest>
<fileset dir="${build.classes}">
- <include name="org/jboss/**"/>
+ <include name="org/jboss/jms/client/**/*.class"/>
</fileset>
<fileset dir="${build.etc}">
<include name="VERSION"/>
Modified: trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -21,7 +21,6 @@
*/
package org.jboss.jms.client.container;
-
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
Modified: trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -33,7 +33,7 @@
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.message.MessageIdGeneratorFactory;
-import org.jboss.jms.tx.ResourceManagerFactory;
+import org.jboss.jms.client.tx.ResourceManagerFactory;
/**
* Handles operations related to the connection
Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -59,8 +59,8 @@
import org.jboss.jms.message.TextMessageProxy;
import org.jboss.jms.server.endpoint.DefaultCancel;
import org.jboss.jms.server.endpoint.DeliveryInfo;
-import org.jboss.jms.tx.LocalTx;
-import org.jboss.jms.tx.ResourceManager;
+import org.jboss.jms.client.tx.LocalTx;
+import org.jboss.jms.client.tx.ResourceManager;
import org.jboss.logging.Logger;
/**
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -35,11 +35,11 @@
import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.client.state.HierarchicalState;
+import org.jboss.jms.client.tx.ResourceManagerFactory;
+import org.jboss.jms.client.tx.TransactionRequest;
import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.server.Version;
-import org.jboss.jms.tx.ResourceManagerFactory;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.jms.wireformat.CloseRequest;
import org.jboss.jms.wireformat.ClosingRequest;
import org.jboss.jms.wireformat.ConnectionCreateSessionDelegateRequest;
Modified: trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ConnectionState.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/client/state/ConnectionState.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -33,8 +33,8 @@
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
import org.jboss.jms.message.MessageIdGenerator;
import org.jboss.jms.server.Version;
-import org.jboss.jms.tx.ResourceManager;
-import org.jboss.jms.tx.ResourceManagerFactory;
+import org.jboss.jms.client.tx.ResourceManager;
+import org.jboss.jms.client.tx.ResourceManagerFactory;
import org.jboss.logging.Logger;
import EDU.oswego.cs.dl.util.concurrent.SyncSet;
Modified: trunk/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/SessionState.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/client/state/SessionState.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -44,8 +44,8 @@
import org.jboss.jms.server.Version;
import org.jboss.jms.server.endpoint.DeliveryInfo;
import org.jboss.jms.server.endpoint.DeliveryRecovery;
-import org.jboss.jms.tx.MessagingXAResource;
-import org.jboss.jms.tx.ResourceManager;
+import org.jboss.jms.client.tx.MessagingXAResource;
+import org.jboss.jms.client.tx.ResourceManager;
import org.jboss.logging.Logger;
import org.jboss.messaging.util.ClearableQueuedExecutor;
Copied: trunk/src/main/org/jboss/jms/client/tx (from rev 2670, trunk/src/main/org/jboss/jms/tx)
Modified: trunk/src/main/org/jboss/jms/client/tx/ClientTransaction.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/ClientTransaction.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/main/org/jboss/jms/client/tx/ClientTransaction.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jms.tx;
+package org.jboss.jms.client.tx;
import java.io.DataInputStream;
import java.io.DataOutputStream;
Modified: trunk/src/main/org/jboss/jms/client/tx/LocalTx.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/LocalTx.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/main/org/jboss/jms/client/tx/LocalTx.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jms.tx;
+package org.jboss.jms.client.tx;
import org.jboss.util.id.GUID;
Modified: trunk/src/main/org/jboss/jms/client/tx/MessagingXAResource.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/main/org/jboss/jms/client/tx/MessagingXAResource.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jms.tx;
+package org.jboss.jms.client.tx;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
Modified: trunk/src/main/org/jboss/jms/client/tx/ResourceManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/ResourceManager.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/main/org/jboss/jms/client/tx/ResourceManager.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jms.tx;
+package org.jboss.jms.client.tx;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,7 +38,7 @@
import org.jboss.jms.message.JBossMessage;
import org.jboss.jms.message.MessageProxy;
import org.jboss.jms.server.endpoint.DeliveryInfo;
-import org.jboss.jms.tx.ClientTransaction.SessionTxState;
+import org.jboss.jms.client.tx.ClientTransaction.SessionTxState;
import org.jboss.jms.util.MessagingTransactionRolledBackException;
import org.jboss.jms.util.MessagingXAException;
import org.jboss.logging.Logger;
Modified: trunk/src/main/org/jboss/jms/client/tx/ResourceManagerFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/main/org/jboss/jms/client/tx/ResourceManagerFactory.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jms.tx;
+package org.jboss.jms.client.tx;
import java.util.HashMap;
import java.util.Map;
Modified: trunk/src/main/org/jboss/jms/client/tx/TransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/TransactionRequest.java 2007-05-12 14:43:53 UTC (rev 2670)
+++ trunk/src/main/org/jboss/jms/client/tx/TransactionRequest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jms.tx;
+package org.jboss.jms.client.tx;
import java.io.DataInputStream;
import java.io.DataOutputStream;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -24,8 +24,8 @@
import javax.jms.JMSException;
import org.jboss.jms.client.Closeable;
+import org.jboss.jms.client.tx.TransactionRequest;
import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.plugin.IDBlock;
import org.jboss.messaging.core.tx.MessagingXid;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -35,6 +35,9 @@
import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.remoting.CallbackManager;
+import org.jboss.jms.client.tx.ClientTransaction;
+import org.jboss.jms.client.tx.TransactionRequest;
+import org.jboss.jms.client.tx.ClientTransaction.SessionTxState;
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.jms.message.JBossMessage;
@@ -45,9 +48,6 @@
import org.jboss.jms.server.endpoint.advised.SessionAdvised;
import org.jboss.jms.server.messagecounter.MessageCounter;
import org.jboss.jms.server.remoting.JMSWireFormat;
-import org.jboss.jms.tx.ClientTransaction;
-import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.jms.tx.ClientTransaction.SessionTxState;
import org.jboss.jms.util.ExceptionUtil;
import org.jboss.jms.util.ToString;
import org.jboss.jms.wireformat.Dispatcher;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -23,9 +23,9 @@
import javax.jms.JMSException;
+import org.jboss.jms.client.tx.TransactionRequest;
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.server.endpoint.ConnectionEndpoint;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.plugin.IDBlock;
import org.jboss.messaging.core.tx.MessagingXid;
Modified: trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/src/main/org/jboss/jms/wireformat/ConnectionSendTransactionRequest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -24,8 +24,8 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
+import org.jboss.jms.client.tx.TransactionRequest;
import org.jboss.jms.server.endpoint.ConnectionEndpoint;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.logging.Logger;
/**
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -37,10 +37,10 @@
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.state.ConnectionState;
+import org.jboss.jms.client.tx.ResourceManager;
+import org.jboss.jms.client.tx.ResourceManagerFactory;
import org.jboss.jms.message.MessageIdGenerator;
import org.jboss.jms.message.MessageIdGeneratorFactory;
-import org.jboss.jms.tx.ResourceManager;
-import org.jboss.jms.tx.ResourceManagerFactory;
import org.jboss.logging.Logger;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -35,7 +35,7 @@
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.tx.ResourceManager;
+import org.jboss.jms.client.tx.ResourceManager;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -33,6 +33,8 @@
import org.jboss.jms.client.delegate.ClientBrowserDelegate;
import org.jboss.jms.client.delegate.ClientConsumerDelegate;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
+import org.jboss.jms.client.tx.ClientTransaction;
+import org.jboss.jms.client.tx.TransactionRequest;
import org.jboss.jms.destination.JBossQueue;
import org.jboss.jms.destination.JBossTemporaryQueue;
import org.jboss.jms.destination.JBossTopic;
@@ -44,8 +46,6 @@
import org.jboss.jms.server.endpoint.DefaultCancel;
import org.jboss.jms.server.endpoint.DeliveryRecovery;
import org.jboss.jms.server.remoting.JMSWireFormat;
-import org.jboss.jms.tx.ClientTransaction;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.jms.wireformat.BrowserHasNextMessageRequest;
import org.jboss.jms.wireformat.BrowserHasNextMessageResponse;
import org.jboss.jms.wireformat.BrowserNextMessageBlockRequest;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -36,7 +36,7 @@
import javax.transaction.xa.Xid;
import org.jboss.jms.client.JBossConnectionFactory;
-import org.jboss.jms.tx.ResourceManagerFactory;
+import org.jboss.jms.client.tx.ResourceManagerFactory;
import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -55,9 +55,9 @@
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.tx.LocalTx;
-import org.jboss.jms.tx.MessagingXAResource;
-import org.jboss.jms.tx.ResourceManager;
+import org.jboss.jms.client.tx.LocalTx;
+import org.jboss.jms.client.tx.MessagingXAResource;
+import org.jboss.jms.client.tx.ResourceManager;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.test.messaging.MessagingTestCase;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -31,12 +31,12 @@
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.JBossConnectionFactory;
+import org.jboss.jms.client.tx.TransactionRequest;
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.connectionmanager.SimpleConnectionManager;
import org.jboss.jms.server.endpoint.ConnectionEndpoint;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.plugin.IDBlock;
import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.test.messaging.MessagingTestCase;
Modified: trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java 2007-05-14 20:09:37 UTC (rev 2675)
+++ trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java 2007-05-14 22:55:42 UTC (rev 2676)
@@ -12,14 +12,14 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.jms.client.tx.TransactionRequest;
+import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
+import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
import org.jboss.jms.server.endpoint.ServerSessionEndpoint;
-import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
+import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
import org.jboss.jms.server.endpoint.advised.SessionAdvised;
-import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
-import org.jboss.jms.server.ServerPeer;
-import org.jboss.jms.tx.TransactionRequest;
import org.jboss.logging.Logger;
import org.jboss.test.messaging.tools.jmx.rmi.RMITestServer;
More information about the jboss-cvs-commits
mailing list