[jboss-cvs] JBoss Messaging SVN: r2687 - in trunk/tests/src/org/jboss/test: messaging/tools/jmx and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-05-15 06:50:27 -0400 (Tue, 15 May 2007)
New Revision: 2687

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
Log:
More tweaks


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-15 08:47:20 UTC (rev 2686)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java	2007-05-15 10:50:27 UTC (rev 2687)
@@ -32,13 +32,13 @@
 import org.jboss.jms.client.JBossConnection;
 import org.jboss.jms.client.JBossConnectionFactory;
 import org.jboss.jms.delegate.ConnectionEndpoint;
+import org.jboss.jms.delegate.IDBlock;
 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.tx.MessagingXid;
 import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.messaging.core.plugin.IDBlock;
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
 

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-05-15 08:47:20 UTC (rev 2686)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-05-15 10:50:27 UTC (rev 2687)
@@ -1368,8 +1368,8 @@
          long clientLeasePeriod = 20000;
 
          String marshallers =
-            "marshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
-            "unmarshaller=org.jboss.jms.server.remoting.JMSWireFormat&";
+            "marshaller=org.jboss.jms.wireformat.JMSWireFormat&" +
+            "unmarshaller=org.jboss.jms.wireformat.JMSWireFormat&";
          String dataType = "dataType=jms&";
 
          // We use this from thirdparty remoting tests when we don't want to send stuff through

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2007-05-15 08:47:20 UTC (rev 2686)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2007-05-15 10:50:27 UTC (rev 2687)
@@ -190,10 +190,10 @@
          "socket://" + addr + ":" + port + "/?" +
             "clientSocketClass=org.jboss.jms.client.remoting.ClientSocketWrapper&" +
             "dataType=jms&" +
-            "marshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
+            "marshaller=org.jboss.jms.wireformat.JMSWireFormat&" +
             "serializationtype=jboss&" +
             "socket.check_connection=false&" +
-            "unmarshaller=org.jboss.jms.server.remoting.JMSWireFormat";
+            "unmarshaller=org.jboss.jms.wireformat.JMSWireFormat";
 
       ServiceAttributeOverrides sao = new ServiceAttributeOverrides();
       sao.put(ServiceContainer.REMOTING_OBJECT_NAME, "LocatorURI", serviceLocatorString);