[jboss-cvs] JBoss Messaging SVN: r1648 - in branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging: core core/base core/distributed/queue core/local core/paging core/plugin jms
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 28 14:14:21 EST 2006
Author: juha at jboss.org
Date: 2006-11-28 14:14:15 -0500 (Tue, 28 Nov 2006)
New Revision: 1648
Modified:
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/SimpleDeliveryTest.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/base/ChannelTestBase.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/distributed/queue/RecoverableDistributedQueueTest.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableQueueTest.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableSubscriptionTest.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
Log:
API change to TransactionRepository to require a reference to message store on start().
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/SimpleDeliveryTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/SimpleDeliveryTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/SimpleDeliveryTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -26,6 +26,7 @@
import org.jboss.messaging.core.DeliveryObserver;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.plugin.JDBCPersistenceManager;
+import org.jboss.messaging.core.plugin.SimpleMessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.messaging.core.tx.TransactionRepository;
@@ -95,7 +96,7 @@
TransactionRepository tr = new TransactionRepository();
- tr.start(pm);
+ tr.start(pm, new SimpleMessageStore("test.store"));
Transaction tx = tr.createTransaction();
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/base/ChannelTestBase.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/base/ChannelTestBase.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/base/ChannelTestBase.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -106,10 +106,11 @@
((JDBCPersistenceManager)msPersistenceManagerDelegate).start();
- tr.start(this.msPersistenceManagerDelegate);
-
ms = new SimpleMessageStore("s47");
+ tr.start(this.msPersistenceManagerDelegate, ms);
+
+
}
public void tearDown() throws Exception
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/distributed/queue/RecoverableDistributedQueueTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/distributed/queue/RecoverableDistributedQueueTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/distributed/queue/RecoverableDistributedQueueTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -83,7 +83,7 @@
channel3 = new DistributedQueue("test", ms3, tl3, dispatcher3);
// initialize the transaction repository with the new transaction log
- tr.start(tl);
+ tr.start(tl, ms);
log.debug("setup done");
}
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableQueueTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableQueueTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableQueueTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -61,7 +61,7 @@
channel = new Queue(1, ms, pm, null, true, 100, 20, 10, new QueuedExecutor());
- tr.start(pm);
+ tr.start(pm, ms);
}
public void tearDown() throws Exception
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableSubscriptionTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableSubscriptionTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/local/RecoverableSubscriptionTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -63,7 +63,7 @@
ms = new SimpleMessageStore("s20");
- tr.start(tl);
+ tr.start(tl, ms);
channel = new CoreSubscription(123, null, ms, tl, null, true, 100, 20, 10, new QueuedExecutor(), null);
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -107,7 +107,7 @@
tr = new TransactionRepository();
- tr.start(pm);
+ tr.start(pm, ms);
}
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -124,7 +124,7 @@
tr = new TransactionRepository();
- tr.start(pm);
+ tr.start(pm, ms);
ChannelSupport queue2 = new Queue(1, ms, pm, null, true, 100, 20, 10, new QueuedExecutor());
@@ -213,7 +213,7 @@
tr = new TransactionRepository();
- tr.start(pm);
+ tr.start(pm, ms);
ChannelSupport queue2 = new Queue(1, ms, pm, null, false, 100, 20, 10, new QueuedExecutor());
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -1024,7 +1024,7 @@
Channel channel = new SimpleChannel(0, ms);
TransactionRepository txRep = new TransactionRepository();
- txRep.start(pm);
+ txRep.start(pm, ms);
Message[] messages = createMessages(10);
@@ -1378,7 +1378,7 @@
Channel channel = new SimpleChannel(0, ms);
TransactionRepository txRep = new TransactionRepository();
- txRep.start(pm);
+ txRep.start(pm, ms);
log.debug("transaction log started");
@@ -1485,7 +1485,7 @@
Channel channel = new SimpleChannel(0, ms);
TransactionRepository txRep = new TransactionRepository();
- txRep.start(pm);
+ txRep.start(pm, ms);
Message[] messages = createMessages(10);
Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2006-11-28 06:28:47 UTC (rev 1647)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2006-11-28 19:14:15 UTC (rev 1648)
@@ -22,7 +22,10 @@
package org.jboss.test.messaging.jms;
import javax.jms.Destination;
+import javax.jms.XASession;
+import javax.jms.XAConnection;
import javax.naming.InitialContext;
+import javax.transaction.xa.XAResource;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.test.messaging.MessagingTestCase;
@@ -89,22 +92,23 @@
}
-//
-// public void test1() throws Exception
-// {
+
+ public void test1() throws Exception
+ {
+ System.out.println("=========================Execute single test");
+
+ XAConnection conn1 = cf.createXAConnection();
+
+ XAConnection conn2 = cf.createXAConnection();
+
+ XASession sess1 = conn1.createXASession();
+
+ XASession sess2 = conn2.createXASession();
+
+ XAResource res1 = sess1.getXAResource();
+
+ XAResource res2 = sess2.getXAResource();
//
-// XAConnection conn1 = cf.createXAConnection();
-//
-// XAConnection conn2 = cf.createXAConnection();
-//
-// XASession sess1 = conn1.createXASession();
-//
-// XASession sess2 = conn2.createXASession();
-//
-// XAResource res1 = sess1.getXAResource();
-//
-// XAResource res2 = sess2.getXAResource();
-//
// //Pretend to be a transaction manager by interacting through the XAResources
// Xid xid1 = new XidImpl("bq1".getBytes(), 123, "gbtxid1".getBytes());
// Xid xid2 = new XidImpl("bq2".getBytes(), 124, "gbtxid2".getBytes());
@@ -189,7 +193,7 @@
//
// conn3.close();
//
-// }
+ }
}
More information about the jboss-cvs-commits
mailing list