From rhmessaging-commits at lists.jboss.org Mon Feb 16 04:20:13 2009
Content-Type: multipart/mixed; boundary="===============5196367549446025444=="
MIME-Version: 1.0
From: rhmessaging-commits at lists.jboss.org
To: rhmessaging-commits at lists.jboss.org
Subject: [rhmessaging-commits] rhmessaging commits: r3119 - in
 store/branches/java/broker-queue-refactor/java/bdbstore/src:
 test/java/org/apache/qpid/server/store/berkeleydb and 1 other directory.
Date: Mon, 16 Feb 2009 04:20:11 -0500
Message-ID: <E1LYze7-0006Zh-Vi@committer01.frg.pub.inap.atl.jboss.com>

--===============5196367549446025444==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ritchiem
Date: 2009-02-16 04:20:11 -0500 (Mon, 16 Feb 2009)
New Revision: 3119

Modified:
   store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/or=
g/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
   store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/or=
g/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
Log:
Update of BDBStore to use the new TransactionalLog

Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/main/=
java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/o=
rg/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2009-02-13 15:1=
3:27 UTC (rev 3118)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/o=
rg/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2009-02-16 09:2=
0:11 UTC (rev 3119)
@@ -49,8 +49,6 @@
 import org.apache.qpid.server.queue.MessageMetaData;
 import org.apache.qpid.server.queue.PersistentAMQMessage;
 import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.TransientAMQMessage;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.berkeleydb.tuples.BindingTupleBindingF=
actory;
 import org.apache.qpid.server.store.berkeleydb.tuples.QueueTuple;
@@ -58,6 +56,8 @@
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.transactionlog.TransactionLog;
+import org.apache.qpid.server.routing.RoutingTable;
 =

 import java.io.File;
 import java.util.ArrayList;
@@ -74,14 +74,14 @@
 import java.util.concurrent.atomic.AtomicReference;
 =

 /**
- * BDBMessageStore implements a persistent {@link MessageStore} using the =
BDB high performance log.
+ * BDBMessageStore implements a persistent {@link TransactionLog} using th=
e BDB high performance log.
  *
  * <p/><table id=3D"crc"><caption>CRC Card</caption> <tr><th> Responsibili=
ties <th> Collaborations <tr><td> Accept
  * transaction boundary demarcations: Begin, Commit, Abort. <tr><td> Store=
 and remove queues. <tr><td> Store and remove
  * exchanges. <tr><td> Store and remove messages. <tr><td> Bind and unbind=
 queues to exchanges. <tr><td> Enqueue and
  * dequeue messages to queues. <tr><td> Generate message identifiers. </ta=
ble>
  */
-public class BDBMessageStore implements MessageStore
+public class BDBMessageStore implements TransactionLog, RoutingTable
 {
     private static final Logger _log =3D Logger.getLogger(BDBMessageStore.=
class);
 =


Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/test/=
java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/o=
rg/apache/qpid/server/store/berkeleydb/BDBStoreTest.java	2009-02-13 15:13:2=
7 UTC (rev 3118)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/o=
rg/apache/qpid/server/store/berkeleydb/BDBStoreTest.java	2009-02-16 09:20:1=
1 UTC (rev 3119)
@@ -104,7 +104,7 @@
         env.addProperty("store.class", "org.apache.qpid.server.store.berke=
leydb.BDBMessageStore");
 =

         _virtualHost =3D new VirtualHost("test", env);
-        _store =3D (BDBMessageStore) _virtualHost.getMessageStore();
+        _store =3D (BDBMessageStore) _virtualHost.getTransactionLog();
     }
 =

     public void tearDown() throws Exception


--===============5196367549446025444==--