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/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/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 =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-02-13 15:13:27 UTC (rev 3118) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-02-16 09:20: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.BindingTupleBindingFactory; 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 the BDB high performance log. * * <p/><table id="crc"><caption>CRC Card</caption> <tr><th> Responsibilities <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. </table> */ -public class BDBMessageStore implements MessageStore +public class BDBMessageStore implements TransactionLog, RoutingTable { private static final Logger _log = Logger.getLogger(BDBMessageStore.class); Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2009-02-13 15:13:27 UTC (rev 3118) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2009-02-16 09:20:11 UTC (rev 3119) @@ -104,7 +104,7 @@ env.addProperty("store.class", "org.apache.qpid.server.store.berkeleydb.BDBMessageStore"); _virtualHost = new VirtualHost("test", env); - _store = (BDBMessageStore) _virtualHost.getMessageStore(); + _store = (BDBMessageStore) _virtualHost.getTransactionLog(); } public void tearDown() throws Exception