You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/05 01:26:36 UTC

svn commit: r1564581 [1/2] - in /qpid/branches/java-broker-amqp-1-0-management/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/jav...

Author: rgodfrey
Date: Wed Feb  5 00:26:35 2014
New Revision: 1564581

URL: http://svn.apache.org/r1564581
Log:
define Subscription and SubscriptionTarget in terms of MessageInstance rather than QueueEntry

Modified:
    qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
    qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueSubscription.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionTarget.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/RecordDeliveryMethod.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionTarget_0_8.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
    qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SubscriptionTarget_1_0.java

Modified: qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java Wed Feb  5 00:26:35 2014
@@ -73,7 +73,7 @@ public class PreparedTransactionBinding 
             output.writeInt(records.length);
             for(Transaction.Record record : records)
             {
-                UUID id = record.getQueue().getId();
+                UUID id = record.getResource().getId();
                 output.writeLong(id.getMostSignificantBits());
                 output.writeLong(id.getLeastSignificantBits());
                 output.writeLong(record.getMessage().getMessageNumber());
@@ -93,7 +93,7 @@ public class PreparedTransactionBinding 
             _queueId = queueId;
         }
 
-        public TransactionLogResource getQueue()
+        public TransactionLogResource getResource()
         {
             return this;
         }
@@ -119,9 +119,21 @@ public class PreparedTransactionBinding 
         }
 
         @Override
+        public String getName()
+        {
+            return _queueId.toString();
+        }
+
+        @Override
         public UUID getId()
         {
             return _queueId;
         }
+
+        @Override
+        public boolean isDurable()
+        {
+            return true;
+        }
     }
 }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Wed Feb  5 00:26:35 2014
@@ -416,10 +416,22 @@ public class BDBMessageStoreTest extends
         TransactionLogResource mockQueue = new TransactionLogResource()
         {
             @Override
+            public String getName()
+            {
+                return getId().toString();
+            }
+
+            @Override
             public UUID getId()
             {
                 return mockQueueId;
             }
+
+            @Override
+            public boolean isDurable()
+            {
+                return true;
+            }
         };
 
         Transaction txn = log.newTransaction();
@@ -454,10 +466,22 @@ public class BDBMessageStoreTest extends
         TransactionLogResource mockQueue = new TransactionLogResource()
         {
             @Override
+            public String getName()
+            {
+                return getId().toString();
+            }
+
+            @Override
             public UUID getId()
             {
                 return mockQueueId;
             }
+
+            @Override
+            public boolean isDurable()
+            {
+                return true;
+            }
         };
 
         Transaction txn = log.newTransaction();
@@ -511,10 +535,22 @@ public class BDBMessageStoreTest extends
         TransactionLogResource mockQueue = new TransactionLogResource()
         {
             @Override
+            public String getName()
+            {
+                return getId().toString();
+            }
+
+            @Override
             public UUID getId()
             {
                 return mockQueueId;
             }
+
+            @Override
+            public boolean isDurable()
+            {
+                return true;
+            }
         };
 
         Transaction txn = log.newTransaction();

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java Wed Feb  5 00:26:35 2014
@@ -22,12 +22,58 @@ package org.apache.qpid.server.message;
 
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.server.filter.Filterable;
+import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.subscription.Subscription;
+import org.apache.qpid.server.txn.ServerTransaction;
+import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.util.StateChangeListener;
 
 public interface MessageInstance
 {
 
 
+    /**
+     * Number of times this queue entry has been delivered.
+     *
+     * @return delivery count
+     */
+    int getDeliveryCount();
+
+    void incrementDeliveryCount();
+
+    void decrementDeliveryCount();
+
+    void addStateChangeListener(StateChangeListener<QueueEntry, State> listener);
+
+    boolean removeStateChangeListener(StateChangeListener<QueueEntry, State> listener);
+
+    boolean acquiredBySubscription();
+
+    boolean isAcquiredBy(Subscription subscription);
+
+    void setRedelivered();
+
+    boolean isRedelivered();
+
+    Subscription getDeliveredSubscription();
+
+    void reject();
+
+    boolean isRejectedBy(Subscription subscription);
+
+    boolean getDeliveredToConsumer();
+
+    boolean expired() throws AMQException;
+
+    boolean acquire(Subscription sub);
+
+    int getMaximumDeliveryCount();
+
+    int routeToAlternate(Action<QueueEntry> action, ServerTransaction txn);
+
+    Filterable asFilterable();
 
     public static enum State
     {
@@ -164,4 +210,6 @@ public interface MessageInstance
     ServerMessage getMessage();
 
     InstanceProperties getInstanceProperties();
+
+    TransactionLogResource getOwningResource();
 }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java Wed Feb  5 00:26:35 2014
@@ -35,48 +35,11 @@ public interface QueueEntry extends Mess
 
     long getSize();
 
-    boolean getDeliveredToConsumer();
-
-    boolean expired() throws AMQException;
-
-    boolean acquire(Subscription sub);
-
-    boolean acquiredBySubscription();
-    boolean isAcquiredBy(Subscription subscription);
-
-    void setRedelivered();
-
-    boolean isRedelivered();
-
-    Subscription getDeliveredSubscription();
-
-    void reject();
-
-    boolean isRejectedBy(Subscription subscription);
-
-    int routeToAlternate(final Action<QueueEntry> action, ServerTransaction txn);
-
     boolean isQueueDeleted();
 
     QueueEntry getNextNode();
 
     QueueEntry getNextValidEntry();
 
-    void addStateChangeListener(StateChangeListener<QueueEntry, State> listener);
-    boolean removeStateChangeListener(StateChangeListener<QueueEntry, State> listener);
-
-
-    /**
-     * Number of times this queue entry has been delivered.
-     *
-     * @return delivery count
-     */
-    int getDeliveryCount();
-
-    void incrementDeliveryCount();
-
-    void decrementDeliveryCount();
-
-    Filterable asFilterable();
 
 }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java Wed Feb  5 00:26:35 2014
@@ -28,6 +28,7 @@ import org.apache.qpid.server.filter.Fil
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.txn.LocalTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
@@ -456,6 +457,12 @@ public abstract class QueueEntryImpl imp
         return _deliveryCount;
     }
 
+    @Override
+    public int getMaximumDeliveryCount()
+    {
+        return getQueue().getMaximumDeliveryCount();
+    }
+
     public void incrementDeliveryCount()
     {
         _deliveryCountUpdater.incrementAndGet(this);
@@ -491,6 +498,12 @@ public abstract class QueueEntryImpl imp
         return false;
     }
 
+    @Override
+    public TransactionLogResource getOwningResource()
+    {
+        return getQueue();
+    }
+
     private static class EntryInstanceProperties implements InstanceProperties
     {
         private final EnumMap<Property, Object> _properties = new EnumMap<Property, Object>(Property.class);

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueSubscription.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueSubscription.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueSubscription.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueSubscription.java Wed Feb  5 00:26:35 2014
@@ -29,6 +29,7 @@ import org.apache.qpid.server.logging.ac
 import org.apache.qpid.server.logging.actors.GenericActor;
 import org.apache.qpid.server.logging.messages.SubscriptionMessages;
 import org.apache.qpid.server.logging.subjects.QueueLogSubject;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.MessageConverterRegistry;
@@ -225,13 +226,13 @@ class QueueSubscription<T extends Subscr
     }
 
     @Override
-    public boolean wouldSuspend(final QueueEntry msg)
+    public boolean wouldSuspend(final MessageInstance msg)
     {
         return !_target.allocateCredit(msg.getMessage());
     }
 
     @Override
-    public void restoreCredit(final QueueEntry queueEntry)
+    public void restoreCredit(final MessageInstance queueEntry)
     {
         _target.restoreCredit(queueEntry.getMessage());
     }
@@ -298,9 +299,9 @@ class QueueSubscription<T extends Subscr
     }
 
     @Override
-    public boolean resend(final QueueEntry entry) throws AMQException
+    public boolean resend(final MessageInstance entry) throws AMQException
     {
-        return getQueue().resend(entry, this);
+        return getQueue().resend((QueueEntry)entry, this);
     }
 
     final SubFlushRunner getRunner()
@@ -353,7 +354,7 @@ class QueueSubscription<T extends Subscr
         _noLocal = noLocal;
     }
 
-    public final boolean hasInterest(QueueEntry entry)
+    public final boolean hasInterest(MessageInstance entry)
     {
        //check that the message hasn't been rejected
         if (entry.isRejectedBy(this))
@@ -429,7 +430,7 @@ class QueueSubscription<T extends Subscr
         return _createTime;
     }
 
-    public final QueueEntry.SubscriptionAcquiredState getOwningState()
+    public final MessageInstance.SubscriptionAcquiredState getOwningState()
     {
         return _owningState;
     }
@@ -464,7 +465,7 @@ class QueueSubscription<T extends Subscr
         return _deliveredCount.longValue();
     }
 
-    public final void send(final QueueEntry entry, final boolean batch) throws AMQException
+    public final void send(final MessageInstance entry, final boolean batch) throws AMQException
     {
         _deliveredCount.incrementAndGet();
         _deliveredBytes.addAndGet(entry.getMessage().getSize());

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Wed Feb  5 00:26:35 2014
@@ -1065,7 +1065,7 @@ abstract public class AbstractJDBCMessag
                     stmt.setString(4, "E");
                     for(Transaction.Record record : enqueues)
                     {
-                        stmt.setString(5, record.getQueue().getId().toString());
+                        stmt.setString(5, record.getResource().getId().toString());
                         stmt.setLong(6, record.getMessage().getMessageNumber());
                         stmt.executeUpdate();
                     }
@@ -1076,7 +1076,7 @@ abstract public class AbstractJDBCMessag
                     stmt.setString(4, "D");
                     for(Transaction.Record record : dequeues)
                     {
-                        stmt.setString(5, record.getQueue().getId().toString());
+                        stmt.setString(5, record.getResource().getId().toString());
                         stmt.setLong(6, record.getMessage().getMessageNumber());
                         stmt.executeUpdate();
                     }
@@ -1371,7 +1371,7 @@ abstract public class AbstractJDBCMessag
         }
 
         @Override
-        public TransactionLogResource getQueue()
+        public TransactionLogResource getResource()
         {
             return this;
         }
@@ -1401,10 +1401,22 @@ abstract public class AbstractJDBCMessag
         }
 
         @Override
+        public String getName()
+        {
+            return _queueId.toString();
+        }
+
+        @Override
         public UUID getId()
         {
             return _queueId;
         }
+
+        @Override
+        public boolean isDurable()
+        {
+            return true;
+        }
     }
 
     protected void recoverXids(TransactionLogRecoveryHandler.DtxRecordRecoveryHandler dtxrh) throws SQLException

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java Wed Feb  5 00:26:35 2014
@@ -70,7 +70,7 @@ public interface Transaction
 
     public static interface Record
     {
-        TransactionLogResource getQueue();
+        TransactionLogResource getResource();
         EnqueueableMessage getMessage();
     }
 

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java Wed Feb  5 00:26:35 2014
@@ -24,5 +24,7 @@ import java.util.UUID;
 
 public interface TransactionLogResource
 {
+    String getName();
     public UUID getId();
+    boolean isDurable();
 }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/Subscription.java Wed Feb  5 00:26:35 2014
@@ -23,9 +23,8 @@ package org.apache.qpid.server.subscript
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.util.StateChangeListener;
 
 public interface Subscription
@@ -64,7 +63,7 @@ public interface Subscription
 
     AMQSessionModel getSessionModel();
 
-    QueueEntry.SubscriptionAcquiredState getOwningState();
+    MessageInstance.SubscriptionAcquiredState getOwningState();
 
     void setNoLocal(boolean noLocal);
 
@@ -72,7 +71,7 @@ public interface Subscription
 
     boolean isSuspended();
 
-    boolean hasInterest(QueueEntry msg);
+    boolean hasInterest(MessageInstance msg);
 
     boolean isClosed();
 
@@ -82,16 +81,16 @@ public interface Subscription
 
     void close() throws AMQException;
 
-    void send(QueueEntry entry, boolean batch) throws AMQException;
+    void send(MessageInstance entry, boolean batch) throws AMQException;
 
-    boolean resend(QueueEntry entry) throws AMQException;
+    boolean resend(MessageInstance entry) throws AMQException;
 
     void flushBatched();
 
     void queueDeleted();
 
 
-    boolean wouldSuspend(QueueEntry msg);
+    boolean wouldSuspend(MessageInstance msg);
 
     boolean trySendLock();
 
@@ -100,7 +99,7 @@ public interface Subscription
 
     void releaseSendLock();
 
-    void restoreCredit(final QueueEntry queueEntry);
+    void restoreCredit(final MessageInstance queueEntry);
 
     void setStateListener(final StateChangeListener<? extends Subscription, State> listener);
 

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionTarget.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionTarget.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionTarget.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/subscription/SubscriptionTarget.java Wed Feb  5 00:26:35 2014
@@ -21,9 +21,9 @@
 package org.apache.qpid.server.subscription;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.util.StateChangeListener;
 
 public interface SubscriptionTarget
@@ -49,7 +49,7 @@ public interface SubscriptionTarget
 
     AMQSessionModel getSessionModel();
 
-    void send(QueueEntry entry, boolean batch) throws AMQException;
+    void send(MessageInstance entry, boolean batch) throws AMQException;
 
     void flushBatched();
 

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java Wed Feb  5 00:26:35 2014
@@ -25,12 +25,14 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.server.message.EnqueueableMessage;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.Transaction;
+import org.apache.qpid.server.store.TransactionLogResource;
 
 import java.util.Collection;
 import java.util.List;
@@ -88,7 +90,7 @@ public class AsyncAutoCommitTransaction 
 
     }
 
-    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
+    public void dequeue(TransactionLogResource queue, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try
@@ -158,15 +160,15 @@ public class AsyncAutoCommitTransaction 
         }
     }
 
-    public void dequeue(Collection<QueueEntry> queueEntries, Action postTransactionAction)
+    public void dequeue(Collection<MessageInstance> queueEntries, Action postTransactionAction)
     {
         Transaction txn = null;
         try
         {
-            for(QueueEntry entry : queueEntries)
+            for(MessageInstance entry : queueEntries)
             {
                 ServerMessage message = entry.getMessage();
-                BaseQueue queue = entry.getQueue();
+                TransactionLogResource queue = entry.getOwningResource();
 
                 if(message.isPersistent() && queue.isDurable())
                 {

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java Wed Feb  5 00:26:35 2014
@@ -25,11 +25,13 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.server.message.EnqueueableMessage;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.Transaction;
+import org.apache.qpid.server.store.TransactionLogResource;
 
 import java.util.Collection;
 import java.util.List;
@@ -73,7 +75,7 @@ public class AutoCommitTransaction imple
         immediateAction.postCommit();
     }
 
-    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
+    public void dequeue(TransactionLogResource queue, EnqueueableMessage message, Action postTransactionAction)
     {
         Transaction txn = null;
         try
@@ -105,15 +107,15 @@ public class AutoCommitTransaction imple
 
     }
 
-    public void dequeue(Collection<QueueEntry> queueEntries, Action postTransactionAction)
+    public void dequeue(Collection<MessageInstance> queueEntries, Action postTransactionAction)
     {
         Transaction txn = null;
         try
         {
-            for(QueueEntry entry : queueEntries)
+            for(MessageInstance entry : queueEntries)
             {
                 ServerMessage message = entry.getMessage();
-                BaseQueue queue = entry.getQueue();
+                TransactionLogResource queue = entry.getOwningResource();
 
                 if(message.isPersistent() && queue.isDurable())
                 {

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java Wed Feb  5 00:26:35 2014
@@ -22,10 +22,12 @@
 package org.apache.qpid.server.txn;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.transport.Xid;
 
@@ -74,7 +76,7 @@ public class DistributedTransaction impl
         }
     }
 
-    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
+    public void dequeue(TransactionLogResource queue, EnqueueableMessage message, Action postTransactionAction)
     {
         if(_branch != null)
         {
@@ -87,13 +89,13 @@ public class DistributedTransaction impl
         }
     }
 
-    public void dequeue(Collection<QueueEntry> messages, Action postTransactionAction)
+    public void dequeue(Collection<MessageInstance> messages, Action postTransactionAction)
     {
         if(_branch != null)
         {
-            for(QueueEntry entry : messages)
+            for(MessageInstance entry : messages)
             {
-                _branch.dequeue(entry.getQueue(), entry.getMessage());
+                _branch.dequeue(entry.getOwningResource(), entry.getMessage());
             }
             _branch.addPostTransactionAction(postTransactionAction);
         }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java Wed Feb  5 00:26:35 2014
@@ -34,6 +34,7 @@ import org.apache.qpid.server.protocol.A
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.Transaction;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.transport.Xid;
 
@@ -335,7 +336,7 @@ public class DtxBranch
         {
             if(enqueue.isDurable())
             {
-                _transaction.enqueueMessage(enqueue.getQueue(), enqueue.getMessage());
+                _transaction.enqueueMessage(enqueue.getResource(), enqueue.getMessage());
             }
         }
 
@@ -344,7 +345,7 @@ public class DtxBranch
         {
             if(enqueue.isDurable())
             {
-                _transaction.dequeueMessage(enqueue.getQueue(), enqueue.getMessage());
+                _transaction.dequeueMessage(enqueue.getResource(), enqueue.getMessage());
             }
         }
     }
@@ -356,9 +357,9 @@ public class DtxBranch
     }
 
 
-    public void dequeue(BaseQueue queue, EnqueueableMessage message)
+    public void dequeue(TransactionLogResource resource, EnqueueableMessage message)
     {
-        _dequeueRecords.add(new Record(queue, message));
+        _dequeueRecords.add(new Record(resource, message));
     }
 
 
@@ -369,18 +370,18 @@ public class DtxBranch
 
     private static final class Record implements Transaction.Record
     {
-        private final BaseQueue _queue;
+        private final TransactionLogResource _resource;
         private final EnqueueableMessage _message;
 
-        public Record(BaseQueue queue, EnqueueableMessage message)
+        public Record(TransactionLogResource resource, EnqueueableMessage message)
         {
-            _queue = queue;
+            _resource = resource;
             _message = message;
         }
 
-        public BaseQueue getQueue()
+        public TransactionLogResource getResource()
         {
-            return _queue;
+            return _resource;
         }
 
         public EnqueueableMessage getMessage()
@@ -390,7 +391,7 @@ public class DtxBranch
 
         public boolean isDurable()
         {
-            return _message.isPersistent() && _queue.isDurable();
+            return _message.isPersistent() && _resource.isDurable();
         }
     }
 

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java Wed Feb  5 00:26:35 2014
@@ -21,7 +21,9 @@
 package org.apache.qpid.server.txn;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.store.StoreFuture;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -91,7 +93,7 @@ public class LocalTransaction implements
         _postTransactionActions.add(postTransactionAction);
     }
 
-    public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction)
+    public void dequeue(TransactionLogResource queue, EnqueueableMessage message, Action postTransactionAction)
     {
         sync();
         _postTransactionActions.add(postTransactionAction);
@@ -118,7 +120,7 @@ public class LocalTransaction implements
         }
     }
 
-    public void dequeue(Collection<QueueEntry> queueEntries, Action postTransactionAction)
+    public void dequeue(Collection<MessageInstance> queueEntries, Action postTransactionAction)
     {
         sync();
         _postTransactionActions.add(postTransactionAction);
@@ -126,10 +128,10 @@ public class LocalTransaction implements
 
         try
         {
-            for(QueueEntry entry : queueEntries)
+            for(MessageInstance entry : queueEntries)
             {
                 ServerMessage message = entry.getMessage();
-                BaseQueue queue = entry.getQueue();
+                TransactionLogResource queue = entry.getOwningResource();
 
                 if(message.isPersistent() && queue.isDurable())
                 {

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java Wed Feb  5 00:26:35 2014
@@ -24,8 +24,9 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.queue.BaseQueue;
-import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.server.store.TransactionLogResource;
 
 
 /**
@@ -79,14 +80,14 @@ public interface ServerTransaction
      * 
      * A store operation will result only for a persistent message on a durable queue.
      */
-    void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction);
+    void dequeue(TransactionLogResource queue, EnqueueableMessage message, Action postTransactionAction);
 
     /** 
      * Dequeue a message(s) from queue(s) registering a post transaction action.
      * 
      * Store operations will result only for a persistent messages on durable queues.
      */
-    void dequeue(Collection<QueueEntry> messages, Action postTransactionAction);
+    void dequeue(Collection<MessageInstance> messages, Action postTransactionAction);
 
     /** 
      * Enqueue a message to a queue registering a post transaction action.

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Wed Feb  5 00:26:35 2014
@@ -119,7 +119,7 @@ public class VirtualHostConfigRecoveryHa
         }
         for(Transaction.Record record : enqueues)
         {
-            final AMQQueue queue = _virtualHost.getQueue(record.getQueue().getId());
+            final AMQQueue queue = _virtualHost.getQueue(record.getResource().getId());
             if(queue != null)
             {
                 final long messageId = record.getMessage().getMessageNumber();
@@ -173,13 +173,13 @@ public class VirtualHostConfigRecoveryHa
                 StringBuilder xidString = xidAsString(id);
                 CurrentActor.get().message(_logSubject,
                                            TransactionLogMessages.XA_INCOMPLETE_QUEUE(xidString.toString(),
-                                                                                      record.getQueue().getId().toString()));
+                                                                                      record.getResource().getId().toString()));
 
             }
         }
         for(Transaction.Record record : dequeues)
         {
-            final AMQQueue queue = _virtualHost.getQueue(record.getQueue().getId());
+            final AMQQueue queue = _virtualHost.getQueue(record.getResource().getId());
             if(queue != null)
             {
                 final long messageId = record.getMessage().getMessageNumber();
@@ -223,7 +223,7 @@ public class VirtualHostConfigRecoveryHa
                 StringBuilder xidString = xidAsString(id);
                 CurrentActor.get().message(_logSubject,
                                            TransactionLogMessages.XA_INCOMPLETE_QUEUE(xidString.toString(),
-                                                                                      record.getQueue().getId().toString()));
+                                                                                      record.getResource().getId().toString()));
             }
 
         }
@@ -312,10 +312,22 @@ public class VirtualHostConfigRecoveryHa
                         new TransactionLogResource()
                         {
                             @Override
+                            public String getName()
+                            {
+                                return "<<UNKNOWN>>";
+                            }
+
+                            @Override
                             public UUID getId()
                             {
                                 return queueId;
                             }
+
+                            @Override
+                            public boolean isDurable()
+                            {
+                                return false;
+                            }
                         };
                 txn.dequeueMessage(mockQueue, new DummyMessage(messageId));
                 txn.commitTranAsync();

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java Wed Feb  5 00:26:35 2014
@@ -25,6 +25,7 @@ import junit.framework.AssertionFailedEr
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 
 import java.util.ArrayList;
@@ -68,7 +69,7 @@ public class AMQPriorityQueueTest extend
         queue.registerSubscription(getSubscription(), null, null, "test", EnumSet.noneOf(Subscription.Option.class));
         Thread.sleep(150);
 
-        ArrayList<QueueEntry> msgs = getSubscription().getMessages();
+        ArrayList<MessageInstance> msgs = getSubscription().getMessages();
         try
         {
             assertEquals(1L, msgs.get(0).getMessage().getMessageNumber());
@@ -87,7 +88,7 @@ public class AMQPriorityQueueTest extend
         {
             // Show message order on failure.
             int index = 1;
-            for (QueueEntry qe : msgs)
+            for (MessageInstance qe : msgs)
             {
                 System.err.println(index + ":" + qe.getMessage().getMessageNumber());
                 index++;

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java Wed Feb  5 00:26:35 2014
@@ -25,6 +25,7 @@ import org.apache.qpid.server.filter.Fil
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
@@ -45,6 +46,12 @@ public class MockQueueEntry implements Q
         return false;
     }
 
+    @Override
+    public int getMaximumDeliveryCount()
+    {
+        return 0;
+    }
+
     public boolean acquiredBySubscription()
     {
         return false;
@@ -225,4 +232,10 @@ public class MockQueueEntry implements Q
     {
         return InstanceProperties.EMPTY;
     }
+
+    @Override
+    public TransactionLogResource getOwningResource()
+    {
+        return getQueue();
+    }
 }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Wed Feb  5 00:26:35 2014
@@ -40,6 +40,7 @@ import org.apache.qpid.AMQSecurityExcept
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.UUIDGenerator;
@@ -206,7 +207,8 @@ public class SimpleAMQQueueTest extends 
                                                     EnumSet.noneOf(Subscription.Option.class));
         Thread.sleep(150);
         assertEquals(messageA, _subscription.getQueueContext().getLastSeenEntry().getMessage());
-        assertNull("There should be no releasedEntry after an enqueue", _subscription.getQueueContext().getReleasedEntry());
+        assertNull("There should be no releasedEntry after an enqueue",
+                   _subscription.getQueueContext().getReleasedEntry());
     }
 
     /**
@@ -222,7 +224,8 @@ public class SimpleAMQQueueTest extends 
                                                     EnumSet.noneOf(Subscription.Option.class));
         Thread.sleep(150);
         assertEquals(messageB, _subscription.getQueueContext().getLastSeenEntry().getMessage());
-        assertNull("There should be no releasedEntry after enqueues",  _subscription.getQueueContext().getReleasedEntry());
+        assertNull("There should be no releasedEntry after enqueues",
+                   _subscription.getQueueContext().getReleasedEntry());
     }
 
     /**
@@ -273,7 +276,8 @@ public class SimpleAMQQueueTest extends 
         assertTrue("Redelivery flag should now be set", queueEntries.get(0).isRedelivered());
         assertFalse("Redelivery flag should remain be unset", queueEntries.get(1).isRedelivered());
         assertFalse("Redelivery flag should remain be unset",queueEntries.get(2).isRedelivered());
-        assertNull("releasedEntry should be cleared after requeue processed", _subscription.getQueueContext().getReleasedEntry());
+        assertNull("releasedEntry should be cleared after requeue processed",
+                   _subscription.getQueueContext().getReleasedEntry());
     }
 
     /**
@@ -321,7 +325,8 @@ public class SimpleAMQQueueTest extends 
         assertTrue("Expecting the queue entry to be now expired", queueEntries.get(0).expired());
         assertEquals("Total number of messages sent should not have changed", 1, _subscriptionTarget.getMessages().size());
         assertFalse("Redelivery flag should not be set", queueEntries.get(0).isRedelivered());
-        assertNull("releasedEntry should be cleared after requeue processed", _subscription.getQueueContext().getReleasedEntry());
+        assertNull("releasedEntry should be cleared after requeue processed",
+                   _subscription.getQueueContext().getReleasedEntry());
 
     }
 
@@ -375,7 +380,8 @@ public class SimpleAMQQueueTest extends 
         assertTrue("Redelivery flag should now be set", queueEntries.get(0).isRedelivered());
         assertFalse("Redelivery flag should remain be unset", queueEntries.get(1).isRedelivered());
         assertTrue("Redelivery flag should now be set",queueEntries.get(2).isRedelivered());
-        assertNull("releasedEntry should be cleared after requeue processed", _subscription.getQueueContext().getReleasedEntry());
+        assertNull("releasedEntry should be cleared after requeue processed",
+                   _subscription.getQueueContext().getReleasedEntry());
     }
 
 
@@ -430,8 +436,10 @@ public class SimpleAMQQueueTest extends 
         assertEquals("Unexpected total number of messages sent to both subscriptions after release",
                      3,
                      target1.getMessages().size() + target2.getMessages().size());
-        assertNull("releasedEntry should be cleared after requeue processed", subscription1.getQueueContext().getReleasedEntry());
-        assertNull("releasedEntry should be cleared after requeue processed", subscription2.getQueueContext().getReleasedEntry());
+        assertNull("releasedEntry should be cleared after requeue processed",
+                   subscription1.getQueueContext().getReleasedEntry());
+        assertNull("releasedEntry should be cleared after requeue processed",
+                   subscription2.getQueueContext().getReleasedEntry());
     }
 
     public void testExclusiveConsumer() throws AMQException
@@ -726,9 +734,9 @@ public class SimpleAMQQueueTest extends 
         });
 
         // check expected messages delivered to correct consumers
-        verifyReceivedMessages(Arrays.asList(msg1,msg2,msg3), sub1.getMessages());
-        verifyReceivedMessages(Collections.singletonList(msg4), sub2.getMessages());
-        verifyReceivedMessages(Collections.singletonList(msg5), sub3.getMessages());
+        verifyReceivedMessages(Arrays.asList((MessageInstance)msg1,msg2,msg3), sub1.getMessages());
+        verifyReceivedMessages(Collections.singletonList((MessageInstance)msg4), sub2.getMessages());
+        verifyReceivedMessages(Collections.singletonList((MessageInstance)msg5), sub3.getMessages());
     }
 
     /**
@@ -919,7 +927,7 @@ public class SimpleAMQQueueTest extends 
              * @param entry
              * @param batch
              */
-            public void send(QueueEntry entry, boolean batch) throws AMQException
+            public void send(MessageInstance entry, boolean batch) throws AMQException
             {
                 super.send(entry, batch);
                 latch.countDown();
@@ -953,7 +961,7 @@ public class SimpleAMQQueueTest extends 
         {
             Thread.currentThread().interrupt();
         }
-        List<QueueEntry> expected = Arrays.asList(entries.get(0), entries.get(2), entries.get(3));
+        List<MessageInstance> expected = Arrays.asList((MessageInstance)entries.get(0), entries.get(2), entries.get(3));
         verifyReceivedMessages(expected, subscription.getMessages());
     }
 
@@ -1027,7 +1035,7 @@ public class SimpleAMQQueueTest extends 
         putGivenNumberOfMessages(queue, 4);
 
         // assert received messages
-        List<QueueEntry> messages = subscription.getMessages();
+        List<MessageInstance> messages = subscription.getMessages();
         assertEquals("Only 2 messages should be returned", 2, messages.size());
         assertEquals("ID of first message should be 1", 1l,
                 (messages.get(0).getMessage()).getMessageNumber());
@@ -1222,13 +1230,13 @@ public class SimpleAMQQueueTest extends 
         return entriesList;
     }
 
-    private void verifyReceivedMessages(List<QueueEntry> expected,
-                                        List<QueueEntry> delivered)
+    private void verifyReceivedMessages(List<MessageInstance> expected,
+                                        List<MessageInstance> delivered)
     {
         assertEquals("Consumer did not receive the expected number of messages",
                     expected.size(), delivered.size());
 
-        for (QueueEntry msg : expected)
+        for (MessageInstance msg : expected)
         {
             assertTrue("Consumer did not receive msg: "
                     + msg.getMessage().getMessageNumber(), delivered.contains(msg));

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Wed Feb  5 00:26:35 2014
@@ -464,7 +464,7 @@ public abstract class AbstractDurableCon
         }
 
         @Override
-        public TransactionLogResource getQueue()
+        public TransactionLogResource getResource()
         {
             return _queue;
         }
@@ -505,7 +505,7 @@ public abstract class AbstractDurableCon
             {
                 return false;
             }
-            if (_queue == null && other.getQueue() != null)
+            if (_queue == null && other.getResource() != null)
             {
                 return false;
             }
@@ -513,7 +513,7 @@ public abstract class AbstractDurableCon
             {
                 return false;
             }
-            return _queue.getId().equals(other.getQueue().getId());
+            return _queue.getId().equals(other.getResource().getId());
         }
 
     }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java Wed Feb  5 00:26:35 2014
@@ -154,6 +154,12 @@ public abstract class MessageStoreQuotaE
         return _transactionResource;
     }
 
+    @Override
+    public boolean isDurable()
+    {
+        return true;
+    }
+
     private static class TestMessage implements EnqueueableMessage
     {
         private final StoredMessage<?> _handle;

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java Wed Feb  5 00:26:35 2014
@@ -28,6 +28,7 @@ import org.apache.qpid.server.filter.Fil
 import org.apache.qpid.server.filter.MessageFilter;
 import org.apache.qpid.server.filter.SimpleFilterManager;
 import org.apache.qpid.server.logging.LogSubject;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Transport;
@@ -54,7 +55,7 @@ public class MockSubscription implements
     private AMQQueue queue = null;
     private StateChangeListener<SubscriptionTarget, State> _listener = null;
     private State _state = State.ACTIVE;
-    private ArrayList<QueueEntry> messages = new ArrayList<QueueEntry>();
+    private ArrayList<MessageInstance> messages = new ArrayList<MessageInstance>();
     private final Lock _stateChangeLock = new ReentrantLock();
 
     private static final AtomicLong idGenerator = new AtomicLong(0);
@@ -156,7 +157,7 @@ public class MockSubscription implements
     {
     }
 
-    public void send(QueueEntry entry, boolean batch) throws AMQException
+    public void send(MessageInstance entry, boolean batch) throws AMQException
     {
         if (messages.contains(entry))
         {
@@ -203,7 +204,7 @@ public class MockSubscription implements
         _listener = listener;
     }
 
-    public ArrayList<QueueEntry> getMessages()
+    public ArrayList<MessageInstance> getMessages()
     {
         return messages;
     }

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java Wed Feb  5 00:26:35 2014
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.txn;
 
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MockAMQQueue;
@@ -47,7 +48,7 @@ public class AutoCommitTransactionTest e
     private MessageStore _transactionLog;
     private AMQQueue _queue;
     private List<AMQQueue> _queues;
-    private Collection<QueueEntry> _queueEntries;
+    private Collection<MessageInstance> _queueEntries;
     private ServerMessage _message;
     private MockAction _action;
     private MockStoreTransaction _storeTransaction;
@@ -373,9 +374,9 @@ public class AutoCommitTransactionTest e
         assertFalse("Rollback action must be fired",  _action.isRollbackActionFired());
     }  
     
-    private Collection<QueueEntry> createTestQueueEntries(boolean[] queueDurableFlags, boolean[] messagePersistentFlags)
+    private Collection<MessageInstance> createTestQueueEntries(boolean[] queueDurableFlags, boolean[] messagePersistentFlags)
     {
-        Collection<QueueEntry> queueEntries = new ArrayList<QueueEntry>();
+        Collection<MessageInstance> queueEntries = new ArrayList<MessageInstance>();
         
         assertTrue("Boolean arrays must be the same length", queueDurableFlags.length == messagePersistentFlags.length);
         

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java Wed Feb  5 00:26:35 2014
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.txn;
 
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MockAMQQueue;
@@ -46,7 +47,7 @@ public class LocalTransactionTest extend
     
     private AMQQueue _queue;
     private List<AMQQueue> _queues;
-    private Collection<QueueEntry> _queueEntries;
+    private Collection<MessageInstance> _queueEntries;
     private ServerMessage _message;
     private MockAction _action1;
     private MockAction _action2;
@@ -597,9 +598,9 @@ public class LocalTransactionTest extend
         assertEquals("Transaction update time should be reset after rollback", 0, _transaction.getTransactionUpdateTime());
     }
 
-    private Collection<QueueEntry> createTestQueueEntries(boolean[] queueDurableFlags, boolean[] messagePersistentFlags)
+    private Collection<MessageInstance> createTestQueueEntries(boolean[] queueDurableFlags, boolean[] messagePersistentFlags)
     {
-        Collection<QueueEntry> queueEntries = new ArrayList<QueueEntry>();
+        Collection<MessageInstance> queueEntries = new ArrayList<MessageInstance>();
         
         assertTrue("Boolean arrays must be the same length", queueDurableFlags.length == messagePersistentFlags.length);
         

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java Wed Feb  5 00:26:35 2014
@@ -22,6 +22,7 @@ package org.apache.qpid.server.protocol.
 
 import org.apache.log4j.Logger;
 
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.queue.QueueEntry;
 
 
@@ -30,10 +31,10 @@ class ExplicitAcceptDispositionChangeLis
     private static final Logger _logger = Logger.getLogger(ExplicitAcceptDispositionChangeListener.class);
 
 
-    private final QueueEntry _entry;
+    private final MessageInstance _entry;
     private final SubscriptionTarget_0_10 _target;
 
-    public ExplicitAcceptDispositionChangeListener(QueueEntry entry, SubscriptionTarget_0_10 target)
+    public ExplicitAcceptDispositionChangeListener(MessageInstance entry, SubscriptionTarget_0_10 target)
     {
         _entry = entry;
         _target = target;

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java Wed Feb  5 00:26:35 2014
@@ -22,6 +22,7 @@ package org.apache.qpid.server.protocol.
 
 import org.apache.log4j.Logger;
 
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.queue.QueueEntry;
 
 class ImplicitAcceptDispositionChangeListener implements ServerSession.MessageDispositionChangeListener
@@ -29,10 +30,10 @@ class ImplicitAcceptDispositionChangeLis
     private static final Logger _logger = Logger.getLogger(ImplicitAcceptDispositionChangeListener.class);
 
 
-    private final QueueEntry _entry;
+    private final MessageInstance _entry;
     private SubscriptionTarget_0_10 _target;
 
-    public ImplicitAcceptDispositionChangeListener(QueueEntry entry, SubscriptionTarget_0_10 target)
+    public ImplicitAcceptDispositionChangeListener(MessageInstance entry, SubscriptionTarget_0_10 target)
     {
         _entry = entry;
         _target = target;

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java Wed Feb  5 00:26:35 2014
@@ -21,17 +21,18 @@
 
 package org.apache.qpid.server.protocol.v0_10;
 
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.transport.Method;
 
 public class MessageAcceptCompletionListener implements Method.CompletionListener
 {
     private final SubscriptionTarget_0_10 _sub;
-    private final QueueEntry _entry;
+    private final MessageInstance _entry;
     private final ServerSession _session;
     private boolean _restoreCredit;
 
-    public MessageAcceptCompletionListener(SubscriptionTarget_0_10 sub, ServerSession session, QueueEntry entry, boolean restoreCredit)
+    public MessageAcceptCompletionListener(SubscriptionTarget_0_10 sub, ServerSession session, MessageInstance entry, boolean restoreCredit)
     {
         super();
         _sub = sub;

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Wed Feb  5 00:26:35 2014
@@ -55,6 +55,7 @@ import org.apache.qpid.server.logging.ac
 import org.apache.qpid.server.logging.messages.ChannelMessages;
 import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
 import org.apache.qpid.server.message.InstanceProperties;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -399,9 +400,9 @@ public class ServerSession extends Sessi
         // Broker shouldn't block awaiting close - thus do override this method to do nothing
     }
 
-    public void acknowledge(final SubscriptionTarget_0_10 sub, final QueueEntry entry)
+    public void acknowledge(final SubscriptionTarget_0_10 sub, final MessageInstance entry)
     {
-        _transaction.dequeue(entry.getQueue(), entry.getMessage(),
+        _transaction.dequeue(entry.getOwningResource(), entry.getMessage(),
                              new ServerTransaction.Action()
                              {
 

Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java?rev=1564581&r1=1564580&r2=1564581&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java Wed Feb  5 00:26:35 2014
@@ -27,11 +27,13 @@ import org.apache.qpid.server.flow.FlowC
 import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.ChannelMessages;
+import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.protocol.MessageConverterRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.subscription.AbstractSubscriptionTarget;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
@@ -193,7 +195,7 @@ public class SubscriptionTarget_0_10 ext
 
     private final AddMessageDispositionListenerAction _postIdSettingAction;
 
-    public void send(final QueueEntry entry, boolean batch) throws AMQException
+    public void send(final MessageInstance entry, boolean batch) throws AMQException
     {
         ServerMessage serverMsg = entry.getMessage();
 
@@ -275,7 +277,7 @@ public class SubscriptionTarget_0_10 ext
                                         {
                                             public void onComplete(Method method)
                                             {
-                                                deferredAddCredit(1, entry.getSize());
+                                                deferredAddCredit(1, entry.getMessage().getSize());
                                             }
                                         });
         }
@@ -309,10 +311,10 @@ public class SubscriptionTarget_0_10 ext
 
     }
 
-    void recordUnacknowledged(QueueEntry entry)
+    void recordUnacknowledged(MessageInstance entry)
     {
         _unacknowledgedCount.incrementAndGet();
-        _unacknowledgedBytes.addAndGet(entry.getSize());
+        _unacknowledgedBytes.addAndGet(entry.getMessage().getSize());
     }
 
     private void deferredAddCredit(final int deferredMessageCredit, final long deferredSizeCredit)
@@ -334,10 +336,10 @@ public class SubscriptionTarget_0_10 ext
         }
     }
 
-    private void forceDequeue(final QueueEntry entry, final boolean restoreCredit)
+    private void forceDequeue(final MessageInstance entry, final boolean restoreCredit)
     {
         AutoCommitTransaction dequeueTxn = new AutoCommitTransaction(_session.getVirtualHost().getMessageStore());
-        dequeueTxn.dequeue(entry.getQueue(), entry.getMessage(),
+        dequeueTxn.dequeue(entry.getOwningResource(), entry.getMessage(),
                            new ServerTransaction.Action()
                            {
                                public void postCommit()
@@ -356,7 +358,7 @@ public class SubscriptionTarget_0_10 ext
                            });
    }
 
-    void reject(final QueueEntry entry)
+    void reject(final MessageInstance entry)
     {
         entry.setRedelivered();
         entry.routeToAlternate(null, null);
@@ -366,7 +368,7 @@ public class SubscriptionTarget_0_10 ext
         }
     }
 
-    void release(final QueueEntry entry, final boolean setRedelivered)
+    void release(final MessageInstance entry, final boolean setRedelivered)
     {
         if (setRedelivered)
         {
@@ -388,7 +390,7 @@ public class SubscriptionTarget_0_10 ext
         }
     }
 
-    protected void sendToDLQOrDiscard(QueueEntry entry)
+    protected void sendToDLQOrDiscard(MessageInstance entry)
     {
         final LogActor logActor = CurrentActor.get();
         final ServerMessage msg = entry.getMessage();
@@ -405,26 +407,30 @@ public class SubscriptionTarget_0_10 ext
 
         if (requeues == 0)
         {
-            final AMQQueue queue = entry.getQueue();
-            final Exchange alternateExchange = queue.getAlternateExchange();
-
-            if(alternateExchange != null)
-            {
-                logActor.message( ChannelMessages.DISCARDMSG_NOROUTE(msg.getMessageNumber(),
-                                                                     alternateExchange.getName()));
-            }
-            else
+            TransactionLogResource owningResource = entry.getOwningResource();
+            if(owningResource instanceof AMQQueue)
             {
-                logActor.message(ChannelMessages.DISCARDMSG_NOALTEXCH(msg.getMessageNumber(),
-                                                                      queue.getName(),
-                                                                      msg.getRoutingKey()));
+                final AMQQueue queue = (AMQQueue)owningResource;
+                final Exchange alternateExchange = queue.getAlternateExchange();
+
+                if(alternateExchange != null)
+                {
+                    logActor.message( ChannelMessages.DISCARDMSG_NOROUTE(msg.getMessageNumber(),
+                                                                         alternateExchange.getName()));
+                }
+                else
+                {
+                    logActor.message(ChannelMessages.DISCARDMSG_NOALTEXCH(msg.getMessageNumber(),
+                                                                          queue.getName(),
+                                                                          msg.getRoutingKey()));
+                }
             }
         }
     }
 
-    private boolean isMaxDeliveryLimitReached(QueueEntry entry)
+    private boolean isMaxDeliveryLimitReached(MessageInstance entry)
     {
-        final int maxDeliveryLimit = entry.getQueue().getMaximumDeliveryCount();
+        final int maxDeliveryLimit = entry.getMaximumDeliveryCount();
         return (maxDeliveryLimit > 0 && entry.getDeliveryCount() >= maxDeliveryLimit);
     }
 
@@ -519,12 +525,12 @@ public class SubscriptionTarget_0_10 ext
         return _stopped.get();
     }
 
-    public void acknowledge(QueueEntry entry)
+    public void acknowledge(MessageInstance entry)
     {
         // TODO Fix Store Context / cleanup
         if(entry.isAcquiredBy(getSubscription()))
         {
-            _unacknowledgedBytes.addAndGet(-entry.getSize());
+            _unacknowledgedBytes.addAndGet(-entry.getMessage().getSize());
             _unacknowledgedCount.decrementAndGet();
             entry.delete();
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org