QPID-4659 : [Java Broker] move amqp 0-8 implementation into a plugin

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1503651 13f79535-47bb-0310-9956-ffa450edef68

86 files changed, 2 insertions, 14184 deletions

diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index a4b3205185..a6d1b23373 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -25,9 +25,9 @@
     <property name="module.genpom" value="true"/>
 
     <!-- Add dependencies to the broker pom for the broker-plugins and bdbstore modules -->
-    <property name="module.maven.depends" value="broker-plugins/management-http broker-plugins/management-jmx broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore bdbstore/jmx broker-plugins/jdbc-store broker-plugins/derby-store broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-1-0 broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10"/>
+    <property name="module.maven.depends" value="broker-plugins/management-http broker-plugins/management-jmx broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore bdbstore/jmx broker-plugins/jdbc-store broker-plugins/derby-store broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-1-0 broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10"/>
     <!-- Make them runtime dependencies, make bdbstore modules optional -->
-    <property name="module.genpom.args" value="-Sqpid-broker-plugins-management-http=runtime -Sqpid-broker-plugins-management-jmx=runtime -Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime -Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx -Sqpid-broker-plugins-jdbc-provider-bone=runtime -Oqpid-broker-plugins-jdbc-provider-bone -Sqpid-broker-plugins-jdbc-store=runtime -Sqpid-broker-plugins-derby-store=runtime -Sqpid-broker-plugins-amqp-1-0-protocol=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime -Sqpid-broker-plugins-amqp-0-10-protocol=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime"/>
+    <property name="module.genpom.args" value="-Sqpid-broker-plugins-management-http=runtime -Sqpid-broker-plugins-management-jmx=runtime -Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime -Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx -Sqpid-broker-plugins-jdbc-provider-bone=runtime -Oqpid-broker-plugins-jdbc-provider-bone -Sqpid-broker-plugins-jdbc-store=runtime -Sqpid-broker-plugins-derby-store=runtime -Sqpid-broker-plugins-amqp-1-0-protocol=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime -Sqpid-broker-plugins-amqp-0-8-protocol=runtime -Sqpid-broker-plugins-amqp-0-10-protocol=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime"/>
 
     <import file="../module.xml"/>
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
index a5fe14641c..d23122ac5d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.logging.actors;
 
 import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.logging.RootMessageLogger;
 import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
deleted file mode 100644
index 6867ee7bb5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ /dev/null
@@ -1,1633 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQSecurityException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.TransactionTimeoutHelper;
-import org.apache.qpid.server.TransactionTimeoutHelper.CloseAction;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.flow.FlowCreditManager;
-import org.apache.qpid.server.flow.Pre0_10CreditManager;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.actors.AMQPChannelActor;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.messages.ChannelMessages;
-import org.apache.qpid.server.logging.messages.ExchangeMessages;
-import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
-import org.apache.qpid.server.message.InboundMessage;
-import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
-import org.apache.qpid.server.protocol.AMQConnectionModel;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.BaseQueue;
-import org.apache.qpid.server.queue.InboundMessageAdapter;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.security.SecurityManager;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreFuture;
-import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.RecordDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.txn.AsyncAutoCommitTransaction;
-import org.apache.qpid.server.txn.LocalTransaction;
-import org.apache.qpid.server.txn.LocalTransaction.ActivityTimeAccessor;
-import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.TransportException;
-
-public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.FutureRecorder
-{
-    public static final int DEFAULT_PREFETCH = 4096;
-
-    private static final Logger _logger = Logger.getLogger(AMQChannel.class);
-
-    //TODO use Broker property to configure message authorization requirements
-    private boolean _messageAuthorizationRequired = Boolean.getBoolean(BrokerProperties.PROPERTY_MSG_AUTH);
-
-    private final int _channelId;
-
-
-    private final Pre0_10CreditManager _creditManager = new Pre0_10CreditManager(0l,0l);
-
-    /**
-     * The delivery tag is unique per channel. This is pre-incremented before putting into the deliver frame so that
-     * value of this represents the <b>last</b> tag sent out
-     */
-    private long _deliveryTag = 0;
-
-    /** A channel has a default queue (the last declared) that is used when no queue name is explicitly set */
-    private AMQQueue _defaultQueue;
-
-    /** This tag is unique per subscription to a queue. The server returns this in response to a basic.consume request. */
-    private int _consumerTag;
-
-    /**
-     * The current message - which may be partial in the sense that not all frames have been received yet - which has
-     * been received by this channel. As the frames are received the message gets updated and once all frames have been
-     * received the message can then be routed.
-     */
-    private IncomingMessage _currentMessage;
-
-    /** Maps from consumer tag to subscription instance. Allows us to unsubscribe from a queue. */
-    private final Map<AMQShortString, Subscription> _tag2SubscriptionMap = new HashMap<AMQShortString, Subscription>();
-
-    private final MessageStore _messageStore;
-
-    private final LinkedList<AsyncCommand> _unfinishedCommandsQueue = new LinkedList<AsyncCommand>();
-
-    private UnacknowledgedMessageMap _unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(DEFAULT_PREFETCH);
-
-    // Set of messages being acknowledged in the current transaction
-    private SortedSet<QueueEntry> _acknowledgedMessages = new TreeSet<QueueEntry>();
-
-    private final AtomicBoolean _suspended = new AtomicBoolean(false);
-
-    private ServerTransaction _transaction;
-
-    private final AtomicLong _txnStarts = new AtomicLong(0);
-    private final AtomicLong _txnCommits = new AtomicLong(0);
-    private final AtomicLong _txnRejects = new AtomicLong(0);
-    private final AtomicLong _txnCount = new AtomicLong(0);
-
-    private final AMQProtocolSession _session;
-    private AtomicBoolean _closing = new AtomicBoolean(false);
-
-    private final Set<Object> _blockingEntities = Collections.synchronizedSet(new HashSet<Object>());
-
-    private final AtomicBoolean _blocking = new AtomicBoolean(false);
-
-
-    private LogActor _actor;
-    private LogSubject _logSubject;
-    private volatile boolean _rollingBack;
-
-    private static final Runnable NULL_TASK = new Runnable() { public void run() {} };
-    private List<QueueEntry> _resendList = new ArrayList<QueueEntry>();
-    private static final
-    AMQShortString IMMEDIATE_DELIVERY_REPLY_TEXT = new AMQShortString("Immediate delivery is not possible.");
-    private long _createTime = System.currentTimeMillis();
-
-    private final ClientDeliveryMethod _clientDeliveryMethod;
-
-    private final TransactionTimeoutHelper _transactionTimeoutHelper;
-    private final UUID _id = UUID.randomUUID();
-
-    public AMQChannel(AMQProtocolSession session, int channelId, MessageStore messageStore)
-            throws AMQException
-    {
-        _session = session;
-        _channelId = channelId;
-
-        _actor = new AMQPChannelActor(this, session.getLogActor().getRootMessageLogger());
-        _logSubject = new ChannelLogSubject(this);
-        _actor.message(ChannelMessages.CREATE());
-
-        _messageStore = messageStore;
-
-        // by default the session is non-transactional
-        _transaction = new AsyncAutoCommitTransaction(_messageStore, this);
-
-        _clientDeliveryMethod = session.createDeliveryMethod(_channelId);
-
-        _transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject, new CloseAction()
-        {
-            @Override
-            public void doTimeoutAction(String reason) throws AMQException
-            {
-                closeConnection(reason);
-            }
-        });
-    }
-
-    /** Sets this channel to be part of a local transaction */
-    public void setLocalTransactional()
-    {
-        _transaction = new LocalTransaction(_messageStore, new ActivityTimeAccessor()
-        {
-            @Override
-            public long getActivityTime()
-            {
-                return _session.getLastReceivedTime();
-            }
-        });
-        _txnStarts.incrementAndGet();
-    }
-
-    public boolean isTransactional()
-    {
-        return _transaction.isTransactional();
-    }
-
-    public void receivedComplete()
-    {
-        sync();
-    }
-
-    private void incrementOutstandingTxnsIfNecessary()
-    {
-        if(isTransactional())
-        {
-            //There can currently only be at most one outstanding transaction
-            //due to only having LocalTransaction support. Set value to 1 if 0.
-            _txnCount.compareAndSet(0,1);
-        }
-    }
-
-    private void decrementOutstandingTxnsIfNecessary()
-    {
-        if(isTransactional())
-        {
-            //There can currently only be at most one outstanding transaction
-            //due to only having LocalTransaction support. Set value to 0 if 1.
-            _txnCount.compareAndSet(1,0);
-        }
-    }
-
-    public Long getTxnCommits()
-    {
-        return _txnCommits.get();
-    }
-
-    public Long getTxnRejects()
-    {
-        return _txnRejects.get();
-    }
-
-    public Long getTxnCount()
-    {
-        return _txnCount.get();
-    }
-
-    public Long getTxnStart()
-    {
-        return _txnStarts.get();
-    }
-
-    public int getChannelId()
-    {
-        return _channelId;
-    }
-
-    public void setPublishFrame(MessagePublishInfo info, final Exchange e) throws AMQSecurityException
-    {
-        String routingKey = info.getRoutingKey() == null ? null : info.getRoutingKey().asString();
-        SecurityManager securityManager = getVirtualHost().getSecurityManager();
-        if (!securityManager.authorisePublish(info.isImmediate(), routingKey, e.getName()))
-        {
-            throw new AMQSecurityException("Permission denied: " + e.getName());
-        }
-        _currentMessage = new IncomingMessage(info, getProtocolSession().getReference());
-        _currentMessage.setExchange(e);
-    }
-
-    public void publishContentHeader(ContentHeaderBody contentHeaderBody)
-            throws AMQException
-    {
-        if (_currentMessage == null)
-        {
-            throw new AMQException("Received content header without previously receiving a BasicPublish frame");
-        }
-        else
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Content header received on channel " + _channelId);
-            }
-
-            _currentMessage.setContentHeaderBody(contentHeaderBody);
-
-            _currentMessage.setExpiration();
-
-            _currentMessage.headersReceived(getProtocolSession().getLastReceivedTime());
-
-            _currentMessage.route();
-
-            deliverCurrentMessageIfComplete();
-        }
-    }
-
-    private void deliverCurrentMessageIfComplete()
-            throws AMQException
-    {
-        // check and deliver if header says body length is zero
-        if (_currentMessage.allContentReceived())
-        {
-            try
-            {
-                final List<? extends BaseQueue> destinationQueues = _currentMessage.getDestinationQueues();
-
-                if(!checkMessageUserId(_currentMessage.getContentHeader()))
-                {
-                    _transaction.addPostTransactionAction(new WriteReturnAction(AMQConstant.ACCESS_REFUSED, "Access Refused", _currentMessage));
-                }
-                else
-                {
-                    if(destinationQueues == null || destinationQueues.isEmpty())
-                    {
-                        handleUnroutableMessage();
-                    }
-                    else
-                    {
-                        final StoredMessage<MessageMetaData> handle = _messageStore.addMessage(_currentMessage.getMessageMetaData());
-                        _currentMessage.setStoredMessage(handle);
-                        int bodyCount = _currentMessage.getBodyCount();
-                        if(bodyCount > 0)
-                        {
-                            long bodyLengthReceived = 0;
-                            for(int i = 0 ; i < bodyCount ; i++)
-                            {
-                                ContentChunk contentChunk = _currentMessage.getContentChunk(i);
-                                handle.addContent((int)bodyLengthReceived, ByteBuffer.wrap(contentChunk.getData()));
-                                bodyLengthReceived += contentChunk.getSize();
-                            }
-                        }
-
-                        _transaction.addPostTransactionAction(new ServerTransaction.Action()
-                        {
-                            public void postCommit()
-                            {
-                            }
-
-                            public void onRollback()
-                            {
-                                handle.remove();
-                            }
-                        });
-
-                        _transaction.enqueue(destinationQueues, _currentMessage, new MessageDeliveryAction(_currentMessage, destinationQueues));
-                        incrementOutstandingTxnsIfNecessary();
-                        _currentMessage.getStoredMessage().flushToStore();
-                    }
-                }
-            }
-            finally
-            {
-                long bodySize = _currentMessage.getSize();
-                long timestamp = ((BasicContentHeaderProperties) _currentMessage.getContentHeader().getProperties()).getTimestamp();
-                _session.registerMessageReceived(bodySize, timestamp);
-                _currentMessage = null;
-            }
-        }
-
-    }
-
-    /**
-     * Either throws a {@link AMQConnectionException} or returns the message
-     *
-     * Pre-requisite: the current message is judged to have no destination queues.
-     *
-     * @throws AMQConnectionException if the message is mandatoryclose-on-no-route
-     * @see AMQProtocolSession#isCloseWhenNoRoute()
-     */
-    private void handleUnroutableMessage() throws AMQConnectionException
-    {
-        boolean mandatory = _currentMessage.isMandatory();
-        String description = currentMessageDescription();
-        boolean closeOnNoRoute = _session.isCloseWhenNoRoute();
-
-        if(_logger.isDebugEnabled())
-        {
-            _logger.debug(String.format(
-                    "Unroutable message %s, mandatory=%s, transactionalSession=%s, closeOnNoRoute=%s",
-                    description, mandatory, isTransactional(), closeOnNoRoute));
-        }
-
-        if (mandatory && isTransactional() && _session.isCloseWhenNoRoute())
-        {
-            throw new AMQConnectionException(
-                    AMQConstant.NO_ROUTE,
-                    "No route for message " + currentMessageDescription(),
-                    0, 0, // default class and method ids
-                    getProtocolSession().getProtocolVersion().getMajorVersion(),
-                    getProtocolSession().getProtocolVersion().getMinorVersion(),
-                    (Throwable) null);
-        }
-
-        if (mandatory || _currentMessage.isImmediate())
-        {
-            _transaction.addPostTransactionAction(new WriteReturnAction(AMQConstant.NO_ROUTE, "No Route for message " + currentMessageDescription(), _currentMessage));
-        }
-        else
-        {
-            _actor.message(ExchangeMessages.DISCARDMSG(_currentMessage.getExchange().asString(), _currentMessage.getRoutingKey()));
-        }
-    }
-
-    private String currentMessageDescription()
-    {
-        if(_currentMessage == null || !_currentMessage.allContentReceived())
-        {
-            throw new IllegalStateException("Cannot create message description for message: " + _currentMessage);
-        }
-
-        return String.format(
-                "[Exchange: %s, Routing key: %s]",
-                _currentMessage.getExchange(),
-                _currentMessage.getRoutingKey());
-    }
-
-    public void publishContentBody(ContentBody contentBody) throws AMQException
-    {
-        if (_currentMessage == null)
-        {
-            throw new AMQException("Received content body without previously receiving a JmsPublishBody");
-        }
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug(debugIdentity() + " content body received on channel " + _channelId);
-        }
-
-        try
-        {
-            final ContentChunk contentChunk =
-                    _session.getMethodRegistry().getProtocolVersionMethodConverter().convertToContentChunk(contentBody);
-
-            _currentMessage.addContentBodyFrame(contentChunk);
-
-            deliverCurrentMessageIfComplete();
-        }
-        catch (AMQException e)
-        {
-            // we want to make sure we don't keep a reference to the message in the
-            // event of an error
-            _currentMessage = null;
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            // we want to make sure we don't keep a reference to the message in the
-            // event of an error
-            _currentMessage = null;
-            throw e;
-        }
-    }
-
-    public long getNextDeliveryTag()
-    {
-        return ++_deliveryTag;
-    }
-
-    public int getNextConsumerTag()
-    {
-        return ++_consumerTag;
-    }
-
-
-    public Subscription getSubscription(AMQShortString subscription)
-    {
-        return _tag2SubscriptionMap.get(subscription);
-    }
-
-    /**
-     * Subscribe to a queue. We register all subscriptions in the channel so that if the channel is closed we can clean
-     * up all subscriptions, even if the client does not explicitly unsubscribe from all queues.
-     *
-     * @param tag       the tag chosen by the client (if null, server will generate one)
-     * @param queue     the queue to subscribe to
-     * @param acks      Are acks enabled for this subscriber
-     * @param filters   Filters to apply to this subscriber
-     *
-     * @param noLocal   Flag stopping own messages being received.
-     * @param exclusive Flag requesting exclusive access to the queue
-     * @return the consumer tag. This is returned to the subscriber and used in subsequent unsubscribe requests
-     *
-     * @throws AMQException                  if something goes wrong
-     */
-    public AMQShortString subscribeToQueue(AMQShortString tag, AMQQueue queue, boolean acks,
-                                           FieldTable filters, boolean noLocal, boolean exclusive) throws AMQException
-    {
-        if (tag == null)
-        {
-            tag = new AMQShortString("sgen_" + getNextConsumerTag());
-        }
-
-        if (_tag2SubscriptionMap.containsKey(tag))
-        {
-            throw new AMQException("Consumer already exists with same tag: " + tag);
-        }
-
-         Subscription subscription =
-                SubscriptionFactoryImpl.INSTANCE.createSubscription(_channelId, _session, tag, acks, filters, noLocal, _creditManager);
-
-
-        // So to keep things straight we put before the call and catch all exceptions from the register and tidy up.
-        // We add before we register as the Async Delivery process may AutoClose the subscriber
-        // so calling _cT2QM.remove before we have done put which was after the register succeeded.
-        // So to keep things straight we put before the call and catch all exceptions from the register and tidy up.
-
-        _tag2SubscriptionMap.put(tag, subscription);
-
-        try
-        {
-            queue.registerSubscription(subscription, exclusive);
-        }
-        catch (AMQException e)
-        {
-            _tag2SubscriptionMap.remove(tag);
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            _tag2SubscriptionMap.remove(tag);
-            throw e;
-        }
-        return tag;
-    }
-
-    /**
-     * Unsubscribe a consumer from a queue.
-     * @param consumerTag
-     * @return true if the consumerTag had a mapped queue that could be unregistered.
-     * @throws AMQException
-     */
-    public boolean unsubscribeConsumer(AMQShortString consumerTag) throws AMQException
-    {
-
-        Subscription sub = _tag2SubscriptionMap.remove(consumerTag);
-        if (sub != null)
-        {
-            try
-            {
-                sub.getSendLock();
-                sub.getQueue().unregisterSubscription(sub);
-            }
-            finally
-            {
-                sub.releaseSendLock();
-            }
-            return true;
-        }
-        else
-        {
-            _logger.warn("Attempt to unsubscribe consumer with tag '"+consumerTag+"' which is not registered.");
-        }
-        return false;
-    }
-
-    /**
-     * Called from the protocol session to close this channel and clean up. T
-     *
-     * @throws AMQException if there is an error during closure
-     */
-    @Override
-    public void close() throws AMQException
-    {
-        close(null, null);
-    }
-
-    public void close(AMQConstant cause, String message) throws AMQException
-    {
-        if(!_closing.compareAndSet(false, true))
-        {
-            //Channel is already closing
-            return;
-        }
-
-        LogMessage operationalLogMessage = cause == null ?
-                ChannelMessages.CLOSE() :
-                ChannelMessages.CLOSE_FORCED(cause.getCode(), message);
-        CurrentActor.get().message(_logSubject, operationalLogMessage);
-
-        unsubscribeAllConsumers();
-        _transaction.rollback();
-
-        try
-        {
-            requeue();
-        }
-        catch (AMQException e)
-        {
-            _logger.error("Caught AMQException whilst attempting to requeue:" + e);
-        }
-        catch (TransportException e)
-        {
-            _logger.error("Caught TransportException whilst attempting to requeue:" + e);
-        }
-    }
-
-    private void unsubscribeAllConsumers() throws AMQException
-    {
-        if (_logger.isInfoEnabled())
-        {
-            if (!_tag2SubscriptionMap.isEmpty())
-            {
-                _logger.info("Unsubscribing all consumers on channel " + toString());
-            }
-            else
-            {
-                _logger.info("No consumers to unsubscribe on channel " + toString());
-            }
-        }
-
-        for (Map.Entry<AMQShortString, Subscription> me : _tag2SubscriptionMap.entrySet())
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Unsubscribing consumer '" + me.getKey() + "' on channel " + toString());
-            }
-
-            Subscription sub = me.getValue();
-
-            try
-            {
-                sub.getSendLock();
-                sub.getQueue().unregisterSubscription(sub);
-            }
-            finally
-            {
-                sub.releaseSendLock();
-            }
-
-        }
-
-        _tag2SubscriptionMap.clear();
-    }
-
-    /**
-     * Add a message to the channel-based list of unacknowledged messages
-     *
-     * @param entry       the record of the message on the queue that was delivered
-     * @param deliveryTag the delivery tag used when delivering the message (see protocol spec for description of the
-     *                    delivery tag)
-     * @param subscription The consumer that is to acknowledge this message.
-     */
-    public void addUnacknowledgedMessage(QueueEntry entry, long deliveryTag, Subscription subscription)
-    {
-        if (_logger.isDebugEnabled())
-        {
-            if (entry.getQueue() == null)
-            {
-                _logger.debug("Adding unacked message with a null queue:" + entry);
-            }
-            else
-            {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug(debugIdentity() + " Adding unacked message(" + entry.getMessage().toString() + " DT:" + deliveryTag
-                               + ") with a queue(" + entry.getQueue() + ") for " + subscription);
-                }
-            }
-        }
-
-        _unacknowledgedMessageMap.add(deliveryTag, entry);
-
-    }
-
-    private final String id = "(" + System.identityHashCode(this) + ")";
-
-    public String debugIdentity()
-    {
-        return _channelId + id;
-    }
-
-    /**
-     * Called to attempt re-delivery all outstanding unacknowledged messages on the channel. May result in delivery to
-     * this same channel or to other subscribers.
-     *
-     * @throws org.apache.qpid.AMQException if the requeue fails
-     */
-    public void requeue() throws AMQException
-    {
-        // we must create a new map since all the messages will get a new delivery tag when they are redelivered
-        Collection<QueueEntry> messagesToBeDelivered = _unacknowledgedMessageMap.cancelAllMessages();
-
-        if (!messagesToBeDelivered.isEmpty())
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Requeuing " + messagesToBeDelivered.size() + " unacked messages. for " + toString());
-            }
-
-        }
-
-        for (QueueEntry unacked : messagesToBeDelivered)
-        {
-            if (!unacked.isQueueDeleted())
-            {
-                // Mark message redelivered
-                unacked.setRedelivered();
-
-                // Ensure message is released for redelivery
-                unacked.release();
-
-            }
-            else
-            {
-                unacked.discard();
-            }
-        }
-
-    }
-
-    /**
-     * Requeue a single message
-     *
-     * @param deliveryTag The message to requeue
-     *
-     * @throws AMQException If something goes wrong.
-     */
-    public void requeue(long deliveryTag) throws AMQException
-    {
-        QueueEntry unacked = _unacknowledgedMessageMap.remove(deliveryTag);
-
-        if (unacked != null)
-        {
-            // Mark message redelivered
-            unacked.setRedelivered();
-
-            // Ensure message is released for redelivery
-            if (!unacked.isQueueDeleted())
-            {
-
-                // Ensure message is released for redelivery
-                unacked.release();
-
-            }
-            else
-            {
-                _logger.warn(System.identityHashCode(this) + " Requested requeue of message(" + unacked
-                          + "):" + deliveryTag + " but no queue defined and no DeadLetter queue so DROPPING message.");
-
-                unacked.discard();
-            }
-        }
-        else
-        {
-            _logger.warn("Requested requeue of message:" + deliveryTag + " but no such delivery tag exists."
-                      + _unacknowledgedMessageMap.size());
-
-        }
-
-    }
-
-    public boolean isMaxDeliveryCountEnabled(final long deliveryTag)
-    {
-        final QueueEntry queueEntry = _unacknowledgedMessageMap.get(deliveryTag);
-        if (queueEntry != null)
-        {
-            final int maximumDeliveryCount = queueEntry.getQueue().getMaximumDeliveryCount();
-            return maximumDeliveryCount > 0;
-        }
-
-        return false;
-    }
-
-    public boolean isDeliveredTooManyTimes(final long deliveryTag)
-    {
-        final QueueEntry queueEntry = _unacknowledgedMessageMap.get(deliveryTag);
-        if (queueEntry != null)
-        {
-            final int maximumDeliveryCount = queueEntry.getQueue().getMaximumDeliveryCount();
-            final int numDeliveries = queueEntry.getDeliveryCount();
-            return maximumDeliveryCount != 0 && numDeliveries >= maximumDeliveryCount;
-        }
-
-        return false;
-    }
-
-    /**
-     * Called to resend all outstanding unacknowledged messages to this same channel.
-     *
-     * @param requeue Are the messages to be requeued or dropped.
-     *
-     * @throws AMQException When something goes wrong.
-     */
-    public void resend(final boolean requeue) throws AMQException
-    {
-
-
-        final Map<Long, QueueEntry> msgToRequeue = new LinkedHashMap<Long, QueueEntry>();
-        final Map<Long, QueueEntry> msgToResend = new LinkedHashMap<Long, QueueEntry>();
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("unacked map Size:" + _unacknowledgedMessageMap.size());
-        }
-
-        // Process the Unacked-Map.
-        // Marking messages who still have a consumer for to be resent
-        // and those that don't to be requeued.
-        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap,
-                                                                    msgToRequeue,
-                                                                    msgToResend,
-                                                                    requeue,
-                                                                    _messageStore));
-
-
-        // Process Messages to Resend
-        if (_logger.isDebugEnabled())
-        {
-            if (!msgToResend.isEmpty())
-            {
-                _logger.debug("Preparing (" + msgToResend.size() + ") message to resend.");
-            }
-            else
-            {
-                _logger.debug("No message to resend.");
-            }
-        }
-
-        for (Map.Entry<Long, QueueEntry> entry : msgToResend.entrySet())
-        {
-            QueueEntry message = entry.getValue();
-            long deliveryTag = entry.getKey();
-
-            //Amend the delivery counter as the client hasn't seen these messages yet.
-            message.decrementDeliveryCount();
-
-            AMQQueue queue = message.getQueue();
-
-            // Without any details from the client about what has been processed we have to mark
-            // all messages in the unacked map as redelivered.
-            message.setRedelivered();
-
-            Subscription sub = message.getDeliveredSubscription();
-
-            if (sub != null)
-            {
-
-                if(!queue.resend(message,sub))
-                {
-                    msgToRequeue.put(deliveryTag, message);
-                }
-            }
-            else
-            {
-
-                if (_logger.isInfoEnabled())
-                {
-                    _logger.info("DeliveredSubscription not recorded so just requeueing(" + message.toString()
-                              + ")to prevent loss");
-                }
-                // move this message to requeue
-                msgToRequeue.put(deliveryTag, message);
-            }
-        } // for all messages
-        // } else !isSuspend
-
-        if (_logger.isInfoEnabled())
-        {
-            if (!msgToRequeue.isEmpty())
-            {
-                _logger.info("Preparing (" + msgToRequeue.size() + ") message to requeue to.");
-            }
-        }
-
-        // Process Messages to Requeue at the front of the queue
-        for (Map.Entry<Long, QueueEntry> entry : msgToRequeue.entrySet())
-        {
-            QueueEntry message = entry.getValue();
-            long deliveryTag = entry.getKey();
-
-            //Amend the delivery counter as the client hasn't seen these messages yet.
-            message.decrementDeliveryCount();
-
-            _unacknowledgedMessageMap.remove(deliveryTag);
-
-            message.setRedelivered();
-            message.release();
-
-        }
-    }
-
-
-    /**
-     * Acknowledge one or more messages.
-     *
-     * @param deliveryTag the last delivery tag
-     * @param multiple    if true will acknowledge all messages up to an including the delivery tag. if false only
-     *                    acknowledges the single message specified by the delivery tag
-     *
-     * @throws AMQException if the delivery tag is unknown (e.g. not outstanding) on this channel
-     */
-    public void acknowledgeMessage(long deliveryTag, boolean multiple) throws AMQException
-    {
-        Collection<QueueEntry> ackedMessages = getAckedMessages(deliveryTag, multiple);
-        _transaction.dequeue(ackedMessages, new MessageAcknowledgeAction(ackedMessages));
-    }
-
-    private Collection<QueueEntry> getAckedMessages(long deliveryTag, boolean multiple)
-    {
-
-        return _unacknowledgedMessageMap.acknowledge(deliveryTag, multiple);
-
-    }
-
-    /**
-     * Used only for testing purposes.
-     *
-     * @return the map of unacknowledged messages
-     */
-    public UnacknowledgedMessageMap getUnacknowledgedMessageMap()
-    {
-        return _unacknowledgedMessageMap;
-    }
-
-    /**
-     * Called from the ChannelFlowHandler to suspend this Channel
-     * @param suspended boolean, should this Channel be suspended
-     */
-    public void setSuspended(boolean suspended)
-    {
-        boolean wasSuspended = _suspended.getAndSet(suspended);
-        if (wasSuspended != suspended)
-        {
-            // Log Flow Started before we start the subscriptions
-            if (!suspended)
-            {
-                _actor.message(_logSubject, ChannelMessages.FLOW("Started"));
-            }
-
-
-            // This section takes two different approaches to perform to perform
-            // the same function. Ensuring that the Subscription has taken note
-            // of the change in Channel State
-
-            // Here we have become unsuspended and so we ask each the queue to
-            // perform an Async delivery for each of the subscriptions in this
-            // Channel. The alternative would be to ensure that the subscription
-            // had received the change in suspension state. That way the logic
-            // behind decieding to start an async delivery was located with the
-            // Subscription.
-            if (wasSuspended)
-            {
-                // may need to deliver queued messages
-                for (Subscription s : _tag2SubscriptionMap.values())
-                {
-                    s.getQueue().deliverAsync(s);
-                }
-            }
-
-
-            // Here we have become suspended so we need to ensure that each of
-            // the Subscriptions has noticed this change so that we can be sure
-            // they are not still sending messages. Again the code here is a
-            // very simplistic approach to ensure that the change of suspension
-            // has been noticed by each of the Subscriptions. Unlike the above
-            // case we don't actually need to do anything else.
-            if (!wasSuspended)
-            {
-                // may need to deliver queued messages
-                for (Subscription s : _tag2SubscriptionMap.values())
-                {
-                    try
-                    {
-                        s.getSendLock();
-                    }
-                    finally
-                    {
-                        s.releaseSendLock();
-                    }
-                }
-            }
-
-
-            // Log Suspension only after we have confirmed all suspensions are
-            // stopped.
-            if (suspended)
-            {
-                _actor.message(_logSubject, ChannelMessages.FLOW("Stopped"));
-            }
-
-        }
-    }
-
-    public boolean isSuspended()
-    {
-        return _suspended.get()  || _closing.get() || _session.isClosing();
-    }
-
-    public void commit() throws AMQException
-    {
-        commit(null, false);
-    }
-
-
-    public void commit(final Runnable immediateAction, boolean async) throws AMQException
-    {
-
-        if (!isTransactional())
-        {
-            throw new AMQException("Fatal error: commit called on non-transactional channel");
-        }
-
-        if(async && _transaction instanceof LocalTransaction)
-        {
-
-            ((LocalTransaction)_transaction).commitAsync(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    immediateAction.run();
-                    _txnCommits.incrementAndGet();
-                    _txnStarts.incrementAndGet();
-                    decrementOutstandingTxnsIfNecessary();
-                }
-            });
-        }
-        else
-        {
-            _transaction.commit(immediateAction);
-
-            _txnCommits.incrementAndGet();
-            _txnStarts.incrementAndGet();
-            decrementOutstandingTxnsIfNecessary();
-        }
-    }
-
-    public void rollback() throws AMQException
-    {
-        rollback(NULL_TASK);
-    }
-
-    public void rollback(Runnable postRollbackTask) throws AMQException
-    {
-        if (!isTransactional())
-        {
-            throw new AMQException("Fatal error: commit called on non-transactional channel");
-        }
-
-        // stop all subscriptions
-        _rollingBack = true;
-        boolean requiresSuspend = _suspended.compareAndSet(false,true);
-
-        // ensure all subscriptions have seen the change to the channel state
-        for(Subscription sub : _tag2SubscriptionMap.values())
-        {
-            sub.getSendLock();
-            sub.releaseSendLock();
-        }
-
-        try
-        {
-            _transaction.rollback();
-        }
-        finally
-        {
-            _rollingBack = false;
-
-            _txnRejects.incrementAndGet();
-            _txnStarts.incrementAndGet();
-            decrementOutstandingTxnsIfNecessary();
-        }
-
-        postRollbackTask.run();
-
-        for(QueueEntry entry : _resendList)
-        {
-            Subscription sub = entry.getDeliveredSubscription();
-            if(sub == null || sub.isClosed())
-            {
-                entry.release();
-            }
-            else
-            {
-                sub.getQueue().resend(entry, sub);
-            }
-        }
-        _resendList.clear();
-
-        if(requiresSuspend)
-        {
-            _suspended.set(false);
-            for(Subscription sub : _tag2SubscriptionMap.values())
-            {
-                sub.getQueue().deliverAsync(sub);
-            }
-
-        }
-    }
-
-    public String toString()
-    {
-        return "["+_session.toString()+":"+_channelId+"]";
-    }
-
-    public void setDefaultQueue(AMQQueue queue)
-    {
-        _defaultQueue = queue;
-    }
-
-    public AMQQueue getDefaultQueue()
-    {
-        return _defaultQueue;
-    }
-
-
-    public boolean isClosing()
-    {
-        return _closing.get();
-    }
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        return _session;
-    }
-
-    public FlowCreditManager getCreditManager()
-    {
-        return _creditManager;
-    }
-
-    public void setCredit(final long prefetchSize, final int prefetchCount)
-    {
-        _actor.message(ChannelMessages.PREFETCH_SIZE(prefetchSize, prefetchCount));
-        _creditManager.setCreditLimits(prefetchSize, prefetchCount);
-    }
-
-    public MessageStore getMessageStore()
-    {
-        return _messageStore;
-    }
-
-    public ClientDeliveryMethod getClientDeliveryMethod()
-    {
-        return _clientDeliveryMethod;
-    }
-
-    private final RecordDeliveryMethod _recordDeliveryMethod = new RecordDeliveryMethod()
-        {
-
-            public void recordMessageDelivery(final Subscription sub, final QueueEntry entry, final long deliveryTag)
-            {
-                addUnacknowledgedMessage(entry, deliveryTag, sub);
-            }
-        };
-
-    public RecordDeliveryMethod getRecordDeliveryMethod()
-    {
-        return _recordDeliveryMethod;
-    }
-
-
-    private AMQMessage createAMQMessage(IncomingMessage incomingMessage)
-            throws AMQException
-    {
-
-        AMQMessage message = new AMQMessage(incomingMessage.getStoredMessage());
-
-        message.setExpiration(incomingMessage.getExpiration());
-        message.setConnectionIdentifier(_session.getReference());
-        return message;
-    }
-
-    private boolean checkMessageUserId(ContentHeaderBody header)
-    {
-        AMQShortString userID =
-                header.getProperties() instanceof BasicContentHeaderProperties
-                    ? ((BasicContentHeaderProperties) header.getProperties()).getUserId()
-                    : null;
-
-        return (!_messageAuthorizationRequired || _session.getAuthorizedPrincipal().getName().equals(userID == null? "" : userID.toString()));
-
-    }
-
-    @Override
-    public UUID getId()
-    {
-        return _id;
-    }
-
-    public AMQConnectionModel getConnectionModel()
-    {
-        return _session;
-    }
-
-    public String getClientID()
-    {
-        return String.valueOf(_session.getContextKey());
-    }
-
-    public LogSubject getLogSubject()
-    {
-        return _logSubject;
-    }
-
-    @Override
-    public int compareTo(AMQSessionModel o)
-    {
-        return getId().compareTo(o.getId());
-    }
-
-    private class MessageDeliveryAction implements ServerTransaction.Action
-    {
-        private IncomingMessage _incommingMessage;
-        private List<? extends BaseQueue> _destinationQueues;
-
-        public MessageDeliveryAction(IncomingMessage currentMessage,
-                                     List<? extends BaseQueue> destinationQueues)
-        {
-            _incommingMessage = currentMessage;
-            _destinationQueues = destinationQueues;
-        }
-
-        public void postCommit()
-        {
-            try
-            {
-                final boolean immediate = _incommingMessage.isImmediate();
-
-                final AMQMessage amqMessage = createAMQMessage(_incommingMessage);
-                MessageReference ref = amqMessage.newReference();
-
-                for(int i = 0; i < _destinationQueues.size(); i++)
-                {
-                    BaseQueue queue = _destinationQueues.get(i);
-
-                    BaseQueue.PostEnqueueAction action;
-
-                    if(immediate)
-                    {
-                        action = new ImmediateAction(queue);
-                    }
-                    else
-                    {
-                        action = null;
-                    }
-
-                    queue.enqueue(amqMessage, isTransactional(), action);
-
-                    if(queue instanceof AMQQueue)
-                    {
-                        ((AMQQueue)queue).checkCapacity(AMQChannel.this);
-                    }
-
-                }
-
-                _incommingMessage.getStoredMessage().flushToStore();
-                ref.release();
-            }
-            catch (AMQException e)
-            {
-                // TODO
-                throw new RuntimeException(e);
-            }
-        }
-
-        public void onRollback()
-        {
-            // Maybe keep track of entries that were created and then delete them here in case of failure
-            // to in memory enqueue
-        }
-
-        private class ImmediateAction implements BaseQueue.PostEnqueueAction
-        {
-            private final BaseQueue _queue;
-
-            public ImmediateAction(BaseQueue queue)
-            {
-                _queue = queue;
-            }
-
-            public void onEnqueue(QueueEntry entry)
-            {
-                if (!entry.getDeliveredToConsumer() && entry.acquire())
-                {
-
-
-                    ServerTransaction txn = new LocalTransaction(_messageStore);
-                    Collection<QueueEntry> entries = new ArrayList<QueueEntry>(1);
-                    entries.add(entry);
-                    final AMQMessage message = (AMQMessage) entry.getMessage();
-                    txn.dequeue(_queue, entry.getMessage(),
-                                new MessageAcknowledgeAction(entries)
-                                {
-                                    @Override
-                                    public void postCommit()
-                                    {
-                                        try
-                                        {
-                                            final
-                                            ProtocolOutputConverter outputConverter =
-                                                    _session.getProtocolOutputConverter();
-
-                                            outputConverter.writeReturn(message.getMessagePublishInfo(),
-                                                                        message.getContentHeaderBody(),
-                                                                        message,
-                                                                        _channelId,
-                                                                        AMQConstant.NO_CONSUMERS.getCode(),
-                                                                        IMMEDIATE_DELIVERY_REPLY_TEXT);
-                                        }
-                                        catch (AMQException e)
-                                        {
-                                            throw new RuntimeException(e);
-                                        }
-                                        super.postCommit();
-                                    }
-                                }
-                    );
-                    txn.commit();
-
-
-                }
-
-            }
-        }
-    }
-
-    private class MessageAcknowledgeAction implements ServerTransaction.Action
-    {
-        private final Collection<QueueEntry> _ackedMessages;
-
-        public MessageAcknowledgeAction(Collection<QueueEntry> ackedMessages)
-        {
-            _ackedMessages = ackedMessages;
-        }
-
-        public void postCommit()
-        {
-            try
-            {
-                for(QueueEntry entry : _ackedMessages)
-                {
-                    entry.discard();
-                }
-            }
-            finally
-            {
-                _acknowledgedMessages.clear();
-            }
-
-        }
-
-        public void onRollback()
-        {
-            // explicit rollbacks resend the message after the rollback-ok is sent
-            if(_rollingBack)
-            {
-                 _resendList.addAll(_ackedMessages);
-            }
-            else
-            {
-                try
-                {
-                        for(QueueEntry entry : _ackedMessages)
-                        {
-                            entry.release();
-                        }
-                }
-                finally
-                {
-                    _acknowledgedMessages.clear();
-                }
-            }
-
-        }
-    }
-
-    private class WriteReturnAction implements ServerTransaction.Action
-    {
-        private final AMQConstant _errorCode;
-        private final IncomingMessage _message;
-        private final String _description;
-
-        public WriteReturnAction(AMQConstant errorCode,
-                                 String description,
-                                 IncomingMessage message)
-        {
-            _errorCode = errorCode;
-            _message = message;
-            _description = description;
-        }
-
-        public void postCommit()
-        {
-            try
-            {
-                _session.getProtocolOutputConverter().writeReturn(_message.getMessagePublishInfo(),
-                                                              _message.getContentHeader(),
-                                                              _message,
-                                                              _channelId,
-                                                              _errorCode.getCode(),
-                                                              AMQShortString.valueOf(_description, true, true));
-            }
-            catch (AMQException e)
-            {
-                //TODO
-                throw new RuntimeException(e);
-            }
-
-        }
-
-        public void onRollback()
-        {
-        }
-    }
-
-
-    public LogActor getLogActor()
-    {
-        return _actor;
-    }
-
-    public synchronized void block()
-    {
-        if(_blockingEntities.add(this))
-        {
-            if(_blocking.compareAndSet(false,true))
-            {
-                _actor.message(_logSubject, ChannelMessages.FLOW_ENFORCED("** All Queues **"));
-                flow(false);
-            }
-        }
-    }
-
-    public synchronized void unblock()
-    {
-        if(_blockingEntities.remove(this))
-        {
-            if(_blockingEntities.isEmpty() && _blocking.compareAndSet(true,false))
-            {
-                _actor.message(_logSubject, ChannelMessages.FLOW_REMOVED());
-
-                flow(true);
-            }
-        }
-    }
-
-    public synchronized void block(AMQQueue queue)
-    {
-        if(_blockingEntities.add(queue))
-        {
-
-            if(_blocking.compareAndSet(false,true))
-            {
-                _actor.message(_logSubject, ChannelMessages.FLOW_ENFORCED(queue.getNameShortString().toString()));
-                flow(false);
-            }
-        }
-    }
-
-    public synchronized void unblock(AMQQueue queue)
-    {
-        if(_blockingEntities.remove(queue))
-        {
-            if(_blockingEntities.isEmpty() && _blocking.compareAndSet(true,false) && !isClosing())
-            {
-                _actor.message(_logSubject, ChannelMessages.FLOW_REMOVED());
-
-                flow(true);
-            }
-        }
-    }
-
-    public boolean onSameConnection(InboundMessage inbound)
-    {
-        if(inbound instanceof IncomingMessage)
-        {
-            IncomingMessage incoming = (IncomingMessage) inbound;
-            return getProtocolSession().getReference() == incoming.getConnectionReference();
-        }
-        return false;
-    }
-
-    public int getUnacknowledgedMessageCount()
-    {
-        return getUnacknowledgedMessageMap().size();
-    }
-
-    private void flow(boolean flow)
-    {
-        MethodRegistry methodRegistry = _session.getMethodRegistry();
-        AMQMethodBody responseBody = methodRegistry.createChannelFlowBody(flow);
-        _session.writeFrame(responseBody.generateFrame(_channelId));
-    }
-
-    @Override
-    public boolean getBlocking()
-    {
-        return _blocking.get();
-    }
-
-    public VirtualHost getVirtualHost()
-    {
-        return getProtocolSession().getVirtualHost();
-    }
-
-    public void checkTransactionStatus(long openWarn, long openClose, long idleWarn, long idleClose) throws AMQException
-    {
-        _transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, openWarn, openClose, idleWarn, idleClose);
-    }
-
-    /**
-     * Typically called from the HouseKeepingThread instead of the main receiver thread,
-     * therefore uses a lock to close the connection in a thread-safe manner.
-     */
-    private void closeConnection(String reason) throws AMQException
-    {
-        Lock receivedLock = _session.getReceivedLock();
-        receivedLock.lock();
-        try
-        {
-            _session.close(AMQConstant.RESOURCE_ERROR, reason);
-        }
-        finally
-        {
-            receivedLock.unlock();
-        }
-    }
-
-    public void deadLetter(long deliveryTag) throws AMQException
-    {
-        final UnacknowledgedMessageMap unackedMap = getUnacknowledgedMessageMap();
-        final QueueEntry rejectedQueueEntry = unackedMap.get(deliveryTag);
-
-        if (rejectedQueueEntry == null)
-        {
-            _logger.warn("No message found, unable to DLQ delivery tag: " + deliveryTag);
-            return;
-        }
-        else
-        {
-            final ServerMessage msg = rejectedQueueEntry.getMessage();
-
-            final AMQQueue queue = rejectedQueueEntry.getQueue();
-
-            final Exchange altExchange = queue.getAlternateExchange();
-            unackedMap.remove(deliveryTag);
-
-            if (altExchange == null)
-            {
-                _logger.debug("No alternate exchange configured for queue, must discard the message as unable to DLQ: delivery tag: " + deliveryTag);
-                _actor.message(_logSubject, ChannelMessages.DISCARDMSG_NOALTEXCH(msg.getMessageNumber(), queue.getName(), msg.getRoutingKey()));
-                rejectedQueueEntry.discard();
-                return;
-            }
-
-            final InboundMessage m = new InboundMessageAdapter(rejectedQueueEntry);
-
-            final List<? extends BaseQueue> destinationQueues = altExchange.route(m);
-
-            if (destinationQueues == null || destinationQueues.isEmpty())
-            {
-                _logger.debug("Routing process provided no queues to enqueue the message on, must discard message as unable to DLQ: delivery tag: " + deliveryTag);
-                _actor.message(_logSubject, ChannelMessages.DISCARDMSG_NOROUTE(msg.getMessageNumber(), altExchange.getName()));
-                rejectedQueueEntry.discard();
-                return;
-            }
-
-            rejectedQueueEntry.routeToAlternate();
-
-            //output operational logging for each delivery post commit
-            for (final BaseQueue destinationQueue : destinationQueues)
-            {
-                _actor.message(_logSubject, ChannelMessages.DEADLETTERMSG(msg.getMessageNumber(), destinationQueue.getNameShortString().asString()));
-            }
-
-        }
-    }
-
-    public void recordFuture(final StoreFuture future, final ServerTransaction.Action action)
-    {
-        _unfinishedCommandsQueue.add(new AsyncCommand(future, action));
-    }
-
-    public void sync()
-    {
-        if(_logger.isDebugEnabled())
-        {
-            _logger.debug("sync() called on channel " + debugIdentity());
-        }
-
-        AsyncCommand cmd;
-        while((cmd = _unfinishedCommandsQueue.poll()) != null)
-        {
-            cmd.awaitReadyForCompletion();
-            cmd.complete();
-        }
-        if(_transaction instanceof LocalTransaction)
-        {
-            ((LocalTransaction)_transaction).sync();
-        }
-    }
-
-    private static class AsyncCommand
-    {
-        private final StoreFuture _future;
-        private ServerTransaction.Action _action;
-
-        public AsyncCommand(final StoreFuture future, final ServerTransaction.Action action)
-        {
-            _future = future;
-            _action = action;
-        }
-
-        void awaitReadyForCompletion()
-        {
-            _future.waitForCompletion();
-        }
-
-        void complete()
-        {
-            if(!_future.isComplete())
-            {
-                _future.waitForCompletion();
-            }
-            _action.postCommit();
-            _action = null;
-        }
-    }
-
-    @Override
-    public int getConsumerCount()
-    {
-        return _tag2SubscriptionMap.size();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
deleted file mode 100644
index 416a4da183..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.message.AMQMessageHeader;
-import org.apache.qpid.server.message.AbstractServerMessageImpl;
-import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.StoredMessage;
-
-import java.lang.ref.WeakReference;
-import java.nio.ByteBuffer;
-
-/**
- * A deliverable message.
- */
-public class AMQMessage extends AbstractServerMessageImpl<MessageMetaData>
-{
-    /** Used for debugging purposes. */
-    private static final Logger _log = Logger.getLogger(AMQMessage.class);
-
-    /** Flag to indicate that this message requires 'immediate' delivery. */
-
-    private static final byte IMMEDIATE = 0x01;
-
-    /**
-     * Flag to indicate whether this message has been delivered to a consumer. Used in implementing return functionality
-     * for messages published with the 'immediate' flag.
-     */
-
-    private static final byte DELIVERED_TO_CONSUMER = 0x02;
-
-    private byte _flags = 0;
-
-    private long _expiration;
-
-    private final long _size;
-
-    private Object _connectionIdentifier;
-    private static final byte IMMEDIATE_AND_DELIVERED = (byte) (IMMEDIATE | DELIVERED_TO_CONSUMER);
-
-    public AMQMessage(StoredMessage<MessageMetaData> handle)
-    {
-        this(handle, null);
-    }
-
-    public AMQMessage(StoredMessage<MessageMetaData> handle, WeakReference<AMQChannel> channelRef)
-    {
-        super(handle);
-
-
-        final MessageMetaData metaData = handle.getMetaData();
-        _size = metaData.getContentSize();
-        final MessagePublishInfo messagePublishInfo = metaData.getMessagePublishInfo();
-
-        if(messagePublishInfo.isImmediate())
-        {
-            _flags |= IMMEDIATE;
-        }
-    }
-
-    public void setExpiration(final long expiration)
-    {
-
-        _expiration = expiration;
-
-    }
-
-    public MessageMetaData getMessageMetaData()
-    {
-        return getStoredMessage().getMetaData();
-    }
-
-    public ContentHeaderBody getContentHeaderBody()
-    {
-        return getMessageMetaData().getContentHeaderBody();
-    }
-
-    public Long getMessageId()
-    {
-        return getStoredMessage().getMessageNumber();
-    }
-
-    /**
-     * Called selectors to determin if the message has already been sent
-     *
-     * @return _deliveredToConsumer
-     */
-    public boolean getDeliveredToConsumer()
-    {
-        return (_flags & DELIVERED_TO_CONSUMER) != 0;
-    }
-
-    public String getRoutingKey()
-    {
-        MessageMetaData messageMetaData = getMessageMetaData();
-        if (messageMetaData != null)
-        {
-            AMQShortString routingKey = messageMetaData.getMessagePublishInfo().getRoutingKey();
-            if (routingKey != null)
-            {
-                return routingKey.asString();
-            }
-        }
-        return null;
-    }
-
-    public AMQMessageHeader getMessageHeader()
-    {
-        return getMessageMetaData().getMessageHeader();
-    }
-
-    public boolean isPersistent()
-    {
-        return getMessageMetaData().isPersistent();
-    }
-
-    /**
-     * Called to enforce the 'immediate' flag.
-     *
-     * @returns  true if the message is marked for immediate delivery but has not been marked as delivered
-     *                              to a consumer
-     */
-    public boolean immediateAndNotDelivered()
-    {
-
-        return (_flags & IMMEDIATE_AND_DELIVERED) == IMMEDIATE;
-
-    }
-
-    public MessagePublishInfo getMessagePublishInfo()
-    {
-        return getMessageMetaData().getMessagePublishInfo();
-    }
-
-    public long getArrivalTime()
-    {
-        return getMessageMetaData().getArrivalTime();
-    }
-
-    /**
-     * Checks to see if the message has expired. If it has the message is dequeued.
-     *
-     * @param queue The queue to check the expiration against. (Currently not used)
-     *
-     * @return true if the message has expire
-     *
-     * @throws AMQException
-     */
-    public boolean expired(AMQQueue queue) throws AMQException
-    {
-
-        if (_expiration != 0L)
-        {
-            long now = System.currentTimeMillis();
-
-            return (now > _expiration);
-        }
-
-        return false;
-    }
-
-    /**
-     * Called when this message is delivered to a consumer. (used to implement the 'immediate' flag functionality).
-     * And for selector efficiency.
-     */
-    public void setDeliveredToConsumer()
-    {
-        _flags |= DELIVERED_TO_CONSUMER;
-    }
-
-    public long getSize()
-    {
-        return _size;
-
-    }
-
-    public boolean isImmediate()
-    {
-        return (_flags & IMMEDIATE) == IMMEDIATE;
-    }
-
-    public long getExpiration()
-    {
-        return _expiration;
-    }
-
-    public MessageReference newReference()
-    {
-        return new AMQMessageReference(this);
-    }
-
-    public long getMessageNumber()
-    {
-        return getStoredMessage().getMessageNumber();
-    }
-
-
-    public Object getConnectionIdentifier()
-    {
-        return _connectionIdentifier;
-
-    }
-
-    public void setConnectionIdentifier(final Object connectionIdentifier)
-    {
-        _connectionIdentifier = connectionIdentifier;
-    }
-
-
-    public String toString()
-    {
-        return "Message[" + debugIdentity() + "]: " + getMessageId() + "; ref count: " + getReferenceCount();
-    }
-
-    public int getContent(ByteBuffer buf, int offset)
-    {
-        return getStoredMessage().getContent(offset, buf);
-    }
-
-
-    public ByteBuffer getContent(int offset, int size)
-    {
-        return getStoredMessage().getContent(offset, size);
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java
deleted file mode 100644
index 3adc9f70cd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.server.message.MessageReference;
-
-public class AMQMessageReference extends MessageReference<AMQMessage>
-{
-
-
-    public AMQMessageReference(AMQMessage message)
-    {
-        super(message);
-    }
-
-    protected void onReference(AMQMessage message)
-    {
-        message.incrementReference();
-    }
-
-    protected void onRelease(AMQMessage message)
-    {
-        message.decrementReference();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
deleted file mode 100644
index 8faf1a7c65..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AMQMethodBody;

-import org.apache.qpid.protocol.AMQMethodEvent;

-

-/**

- * AMQNoMethodHandlerException represents the case where no method handler exists to handle an AQMP method.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure to handle an AMQP method.

- * </table>

- *

- * @todo Not an AMQP exception as no status code.

- *

- * @todo Missing method handler. Unlikely to ever happen, and if it does its a coding error. Consider replacing with a

- *       Runtime.

- */

-public class AMQNoMethodHandlerException extends AMQException

-{

-    public AMQNoMethodHandlerException(AMQMethodEvent<AMQMethodBody> evt)

-    {

-        super("AMQMethodEvent " + evt + " was not processed by any listener on Broker.");

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
deleted file mode 100644
index dcf8d1fd47..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ /dev/null
@@ -1,1705 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import javax.security.auth.Subject;
-import javax.security.sasl.SaslServer;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQChannelException;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQSecurityException;
-import org.apache.qpid.codec.AMQCodecFactory;
-import org.apache.qpid.common.QpidProperties;
-import org.apache.qpid.common.ServerPropertyNames;
-import org.apache.qpid.framing.AMQBody;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQProtocolHeaderException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.FieldTableFactory;
-import org.apache.qpid.framing.HeartbeatBody;
-import org.apache.qpid.framing.MethodDispatcher;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolInitiation;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.properties.ConnectionStartProperties;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQMethodListener;
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.protocol.v0_8.handler.ServerMethodDispatcherImpl;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.actors.AMQPConnectionActor;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.actors.ManagementActor;
-import org.apache.qpid.server.logging.messages.ConnectionMessages;
-import org.apache.qpid.server.logging.subjects.ConnectionLogSubject;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverterRegistry;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
-import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.stats.StatisticsCounter;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.util.BytesDataOutput;
-
-public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSession
-{
-    private static final Logger _logger = Logger.getLogger(AMQProtocolEngine.class);
-
-    // to save boxing the channelId and looking up in a map... cache in an array the low numbered
-    // channels.  This value must be of the form 2^x - 1.
-    private static final int CHANNEL_CACHE_SIZE = 0xff;
-    private static final int REUSABLE_BYTE_BUFFER_CAPACITY = 65 * 1024;
-    private final Port _port;
-
-    private AMQShortString _contextKey;
-
-    private String _clientVersion = null;
-
-    private VirtualHost _virtualHost;
-
-    private final Map<Integer, AMQChannel> _channelMap = new HashMap<Integer, AMQChannel>();
-
-    private final AMQChannel[] _cachedChannels = new AMQChannel[CHANNEL_CACHE_SIZE + 1];
-
-    /**
-     * The channels that the latest call to {@link #received(ByteBuffer)} applied to.
-     * Used so we know which channels we need to call {@link AMQChannel#receivedComplete()}
-     * on after handling the frames.
-     *
-     * Thread-safety: guarded by {@link #_receivedLock}.
-     */
-    private final Set<AMQChannel> _channelsForCurrentMessage = new HashSet<AMQChannel>();
-
-    private final CopyOnWriteArraySet<AMQMethodListener> _frameListeners = new CopyOnWriteArraySet<AMQMethodListener>();
-
-    private final AMQStateManager _stateManager;
-
-    private AMQCodecFactory _codecFactory;
-
-    private SaslServer _saslServer;
-
-    private Object _lastReceived;
-
-    private Object _lastSent;
-
-    private volatile boolean _closed;
-
-    // maximum number of channels this session should have
-    private long _maxNoOfChannels;
-
-    /* AMQP Version for this session */
-    private ProtocolVersion _protocolVersion = ProtocolVersion.getLatestSupportedVersion();
-    private MethodRegistry _methodRegistry = MethodRegistry.getMethodRegistry(_protocolVersion);
-    private FieldTable _clientProperties;
-    private final List<Task> _taskList = new CopyOnWriteArrayList<Task>();
-
-    private Map<Integer, Long> _closingChannelsList = new ConcurrentHashMap<Integer, Long>();
-    private ProtocolOutputConverter _protocolOutputConverter;
-    private Subject _authorizedSubject;
-    private MethodDispatcher _dispatcher;
-
-    private final long _connectionID;
-    private Object _reference = new Object();
-
-    private AMQPConnectionActor _actor;
-    private LogSubject _logSubject;
-
-    private long _lastIoTime;
-
-    private long _writtenBytes;
-    private long _readBytes;
-
-
-    private long _maxFrameSize;
-    private final AtomicBoolean _closing = new AtomicBoolean(false);
-    private long _createTime = System.currentTimeMillis();
-
-    private StatisticsCounter _messagesDelivered, _dataDelivered, _messagesReceived, _dataReceived;
-
-    private NetworkConnection _network;
-    private Sender<ByteBuffer> _sender;
-
-    private volatile boolean _deferFlush;
-    private long _lastReceivedTime;
-    private boolean _blocking;
-
-    private final ReentrantLock _receivedLock;
-    private AtomicLong _lastWriteTime = new AtomicLong(System.currentTimeMillis());
-    private final Broker _broker;
-    private final Transport _transport;
-
-    private volatile boolean _closeWhenNoRoute;
-    private volatile boolean _stopped;
-
-    public AMQProtocolEngine(Broker broker,
-                             NetworkConnection network,
-                             final long connectionId,
-                             Port port,
-                             Transport transport)
-    {
-        _broker = broker;
-        _port = port;
-        _transport = transport;
-        _maxNoOfChannels = (Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT);
-        _receivedLock = new ReentrantLock();
-        _stateManager = new AMQStateManager(broker, this);
-        _codecFactory = new AMQCodecFactory(true, this);
-
-        setNetworkConnection(network);
-        _connectionID = connectionId;
-
-        _actor = new AMQPConnectionActor(this, _broker.getRootMessageLogger());
-
-        _logSubject = new ConnectionLogSubject(this);
-
-        _actor.message(ConnectionMessages.OPEN(null, null, null, false, false, false));
-
-        _closeWhenNoRoute = (Boolean)_broker.getAttribute(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE);
-
-        initialiseStatistics();
-
-    }
-
-    public void setNetworkConnection(NetworkConnection network)
-    {
-        setNetworkConnection(network, network.getSender());
-    }
-
-    public void setNetworkConnection(NetworkConnection network, Sender<ByteBuffer> sender)
-    {
-        _network = network;
-        _sender = sender;
-    }
-
-    public long getSessionID()
-    {
-        return _connectionID;
-    }
-
-    public LogActor getLogActor()
-    {
-        return _actor;
-    }
-
-    public void setMaxFrameSize(long frameMax)
-    {
-        _maxFrameSize = frameMax;
-    }
-
-    public long getMaxFrameSize()
-    {
-        return _maxFrameSize;
-    }
-
-    public boolean isClosing()
-    {
-        return _closing.get();
-    }
-
-    public synchronized void flushBatched()
-    {
-        _sender.flush();
-    }
-
-
-    public ClientDeliveryMethod createDeliveryMethod(int channelId)
-    {
-        return new WriteDeliverMethod(channelId);
-    }
-
-    public void received(final ByteBuffer msg)
-    {
-        final long arrivalTime = System.currentTimeMillis();
-        _lastReceivedTime = arrivalTime;
-        _lastIoTime = arrivalTime;
-
-        _receivedLock.lock();
-        try
-        {
-            final ArrayList<AMQDataBlock> dataBlocks = _codecFactory.getDecoder().decodeBuffer(msg);
-            final int len = dataBlocks.size();
-            for (int i = 0; i < len; i++)
-            {
-                AMQDataBlock dataBlock = dataBlocks.get(i);
-                try
-                {
-                    dataBlockReceived(dataBlock);
-                }
-                catch(AMQConnectionException e)
-                {
-                    if(_logger.isDebugEnabled())
-                    {
-                        _logger.debug("Caught AMQConnectionException but will simply stop processing data blocks - the connection should already be closed.", e);
-                    }
-                    break;
-                }
-                catch (Exception e)
-                {
-                    _logger.error("Unexpected exception when processing datablock", e);
-                    closeProtocolSession();
-                    break;
-                }
-            }
-            receivedComplete();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Unexpected exception when processing datablocks", e);
-            closeProtocolSession();
-        }
-        finally
-        {
-            _receivedLock.unlock();
-        }
-    }
-
-    private void receivedComplete() throws AMQException
-    {
-        Exception exception = null;
-        for (AMQChannel channel : _channelsForCurrentMessage)
-        {
-            try
-            {
-                channel.receivedComplete();
-            }
-            catch(Exception exceptionForThisChannel)
-            {
-                if(exception == null)
-                {
-                    exception = exceptionForThisChannel;
-                }
-                _logger.error("Error informing channel that receiving is complete. Channel: " + channel, exceptionForThisChannel);
-            }
-        }
-
-        _channelsForCurrentMessage.clear();
-
-        if(exception != null)
-        {
-            throw new AMQException(
-                    AMQConstant.INTERNAL_ERROR,
-                    "Error informing channel that receiving is complete: " + exception.getMessage(),
-                    exception);
-        }
-    }
-
-    /**
-     * Process the data block.
-     * If the message is for a channel it is added to {@link #_channelsForCurrentMessage}.
-     *
-     * @throws an AMQConnectionException if unable to process the data block. In this case,
-     * the connection is already closed by the time the exception is thrown. If any other
-     * type of exception is thrown, the connection is not already closed.
-     */
-    private void dataBlockReceived(AMQDataBlock message) throws Exception
-    {
-        _lastReceived = message;
-        if (message instanceof ProtocolInitiation)
-        {
-            protocolInitiationReceived((ProtocolInitiation) message);
-
-        }
-        else if (message instanceof AMQFrame)
-        {
-            AMQFrame frame = (AMQFrame) message;
-            frameReceived(frame);
-
-        }
-        else
-        {
-            throw new AMQException("Unknown message type: " + message.getClass().getName() + ": " + message);
-        }
-    }
-
-    /**
-     * Handle the supplied frame.
-     * Adds this frame's channel to {@link #_channelsForCurrentMessage}.
-     *
-     * @throws an AMQConnectionException if unable to process the data block. In this case,
-     * the connection is already closed by the time the exception is thrown. If any other
-     * type of exception is thrown, the connection is not already closed.
-     */
-    private void frameReceived(AMQFrame frame) throws AMQException
-    {
-        int channelId = frame.getChannel();
-        AMQChannel amqChannel = _channelMap.get(channelId);
-        if(amqChannel != null)
-        {
-            // The _receivedLock is already aquired in the caller
-            // It is safe to add channel
-            _channelsForCurrentMessage.add(amqChannel);
-        }
-        else
-        {
-            // Not an error. The frame is probably a channel Open for this channel id, which
-            // does not require asynchronous work therefore its absence from
-            // _channelsForCurrentMessage is ok.
-        }
-
-        AMQBody body = frame.getBodyFrame();
-
-        //Look up the Channel's Actor and set that as the current actor
-        // If that is not available then we can use the ConnectionActor
-        // that is associated with this AMQMPSession.
-        LogActor channelActor = null;
-        if (amqChannel != null)
-        {
-            channelActor = amqChannel.getLogActor();
-        }
-        CurrentActor.set(channelActor == null ? _actor : channelActor);
-
-        try
-        {
-            long startTime = 0;
-            String frameToString = null;
-            if (_logger.isDebugEnabled())
-            {
-                startTime = System.currentTimeMillis();
-                frameToString = frame.toString();
-                _logger.debug("RECV: " + frame);
-            }
-
-            // Check that this channel is not closing
-            if (channelAwaitingClosure(channelId))
-            {
-                if ((frame.getBodyFrame() instanceof ChannelCloseOkBody))
-                {
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Channel[" + channelId + "] awaiting closure - processing close-ok");
-                    }
-                }
-                else
-                {
-                    // The channel has been told to close, we don't process any more frames until
-                    // it's closed.
-                    return;
-                }
-            }
-
-            try
-            {
-                body.handle(channelId, this);
-            }
-            catch(AMQConnectionException e)
-            {
-                _logger.info(e.getMessage() + " whilst processing frame: " + body);
-                closeConnection(channelId, e);
-                throw e;
-            }
-            catch (AMQException e)
-            {
-                closeChannel(channelId, e.getErrorCode() == null ? AMQConstant.INTERNAL_ERROR : e.getErrorCode(), e.getMessage());
-                throw e;
-            }
-            catch (TransportException e)
-            {
-                closeChannel(channelId, AMQConstant.CHANNEL_ERROR, e.getMessage());
-                throw e;
-            }
-
-            if(_logger.isDebugEnabled())
-            {
-                _logger.debug("Frame handled in " + (System.currentTimeMillis() - startTime) + " ms. Frame: " + frameToString);
-            }
-        }
-        finally
-        {
-            CurrentActor.remove();
-        }
-    }
-
-    private synchronized void protocolInitiationReceived(ProtocolInitiation pi)
-    {
-        // this ensures the codec never checks for a PI message again
-        (_codecFactory.getDecoder()).setExpectProtocolInitiation(false);
-        try
-        {
-            // Log incomming protocol negotiation request
-            _actor.message(ConnectionMessages.OPEN(null, pi.getProtocolMajor() + "-" + pi.getProtocolMinor(), null, false, true, false));
-
-            ProtocolVersion pv = pi.checkVersion(); // Fails if not correct
-
-            // This sets the protocol version (and hence framing classes) for this session.
-            setProtocolVersion(pv);
-
-            String mechanisms = _broker.getSubjectCreator(getLocalAddress()).getMechanisms();
-
-            String locales = "en_US";
-
-
-            FieldTable serverProperties = FieldTableFactory.newFieldTable();
-
-            serverProperties.setString(ServerPropertyNames.PRODUCT,
-                    QpidProperties.getProductName());
-            serverProperties.setString(ServerPropertyNames.VERSION,
-                    QpidProperties.getReleaseVersion());
-            serverProperties.setString(ServerPropertyNames.QPID_BUILD,
-                    QpidProperties.getBuildVersion());
-            serverProperties.setString(ServerPropertyNames.QPID_INSTANCE_NAME,
-                    _broker.getName());
-            serverProperties.setString(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE,
-                    String.valueOf(_closeWhenNoRoute));
-
-            AMQMethodBody responseBody = getMethodRegistry().createConnectionStartBody((short) getProtocolMajorVersion(),
-                                                                                       (short) pv.getActualMinorVersion(),
-                                                                                       serverProperties,
-                                                                                       mechanisms.getBytes(),
-                                                                                       locales.getBytes());
-            _sender.send(asByteBuffer(responseBody.generateFrame(0)));
-            _sender.flush();
-
-        }
-        catch (AMQException e)
-        {
-            _logger.info("Received unsupported protocol initiation for protocol version: " + getProtocolVersion());
-
-            _sender.send(asByteBuffer(new ProtocolInitiation(ProtocolVersion.getLatestSupportedVersion())));
-            _sender.flush();
-        }
-    }
-
-
-    private final byte[] _reusableBytes = new byte[REUSABLE_BYTE_BUFFER_CAPACITY];
-    private final ByteBuffer _reusableByteBuffer = ByteBuffer.wrap(_reusableBytes);
-    private final BytesDataOutput _reusableDataOutput = new BytesDataOutput(_reusableBytes);
-
-    private ByteBuffer asByteBuffer(AMQDataBlock block)
-    {
-        final int size = (int) block.getSize();
-
-        final byte[] data;
-
-
-        if(size > REUSABLE_BYTE_BUFFER_CAPACITY)
-        {
-            data= new byte[size];
-        }
-        else
-        {
-
-            data = _reusableBytes;
-        }
-        _reusableDataOutput.setBuffer(data);
-
-        try
-        {
-            block.writePayload(_reusableDataOutput);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(e);
-        }
-
-        final ByteBuffer buf;
-
-        if(size <= REUSABLE_BYTE_BUFFER_CAPACITY)
-        {
-            buf = _reusableByteBuffer;
-            buf.position(0);
-        }
-        else
-        {
-            buf = ByteBuffer.wrap(data);
-        }
-        buf.limit(_reusableDataOutput.length());
-
-        return buf;
-    }
-
-    public void methodFrameReceived(int channelId, AMQMethodBody methodBody)
-    {
-        final AMQMethodEvent<AMQMethodBody> evt = new AMQMethodEvent<AMQMethodBody>(channelId, methodBody);
-
-        try
-        {
-            try
-            {
-                boolean wasAnyoneInterested = _stateManager.methodReceived(evt);
-
-                if (!_frameListeners.isEmpty())
-                {
-                    for (AMQMethodListener listener : _frameListeners)
-                    {
-                        wasAnyoneInterested = listener.methodReceived(evt) || wasAnyoneInterested;
-                    }
-                }
-
-                if (!wasAnyoneInterested)
-                {
-                    throw new AMQNoMethodHandlerException(evt);
-                }
-            }
-            catch (AMQChannelException e)
-            {
-                if (getChannel(channelId) != null)
-                {
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Closing channel due to: " + e.getMessage());
-                    }
-
-                    writeFrame(e.getCloseFrame(channelId));
-                    closeChannel(channelId, e.getErrorCode() == null ? AMQConstant.INTERNAL_ERROR : e.getErrorCode(), e.getMessage());
-                }
-                else
-                {
-                    if (_logger.isDebugEnabled())
-                    {
-                        _logger.debug("ChannelException occured on non-existent channel:" + e.getMessage());
-                    }
-
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Closing connection due to: " + e.getMessage());
-                    }
-
-                    AMQConnectionException ce =
-                            evt.getMethod().getConnectionException(AMQConstant.CHANNEL_ERROR,
-                                                                   AMQConstant.CHANNEL_ERROR.getName().toString());
-
-                    _logger.info(e.getMessage() + " whilst processing:" + methodBody);
-                    closeConnection(channelId, ce);
-                }
-            }
-            catch (AMQConnectionException e)
-            {
-                _logger.info(e.getMessage() + " whilst processing:" + methodBody);
-                closeConnection(channelId, e);
-            }
-            catch (AMQSecurityException e)
-            {
-                AMQConnectionException ce = evt.getMethod().getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
-                _logger.info(e.getMessage() + " whilst processing:" + methodBody);
-                closeConnection(channelId, ce);
-            }
-        }
-        catch (Exception e)
-        {
-            for (AMQMethodListener listener : _frameListeners)
-            {
-                listener.error(e);
-            }
-
-            _logger.error("Unexpected exception while processing frame.  Closing connection.", e);
-
-            closeProtocolSession();
-        }
-    }
-
-    public void contentHeaderReceived(int channelId, ContentHeaderBody body) throws AMQException
-    {
-
-        AMQChannel channel = getAndAssertChannel(channelId);
-
-        channel.publishContentHeader(body);
-
-    }
-
-    public void contentBodyReceived(int channelId, ContentBody body) throws AMQException
-    {
-        AMQChannel channel = getAndAssertChannel(channelId);
-
-        channel.publishContentBody(body);
-    }
-
-    public void heartbeatBodyReceived(int channelId, HeartbeatBody body)
-    {
-        // NO - OP
-    }
-
-    /**
-     * Convenience method that writes a frame to the protocol session. Equivalent to calling
-     * getProtocolSession().write().
-     *
-     * @param frame the frame to write
-     */
-    public synchronized void writeFrame(AMQDataBlock frame)
-    {
-
-        final ByteBuffer buf = asByteBuffer(frame);
-        _writtenBytes += buf.remaining();
-
-        if(_logger.isDebugEnabled())
-        {
-            _logger.debug("SEND: " + frame);
-        }
-
-        _sender.send(buf);
-        final long time = System.currentTimeMillis();
-        _lastIoTime = time;
-        _lastWriteTime.set(time);
-
-        if(!_deferFlush)
-        {
-            _sender.flush();
-        }
-    }
-
-    public AMQShortString getContextKey()
-    {
-        return _contextKey;
-    }
-
-    public void setContextKey(AMQShortString contextKey)
-    {
-        _contextKey = contextKey;
-    }
-
-    public List<AMQChannel> getChannels()
-    {
-        synchronized (_channelMap)
-        {
-            return new ArrayList<AMQChannel>(_channelMap.values());
-        }
-    }
-
-    public AMQChannel getAndAssertChannel(int channelId) throws AMQException
-    {
-        AMQChannel channel = getChannel(channelId);
-        if (channel == null)
-        {
-            throw new AMQException(AMQConstant.NOT_FOUND, "Channel not found with id:" + channelId);
-        }
-
-        return channel;
-    }
-
-    public AMQChannel getChannel(int channelId)
-    {
-        final AMQChannel channel =
-                ((channelId & CHANNEL_CACHE_SIZE) == channelId) ? _cachedChannels[channelId] : _channelMap.get(channelId);
-        if ((channel == null) || channel.isClosing())
-        {
-            return null;
-        }
-        else
-        {
-            return channel;
-        }
-    }
-
-    public boolean channelAwaitingClosure(int channelId)
-    {
-        return !_closingChannelsList.isEmpty() && _closingChannelsList.containsKey(channelId);
-    }
-
-    public void addChannel(AMQChannel channel) throws AMQException
-    {
-        if (_closed)
-        {
-            throw new AMQException("Session is closed");
-        }
-
-        final int channelId = channel.getChannelId();
-
-        if (_closingChannelsList.containsKey(channelId))
-        {
-            throw new AMQException("Session is marked awaiting channel close");
-        }
-
-        if (_channelMap.size() == _maxNoOfChannels)
-        {
-            String errorMessage =
-                    toString() + ": maximum number of channels has been reached (" + _maxNoOfChannels
-                    + "); can't create channel";
-            _logger.error(errorMessage);
-            throw new AMQException(AMQConstant.NOT_ALLOWED, errorMessage);
-        }
-        else
-        {
-            synchronized (_channelMap)
-            {
-                _channelMap.put(channel.getChannelId(), channel);
-
-                if(_blocking)
-                {
-                    channel.block();
-                }
-            }
-        }
-
-        if (((channelId & CHANNEL_CACHE_SIZE) == channelId))
-        {
-            _cachedChannels[channelId] = channel;
-        }
-    }
-
-    public Long getMaximumNumberOfChannels()
-    {
-        return _maxNoOfChannels;
-    }
-
-    public void setMaximumNumberOfChannels(Long value)
-    {
-        _maxNoOfChannels = value;
-    }
-
-    public void commitTransactions(AMQChannel channel) throws AMQException
-    {
-        if ((channel != null) && channel.isTransactional())
-        {
-            channel.commit();
-        }
-    }
-
-    public void rollbackTransactions(AMQChannel channel) throws AMQException
-    {
-        if ((channel != null) && channel.isTransactional())
-        {
-            channel.rollback();
-        }
-    }
-
-    /**
-     * Close a specific channel. This will remove any resources used by the channel, including: <ul><li>any queue
-     * subscriptions (this may in turn remove queues if they are auto delete</li> </ul>
-     *
-     * @param channelId id of the channel to close
-     *
-     * @throws AMQException             if an error occurs closing the channel
-     * @throws IllegalArgumentException if the channel id is not valid
-     */
-    @Override
-    public void closeChannel(int channelId) throws AMQException
-    {
-        closeChannel(channelId, null, null);
-    }
-
-    public void closeChannel(int channelId, AMQConstant cause, String message) throws AMQException
-    {
-        final AMQChannel channel = getChannel(channelId);
-        if (channel == null)
-        {
-            throw new IllegalArgumentException("Unknown channel id");
-        }
-        else
-        {
-            try
-            {
-                channel.close(cause, message);
-                markChannelAwaitingCloseOk(channelId);
-            }
-            finally
-            {
-                removeChannel(channelId);
-            }
-        }
-    }
-
-    public void closeChannelOk(int channelId)
-    {
-        // todo QPID-847 - This is called from two lcoations ChannelCloseHandler and ChannelCloseOkHandler.
-        // When it is the CC_OK_Handler then it makes sence to remove the channel else we will leak memory.
-        // We do it from the Close Handler as we are sending the OK back to the client.
-        // While this is AMQP spec compliant. The Java client in the event of an IllegalArgumentException
-        // will send a close-ok.. Where we should call removeChannel.
-        // However, due to the poor exception handling on the client. The client-user will be notified of the
-        // InvalidArgument and if they then decide to close the session/connection then the there will be time
-        // for that to occur i.e. a new close method be sent before the exeption handling can mark the session closed.
-
-        _closingChannelsList.remove(channelId);
-    }
-
-    private void markChannelAwaitingCloseOk(int channelId)
-    {
-        _closingChannelsList.put(channelId, System.currentTimeMillis());
-    }
-
-    /**
-     * In our current implementation this is used by the clustering code.
-     *
-     * @param channelId The channel to remove
-     */
-    public void removeChannel(int channelId)
-    {
-        synchronized (_channelMap)
-        {
-            _channelMap.remove(channelId);
-
-            if ((channelId & CHANNEL_CACHE_SIZE) == channelId)
-            {
-                _cachedChannels[channelId] = null;
-            }
-        }
-    }
-
-    /**
-     * Initialise heartbeats on the session.
-     *
-     * @param delay delay in seconds (not ms)
-     */
-    public void initHeartbeats(int delay)
-    {
-        if (delay > 0)
-        {
-            _network.setMaxWriteIdle(delay);
-            _network.setMaxReadIdle(BrokerProperties.HEARTBEAT_TIMEOUT_FACTOR * delay);
-        }
-        else
-        {
-            _network.setMaxWriteIdle(0);
-            _network.setMaxReadIdle(0);
-        }
-    }
-
-    /**
-     * Closes all channels that were opened by this protocol session. This frees up all resources used by the channel.
-     *
-     * @throws AMQException if an error occurs while closing any channel
-     */
-    private void closeAllChannels() throws AMQException
-    {
-        for (AMQChannel channel : getChannels())
-        {
-            channel.close();
-        }
-        synchronized (_channelMap)
-        {
-            _channelMap.clear();
-        }
-        for (int i = 0; i <= CHANNEL_CACHE_SIZE; i++)
-        {
-            _cachedChannels[i] = null;
-        }
-    }
-
-    /** This must be called when the session is _closed in order to free up any resources managed by the session. */
-    @Override
-    public void closeSession() throws AMQException
-    {
-        if(_closing.compareAndSet(false,true))
-        {
-            // force sync of outstanding async work
-            _receivedLock.lock();
-            try
-            {
-                receivedComplete();
-            }
-            finally
-            {
-                _receivedLock.unlock();
-            }
-
-            // REMOVE THIS SHOULD NOT BE HERE.
-            if (CurrentActor.get() == null)
-            {
-                CurrentActor.set(_actor);
-            }
-            if (!_closed)
-            {
-                if (_virtualHost != null)
-                {
-                    _virtualHost.getConnectionRegistry().deregisterConnection(this);
-                }
-
-                closeAllChannels();
-
-                for (Task task : _taskList)
-                {
-                    task.doTask(this);
-                }
-
-                synchronized(this)
-                {
-                    _closed = true;
-                    notifyAll();
-                }
-                CurrentActor.get().message(_logSubject, ConnectionMessages.CLOSE());
-            }
-        }
-        else
-        {
-            synchronized(this)
-            {
-
-                boolean lockHeld = _receivedLock.isHeldByCurrentThread();
-
-                while(!_closed)
-                {
-                    try
-                    {
-                        if(lockHeld)
-                        {
-                            _receivedLock.unlock();
-                        }
-                        wait(1000);
-                    }
-                    catch (InterruptedException e)
-                    {
-
-                    }
-                    finally
-                    {
-                        if(lockHeld)
-                        {
-                            _receivedLock.lock();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private void closeConnection(int channelId, AMQConnectionException e) throws AMQException
-    {
-        try
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Closing connection due to: " + e);
-            }
-
-            markChannelAwaitingCloseOk(channelId);
-            closeSession();
-        }
-        finally
-        {
-            try
-            {
-                _stateManager.changeState(AMQState.CONNECTION_CLOSING);
-                writeFrame(e.getCloseFrame(channelId));
-            }
-            finally
-            {
-                closeProtocolSession();
-            }
-        }
-
-
-    }
-
-    @Override
-    public void closeProtocolSession()
-    {
-        _network.close();
-
-        try
-        {
-            _stateManager.changeState(AMQState.CONNECTION_CLOSED);
-        }
-        catch (AMQException e)
-        {
-            _logger.info(e.getMessage());
-        }
-        catch (TransportException e)
-        {
-            _logger.info(e.getMessage());
-        }
-    }
-
-    public String toString()
-    {
-        return getRemoteAddress() + "(" + (getAuthorizedPrincipal() == null ? "?" : getAuthorizedPrincipal().getName() + ")");
-    }
-
-    public String dump()
-    {
-        return this + " last_sent=" + _lastSent + " last_received=" + _lastReceived;
-    }
-
-    /** @return an object that can be used to identity */
-    public Object getKey()
-    {
-        return getRemoteAddress();
-    }
-
-    /**
-     * Get the fully qualified domain name of the local address to which this session is bound. Since some servers may
-     * be bound to multiple addresses this could vary depending on the acceptor this session was created from.
-     *
-     * @return a String FQDN
-     */
-    public String getLocalFQDN()
-    {
-        SocketAddress address = _network.getLocalAddress();
-        if (address instanceof InetSocketAddress)
-        {
-            return ((InetSocketAddress) address).getHostName();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Unsupported socket address class: " + address);
-        }
-    }
-
-    public SaslServer getSaslServer()
-    {
-        return _saslServer;
-    }
-
-    public void setSaslServer(SaslServer saslServer)
-    {
-        _saslServer = saslServer;
-    }
-
-    public void setClientProperties(FieldTable clientProperties)
-    {
-        _clientProperties = clientProperties;
-        if (_clientProperties != null)
-        {
-            String closeWhenNoRoute = _clientProperties.getString(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE);
-            if (closeWhenNoRoute != null)
-            {
-                _closeWhenNoRoute = Boolean.parseBoolean(closeWhenNoRoute);
-                if(_logger.isDebugEnabled())
-                {
-                    _logger.debug("Client set closeWhenNoRoute=" + _closeWhenNoRoute + " for protocol engine " + this);
-                }
-            }
-
-            _clientVersion = _clientProperties.getString(ConnectionStartProperties.VERSION_0_8);
-
-            if (_clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8) != null)
-            {
-                String clientID = _clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8);
-                setContextKey(new AMQShortString(clientID));
-
-                // Log the Opening of the connection for this client
-                _actor.message(ConnectionMessages.OPEN(clientID, _protocolVersion.toString(), _clientVersion, true, true, true));
-            }
-        }
-    }
-
-    private void setProtocolVersion(ProtocolVersion pv)
-    {
-        _protocolVersion = pv;
-        _methodRegistry = MethodRegistry.getMethodRegistry(_protocolVersion);
-        _protocolOutputConverter = ProtocolOutputConverterRegistry.getConverter(this);
-        _dispatcher = ServerMethodDispatcherImpl.createMethodDispatcher(_stateManager, _protocolVersion);
-    }
-
-    public byte getProtocolMajorVersion()
-    {
-        return _protocolVersion.getMajorVersion();
-    }
-
-    public ProtocolVersion getProtocolVersion()
-    {
-        return _protocolVersion;
-    }
-
-    public byte getProtocolMinorVersion()
-    {
-        return _protocolVersion.getMinorVersion();
-    }
-
-    public boolean isProtocolVersion(byte major, byte minor)
-    {
-        return (getProtocolMajorVersion() == major) && (getProtocolMinorVersion() == minor);
-    }
-
-    public MethodRegistry getRegistry()
-    {
-        return getMethodRegistry();
-    }
-
-    public VirtualHost getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    public void setVirtualHost(VirtualHost virtualHost) throws AMQException
-    {
-        _virtualHost = virtualHost;
-
-        _virtualHost.getConnectionRegistry().registerConnection(this);
-
-    }
-
-    public void addSessionCloseTask(Task task)
-    {
-        _taskList.add(task);
-    }
-
-    public void removeSessionCloseTask(Task task)
-    {
-        _taskList.remove(task);
-    }
-
-    public ProtocolOutputConverter getProtocolOutputConverter()
-    {
-        return _protocolOutputConverter;
-    }
-
-    public void setAuthorizedSubject(final Subject authorizedSubject)
-    {
-        if (authorizedSubject == null)
-        {
-            throw new IllegalArgumentException("authorizedSubject cannot be null");
-        }
-        _authorizedSubject = authorizedSubject;
-    }
-
-    public Subject getAuthorizedSubject()
-    {
-        return _authorizedSubject;
-    }
-
-    public Principal getAuthorizedPrincipal()
-    {
-        return _authorizedSubject == null ? null : AuthenticatedPrincipal.getAuthenticatedPrincipalFromSubject(_authorizedSubject);
-    }
-
-    public SocketAddress getRemoteAddress()
-    {
-        return _network.getRemoteAddress();
-    }
-
-    public SocketAddress getLocalAddress()
-    {
-        return _network.getLocalAddress();
-    }
-
-    public Principal getPeerPrincipal()
-    {
-        return _network.getPeerPrincipal();
-    }
-
-    public MethodRegistry getMethodRegistry()
-    {
-        return _methodRegistry;
-    }
-
-    public MethodDispatcher getMethodDispatcher()
-    {
-        return _dispatcher;
-    }
-
-    public void closed()
-    {
-        try
-        {
-            try
-            {
-                closeSession();
-            }
-            finally
-            {
-                closeProtocolSession();
-            }
-        }
-        catch (AMQException e)
-        {
-           _logger.error("Could not close protocol engine", e);
-        }
-        catch (TransportException e)
-        {
-           _logger.error("Could not close protocol engine", e);
-        }
-    }
-
-    public void readerIdle()
-    {
-        // TODO - enforce disconnect on lack of inbound data
-    }
-
-    public synchronized void writerIdle()
-    {
-        writeFrame(HeartbeatBody.FRAME);
-    }
-
-    public void exception(Throwable throwable)
-    {
-        if (throwable instanceof AMQProtocolHeaderException)
-        {
-            writeFrame(new ProtocolInitiation(ProtocolVersion.getLatestSupportedVersion()));
-            _sender.close();
-
-            _logger.error("Error in protocol initiation " + this + ":" + getRemoteAddress() + " :" + throwable.getMessage(), throwable);
-        }
-        else if (throwable instanceof IOException)
-        {
-            _logger.error("IOException caught in" + this + ", session closed implictly: " + throwable);
-        }
-        else
-        {
-            _logger.error("Exception caught in" + this + ", closing session explictly: " + throwable, throwable);
-
-
-            MethodRegistry methodRegistry = MethodRegistry.getMethodRegistry(getProtocolVersion());
-            ConnectionCloseBody closeBody = methodRegistry.createConnectionCloseBody(200,new AMQShortString(throwable.getMessage()),0,0);
-
-            writeFrame(closeBody.generateFrame(0));
-
-            _sender.close();
-        }
-    }
-
-    public void init()
-    {
-        // Do nothing
-    }
-
-    public void setSender(Sender<ByteBuffer> sender)
-    {
-        // Do nothing
-    }
-
-    public long getReadBytes()
-    {
-        return _readBytes;
-    }
-
-    public long getWrittenBytes()
-    {
-        return _writtenBytes;
-    }
-
-    public long getLastIoTime()
-    {
-        return _lastIoTime;
-    }
-
-    @Override
-    public Port getPort()
-    {
-        return _port;
-    }
-
-    @Override
-    public Transport getTransport()
-    {
-        return _transport;
-    }
-
-    @Override
-    public void stop()
-    {
-        _stopped = true;
-    }
-
-    @Override
-    public boolean isStopped()
-    {
-        return _stopped;
-    }
-
-    @Override
-    public String getVirtualHostName()
-    {
-        return _virtualHost == null ? null : _virtualHost.getName();
-    }
-
-    public long getLastReceivedTime()
-    {
-        return _lastReceivedTime;
-    }
-
-    public String getClientVersion()
-    {
-        return _clientVersion;
-    }
-
-    public String getPrincipalAsString()
-    {
-        return getAuthId();
-    }
-
-    public long getSessionCountLimit()
-    {
-        return getMaximumNumberOfChannels();
-    }
-
-    public Boolean isIncoming()
-    {
-        return true;
-    }
-
-    public Boolean isSystemConnection()
-    {
-        return false;
-    }
-
-    public Boolean isFederationLink()
-    {
-        return false;
-    }
-
-    public String getAuthId()
-    {
-        return getAuthorizedPrincipal() == null ? null : getAuthorizedPrincipal().getName();
-    }
-
-    public Integer getRemotePID()
-    {
-        return null;
-    }
-
-    public String getRemoteProcessName()
-    {
-        return null;
-    }
-
-    public Integer getRemoteParentPID()
-    {
-        return null;
-    }
-
-    public boolean isDurable()
-    {
-        return false;
-    }
-
-    public long getConnectionId()
-    {
-        return getSessionID();
-    }
-
-    public String getAddress()
-    {
-        return String.valueOf(getRemoteAddress());
-    }
-
-    public long getCreateTime()
-    {
-        return _createTime;
-    }
-
-    public Boolean isShadow()
-    {
-        return false;
-    }
-
-    public void mgmtClose()
-    {
-        MethodRegistry methodRegistry = getMethodRegistry();
-        ConnectionCloseBody responseBody =
-                methodRegistry.createConnectionCloseBody(
-                        AMQConstant.REPLY_SUCCESS.getCode(),
-                        new AMQShortString("The connection was closed using the broker's management interface."),
-                        0,0);
-
-        // This seems ugly but because we use closeConnection in both normal
-        // broker operation and as part of the management interface it cannot
-        // be avoided. The Current Actor will be null when this method is
-        // called via the QMF management interface. As such we need to set one.
-        boolean removeActor = false;
-        if (CurrentActor.get() == null)
-        {
-            removeActor = true;
-            CurrentActor.set(new ManagementActor(_actor.getRootMessageLogger()));
-        }
-
-        try
-        {
-            writeFrame(responseBody.generateFrame(0));
-
-            try
-            {
-
-                closeSession();
-            }
-            catch (AMQException ex)
-            {
-                throw new RuntimeException(ex);
-            }
-        }
-        finally
-        {
-            if (removeActor)
-            {
-                CurrentActor.remove();
-            }
-        }
-    }
-
-    public void mgmtCloseChannel(int channelId)
-    {
-        MethodRegistry methodRegistry = getMethodRegistry();
-        ChannelCloseBody responseBody =
-                methodRegistry.createChannelCloseBody(
-                        AMQConstant.REPLY_SUCCESS.getCode(),
-                        new AMQShortString("The channel was closed using the broker's management interface."),
-                        0,0);
-
-        // This seems ugly but because we use AMQChannel.close() in both normal
-        // broker operation and as part of the management interface it cannot
-        // be avoided. The Current Actor will be null when this method is
-        // called via the QMF management interface. As such we need to set one.
-        boolean removeActor = false;
-        if (CurrentActor.get() == null)
-        {
-            removeActor = true;
-            CurrentActor.set(new ManagementActor(_actor.getRootMessageLogger()));
-        }
-
-        try
-        {
-            writeFrame(responseBody.generateFrame(channelId));
-
-            try
-            {
-                closeChannel(channelId);
-            }
-            catch (AMQException ex)
-            {
-                throw new RuntimeException(ex);
-            }
-        }
-        finally
-        {
-            if (removeActor)
-            {
-                CurrentActor.remove();
-            }
-        }
-    }
-
-    public String getClientID()
-    {
-        return getContextKey().toString();
-    }
-
-    public void closeSession(AMQSessionModel session, AMQConstant cause, String message) throws AMQException
-    {
-        int channelId = ((AMQChannel)session).getChannelId();
-        closeChannel(channelId, cause, message);
-
-        MethodRegistry methodRegistry = getMethodRegistry();
-        ChannelCloseBody responseBody =
-                methodRegistry.createChannelCloseBody(
-                        cause.getCode(),
-                        new AMQShortString(message),
-                        0,0);
-
-        writeFrame(responseBody.generateFrame(channelId));
-    }
-
-    public void close(AMQConstant cause, String message) throws AMQException
-    {
-        closeConnection(0, new AMQConnectionException(cause, message, 0, 0,
-		                getProtocolOutputConverter().getProtocolMajorVersion(),
-		                getProtocolOutputConverter().getProtocolMinorVersion(),
-		                (Throwable) null));
-    }
-
-    public void block()
-    {
-        synchronized (_channelMap)
-        {
-            if(!_blocking)
-            {
-                _blocking = true;
-                for(AMQChannel channel : _channelMap.values())
-                {
-                    channel.block();
-                }
-            }
-        }
-    }
-
-    public void unblock()
-    {
-        synchronized (_channelMap)
-        {
-            if(_blocking)
-            {
-                _blocking = false;
-                for(AMQChannel channel : _channelMap.values())
-                {
-                    channel.unblock();
-                }
-            }
-        }
-    }
-
-    public boolean isClosed()
-    {
-        return _closed;
-    }
-
-    public List<AMQSessionModel> getSessionModels()
-    {
-		return new ArrayList<AMQSessionModel>(getChannels());
-    }
-
-    public LogSubject getLogSubject()
-    {
-        return _logSubject;
-    }
-
-    public void registerMessageDelivered(long messageSize)
-    {
-        _messagesDelivered.registerEvent(1L);
-        _dataDelivered.registerEvent(messageSize);
-        _virtualHost.registerMessageDelivered(messageSize);
-    }
-
-    public void registerMessageReceived(long messageSize, long timestamp)
-    {
-        _messagesReceived.registerEvent(1L, timestamp);
-        _dataReceived.registerEvent(messageSize, timestamp);
-        _virtualHost.registerMessageReceived(messageSize, timestamp);
-    }
-
-    public StatisticsCounter getMessageReceiptStatistics()
-    {
-        return _messagesReceived;
-    }
-
-    public StatisticsCounter getDataReceiptStatistics()
-    {
-        return _dataReceived;
-    }
-
-    public StatisticsCounter getMessageDeliveryStatistics()
-    {
-        return _messagesDelivered;
-    }
-
-    public StatisticsCounter getDataDeliveryStatistics()
-    {
-        return _dataDelivered;
-    }
-
-    public void resetStatistics()
-    {
-        _messagesDelivered.reset();
-        _dataDelivered.reset();
-        _messagesReceived.reset();
-        _dataReceived.reset();
-    }
-
-    public void initialiseStatistics()
-    {
-        _messagesDelivered = new StatisticsCounter("messages-delivered-" + getSessionID());
-        _dataDelivered = new StatisticsCounter("data-delivered-" + getSessionID());
-        _messagesReceived = new StatisticsCounter("messages-received-" + getSessionID());
-        _dataReceived = new StatisticsCounter("data-received-" + getSessionID());
-    }
-
-    public boolean isSessionNameUnique(byte[] name)
-    {
-        // 0-8/0-9/0-9-1 sessions don't have names
-        return true;
-    }
-
-    public String getRemoteAddressString()
-    {
-        return String.valueOf(getRemoteAddress());
-    }
-
-    public String getClientId()
-    {
-        return String.valueOf(getContextKey());
-    }
-
-    public void setDeferFlush(boolean deferFlush)
-    {
-        _deferFlush = deferFlush;
-    }
-
-    public String getUserName()
-    {
-        return getAuthorizedPrincipal().getName();
-    }
-
-    public final class WriteDeliverMethod
-            implements ClientDeliveryMethod
-    {
-        private final int _channelId;
-
-        public WriteDeliverMethod(int channelId)
-        {
-            _channelId = channelId;
-        }
-
-        public void deliverToClient(final Subscription sub, final QueueEntry entry, final long deliveryTag)
-                throws AMQException
-        {
-            registerMessageDelivered(entry.getMessage().getSize());
-            _protocolOutputConverter.writeDeliver(entry, _channelId, deliveryTag, ((SubscriptionImpl)sub).getConsumerTag());
-            entry.incrementDeliveryCount();
-        }
-
-    }
-
-    public Object getReference()
-    {
-        return _reference;
-    }
-
-    public Lock getReceivedLock()
-    {
-        return _receivedLock;
-    }
-
-    @Override
-    public long getLastReadTime()
-    {
-        return _lastReceivedTime;
-    }
-
-    @Override
-    public long getLastWriteTime()
-    {
-        return _lastWriteTime.get();
-    }
-
-    @Override
-    public boolean isCloseWhenNoRoute()
-    {
-        return _closeWhenNoRoute;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
deleted file mode 100644
index 559ab3468e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import java.net.SocketAddress;
-import java.security.Principal;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-
-import javax.security.auth.Subject;
-import javax.security.sasl.SaslServer;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MethodDispatcher;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.protocol.AMQConnectionModel;
-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
-import org.apache.qpid.server.security.AuthorizationHolder;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-
-public interface AMQProtocolSession extends AMQVersionAwareProtocolSession, AuthorizationHolder, AMQConnectionModel
-{
-    long getSessionID();
-
-    LogActor getLogActor();
-
-    void setMaxFrameSize(long frameMax);
-
-    long getMaxFrameSize();
-
-    boolean isClosing();
-
-    void flushBatched();
-
-    void setDeferFlush(boolean defer);
-
-    ClientDeliveryMethod createDeliveryMethod(int channelId);
-
-    long getLastReceivedTime();
-
-    /**
-     * Return the local socket address for the connection
-     *
-     * @return the socket address
-     */
-    SocketAddress getLocalAddress();
-
-    public static interface Task
-    {
-        public void doTask(AMQProtocolSession session) throws AMQException;
-    }
-
-    /**
-     * Get the context key associated with this session. Context key is described in the AMQ protocol specification (RFC
-     * 6).
-     *
-     * @return the context key
-     */
-    AMQShortString getContextKey();
-
-    /**
-     * Set the context key associated with this session. Context key is described in the AMQ protocol specification (RFC
-     * 6).
-     *
-     * @param contextKey the context key
-     */
-    void setContextKey(AMQShortString contextKey);
-
-    /**
-     * Get the channel for this session associated with the specified id. A channel id is unique per connection (i.e.
-     * per session).
-     *
-     * @param channelId the channel id which must be valid
-     *
-     * @return null if no channel exists, the channel otherwise
-     */
-    AMQChannel getChannel(int channelId);
-
-    /**
-     * Associate a channel with this session.
-     *
-     * @param channel the channel to associate with this session. It is an error to associate the same channel with more
-     *                than one session but this is not validated.
-     */
-    void addChannel(AMQChannel channel) throws AMQException;
-
-    /**
-     * Close a specific channel. This will remove any resources used by the channel, including: <ul><li>any queue
-     * subscriptions (this may in turn remove queues if they are auto delete</li> </ul>
-     *
-     * @param channelId id of the channel to close
-     *
-     * @throws org.apache.qpid.AMQException if an error occurs closing the channel
-     * @throws IllegalArgumentException     if the channel id is not valid
-     */
-    void closeChannel(int channelId) throws AMQException;
-
-    void closeChannel(int channelId, AMQConstant cause, String message) throws AMQException;
-
-    /**
-     * Markes the specific channel as closed. This will release the lock for that channel id so a new channel can be
-     * created on that id.
-     *
-     * @param channelId id of the channel to close
-     */
-    void closeChannelOk(int channelId);
-
-    /**
-     * Check to see if this chanel is closing
-     *
-     * @param channelId id to check
-     * @return boolean with state of channel awaiting closure
-     */
-    boolean channelAwaitingClosure(int channelId);
-
-    /**
-     * Remove a channel from the session but do not close it.
-     *
-     * @param channelId
-     */
-    void removeChannel(int channelId);
-
-    /**
-     * Initialise heartbeats on the session.
-     *
-     * @param delay delay in seconds (not ms)
-     */
-    void initHeartbeats(int delay);
-
-    /** This must be called when the session is _closed in order to free up any resources managed by the session. */
-    void closeSession() throws AMQException;
-
-    void closeProtocolSession();
-
-    /** @return a key that uniquely identifies this session */
-    Object getKey();
-
-    /**
-     * Get the fully qualified domain name of the local address to which this session is bound. Since some servers may
-     * be bound to multiple addresses this could vary depending on the acceptor this session was created from.
-     *
-     * @return a String FQDN
-     */
-    String getLocalFQDN();
-
-    /** @return the sasl server that can perform authentication for this session. */
-    SaslServer getSaslServer();
-
-    /**
-     * Set the sasl server that is to perform authentication for this session.
-     *
-     * @param saslServer
-     */
-    void setSaslServer(SaslServer saslServer);
-
-    void setClientProperties(FieldTable clientProperties);
-
-    Object getReference();
-
-    VirtualHost getVirtualHost();
-
-    void setVirtualHost(VirtualHost virtualHost) throws AMQException;
-
-    void addSessionCloseTask(Task task);
-
-    void removeSessionCloseTask(Task task);
-
-    public ProtocolOutputConverter getProtocolOutputConverter();
-
-    void setAuthorizedSubject(Subject authorizedSubject);
-
-    public java.net.SocketAddress getRemoteAddress();
-
-    public MethodRegistry getMethodRegistry();
-
-    public MethodDispatcher getMethodDispatcher();
-
-    String getClientVersion();
-
-    long getLastIoTime();
-
-    long getWrittenBytes();
-
-    Long getMaximumNumberOfChannels();
-
-    void setMaximumNumberOfChannels(Long value);
-
-    void commitTransactions(AMQChannel channel) throws AMQException;
-
-    void rollbackTransactions(AMQChannel channel) throws AMQException;
-
-    List<AMQChannel> getChannels();
-
-    void mgmtCloseChannel(int channelId);
-
-    public Principal getPeerPrincipal();
-
-    Lock getReceivedLock();
-
-    /**
-     * Used for 0-8/0-9/0-9-1 connections to choose to close
-     * the connection when a transactional session receives a 'mandatory' message which
-     * can't be routed rather than returning the message.
-     */
-    boolean isCloseWhenNoRoute();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java
deleted file mode 100644
index f5c43003a4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import java.util.Collection;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-
-import java.util.Set;
-import org.apache.qpid.server.message.AMQMessageHeader;
-
-public class ContentHeaderBodyAdapter implements AMQMessageHeader
-{
-    private final ContentHeaderBody _contentHeaderBody;
-
-    public ContentHeaderBodyAdapter(ContentHeaderBody contentHeaderBody)
-    {
-        _contentHeaderBody = contentHeaderBody;
-    }
-
-    private BasicContentHeaderProperties getProperties()
-    {
-        return (BasicContentHeaderProperties) _contentHeaderBody.getProperties();
-    }
-
-    public String getCorrelationId()
-    {
-        return getProperties().getCorrelationIdAsString();
-    }
-
-    public long getExpiration()
-    {
-        return getProperties().getExpiration();
-    }
-
-    public String getUserId()
-    {
-        return getProperties().getUserIdAsString();
-    }
-
-    public String getAppId()
-    {
-        return getProperties().getAppIdAsString();
-    }
-
-    public String getMessageId()
-    {
-        return getProperties().getMessageIdAsString();
-    }
-
-    public String getMimeType()
-    {
-        return getProperties().getContentTypeAsString();
-    }
-
-    public String getEncoding()
-    {
-        return getProperties().getEncodingAsString();
-    }
-
-    public byte getPriority()
-    {
-        return getProperties().getPriority();
-    }
-
-    public long getTimestamp()
-    {
-        return getProperties().getTimestamp();
-    }
-
-    public String getType()
-    {
-        return getProperties().getTypeAsString();
-    }
-
-    public String getReplyTo()
-    {
-        return getProperties().getReplyToAsString();
-    }
-
-    public String getReplyToExchange()
-    {
-        // TODO
-        return getReplyTo();
-    }
-
-    public String getReplyToRoutingKey()
-    {
-        // TODO
-        return getReplyTo();
-
-    }
-
-    public Object getHeader(String name)
-    {
-        FieldTable ft = getProperties().getHeaders();
-        return ft.get(name);
-    }
-
-    public boolean containsHeaders(Set<String> names)
-    {
-        FieldTable ft = getProperties().getHeaders();
-        for(String name : names)
-        {
-            if(!ft.containsKey(name))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Collection<String> getHeaderNames()
-    {
-        FieldTable ft = getProperties().getHeaders();
-        return ft.keys();
-    }
-
-    public boolean containsHeader(String name)
-    {
-        FieldTable ft = getProperties().getHeaders();
-        return ft.containsKey(name);
-    }
-
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
deleted file mode 100644
index 5e416b52ca..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.txn.AutoCommitTransaction;
-import org.apache.qpid.server.txn.ServerTransaction;
-
-import java.util.Map;
-
-public class ExtractResendAndRequeue implements UnacknowledgedMessageMap.Visitor
-{
-    private static final Logger _log = Logger.getLogger(ExtractResendAndRequeue.class);
-
-    private final Map<Long, QueueEntry> _msgToRequeue;
-    private final Map<Long, QueueEntry> _msgToResend;
-    private final boolean _requeueIfUnabletoResend;
-    private final UnacknowledgedMessageMap _unacknowledgedMessageMap;
-    private final MessageStore _transactionLog;
-
-    public ExtractResendAndRequeue(UnacknowledgedMessageMap unacknowledgedMessageMap,
-                                   Map<Long, QueueEntry> msgToRequeue,
-                                   Map<Long, QueueEntry> msgToResend,
-                                   boolean requeueIfUnabletoResend,
-                                   MessageStore txnLog)
-    {
-        _unacknowledgedMessageMap = unacknowledgedMessageMap;
-        _msgToRequeue = msgToRequeue;
-        _msgToResend = msgToResend;
-        _requeueIfUnabletoResend = requeueIfUnabletoResend;
-        _transactionLog = txnLog;
-    }
-
-    public boolean callback(final long deliveryTag, QueueEntry message) throws AMQException
-    {
-
-        message.setRedelivered();
-        final Subscription subscription = message.getDeliveredSubscription();
-        if (subscription != null)
-        {
-            // Consumer exists
-            if (!subscription.isClosed())
-            {
-                _msgToResend.put(deliveryTag, message);
-            }
-            else // consumer has gone
-            {
-                _msgToRequeue.put(deliveryTag, message);
-            }
-        }
-        else
-        {
-            // Message has no consumer tag, so was "delivered" to a GET
-            // or consumer no longer registered
-            // cannot resend, so re-queue.
-            if (!message.isQueueDeleted())
-            {
-                if (_requeueIfUnabletoResend)
-                {
-                    _msgToRequeue.put(deliveryTag, message);
-                }
-                else
-                {
-
-                    dequeueEntry(message);
-                    _log.info("No DeadLetter Queue and requeue not requested so dropping message:" + message);
-                }
-            }
-            else
-            {
-                dequeueEntry(message);
-                _log.warn("Message.queue is null and no DeadLetter Queue so dropping message:" + message);
-            }
-        }
-
-        // false means continue processing
-        return false;
-    }
-
-
-    private void dequeueEntry(final QueueEntry node)
-    {
-        ServerTransaction txn = new AutoCommitTransaction(_transactionLog);
-        dequeueEntry(node, txn);
-    }
-
-    private void dequeueEntry(final QueueEntry node, ServerTransaction txn)
-    {
-        txn.dequeue(node.getQueue(), node.getMessage(),
-                    new ServerTransaction.Action()
-                    {
-
-                        public void postCommit()
-                        {
-                            node.discard();
-                        }
-
-                        public void onRollback()
-                        {
-
-                        }
-                    });
-    }
-
-    public void visitComplete()
-    {
-        _unacknowledgedMessageMap.clear();
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
deleted file mode 100644
index 90c764daac..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.message.AMQMessageHeader;
-import org.apache.qpid.server.message.EnqueableMessage;
-import org.apache.qpid.server.message.InboundMessage;
-import org.apache.qpid.server.message.MessageContentSource;
-import org.apache.qpid.server.queue.BaseQueue;
-import org.apache.qpid.server.queue.Filterable;
-import org.apache.qpid.server.store.StoredMessage;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-public class IncomingMessage implements Filterable, InboundMessage, EnqueableMessage, MessageContentSource
-{
-
-    /** Used for debugging purposes. */
-    private static final Logger _logger = Logger.getLogger(IncomingMessage.class);
-
-    private final MessagePublishInfo _messagePublishInfo;
-    private ContentHeaderBody _contentHeaderBody;
-
-
-    /**
-     * Keeps a track of how many bytes we have received in body frames
-     */
-    private long _bodyLengthReceived = 0;
-
-    /**
-     * This is stored during routing, to know the queues to which this message should immediately be
-     * delivered. It is <b>cleared after delivery has been attempted</b>. Any persistent record of destinations is done
-     * by the message handle.
-     */
-    private List<? extends BaseQueue> _destinationQueues;
-
-    private long _expiration;
-
-    private Exchange _exchange;
-
-    private List<ContentChunk> _contentChunks = new ArrayList<ContentChunk>();
-
-    // we keep both the original meta data object and the store reference to it just in case the
-    // store would otherwise flow it to disk
-
-    private MessageMetaData _messageMetaData;
-
-    private StoredMessage<MessageMetaData> _storedMessageHandle;
-    private Object _connectionReference;
-
-
-    public IncomingMessage(
-            final MessagePublishInfo info
-    )
-    {
-        this(info, null);
-    }
-
-    public IncomingMessage(MessagePublishInfo info, Object reference)
-    {
-        _messagePublishInfo = info;
-        _connectionReference = reference;
-    }
-
-    public void setContentHeaderBody(final ContentHeaderBody contentHeaderBody) throws AMQException
-    {
-        _contentHeaderBody = contentHeaderBody;
-    }
-
-    public void setExpiration()
-    {
-        _expiration = ((BasicContentHeaderProperties) _contentHeaderBody.getProperties()).getExpiration();
-    }
-
-    public MessageMetaData headersReceived(long currentTime)
-    {
-        _messageMetaData = new MessageMetaData(_messagePublishInfo, _contentHeaderBody, 0, currentTime);
-        return _messageMetaData;
-    }
-
-
-    public List<? extends BaseQueue> getDestinationQueues()
-    {
-        return _destinationQueues;
-    }
-
-    public void addContentBodyFrame(final ContentChunk contentChunk) throws AMQException
-    {
-        _bodyLengthReceived += contentChunk.getSize();
-        _contentChunks.add(contentChunk);
-    }
-
-    public boolean allContentReceived()
-    {
-        return (_bodyLengthReceived == getContentHeader().getBodySize());
-    }
-
-    public AMQShortString getExchange()
-    {
-        return _messagePublishInfo.getExchange();
-    }
-
-    public AMQShortString getRoutingKeyShortString()
-    {
-        return _messagePublishInfo.getRoutingKey();
-    }
-
-    public String getRoutingKey()
-    {
-        return _messagePublishInfo.getRoutingKey() == null ? null : _messagePublishInfo.getRoutingKey().toString();
-    }
-
-    public String getBinding()
-    {
-        return _messagePublishInfo.getRoutingKey() == null ? null : _messagePublishInfo.getRoutingKey().toString();
-    }
-
-
-    public boolean isMandatory()
-    {
-        return _messagePublishInfo.isMandatory();
-    }
-
-
-    public boolean isImmediate()
-    {
-        return _messagePublishInfo.isImmediate();
-    }
-
-    public ContentHeaderBody getContentHeader()
-    {
-        return _contentHeaderBody;
-    }
-
-
-    public AMQMessageHeader getMessageHeader()
-    {
-        return _messageMetaData.getMessageHeader();
-    }
-
-    public boolean isPersistent()
-    {
-        return getContentHeader().getProperties() instanceof BasicContentHeaderProperties &&
-             ((BasicContentHeaderProperties) getContentHeader().getProperties()).getDeliveryMode() ==
-                                                             BasicContentHeaderProperties.PERSISTENT;
-    }
-
-    public boolean isRedelivered()
-    {
-        return false;
-    }
-
-
-    public long getSize()
-    {
-        return getContentHeader().getBodySize();
-    }
-
-    public long getMessageNumber()
-    {
-        return _storedMessageHandle.getMessageNumber();
-    }
-
-    public void setExchange(final Exchange e)
-    {
-        _exchange = e;
-    }
-
-    public void route()
-    {
-        enqueue(_exchange.route(this));
-
-    }
-
-    public void enqueue(final List<? extends BaseQueue> queues)
-    {
-        _destinationQueues = queues;
-    }
-
-    public MessagePublishInfo getMessagePublishInfo()
-    {
-        return _messagePublishInfo;
-    }
-
-    public long getExpiration()
-    {
-        return _expiration;
-    }
-
-    public int getBodyCount() throws AMQException
-    {
-        return _contentChunks.size();
-    }
-
-    public ContentChunk getContentChunk(int index)
-    {
-        return _contentChunks.get(index);
-    }
-
-
-    public int getContent(ByteBuffer buf, int offset)
-    {
-        int pos = 0;
-        int written = 0;
-        for(ContentChunk cb : _contentChunks)
-        {
-            ByteBuffer data = ByteBuffer.wrap(cb.getData());
-            if(offset+written >= pos && offset < pos + data.limit())
-            {
-                ByteBuffer src = data.duplicate();
-                src.position(offset+written - pos);
-                src = src.slice();
-
-                if(buf.remaining() < src.limit())
-                {
-                    src.limit(buf.remaining());
-                }
-                int count = src.limit();
-                buf.put(src);
-                written += count;
-                if(buf.remaining() == 0)
-                {
-                    break;
-                }
-            }
-            pos+=data.limit();
-        }
-        return written;
-
-    }
-
-
-    public ByteBuffer getContent(int offset, int size)
-    {
-        ByteBuffer buf = ByteBuffer.allocate(size);
-        getContent(buf,offset);
-        buf.flip();
-        return buf;
-    }
-
-    public void setStoredMessage(StoredMessage<MessageMetaData> storedMessageHandle)
-    {
-        _storedMessageHandle = storedMessageHandle;
-    }
-
-    public StoredMessage<MessageMetaData> getStoredMessage()
-    {
-        return _storedMessageHandle;
-    }
-
-    public Object getConnectionReference()
-    {
-        return _connectionReference;
-    }
-
-    public MessageMetaData getMessageMetaData()
-    {
-        return _messageMetaData;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
deleted file mode 100644
index 4cc590d8cc..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import java.util.Collection;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.EncodingUtils;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.message.AMQMessageHeader;
-import org.apache.qpid.server.plugin.MessageMetaDataType;
-import org.apache.qpid.server.store.StorableMessageMetaData;
-import org.apache.qpid.server.util.ByteBufferOutputStream;
-import org.apache.qpid.util.ByteBufferInputStream;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Set;
-
-/**
- * Encapsulates a publish body and a content header. In the context of the message store these are treated as a
- * single unit.
- */
-public class MessageMetaData implements StorableMessageMetaData
-{
-    private MessagePublishInfo _messagePublishInfo;
-
-    private ContentHeaderBody _contentHeaderBody;
-
-    private int _contentChunkCount;
-
-    private long _arrivalTime;
-    private static final byte MANDATORY_FLAG = 1;
-    private static final byte IMMEDIATE_FLAG = 2;
-    public static final MessageMetaDataType.Factory<MessageMetaData> FACTORY = new MetaDataFactory();
-    private static final MessageMetaDataType_0_8 TYPE = new MessageMetaDataType_0_8();
-
-    public MessageMetaData(MessagePublishInfo publishBody, ContentHeaderBody contentHeaderBody, int contentChunkCount)
-    {
-        this(publishBody,contentHeaderBody, contentChunkCount, System.currentTimeMillis());
-    }
-
-    public MessageMetaData(MessagePublishInfo publishBody, ContentHeaderBody contentHeaderBody, int contentChunkCount, long arrivalTime)
-    {
-        _contentHeaderBody = contentHeaderBody;
-        _messagePublishInfo = publishBody;
-        _contentChunkCount = contentChunkCount;
-        _arrivalTime = arrivalTime;
-    }
-
-    public int getContentChunkCount()
-    {
-        return _contentChunkCount;
-    }
-
-    public void setContentChunkCount(int contentChunkCount)
-    {
-        _contentChunkCount = contentChunkCount;
-    }
-
-    public ContentHeaderBody getContentHeaderBody()
-    {
-        return _contentHeaderBody;
-    }
-
-    public void setContentHeaderBody(ContentHeaderBody contentHeaderBody)
-    {
-        _contentHeaderBody = contentHeaderBody;
-    }
-
-    public MessagePublishInfo getMessagePublishInfo()
-    {
-        return _messagePublishInfo;
-    }
-
-    public void setMessagePublishInfo(MessagePublishInfo messagePublishInfo)
-    {
-        _messagePublishInfo = messagePublishInfo;
-    }
-
-    public long getArrivalTime()
-    {
-        return _arrivalTime;
-    }
-
-    public void setArrivalTime(long arrivalTime)
-    {
-        _arrivalTime = arrivalTime;
-    }
-
-    public MessageMetaDataType getType()
-    {
-        return TYPE;
-    }
-
-    public int getStorableSize()
-    {
-        int size = _contentHeaderBody.getSize();
-        size += 4;
-        size += EncodingUtils.encodedShortStringLength(_messagePublishInfo.getExchange());
-        size += EncodingUtils.encodedShortStringLength(_messagePublishInfo.getRoutingKey());
-        size += 1; // flags for immediate/mandatory
-        size += EncodingUtils.encodedLongLength();
-
-        return size;
-    }
-
-
-    public int writeToBuffer(int offset, ByteBuffer dest)
-    {
-        int oldPosition = dest.position();
-        try
-        {
-
-            DataOutputStream dataOutputStream = new DataOutputStream(new ByteBufferOutputStream(dest));
-            EncodingUtils.writeInteger(dataOutputStream, _contentHeaderBody.getSize());
-            _contentHeaderBody.writePayload(dataOutputStream);
-            EncodingUtils.writeShortStringBytes(dataOutputStream, _messagePublishInfo.getExchange());
-            EncodingUtils.writeShortStringBytes(dataOutputStream, _messagePublishInfo.getRoutingKey());
-            byte flags = 0;
-            if(_messagePublishInfo.isMandatory())
-            {
-                flags |= MANDATORY_FLAG;
-            }
-            if(_messagePublishInfo.isImmediate())
-            {
-                flags |= IMMEDIATE_FLAG;
-            }
-            dest.put(flags);
-            dest.putLong(_arrivalTime);
-
-        }
-        catch (IOException e)
-        {
-            // This shouldn't happen as we are not actually using anything that can throw an IO Exception
-            throw new RuntimeException(e);
-        }
-
-        return dest.position()-oldPosition;
-    }
-
-    public int getContentSize()
-    {
-        return (int) _contentHeaderBody.getBodySize();
-    }
-
-    public boolean isPersistent()
-    {
-        BasicContentHeaderProperties properties = (BasicContentHeaderProperties) (_contentHeaderBody.getProperties());
-        return properties.getDeliveryMode() ==  BasicContentHeaderProperties.PERSISTENT;
-    }
-
-    private static class MetaDataFactory implements MessageMetaDataType.Factory
-    {
-
-
-        public MessageMetaData createMetaData(ByteBuffer buf)
-        {
-            try
-            {
-                ByteBufferInputStream bbis = new ByteBufferInputStream(buf);
-                DataInputStream dais = new DataInputStream(bbis);
-                int size = EncodingUtils.readInteger(dais);
-                ContentHeaderBody chb = ContentHeaderBody.createFromBuffer(dais, size);
-                final AMQShortString exchange = EncodingUtils.readAMQShortString(dais);
-                final AMQShortString routingKey = EncodingUtils.readAMQShortString(dais);
-
-                final byte flags = EncodingUtils.readByte(dais);
-                long arrivalTime = EncodingUtils.readLong(dais);
-
-                MessagePublishInfo publishBody =
-                        new MessagePublishInfo()
-                        {
-
-                            public AMQShortString getExchange()
-                            {
-                                return exchange;
-                            }
-
-                            public void setExchange(AMQShortString exchange)
-                            {
-                            }
-
-                            public boolean isImmediate()
-                            {
-                                return (flags & IMMEDIATE_FLAG) != 0;
-                            }
-
-                            public boolean isMandatory()
-                            {
-                                return (flags & MANDATORY_FLAG) != 0;
-                            }
-
-                            public AMQShortString getRoutingKey()
-                            {
-                                return routingKey;
-                            }
-                        };
-                return new MessageMetaData(publishBody, chb, 0, arrivalTime);
-            }
-            catch (AMQException e)
-            {
-                throw new RuntimeException(e);
-            }
-            catch (IOException e)
-            {
-                throw new RuntimeException(e);
-            }
-
-        }
-    };
-
-    public AMQMessageHeader getMessageHeader()
-    {
-        return new MessageHeaderAdapter();
-    }
-
-    private final class MessageHeaderAdapter implements AMQMessageHeader
-    {
-        private BasicContentHeaderProperties getProperties()
-        {
-            return (BasicContentHeaderProperties) getContentHeaderBody().getProperties();
-        }
-
-        public String getUserId()
-        {
-            return getProperties().getUserIdAsString();
-        }
-
-        public String getAppId()
-        {
-            return getProperties().getAppIdAsString();
-        }
-
-        public String getCorrelationId()
-        {
-            return getProperties().getCorrelationIdAsString();
-        }
-
-        public long getExpiration()
-        {
-            return getProperties().getExpiration();
-        }
-
-        public String getMessageId()
-        {
-            return getProperties().getMessageIdAsString();
-        }
-
-        public String getMimeType()
-        {
-            return getProperties().getContentTypeAsString();
-        }
-
-        public String getEncoding()
-        {
-            return getProperties().getEncodingAsString();
-        }
-
-        public byte getPriority()
-        {
-            return getProperties().getPriority();
-        }
-
-        public long getTimestamp()
-        {
-            return getProperties().getTimestamp();
-        }
-
-        public String getType()
-        {
-            return getProperties().getTypeAsString();
-        }
-
-        public String getReplyTo()
-        {
-            return getProperties().getReplyToAsString();
-        }
-
-        public String getReplyToExchange()
-        {
-            // TODO
-            return getReplyTo();
-        }
-
-        public String getReplyToRoutingKey()
-        {
-            // TODO
-            return getReplyTo();
-        }
-
-        public Object getHeader(String name)
-        {
-            FieldTable ft = getProperties().getHeaders();
-            return ft.get(name);
-        }
-
-        public boolean containsHeaders(Set<String> names)
-        {
-            FieldTable ft = getProperties().getHeaders();
-            for(String name : names)
-            {
-                if(!ft.containsKey(name))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public Collection<String> getHeaderNames()
-        {
-            return getProperties().getHeaders().keys();
-        }
-
-        public boolean containsHeader(String name)
-        {
-            FieldTable ft = getProperties().getHeaders();
-            return ft.containsKey(name);
-        }
-
-
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
deleted file mode 100644
index 9b50127ec7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import java.nio.ByteBuffer;
-import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.plugin.MessageMetaDataType;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.store.StoredMessage;
-
-public class MessageMetaDataType_0_8 implements MessageMetaDataType<MessageMetaData>
-{
-
-    public static final int TYPE = 0;
-
-    @Override
-    public int ordinal()
-    {
-        return TYPE;
-    }
-
-    @Override
-    public MessageMetaData createMetaData(ByteBuffer buf)
-    {
-        return MessageMetaData.FACTORY.createMetaData(buf);
-    }
-
-    @Override
-    public ServerMessage<MessageMetaData> createMessage(StoredMessage<MessageMetaData> msg)
-    {
-        return new AMQMessage(msg);
-    }
-
-    public int hashCode()
-    {
-        return ordinal();
-    }
-
-    public boolean equals(Object o)
-    {
-        return o != null && o.getClass() == getClass();
-    }
-
-    @Override
-    public String getType()
-    {
-        return AmqpProtocolVersion.v0_8.toString();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
deleted file mode 100644
index 5ee56508d7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.plugin.ProtocolEngineCreator;
-import org.apache.qpid.transport.network.NetworkConnection;
-
-public class ProtocolEngineCreator_0_8 implements ProtocolEngineCreator
-{
-    private static final byte[] AMQP_0_8_HEADER =
-            new byte[] { (byte) 'A',
-                         (byte) 'M',
-                         (byte) 'Q',
-                         (byte) 'P',
-                         (byte) 1,
-                         (byte) 1,
-                         (byte) 8,
-                         (byte) 0
-            };
-
-
-    public ProtocolEngineCreator_0_8()
-    {
-    }
-
-    public AmqpProtocolVersion getVersion()
-    {
-        return AmqpProtocolVersion.v0_8;
-    }
-
-    public byte[] getHeaderIdentifier()
-    {
-        return AMQP_0_8_HEADER;
-    }
-
-    public ServerProtocolEngine newProtocolEngine(Broker broker,
-                                                  NetworkConnection network,
-                                                  Port port,
-                                                  Transport transport,
-                                                  long id)
-    {
-        return new AMQProtocolEngine(broker, network, id, port, transport);
-    }
-
-    private static ProtocolEngineCreator INSTANCE = new ProtocolEngineCreator_0_8();
-
-    public static ProtocolEngineCreator getInstance()
-    {
-        return INSTANCE;
-    }
-
-    @Override
-    public String getType()
-    {
-        return getVersion().toString();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
deleted file mode 100644
index 2a29348261..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.plugin.ProtocolEngineCreator;
-import org.apache.qpid.transport.network.NetworkConnection;
-
-public class ProtocolEngineCreator_0_9 implements ProtocolEngineCreator
-{
-    private static final byte[] AMQP_0_9_HEADER =
-            new byte[] { (byte) 'A',
-                         (byte) 'M',
-                         (byte) 'Q',
-                         (byte) 'P',
-                         (byte) 1,
-                         (byte) 1,
-                         (byte) 0,
-                         (byte) 9
-            };
-
-    public ProtocolEngineCreator_0_9()
-    {
-    }
-
-    public AmqpProtocolVersion getVersion()
-    {
-        return AmqpProtocolVersion.v0_9;
-    }
-
-
-    public byte[] getHeaderIdentifier()
-    {
-        return AMQP_0_9_HEADER;
-    }
-
-    public ServerProtocolEngine newProtocolEngine(Broker broker,
-                                                  NetworkConnection network,
-                                                  Port port,
-                                                  Transport transport,
-                                                  long id)
-    {
-        return new AMQProtocolEngine(broker, network, id, port, transport);
-    }
-
-    private static ProtocolEngineCreator INSTANCE = new ProtocolEngineCreator_0_9();
-
-    public static ProtocolEngineCreator getInstance()
-    {
-        return INSTANCE;
-    }
-
-    @Override
-    public String getType()
-    {
-        return getVersion().toString();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
deleted file mode 100644
index dad6bef032..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.plugin.ProtocolEngineCreator;
-import org.apache.qpid.transport.network.NetworkConnection;
-
-public class ProtocolEngineCreator_0_9_1 implements ProtocolEngineCreator
-{
-
-    private static final byte[] AMQP_0_9_1_HEADER =
-            new byte[] { (byte) 'A',
-                         (byte) 'M',
-                         (byte) 'Q',
-                         (byte) 'P',
-                         (byte) 0,
-                         (byte) 0,
-                         (byte) 9,
-                         (byte) 1
-            };
-
-    public ProtocolEngineCreator_0_9_1()
-    {
-    }
-
-    public AmqpProtocolVersion getVersion()
-    {
-        return AmqpProtocolVersion.v0_9_1;
-    }
-
-
-    public byte[] getHeaderIdentifier()
-    {
-        return AMQP_0_9_1_HEADER;
-    }
-
-    public ServerProtocolEngine newProtocolEngine(Broker broker,
-                                                  NetworkConnection network,
-                                                  Port port,
-                                                  Transport transport,
-                                                  long id)
-    {
-        return new AMQProtocolEngine(broker, network, id, port, transport);
-    }
-
-
-    private static ProtocolEngineCreator INSTANCE = new ProtocolEngineCreator_0_9_1();
-
-    public static ProtocolEngineCreator getInstance()
-    {
-        return INSTANCE;
-    }
-
-    @Override
-    public String getType()
-    {
-        return getVersion().toString();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
deleted file mode 100644
index 6646dc0cc2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.flow.FlowCreditManager;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.RecordDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-
-/**
- * Allows the customisation of the creation of a subscription. This is typically done within an AMQQueue. This factory
- * primarily assists testing although in future more sophisticated subscribers may need a different subscription
- * implementation.
- *
- * @see org.apache.qpid.server.queue.AMQQueue
- */
-public interface SubscriptionFactory
-{
-    Subscription createSubscription(int channel,
-                                    AMQProtocolSession protocolSession,
-                                    AMQShortString consumerTag,
-                                    boolean acks,
-                                    FieldTable filters,
-                                    boolean noLocal, FlowCreditManager creditManager) throws AMQException;
-
-
-    Subscription createSubscription(AMQChannel channel,
-                                    AMQProtocolSession protocolSession,
-                                    AMQShortString consumerTag,
-                                    boolean acks,
-                                    FieldTable filters,
-                                    boolean noLocal,
-                                    FlowCreditManager creditManager,
-                                    ClientDeliveryMethod clientMethod,
-                                    RecordDeliveryMethod recordMethod) throws AMQException;
-
-
-    Subscription createBasicGetNoAckSubscription(AMQChannel channel,
-                                                 AMQProtocolSession session,
-                                                 AMQShortString consumerTag,
-                                                 FieldTable filters,
-                                                 boolean noLocal,
-                                                 FlowCreditManager creditManager,
-                                                 ClientDeliveryMethod deliveryMethod,
-                                                 RecordDeliveryMethod recordMethod) throws AMQException;
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
deleted file mode 100644
index 93b51a0567..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.flow.FlowCreditManager;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.RecordDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-
-public class SubscriptionFactoryImpl implements SubscriptionFactory
-{
-
-    public Subscription createSubscription(int channelId, AMQProtocolSession protocolSession,
-                                           AMQShortString consumerTag, boolean acks, FieldTable filters,
-                                           boolean noLocal, FlowCreditManager creditManager) throws AMQException
-    {
-        AMQChannel channel = protocolSession.getChannel(channelId);
-        if (channel == null)
-        {
-            throw new AMQException(AMQConstant.NOT_FOUND, "channel :" + channelId + " not found in protocol session");
-        }
-        ClientDeliveryMethod clientMethod = channel.getClientDeliveryMethod();
-        RecordDeliveryMethod recordMethod = channel.getRecordDeliveryMethod();
-
-
-        return createSubscription(channel, protocolSession, consumerTag, acks, filters,
-                                  noLocal,
-                                  creditManager,
-                                  clientMethod,
-                                  recordMethod
-        );
-    }
-
-    public Subscription createSubscription(final AMQChannel channel,
-                                            final AMQProtocolSession protocolSession,
-                                            final AMQShortString consumerTag,
-                                            final boolean acks,
-                                            final FieldTable filters,
-                                            final boolean noLocal,
-                                            final FlowCreditManager creditManager,
-                                            final ClientDeliveryMethod clientMethod,
-                                            final RecordDeliveryMethod recordMethod
-    )
-            throws AMQException
-    {
-        boolean isBrowser;
-
-        if (filters != null)
-        {
-            Boolean isBrowserObj = (Boolean) filters.get(AMQPFilterTypes.NO_CONSUME.getValue());
-            isBrowser = (isBrowserObj != null) && isBrowserObj.booleanValue();
-        }
-        else
-        {
-            isBrowser = false;
-        }
-
-        if(isBrowser)
-        {
-            return new SubscriptionImpl.BrowserSubscription(channel, protocolSession, consumerTag,  filters, noLocal, creditManager, clientMethod, recordMethod);
-        }
-        else if(acks)
-        {
-            return new SubscriptionImpl.AckSubscription(channel, protocolSession, consumerTag,  filters, noLocal, creditManager, clientMethod, recordMethod);
-        }
-        else
-        {
-            return new SubscriptionImpl.NoAckSubscription(channel, protocolSession, consumerTag,  filters, noLocal, creditManager, clientMethod, recordMethod);
-        }
-    }
-
-    public SubscriptionImpl.GetNoAckSubscription createBasicGetNoAckSubscription(final AMQChannel channel,
-                                                                                 final AMQProtocolSession session,
-                                                                                 final AMQShortString consumerTag,
-                                                                                 final FieldTable filters,
-                                                                                 final boolean noLocal,
-                                                                                 final FlowCreditManager creditManager,
-                                                                                 final ClientDeliveryMethod deliveryMethod,
-                                                                                 final RecordDeliveryMethod recordMethod) throws AMQException
-    {
-        return new SubscriptionImpl.GetNoAckSubscription(channel, session, null, null, false, creditManager, deliveryMethod, recordMethod);
-    }
-
-    public static final SubscriptionFactoryImpl INSTANCE = new SubscriptionFactoryImpl();
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
deleted file mode 100644
index 5803135b16..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
+++ /dev/null
@@ -1,855 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.filter.FilterManager;
-import org.apache.qpid.server.filter.FilterManagerFactory;
-import org.apache.qpid.server.flow.FlowCreditManager;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.actors.SubscriptionActor;
-import org.apache.qpid.server.logging.messages.SubscriptionMessages;
-import org.apache.qpid.server.logging.subjects.SubscriptionLogSubject;
-import org.apache.qpid.server.protocol.MessageConverterRegistry;
-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
-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.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.RecordDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.txn.AutoCommitTransaction;
-import org.apache.qpid.server.txn.ServerTransaction;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Encapsulation of a supscription to a queue. <p/> Ties together the protocol session of a subscriber, the consumer tag
- * that was given out by the broker and the channel id. <p/>
- */
-public abstract class SubscriptionImpl implements Subscription, FlowCreditManager.FlowCreditManagerListener
-{
-
-    private StateListener _stateListener = new StateListener()
-                                            {
-
-                                                public void stateChange(Subscription sub, State oldState, State newState)
-                                                {
-
-                                                }
-                                            };
-
-
-    private final AtomicReference<State> _state = new AtomicReference<State>(State.ACTIVE);
-    private volatile AMQQueue.Context _queueContext;
-
-    private final ClientDeliveryMethod _deliveryMethod;
-    private final RecordDeliveryMethod _recordMethod;
-
-    private final QueueEntry.SubscriptionAcquiredState _owningState = new QueueEntry.SubscriptionAcquiredState(this);
-
-    private final Map<String, Object> _properties = new ConcurrentHashMap<String, Object>();
-
-    private final Lock _stateChangeLock;
-
-    private final long _subscriptionID;
-    private LogSubject _logSubject;
-    private LogActor _logActor;
-    private final AtomicLong _deliveredCount = new AtomicLong(0);
-    private final AtomicLong _deliveredBytes = new AtomicLong(0);
-
-    private final AtomicLong _unacknowledgedCount = new AtomicLong(0);
-    private final AtomicLong _unacknowledgedBytes = new AtomicLong(0);
-
-    private long _createTime = System.currentTimeMillis();
-
-
-    static final class BrowserSubscription extends SubscriptionImpl
-    {
-        public BrowserSubscription(AMQChannel channel, AMQProtocolSession protocolSession,
-                                   AMQShortString consumerTag, FieldTable filters,
-                                   boolean noLocal, FlowCreditManager creditManager,
-                                   ClientDeliveryMethod deliveryMethod,
-                                   RecordDeliveryMethod recordMethod)
-            throws AMQException
-        {
-            super(channel, protocolSession, consumerTag, filters, noLocal, creditManager, deliveryMethod, recordMethod);
-        }
-
-
-        public boolean isBrowser()
-        {
-            return true;
-        }
-
-        /**
-         * This method can be called by each of the publisher threads. As a result all changes to the channel object must be
-         * thread safe.
-         *
-         *
-         * @param entry
-         * @param batch
-         * @throws AMQException
-         */
-        @Override
-        public void send(QueueEntry entry, boolean batch) throws AMQException
-        {
-            // We don't decrement the reference here as we don't want to consume the message
-            // but we do want to send it to the client.
-
-            synchronized (getChannel())
-            {
-                long deliveryTag = getChannel().getNextDeliveryTag();
-                sendToClient(entry, deliveryTag);
-            }
-
-        }
-
-        @Override
-        public boolean wouldSuspend(QueueEntry msg)
-        {
-            return false;
-        }
-
-    }
-
-    public static class NoAckSubscription extends SubscriptionImpl
-    {
-        private volatile AutoCommitTransaction _txn;
-
-        public NoAckSubscription(AMQChannel channel, AMQProtocolSession protocolSession,
-                                 AMQShortString consumerTag, FieldTable filters,
-                                 boolean noLocal, FlowCreditManager creditManager,
-                                 ClientDeliveryMethod deliveryMethod,
-                                 RecordDeliveryMethod recordMethod)
-            throws AMQException
-        {
-            super(channel, protocolSession, consumerTag, filters, noLocal, creditManager, deliveryMethod, recordMethod);
-        }
-
-
-        public boolean isBrowser()
-        {
-            return false;
-        }
-
-        @Override
-        public boolean isExplicitAcknowledge()
-        {
-            return false;
-        }
-
-        /**
-         * This method can be called by each of the publisher threads. As a result all changes to the channel object must be
-         * thread safe.
-         *
-         *
-         * @param entry   The message to send
-         * @param batch
-         * @throws AMQException
-         */
-        @Override
-        public void send(QueueEntry entry, boolean batch) throws AMQException
-        {
-            // if we do not need to wait for client acknowledgements
-            // we can decrement the reference count immediately.
-
-            // By doing this _before_ the send we ensure that it
-            // doesn't get sent if it can't be dequeued, preventing
-            // duplicate delivery on recovery.
-
-            // The send may of course still fail, in which case, as
-            // the message is unacked, it will be lost.
-            if(_txn == null)
-            {
-                _txn = new AutoCommitTransaction(getQueue().getVirtualHost().getMessageStore());
-            }
-            _txn.dequeue(getQueue(), entry.getMessage(), NOOP);
-
-            entry.dequeue();
-
-            synchronized (getChannel())
-            {
-                getChannel().getProtocolSession().setDeferFlush(batch);
-                long deliveryTag = getChannel().getNextDeliveryTag();
-
-                sendToClient(entry, deliveryTag);
-
-            }
-            entry.dispose();
-
-
-        }
-
-        @Override
-        public boolean wouldSuspend(QueueEntry msg)
-        {
-            return false;
-        }
-
-        private static final ServerTransaction.Action NOOP =
-                new ServerTransaction.Action()
-                {
-                    @Override
-                    public void postCommit()
-                    {
-                    }
-
-                    @Override
-                    public void onRollback()
-                    {
-                    }
-                };
-    }
-
-    /**
-     * NoAck Subscription for use with BasicGet method.
-     */
-    public static final class GetNoAckSubscription extends SubscriptionImpl.NoAckSubscription
-    {
-        public GetNoAckSubscription(AMQChannel channel, AMQProtocolSession protocolSession,
-                                    AMQShortString consumerTag, FieldTable filters,
-                                    boolean noLocal, FlowCreditManager creditManager,
-                                    ClientDeliveryMethod deliveryMethod,
-                                    RecordDeliveryMethod recordMethod)
-            throws AMQException
-        {
-            super(channel, protocolSession, consumerTag, filters, noLocal, creditManager, deliveryMethod, recordMethod);
-        }
-
-        public boolean isTransient()
-        {
-            return true;
-        }
-
-        public boolean wouldSuspend(QueueEntry msg)
-        {
-            return !getCreditManager().useCreditForMessage(msg.getMessage().getSize());
-        }
-
-    }
-
-    static final class AckSubscription extends SubscriptionImpl
-    {
-        public AckSubscription(AMQChannel channel, AMQProtocolSession protocolSession,
-                               AMQShortString consumerTag, FieldTable filters,
-                               boolean noLocal, FlowCreditManager creditManager,
-                               ClientDeliveryMethod deliveryMethod,
-                               RecordDeliveryMethod recordMethod)
-            throws AMQException
-        {
-            super(channel, protocolSession, consumerTag, filters, noLocal, creditManager, deliveryMethod, recordMethod);
-        }
-
-
-        public boolean isBrowser()
-        {
-            return false;
-        }
-
-
-        /**
-         * This method can be called by each of the publisher threads. As a result all changes to the channel object must be
-         * thread safe.
-         *
-         *
-         * @param entry   The message to send
-         * @param batch
-         * @throws AMQException
-         */
-        @Override
-        public void send(QueueEntry entry, boolean batch) throws AMQException
-        {
-
-
-            synchronized (getChannel())
-            {
-                getChannel().getProtocolSession().setDeferFlush(batch);
-                long deliveryTag = getChannel().getNextDeliveryTag();
-
-                addUnacknowledgedMessage(entry);
-                recordMessageDelivery(entry, deliveryTag);
-                sendToClient(entry, deliveryTag);
-
-
-            }
-        }
-
-
-
-    }
-
-
-    private static final Logger _logger = Logger.getLogger(SubscriptionImpl.class);
-
-    private final AMQChannel _channel;
-
-    private final AMQShortString _consumerTag;
-
-
-    private boolean _noLocal;
-
-    private final FlowCreditManager _creditManager;
-
-    private FilterManager _filters;
-
-    private final Boolean _autoClose;
-
-    private AMQQueue _queue;
-    private final AtomicBoolean _deleted = new AtomicBoolean(false);
-
-
-
-
-    public SubscriptionImpl(AMQChannel channel, AMQProtocolSession protocolSession,
-                            AMQShortString consumerTag, FieldTable arguments,
-                            boolean noLocal, FlowCreditManager creditManager,
-                            ClientDeliveryMethod deliveryMethod,
-                            RecordDeliveryMethod recordMethod)
-            throws AMQException
-    {
-        _subscriptionID = SUB_ID_GENERATOR.getAndIncrement();
-        _channel = channel;
-        _consumerTag = consumerTag;
-
-        _creditManager = creditManager;
-        creditManager.addStateListener(this);
-
-        _noLocal = noLocal;
-
-
-        _filters = FilterManagerFactory.createManager(arguments);
-
-        _deliveryMethod = deliveryMethod;
-        _recordMethod = recordMethod;
-
-
-        _stateChangeLock = new ReentrantLock();
-
-
-        if (arguments != null)
-        {
-            Object autoClose = arguments.get(AMQPFilterTypes.AUTO_CLOSE.getValue());
-            if (autoClose != null)
-            {
-                _autoClose = (Boolean) autoClose;
-            }
-            else
-            {
-                _autoClose = false;
-            }
-        }
-        else
-        {
-            _autoClose = false;
-        }
-
-    }
-
-    public AMQSessionModel getSessionModel()
-    {
-        return _channel;
-    }
-
-    public Long getDelivered()
-    {
-        return _deliveredCount.get();
-    }
-
-    public synchronized void setQueue(AMQQueue queue, boolean exclusive)
-    {
-        if(getQueue() != null)
-        {
-            throw new IllegalStateException("Attempt to set queue for subscription " + this + " to " + queue + "when already set to " + getQueue());
-        }
-        _queue = queue;
-
-        _logSubject = new SubscriptionLogSubject(this);
-        _logActor = new SubscriptionActor(CurrentActor.get().getRootMessageLogger(), this);
-
-        if (CurrentActor.get().getRootMessageLogger().
-                isMessageEnabled(CurrentActor.get(), _logSubject, SubscriptionMessages.CREATE_LOG_HIERARCHY))
-        {
-            // Get the string value of the filters
-            String filterLogString = null;
-            if (_filters != null && _filters.hasFilters())
-            {
-                filterLogString = _filters.toString();
-            }
-
-            if (isAutoClose())
-            {
-                if (filterLogString == null)
-                {
-                    filterLogString = "";
-                }
-                else
-                {
-                    filterLogString += ",";
-                }
-                filterLogString += "AutoClose";
-            }
-
-            if (isBrowser())
-            {
-                // We do not need to check for null here as all Browsers are AutoClose
-                filterLogString +=",Browser";
-            }
-
-            CurrentActor.get().
-                    message(_logSubject,
-                            SubscriptionMessages.CREATE(filterLogString,
-                                                          queue.isDurable() && exclusive,
-                                                          filterLogString != null));
-        }
-    }
-
-    public String toString()
-    {
-        String subscriber = "[channel=" + _channel +
-                            ", consumerTag=" + _consumerTag +
-                            ", session=" + getProtocolSession().getKey()  ;
-
-        return subscriber + "]";
-    }
-
-    /**
-     * This method can be called by each of the publisher threads. As a result all changes to the channel object must be
-     * thread safe.
-     *
-     *
-     * @param entry
-     * @param batch
-     * @throws AMQException
-     */
-    abstract public void send(QueueEntry entry, boolean batch) throws AMQException;
-
-
-    public boolean isSuspended()
-    {
-        return !isActive() || _channel.isSuspended() || _deleted.get() || _channel.getConnectionModel().isStopped();
-    }
-
-    /**
-     * Callback indicating that a queue has been deleted.
-     *
-     * @param queue The queue to delete
-     */
-    public void queueDeleted(AMQQueue queue)
-    {
-        _deleted.set(true);
-    }
-
-    public boolean hasInterest(QueueEntry entry)
-    {
-        //check that the message hasn't been rejected
-        if (entry.isRejectedBy(getSubscriptionID()))
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Subscription:" + this + " rejected message:" + entry);
-            }
-        }
-
-        if(entry.getMessage() instanceof AMQMessage)
-        {
-            if (_noLocal)
-            {
-                AMQMessage message = (AMQMessage) entry.getMessage();
-
-                final Object publisherReference = message.getConnectionIdentifier();
-
-                // We don't want local messages so check to see if message is one we sent
-                Object localReference = getProtocolSession().getReference();
-
-                if(publisherReference != null && publisherReference.equals(localReference))
-                {
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            // No interest in messages we can't convert to AMQMessage
-            if(MessageConverterRegistry.getConverter(entry.getMessage().getClass(), AMQMessage.class)==null)
-            {
-                return false;
-            }
-        }
-
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("(" + this + ") checking filters for message (" + entry);
-        }
-        return checkFilters(entry);
-
-    }
-
-    private boolean checkFilters(QueueEntry msg)
-    {
-        return (_filters == null) || _filters.allAllow(msg);
-    }
-
-    public boolean isAutoClose()
-    {
-        return _autoClose;
-    }
-
-    public FlowCreditManager getCreditManager()
-    {
-        return _creditManager;
-    }
-
-
-    public void close()
-    {
-        boolean closed = false;
-        State state = getState();
-
-        _stateChangeLock.lock();
-        try
-        {
-            while(!closed && state != State.CLOSED)
-            {
-                closed = _state.compareAndSet(state, State.CLOSED);
-                if(!closed)
-                {
-                    state = getState();
-                }
-                else
-                {
-                    _stateListener.stateChange(this,state, State.CLOSED);
-                }
-            }
-            _creditManager.removeListener(this);
-        }
-        finally
-        {
-            _stateChangeLock.unlock();
-        }
-        //Log Subscription closed
-        CurrentActor.get().message(_logSubject, SubscriptionMessages.CLOSE());
-    }
-
-    public boolean isClosed()
-    {
-        return getState() == State.CLOSED;
-    }
-
-
-    public boolean wouldSuspend(QueueEntry msg)
-    {
-        return !_creditManager.useCreditForMessage(msg.getMessage().getSize());
-    }
-
-    public boolean trySendLock()
-    {
-        return _stateChangeLock.tryLock();
-    }
-
-    public void getSendLock()
-    {
-        _stateChangeLock.lock();
-    }
-
-    public void releaseSendLock()
-    {
-        _stateChangeLock.unlock();
-    }
-
-    public AMQChannel getChannel()
-    {
-        return _channel;
-    }
-
-    public AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    public String getConsumerName()
-    {
-        return _consumerTag == null ? null : _consumerTag.asString();
-    }
-
-    public long getSubscriptionID()
-    {
-        return _subscriptionID;
-    }
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        return _channel.getProtocolSession();
-    }
-
-    public LogActor getLogActor()
-    {
-        return _logActor;
-    }
-
-    public AMQQueue getQueue()
-    {
-        return _queue;
-    }
-
-    public void onDequeue(final QueueEntry queueEntry)
-    {
-        restoreCredit(queueEntry);
-    }
-
-    public void releaseQueueEntry(final QueueEntry queueEntry)
-    {
-        restoreCredit(queueEntry);
-    }
-
-    public void restoreCredit(final QueueEntry queueEntry)
-    {
-        _creditManager.restoreCredit(1, queueEntry.getSize());
-    }
-
-    public void creditStateChanged(boolean hasCredit)
-    {
-
-        if(hasCredit)
-        {
-            if(_state.compareAndSet(State.SUSPENDED, State.ACTIVE))
-            {
-                _stateListener.stateChange(this, State.SUSPENDED, State.ACTIVE);
-            }
-            else
-            {
-                // this is a hack to get round the issue of increasing bytes credit
-                _stateListener.stateChange(this, State.ACTIVE, State.ACTIVE);
-            }
-        }
-        else
-        {
-            if(_state.compareAndSet(State.ACTIVE, State.SUSPENDED))
-            {
-                _stateListener.stateChange(this, State.ACTIVE, State.SUSPENDED);
-            }
-        }
-        CurrentActor.get().message(_logSubject,SubscriptionMessages.STATE(_state.get().toString()));
-    }
-
-    public State getState()
-    {
-        return _state.get();
-    }
-
-
-    public void setStateListener(final StateListener listener)
-    {
-        _stateListener = listener;
-    }
-
-
-    public AMQQueue.Context getQueueContext()
-    {
-        return _queueContext;
-    }
-
-    public void setQueueContext(AMQQueue.Context context)
-    {
-        _queueContext = context;
-    }
-
-
-    protected void sendToClient(final QueueEntry entry, final long deliveryTag)
-            throws AMQException
-    {
-        _deliveryMethod.deliverToClient(this,entry,deliveryTag);
-        _deliveredCount.incrementAndGet();
-        _deliveredBytes.addAndGet(entry.getSize());
-    }
-
-
-    protected void recordMessageDelivery(final QueueEntry entry, final long deliveryTag)
-    {
-        _recordMethod.recordMessageDelivery(this,entry,deliveryTag);
-    }
-
-
-    public boolean isActive()
-    {
-        return getState() == State.ACTIVE;
-    }
-
-    public QueueEntry.SubscriptionAcquiredState getOwningState()
-    {
-        return _owningState;
-    }
-
-    public void confirmAutoClose()
-    {
-        ProtocolOutputConverter converter = getChannel().getProtocolSession().getProtocolOutputConverter();
-        converter.confirmConsumerAutoClose(getChannel().getChannelId(), getConsumerTag());
-    }
-
-    public boolean acquires()
-    {
-        return !isBrowser();
-    }
-
-    public boolean seesRequeues()
-    {
-        return !isBrowser();
-    }
-
-    public boolean isTransient()
-    {
-        return false;
-    }
-
-    public void set(String key, Object value)
-    {
-        _properties.put(key, value);
-    }
-
-    public Object get(String key)
-    {
-        return _properties.get(key);
-    }
-
-
-    public void setNoLocal(boolean noLocal)
-    {
-        _noLocal = noLocal;
-    }
-
-    abstract boolean isBrowser();
-
-    public String getCreditMode()
-    {
-        return "WINDOW";
-    }
-
-    public boolean isBrowsing()
-    {
-        return isBrowser();
-    }
-
-    public boolean isExplicitAcknowledge()
-    {
-        return true;
-    }
-
-    public boolean isDurable()
-    {
-        return false;
-    }
-
-    public boolean isExclusive()
-    {
-        return getQueue().hasExclusiveSubscriber();
-    }
-
-    public String getName()
-    {
-        return String.valueOf(_consumerTag);
-    }
-
-    public Map<String, Object> getArguments()
-    {
-        return null;
-    }
-
-    public boolean isSessionTransactional()
-    {
-        return _channel.isTransactional();
-    }
-
-    public long getCreateTime()
-    {
-        return _createTime;
-    }
-
-    public void queueEmpty() throws AMQException
-    {
-        if (isAutoClose())
-        {
-            _queue.unregisterSubscription(this);
-
-            confirmAutoClose();
-        }
-    }
-
-    public void flushBatched()
-    {
-        _channel.getProtocolSession().setDeferFlush(false);
-
-        _channel.getProtocolSession().flushBatched();
-    }
-
-    public long getBytesOut()
-    {
-        return _deliveredBytes.longValue();
-    }
-
-    public long getMessagesOut()
-    {
-        return _deliveredCount.longValue();
-    }
-
-
-    protected void addUnacknowledgedMessage(QueueEntry entry)
-    {
-        final long size = entry.getSize();
-        _unacknowledgedBytes.addAndGet(size);
-        _unacknowledgedCount.incrementAndGet();
-        entry.addStateChangeListener(new QueueEntry.StateChangeListener()
-        {
-            public void stateChanged(QueueEntry entry, QueueEntry.State oldState, QueueEntry.State newState)
-            {
-                if(oldState.equals(QueueEntry.State.ACQUIRED) && !newState.equals(QueueEntry.State.ACQUIRED))
-                {
-                    _unacknowledgedBytes.addAndGet(-size);
-                    _unacknowledgedCount.decrementAndGet();
-                    entry.removeStateChangeListener(this);
-                }
-            }
-        });
-    }
-
-    public long getUnacknowledgedBytes()
-    {
-        return _unacknowledgedBytes.longValue();
-    }
-
-    public long getUnacknowledgedMessages()
-    {
-        return _unacknowledgedCount.longValue();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
deleted file mode 100644
index 1d41bcdcf4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.QueueEntry;
-
-import java.util.Collection;
-import java.util.Set;
-
-
-public interface UnacknowledgedMessageMap
-{
-    public interface Visitor
-    {
-        /**
-         * @param deliveryTag
-         *@param message the message being iterated over @return true to stop iteration, false to continue
-         * @throws AMQException
-         */
-        boolean callback(final long deliveryTag, QueueEntry message) throws AMQException;
-
-        void visitComplete();
-    }
-
-    void visit(Visitor visitor) throws AMQException;
-
-    void add(long deliveryTag, QueueEntry message);
-
-    QueueEntry remove(long deliveryTag);
-
-    Collection<QueueEntry> cancelAllMessages();
-
-    int size();
-
-    void clear();
-
-    QueueEntry get(long deliveryTag);
-
-    /**
-     * Get the set of delivery tags that are outstanding.
-     *
-     * @return a set of delivery tags
-     */
-    Set<Long> getDeliveryTags();
-
-    Collection<QueueEntry> acknowledge(long deliveryTag, boolean multiple);
-
-}
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
deleted file mode 100644
index 17b2c7b985..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.QueueEntry;
-
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
-{
-    private final Object _lock = new Object();
-
-    private long _unackedSize;
-
-    private Map<Long, QueueEntry> _map;
-
-    private long _lastDeliveryTag;
-
-    private final int _prefetchLimit;
-
-    public UnacknowledgedMessageMapImpl(int prefetchLimit)
-    {
-        _prefetchLimit = prefetchLimit;
-        _map = new LinkedHashMap<Long, QueueEntry>(prefetchLimit);
-    }
-
-    public void collect(long deliveryTag, boolean multiple, Map<Long, QueueEntry> msgs)
-    {
-        if (multiple)
-        {
-            collect(deliveryTag, msgs);
-        }
-        else
-        {
-            final QueueEntry entry = get(deliveryTag);
-            if(entry != null)
-            {
-                msgs.put(deliveryTag, entry);
-            }
-        }
-
-    }
-
-    public void remove(Map<Long,QueueEntry> msgs)
-    {
-        synchronized (_lock)
-        {
-            for (Long deliveryTag : msgs.keySet())
-            {
-                remove(deliveryTag);
-            }
-        }
-    }
-
-    public QueueEntry remove(long deliveryTag)
-    {
-        synchronized (_lock)
-        {
-
-            QueueEntry message = _map.remove(deliveryTag);
-            if(message != null)
-            {
-                _unackedSize -= message.getMessage().getSize();
-
-            }
-
-            return message;
-        }
-    }
-
-    public void visit(Visitor visitor) throws AMQException
-    {
-        synchronized (_lock)
-        {
-            Set<Map.Entry<Long, QueueEntry>> currentEntries = _map.entrySet();
-            for (Map.Entry<Long, QueueEntry> entry : currentEntries)
-            {
-                visitor.callback(entry.getKey().longValue(), entry.getValue());
-            }
-            visitor.visitComplete();
-        }
-    }
-
-    public void add(long deliveryTag, QueueEntry message)
-    {
-        synchronized (_lock)
-        {
-            _map.put(deliveryTag, message);
-            _unackedSize += message.getMessage().getSize();
-            _lastDeliveryTag = deliveryTag;
-        }
-    }
-
-    public Collection<QueueEntry> cancelAllMessages()
-    {
-        synchronized (_lock)
-        {
-            Collection<QueueEntry> currentEntries = _map.values();
-            _map = new LinkedHashMap<Long, QueueEntry>(_prefetchLimit);
-            _unackedSize = 0l;
-            return currentEntries;
-        }
-    }
-
-    public int size()
-    {
-        synchronized (_lock)
-        {
-            return _map.size();
-        }
-    }
-
-    public void clear()
-    {
-        synchronized (_lock)
-        {
-            _map.clear();
-            _unackedSize = 0l;
-        }
-    }
-
-    public QueueEntry get(long key)
-    {
-        synchronized (_lock)
-        {
-            return _map.get(key);
-        }
-    }
-
-    public Set<Long> getDeliveryTags()
-    {
-        synchronized (_lock)
-        {
-            return _map.keySet();
-        }
-    }
-
-    public Collection<QueueEntry> acknowledge(long deliveryTag, boolean multiple)
-    {
-        Map<Long, QueueEntry> ackedMessageMap = new LinkedHashMap<Long,QueueEntry>();
-        collect(deliveryTag, multiple, ackedMessageMap);
-        remove(ackedMessageMap);
-        return ackedMessageMap.values();
-    }
-
-    private void collect(long key, Map<Long, QueueEntry> msgs)
-    {
-        synchronized (_lock)
-        {
-            for (Map.Entry<Long, QueueEntry> entry : _map.entrySet())
-            {
-                msgs.put(entry.getKey(),entry.getValue());
-                if (entry.getKey() == key)
-                {
-                    break;
-                }
-            }
-        }
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
deleted file mode 100644
index ae07d60c4e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AccessRequestBody;

-import org.apache.qpid.framing.AccessRequestOkBody;

-import org.apache.qpid.framing.MethodRegistry;

-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;

-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;

-import org.apache.qpid.protocol.AMQConstant;

-import org.apache.qpid.server.protocol.v0_8.AMQChannel;

-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;

-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;

-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;

-

-/**

- * @author Apache Software Foundation

- *

- *

- */

-public class AccessRequestHandler implements StateAwareMethodListener<AccessRequestBody>

-{

-    private static final AccessRequestHandler _instance = new AccessRequestHandler();

-

-

-    public static AccessRequestHandler getInstance()

-    {

-        return _instance;

-    }

-

-    private AccessRequestHandler()

-    {

-    }

-

-    public void methodReceived(AMQStateManager stateManager, AccessRequestBody body, int channelId) throws AMQException

-    {

-        AMQProtocolSession session = stateManager.getProtocolSession();

-        final AMQChannel channel = session.getChannel(channelId);

-        if (channel == null)

-        {

-            throw body.getChannelNotFoundException(channelId);

-        }

-

-        MethodRegistry methodRegistry = session.getMethodRegistry();

-

-        // We don't implement access control class, but to keep clients happy that expect it

-        // always use the "0" ticket.

-        AccessRequestOkBody response;

-        if(methodRegistry instanceof MethodRegistry_0_9)

-        {

-            response = ((MethodRegistry_0_9)methodRegistry).createAccessRequestOkBody(0);

-        }

-        else if(methodRegistry instanceof MethodRegistry_8_0)

-        {

-            response = ((MethodRegistry_8_0)methodRegistry).createAccessRequestOkBody(0);

-        }

-        else

-        {

-            throw new AMQException(AMQConstant.COMMAND_INVALID, "AccessRequest not present in AMQP versions other than 0-8, 0-9");

-        }

-

-        channel.sync();

-        session.writeFrame(response.generateFrame(channelId));

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
deleted file mode 100644
index f623d27e87..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicAckBody;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class BasicAckMethodHandler implements StateAwareMethodListener<BasicAckBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicAckMethodHandler.class);
-
-    private static final BasicAckMethodHandler _instance = new BasicAckMethodHandler();
-
-    public static BasicAckMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicAckMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicAckBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession protocolSession = stateManager.getProtocolSession();
-
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Ack(Tag:" + body.getDeliveryTag() + ":Mult:" + body.getMultiple() + ") received on channel " + channelId);
-        }
-
-        final AMQChannel channel = protocolSession.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        // this method throws an AMQException if the delivery tag is not known
-        channel.acknowledgeMessage(body.getDeliveryTag(), body.getMultiple());
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
deleted file mode 100644
index 5a6a7bdc18..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicCancelBody;
-import org.apache.qpid.framing.BasicCancelOkBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class BasicCancelMethodHandler implements StateAwareMethodListener<BasicCancelBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicCancelMethodHandler.class);
-
-    private static final BasicCancelMethodHandler _instance = new BasicCancelMethodHandler();
-
-    public static BasicCancelMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicCancelMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicCancelBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        final AMQChannel channel = session.getChannel(channelId);
-
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("BasicCancel: for:" + body.getConsumerTag() +
-                       " nowait:" + body.getNowait());
-        }
-
-        channel.unsubscribeConsumer(body.getConsumerTag());
-        if (!body.getNowait())
-        {
-            MethodRegistry methodRegistry = session.getMethodRegistry();
-            BasicCancelOkBody cancelOkBody = methodRegistry.createBasicCancelOkBody(body.getConsumerTag());
-            channel.sync();
-            session.writeFrame(cancelOkBody.generateFrame(channelId));
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
deleted file mode 100644
index 6577efe292..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicConsumeBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class BasicConsumeMethodHandler implements StateAwareMethodListener<BasicConsumeBody>
-{
-    private static final Logger _logger = Logger.getLogger(BasicConsumeMethodHandler.class);
-
-    private static final BasicConsumeMethodHandler _instance = new BasicConsumeMethodHandler();
-
-    public static BasicConsumeMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicConsumeMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicConsumeBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-        VirtualHost vHost = protocolConnection.getVirtualHost();
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        else
-        {
-            channel.sync();
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("BasicConsume: from '" + body.getQueue() +
-                              "' for:" + body.getConsumerTag() +
-                              " nowait:" + body.getNowait() +
-                              " args:" + body.getArguments());
-            }
-
-            AMQQueue queue = body.getQueue() == null ? channel.getDefaultQueue() : vHost.getQueueRegistry().getQueue(body.getQueue().intern());
-
-            if (queue == null)
-            {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("No queue for '" + body.getQueue() + "'");
-                }
-                if (body.getQueue() != null)
-                {
-                    String msg = "No such queue, '" + body.getQueue() + "'";
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, msg);
-                }
-                else
-                {
-                    String msg = "No queue name provided, no default queue defined.";
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED, msg);
-                }
-            }
-            else
-            {
-                final AMQShortString consumerTagName;
-
-                if (queue.isExclusive() && !queue.isDurable())
-                {
-                    AMQSessionModel session = queue.getExclusiveOwningSession();
-                    if (session == null || session.getConnectionModel() != protocolConnection)
-                    {
-                        throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                          "Queue " + queue.getNameShortString() + " is exclusive, but not created on this Connection.");
-                    }
-                }
-
-                if (body.getConsumerTag() != null)
-                {
-                    consumerTagName = body.getConsumerTag().intern();
-                }
-                else
-                {
-                    consumerTagName = null;
-                }
-
-                try
-                {
-                    if(consumerTagName == null || channel.getSubscription(consumerTagName) == null)
-                    {
-
-                        AMQShortString consumerTag = channel.subscribeToQueue(consumerTagName, queue, !body.getNoAck(),
-                                                                              body.getArguments(), body.getNoLocal(), body.getExclusive());
-                        if (!body.getNowait())
-                        {
-                            MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-                            AMQMethodBody responseBody = methodRegistry.createBasicConsumeOkBody(consumerTag);
-                            protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-
-                        }
-                    }
-                    else
-                    {
-                        AMQShortString msg = new AMQShortString("Non-unique consumer tag, '" + body.getConsumerTag() + "'");
-
-                        MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-                        AMQMethodBody responseBody = methodRegistry.createConnectionCloseBody(AMQConstant.NOT_ALLOWED.getCode(),    // replyCode
-                                                                 msg,               // replytext
-                                                                 body.getClazz(),
-                                                                 body.getMethod());
-                        protocolConnection.writeFrame(responseBody.generateFrame(0));
-                    }
-
-                }
-                catch (org.apache.qpid.AMQInvalidArgumentException ise)
-                {
-                    _logger.debug("Closing connection due to invalid selector");
-
-                    MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-                    AMQMethodBody responseBody = methodRegistry.createChannelCloseBody(AMQConstant.ARGUMENT_INVALID.getCode(),
-                                                                                       new AMQShortString(ise.getMessage()),
-                                                                                       body.getClazz(),
-                                                                                       body.getMethod());
-                    protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-
-
-                }
-                catch (AMQQueue.ExistingExclusiveSubscription e)
-                {
-                    throw body.getChannelException(AMQConstant.ACCESS_REFUSED,
-                                                   "Cannot subscribe to queue "
-                                                   + queue.getNameShortString()
-                                                   + " as it already has an existing exclusive consumer");
-                }
-                catch (AMQQueue.ExistingSubscriptionPreventsExclusive e)
-                {
-                    throw body.getChannelException(AMQConstant.ACCESS_REFUSED,
-                                                   "Cannot subscribe to queue "
-                                                   + queue.getNameShortString()
-                                                   + " exclusively as it already has a consumer");
-                }
-
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
deleted file mode 100644
index 8883422989..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicGetBody;
-import org.apache.qpid.framing.BasicGetEmptyBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.flow.FlowCreditManager;
-import org.apache.qpid.server.flow.MessageOnlyCreditManager;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-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.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.RecordDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.protocol.v0_8.SubscriptionFactoryImpl;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class BasicGetMethodHandler implements StateAwareMethodListener<BasicGetBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicGetMethodHandler.class);
-
-    private static final BasicGetMethodHandler _instance = new BasicGetMethodHandler();
-
-    public static BasicGetMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicGetMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicGetBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-
-
-        VirtualHost vHost = protocolConnection.getVirtualHost();
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        else
-        {
-            channel.sync();
-            AMQQueue queue = body.getQueue() == null ? channel.getDefaultQueue() : vHost.getQueueRegistry().getQueue(body.getQueue());
-            if (queue == null)
-            {
-                _log.info("No queue for '" + body.getQueue() + "'");
-                if(body.getQueue()!=null)
-                {
-                    throw body.getConnectionException(AMQConstant.NOT_FOUND,
-                                                      "No such queue, '" + body.getQueue()+ "'");
-                }
-                else
-                {
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "No queue name provided, no default queue defined.");
-                }
-            }
-            else
-            {
-                if (queue.isExclusive())
-                {
-                    AMQSessionModel session = queue.getExclusiveOwningSession();
-                    if (session == null || session.getConnectionModel() != protocolConnection)
-                    {
-                        throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                          "Queue is exclusive, but not created on this Connection.");
-                    }
-                }
-
-                if (!performGet(queue,protocolConnection, channel, !body.getNoAck()))
-                {
-                    MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-                    // TODO - set clusterId
-                    BasicGetEmptyBody responseBody = methodRegistry.createBasicGetEmptyBody(null);
-
-
-                    protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-                }
-            }
-        }
-    }
-
-    public static boolean performGet(final AMQQueue queue,
-                                     final AMQProtocolSession session,
-                                     final AMQChannel channel,
-                                     final boolean acks)
-            throws AMQException
-    {
-
-        final FlowCreditManager singleMessageCredit = new MessageOnlyCreditManager(1L);
-
-        final ClientDeliveryMethod getDeliveryMethod = new ClientDeliveryMethod()
-        {
-
-            public void deliverToClient(final Subscription sub, final QueueEntry entry, final long deliveryTag)
-            throws AMQException
-            {
-                singleMessageCredit.useCreditForMessage(entry.getMessage().getSize());
-                if(entry.getMessage() instanceof AMQMessage)
-                {
-                    session.getProtocolOutputConverter().writeGetOk(entry, channel.getChannelId(),
-                                                                            deliveryTag, queue.getMessageCount());
-                    entry.incrementDeliveryCount();
-                }
-                else
-                {
-                    //TODO Convert AMQP 0-10 message
-                    throw new AMQException(AMQConstant.NOT_IMPLEMENTED, "Not implemented conversion of 0-10 message", null);
-                }
-
-            }
-        };
-        final RecordDeliveryMethod getRecordMethod = new RecordDeliveryMethod()
-        {
-
-            public void recordMessageDelivery(final Subscription sub, final QueueEntry entry, final long deliveryTag)
-            {
-                channel.addUnacknowledgedMessage(entry, deliveryTag, null);
-            }
-        };
-
-        Subscription sub;
-        if(acks)
-        {
-            sub = SubscriptionFactoryImpl.INSTANCE.createSubscription(channel, session, null, acks, null, false, singleMessageCredit, getDeliveryMethod, getRecordMethod);
-        }
-        else
-        {
-            sub = SubscriptionFactoryImpl.INSTANCE.createBasicGetNoAckSubscription(channel, session, null, null, false, singleMessageCredit, getDeliveryMethod, getRecordMethod);
-        }
-
-        queue.registerSubscription(sub,false);
-        queue.flushSubscription(sub);
-        queue.unregisterSubscription(sub);
-        return(!singleMessageCredit.hasCredit());
-
-
-    }
-
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
deleted file mode 100644
index 96936dc429..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class BasicPublishMethodHandler implements StateAwareMethodListener<BasicPublishBody>
-{
-    private static final Logger _logger = Logger.getLogger(BasicPublishMethodHandler.class);
-
-    private static final BasicPublishMethodHandler _instance = new BasicPublishMethodHandler();
-
-
-    public static BasicPublishMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicPublishMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicPublishBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Publish received on channel " + channelId);
-        }
-
-        AMQShortString exchangeName = body.getExchange();
-        // TODO: check the delivery tag field details - is it unique across the broker or per subscriber?
-        if (exchangeName == null)
-        {
-            exchangeName = ExchangeDefaults.DEFAULT_EXCHANGE_NAME;
-        }
-
-        VirtualHost vHost = session.getVirtualHost();
-        Exchange exch = vHost.getExchange(exchangeName.toString());
-        // if the exchange does not exist we raise a channel exception
-        if (exch == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange name");
-        }
-        else
-        {
-            // The partially populated BasicDeliver frame plus the received route body
-            // is stored in the channel. Once the final body frame has been received
-            // it is routed to the exchange.
-            AMQChannel channel = session.getChannel(channelId);
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(channelId);
-            }
-
-            MessagePublishInfo info = session.getMethodRegistry().getProtocolVersionMethodConverter().convertToInfo(body);
-            info.setExchange(exchangeName);
-            channel.setPublishFrame(info, exch);
-        }
-    }
-
-}
-
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
deleted file mode 100644
index e4a6636a74..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.BasicQosBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class BasicQosHandler implements StateAwareMethodListener<BasicQosBody>
-{
-    private static final BasicQosHandler _instance = new BasicQosHandler();
-
-    public static BasicQosHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicQosBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        AMQChannel channel = session.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        channel.sync();
-        channel.setCredit(body.getPrefetchSize(), body.getPrefetchCount());
-
-
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-        AMQMethodBody responseBody = methodRegistry.createBasicQosOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
deleted file mode 100644
index 0a79466b35..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.BasicRecoverBody;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class BasicRecoverMethodHandler implements StateAwareMethodListener<BasicRecoverBody>
-{
-    private static final Logger _logger = Logger.getLogger(BasicRecoverMethodHandler.class);
-
-    private static final BasicRecoverMethodHandler _instance = new BasicRecoverMethodHandler();
-
-    public static BasicRecoverMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicRecoverBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        _logger.debug("Recover received on protocol session " + session + " and channel " + channelId);
-        AMQChannel channel = session.getChannel(channelId);
-
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        channel.resend(body.getRequeue());
-
-        // Qpid 0-8 hacks a synchronous -ok onto recover.
-        // In Qpid 0-9 we create a separate sync-recover, sync-recover-ok pair to be "more" compliant
-        if(session.getProtocolVersion().equals(ProtocolVersion.v8_0))
-        {
-            MethodRegistry_8_0 methodRegistry = (MethodRegistry_8_0) session.getMethodRegistry();
-            AMQMethodBody recoverOk = methodRegistry.createBasicRecoverOkBody();
-            channel.sync();
-            session.writeFrame(recoverOk.generateFrame(channelId));
-
-        }
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
deleted file mode 100644
index b54e1c7dcf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-

-import org.apache.log4j.Logger;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AMQMethodBody;

-import org.apache.qpid.framing.BasicRecoverSyncBody;

-import org.apache.qpid.framing.ProtocolVersion;

-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;

-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;

-import org.apache.qpid.server.protocol.v0_8.AMQChannel;

-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;

-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;

-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;

-

-public class BasicRecoverSyncMethodHandler implements StateAwareMethodListener<BasicRecoverSyncBody>

-{

-    private static final Logger _logger = Logger.getLogger(BasicRecoverSyncMethodHandler.class);

-

-    private static final BasicRecoverSyncMethodHandler _instance = new BasicRecoverSyncMethodHandler();

-

-    public static BasicRecoverSyncMethodHandler getInstance()

-    {

-        return _instance;

-    }

-

-    public void methodReceived(AMQStateManager stateManager, BasicRecoverSyncBody body, int channelId) throws AMQException

-    {

-        AMQProtocolSession session = stateManager.getProtocolSession();

-

-        _logger.debug("Recover received on protocol session " + session + " and channel " + channelId);

-        AMQChannel channel = session.getChannel(channelId);

-

-

-        if (channel == null)

-        {

-            throw body.getChannelNotFoundException(channelId);

-        }

-        channel.sync();

-        channel.resend(body.getRequeue());

-

-        // Qpid 0-8 hacks a synchronous -ok onto recover.

-        // In Qpid 0-9 we create a separate sync-recover, sync-recover-ok pair to be "more" compliant

-        if(session.getProtocolVersion().equals(ProtocolVersion.v0_9))

-        {

-            MethodRegistry_0_9 methodRegistry = (MethodRegistry_0_9) session.getMethodRegistry();

-            AMQMethodBody recoverOk = methodRegistry.createBasicRecoverSyncOkBody();

-            session.writeFrame(recoverOk.generateFrame(channelId));

-

-        }

-        else if(session.getProtocolVersion().equals(ProtocolVersion.v0_91))

-        {

-            MethodRegistry_0_91 methodRegistry = (MethodRegistry_0_91) session.getMethodRegistry();

-            AMQMethodBody recoverOk = methodRegistry.createBasicRecoverSyncOkBody();

-            session.writeFrame(recoverOk.generateFrame(channelId));

-

-        }

-

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
deleted file mode 100644
index 0cfdff3338..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicRejectBody;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class BasicRejectMethodHandler implements StateAwareMethodListener<BasicRejectBody>
-{
-    private static final Logger _logger = Logger.getLogger(BasicRejectMethodHandler.class);
-
-    private static BasicRejectMethodHandler _instance = new BasicRejectMethodHandler();
-
-    public static BasicRejectMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicRejectMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, BasicRejectBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Rejecting:" + body.getDeliveryTag() +
-                          ": Requeue:" + body.getRequeue() +
-                          " on channel:" + channel.debugIdentity());
-        }
-
-        long deliveryTag = body.getDeliveryTag();
-
-        QueueEntry message = channel.getUnacknowledgedMessageMap().get(deliveryTag);
-
-        if (message == null)
-        {
-            _logger.warn("Dropping reject request as message is null for tag:" + deliveryTag);
-        }
-        else
-        {
-            if (message.isQueueDeleted())
-            {
-                _logger.warn("Message's Queue has already been purged, dropping message");
-                message = channel.getUnacknowledgedMessageMap().remove(deliveryTag);
-                if(message != null)
-                {
-                    message.discard();
-                }
-                return;
-            }
-
-            if (message.getMessage() == null)
-            {
-                _logger.warn("Message has already been purged, unable to Reject.");
-                return;
-            }
-
-
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Rejecting: DT:" + deliveryTag + "-" + message.getMessage() +
-                              ": Requeue:" + body.getRequeue() +
-                              " on channel:" + channel.debugIdentity());
-            }
-
-            message.reject();
-
-            if (body.getRequeue())
-            {
-                channel.requeue(deliveryTag);
-
-                //this requeue represents a message rejected from the pre-dispatch queue
-                //therefore we need to amend the delivery counter.
-                message.decrementDeliveryCount();
-            }
-            else
-            {
-                 final boolean maxDeliveryCountEnabled = channel.isMaxDeliveryCountEnabled(deliveryTag);
-                 _logger.debug("maxDeliveryCountEnabled: " + maxDeliveryCountEnabled + " deliveryTag " + deliveryTag);
-                 if (maxDeliveryCountEnabled)
-                 {
-                     final boolean deliveredTooManyTimes = channel.isDeliveredTooManyTimes(deliveryTag);
-                     _logger.debug("deliveredTooManyTimes: " + deliveredTooManyTimes + " deliveryTag " + deliveryTag);
-                     if (deliveredTooManyTimes)
-                     {
-                         channel.deadLetter(body.getDeliveryTag());
-                     }
-                     else
-                     {
-                         //this requeue represents a message rejected because of a recover/rollback that we
-                         //are not ready to DLQ. We rely on the reject command to resend from the unacked map
-                         //and therefore need to increment the delivery counter so we cancel out the effect
-                         //of the AMQChannel#resend() decrement.
-                         message.incrementDeliveryCount();
-                     }
-                 }
-                 else
-                 {
-                     channel.deadLetter(body.getDeliveryTag());
-                 }
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
deleted file mode 100644
index e96d098618..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class ChannelCloseHandler implements StateAwareMethodListener<ChannelCloseBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelCloseHandler.class);
-
-    private static ChannelCloseHandler _instance = new ChannelCloseHandler();
-
-    public static ChannelCloseHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelCloseHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ChannelCloseBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("Received channel close for id " + channelId + " citing class " + body.getClassId() +
-                         " and method " + body.getMethodId());
-        }
-
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "Trying to close unknown channel");
-        }
-        channel.sync();
-        session.closeChannel(channelId);
-        // Client requested closure so we don't wait for ok we send it
-        stateManager.getProtocolSession().closeChannelOk(channelId);
-
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-        ChannelCloseOkBody responseBody = methodRegistry.createChannelCloseOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
deleted file mode 100644
index 2a220ff78d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class ChannelCloseOkHandler implements StateAwareMethodListener<ChannelCloseOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelCloseOkHandler.class);
-
-    private static ChannelCloseOkHandler _instance = new ChannelCloseOkHandler();
-
-    public static ChannelCloseOkHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelCloseOkHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ChannelCloseOkBody body, int channelId) throws AMQException
-    {
-
-        _logger.info("Received channel-close-ok for channel-id " + channelId);
-
-        // Let the Protocol Session know the channel is now closed.
-        stateManager.getProtocolSession().closeChannelOk(channelId);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
deleted file mode 100644
index cc1677c93e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.ChannelFlowBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class ChannelFlowHandler implements StateAwareMethodListener<ChannelFlowBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelFlowHandler.class);
-
-    private static ChannelFlowHandler _instance = new ChannelFlowHandler();
-
-    public static ChannelFlowHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelFlowHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ChannelFlowBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        channel.sync();
-        channel.setSuspended(!body.getActive());
-        _logger.debug("Channel.Flow for channel " + channelId + ", active=" + body.getActive());
-
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-        AMQMethodBody responseBody = methodRegistry.createChannelFlowOkBody(body.getActive());
-        session.writeFrame(responseBody.generateFrame(channelId));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
deleted file mode 100644
index 442c912032..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ChannelOpenBody;
-import org.apache.qpid.framing.ChannelOpenOkBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class ChannelOpenHandler implements StateAwareMethodListener<ChannelOpenBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelOpenHandler.class);
-
-    private static ChannelOpenHandler _instance = new ChannelOpenHandler();
-
-    public static ChannelOpenHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelOpenHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ChannelOpenBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-
-        // Protect the broker against out of order frame request.
-        if (virtualHost == null)
-        {
-            throw new AMQException(AMQConstant.COMMAND_INVALID, "Virtualhost has not yet been set. ConnectionOpen has not been called.", null);
-        }
-        _logger.info("Connecting to: " + virtualHost.getName());
-
-        final AMQChannel channel = new AMQChannel(session,channelId, virtualHost.getMessageStore());
-
-        session.addChannel(channel);
-
-        ChannelOpenOkBody response;
-
-        ProtocolVersion pv = session.getProtocolVersion();
-
-        if(pv.equals(ProtocolVersion.v8_0))
-        {
-            MethodRegistry_8_0 methodRegistry = (MethodRegistry_8_0) MethodRegistry.getMethodRegistry(ProtocolVersion.v8_0);
-            response = methodRegistry.createChannelOpenOkBody();
-
-        }
-        else if(pv.equals(ProtocolVersion.v0_9))
-        {
-            MethodRegistry_0_9 methodRegistry = (MethodRegistry_0_9) MethodRegistry.getMethodRegistry(ProtocolVersion.v0_9);
-            UUID uuid = UUID.randomUUID();
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            DataOutputStream dataOut = new DataOutputStream(output);
-            try
-            {
-                dataOut.writeLong(uuid.getMostSignificantBits());
-                dataOut.writeLong(uuid.getLeastSignificantBits());
-                dataOut.flush();
-                dataOut.close();
-            }
-            catch (IOException e)
-            {
-                // This *really* shouldn't happen as we're not doing any I/O
-                throw new RuntimeException("I/O exception when writing to byte array", e);
-            }
-
-            // should really associate this channelId to the session
-            byte[] channelName = output.toByteArray();
-
-            response = methodRegistry.createChannelOpenOkBody(channelName);
-        }
-        else if(pv.equals(ProtocolVersion.v0_91))
-        {
-            MethodRegistry_0_91 methodRegistry = (MethodRegistry_0_91) MethodRegistry.getMethodRegistry(ProtocolVersion.v0_91);
-            UUID uuid = UUID.randomUUID();
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            DataOutputStream dataOut = new DataOutputStream(output);
-            try
-            {
-                dataOut.writeLong(uuid.getMostSignificantBits());
-                dataOut.writeLong(uuid.getLeastSignificantBits());
-                dataOut.flush();
-                dataOut.close();
-            }
-            catch (IOException e)
-            {
-                // This *really* shouldn't happen as we're not doing any I/O
-                throw new RuntimeException("I/O exception when writing to byte array", e);
-            }
-
-            // should really associate this channelId to the session
-            byte[] channelName = output.toByteArray();
-
-            response = methodRegistry.createChannelOpenOkBody(channelName);
-        }
-        else
-        {
-            throw new AMQException(AMQConstant.INTERNAL_ERROR, "Got channel open for protocol version not catered for: " + pv, null);
-        }
-
-
-        session.writeFrame(response.generateFrame(channelId));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
deleted file mode 100644
index 60f9c1d495..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ConnectionCloseOkBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class ConnectionCloseMethodHandler implements StateAwareMethodListener<ConnectionCloseBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionCloseMethodHandler.class);
-
-    private static ConnectionCloseMethodHandler _instance = new ConnectionCloseMethodHandler();
-
-    public static ConnectionCloseMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionCloseMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ConnectionCloseBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("ConnectionClose received with reply code/reply text " + body.getReplyCode() + "/" +
-                         body.getReplyText() + " for " + session);
-        }
-        try
-        {
-            session.closeSession();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error closing protocol session: " + e, e);
-        }
-
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-        ConnectionCloseOkBody responseBody = methodRegistry.createConnectionCloseOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
-
-        session.closeProtocolSession();
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
deleted file mode 100644
index fe46b6c0cd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionCloseOkBody;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class ConnectionCloseOkMethodHandler implements StateAwareMethodListener<ConnectionCloseOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionCloseOkMethodHandler.class);
-
-    private static ConnectionCloseOkMethodHandler _instance = new ConnectionCloseOkMethodHandler();
-
-    public static ConnectionCloseOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionCloseOkMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ConnectionCloseOkBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        //todo should this not do more than just log the method?
-        _logger.info("Received Connection-close-ok");
-
-        try
-        {
-            stateManager.changeState(AMQState.CONNECTION_CLOSED);
-            session.closeSession();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error closing protocol session: " + e, e);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
deleted file mode 100644
index 62b13baac2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ConnectionOpenBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.State;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class ConnectionOpenMethodHandler implements StateAwareMethodListener<ConnectionOpenBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionOpenMethodHandler.class);
-
-    private static ConnectionOpenMethodHandler _instance = new ConnectionOpenMethodHandler();
-
-    public static ConnectionOpenMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionOpenMethodHandler()
-    {
-    }
-
-    private static AMQShortString generateClientID()
-    {
-        return new AMQShortString(Long.toString(System.currentTimeMillis()));
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ConnectionOpenBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        //ignore leading '/'
-        String virtualHostName;
-        if ((body.getVirtualHost() != null) && body.getVirtualHost().charAt(0) == '/')
-        {
-            virtualHostName = new StringBuilder(body.getVirtualHost().subSequence(1, body.getVirtualHost().length())).toString();
-        }
-        else
-        {
-            virtualHostName = body.getVirtualHost() == null ? null : String.valueOf(body.getVirtualHost());
-        }
-
-        VirtualHost virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName);
-
-        if (virtualHost == null)
-        {
-            throw body.getConnectionException(AMQConstant.NOT_FOUND, "Unknown virtual host: '" + virtualHostName + "'");
-        }
-        else
-        {
-            // Check virtualhost access
-            if (!virtualHost.getSecurityManager().accessVirtualhost(virtualHostName, session.getRemoteAddress()))
-            {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, "Permission denied: '" + virtualHost.getName() + "'");
-            }
-            else if (virtualHost.getState() != State.ACTIVE)
-            {
-                throw body.getConnectionException(AMQConstant.CONNECTION_FORCED, "Virtual host '" + virtualHost.getName() + "' is not active");
-            }
-
-            session.setVirtualHost(virtualHost);
-
-            // See Spec (0.8.2). Section  3.1.2 Virtual Hosts
-            if (session.getContextKey() == null)
-            {
-                session.setContextKey(generateClientID());
-            }
-
-            MethodRegistry methodRegistry = session.getMethodRegistry();
-            AMQMethodBody responseBody =  methodRegistry.createConnectionOpenOkBody(body.getVirtualHost());
-
-            stateManager.changeState(AMQState.CONNECTION_OPEN);
-
-            session.writeFrame(responseBody.generateFrame(channelId));
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
deleted file mode 100644
index d319f080d2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ConnectionSecureBody;
-import org.apache.qpid.framing.ConnectionSecureOkBody;
-import org.apache.qpid.framing.ConnectionTuneBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.security.SubjectCreator;
-import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
-import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener<ConnectionSecureOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionSecureOkMethodHandler.class);
-
-    private static ConnectionSecureOkMethodHandler _instance = new ConnectionSecureOkMethodHandler();
-
-    public static ConnectionSecureOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionSecureOkMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ConnectionSecureOkBody body, int channelId) throws AMQException
-    {
-        Broker broker = stateManager.getBroker();
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        SubjectCreator subjectCreator = stateManager.getSubjectCreator();
-
-        SaslServer ss = session.getSaslServer();
-        if (ss == null)
-        {
-            throw new AMQException("No SASL context set up in session");
-        }
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-        SubjectAuthenticationResult authResult = subjectCreator.authenticate(ss, body.getResponse());
-        switch (authResult.getStatus())
-        {
-            case ERROR:
-                Exception cause = authResult.getCause();
-
-                _logger.info("Authentication failed:" + (cause == null ? "" : cause.getMessage()));
-
-                // This should be abstracted
-                stateManager.changeState(AMQState.CONNECTION_CLOSING);
-
-                ConnectionCloseBody connectionCloseBody =
-                        methodRegistry.createConnectionCloseBody(AMQConstant.NOT_ALLOWED.getCode(),
-                                                                 AMQConstant.NOT_ALLOWED.getName(),
-                                                                 body.getClazz(),
-                                                                 body.getMethod());
-
-                session.writeFrame(connectionCloseBody.generateFrame(0));
-                disposeSaslServer(session);
-                break;
-            case SUCCESS:
-                if (_logger.isInfoEnabled())
-                {
-                    _logger.info("Connected as: " + authResult.getSubject());
-                }
-                stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
-
-                ConnectionTuneBody tuneBody =
-                        methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT),
-                                                                BrokerProperties.FRAME_SIZE,
-                                                                (Integer)broker.getAttribute(Broker.CONNECTION_HEART_BEAT_DELAY));
-                session.writeFrame(tuneBody.generateFrame(0));
-                session.setAuthorizedSubject(authResult.getSubject());
-                disposeSaslServer(session);
-                break;
-            case CONTINUE:
-                stateManager.changeState(AMQState.CONNECTION_NOT_AUTH);
-
-                ConnectionSecureBody secureBody = methodRegistry.createConnectionSecureBody(authResult.getChallenge());
-                session.writeFrame(secureBody.generateFrame(0));
-        }
-    }
-
-    private void disposeSaslServer(AMQProtocolSession ps)
-    {
-        SaslServer ss = ps.getSaslServer();
-        if (ss != null)
-        {
-            ps.setSaslServer(null);
-            try
-            {
-                ss.dispose();
-            }
-            catch (SaslException e)
-            {
-                _logger.error("Error disposing of Sasl server: " + e);
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
deleted file mode 100644
index 9350327346..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ConnectionSecureBody;
-import org.apache.qpid.framing.ConnectionStartOkBody;
-import org.apache.qpid.framing.ConnectionTuneBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.security.SubjectCreator;
-import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
-import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-
-public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<ConnectionStartOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionStartOkMethodHandler.class);
-
-    private static ConnectionStartOkMethodHandler _instance = new ConnectionStartOkMethodHandler();
-
-    public static ConnectionStartOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionStartOkMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ConnectionStartOkBody body, int channelId) throws AMQException
-    {
-        Broker broker = stateManager.getBroker();
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        _logger.info("SASL Mechanism selected: " + body.getMechanism());
-        _logger.info("Locale selected: " + body.getLocale());
-
-        SubjectCreator subjectCreator = stateManager.getSubjectCreator();
-        SaslServer ss = null;
-        try
-        {
-            ss = subjectCreator.createSaslServer(String.valueOf(body.getMechanism()), session.getLocalFQDN(), session.getPeerPrincipal());
-
-            if (ss == null)
-            {
-                throw body.getConnectionException(AMQConstant.RESOURCE_ERROR, "Unable to create SASL Server:" + body.getMechanism());
-            }
-
-            session.setSaslServer(ss);
-
-            final SubjectAuthenticationResult authResult = subjectCreator.authenticate(ss, body.getResponse());
-            //save clientProperties
-            session.setClientProperties(body.getClientProperties());
-
-            MethodRegistry methodRegistry = session.getMethodRegistry();
-
-            switch (authResult.getStatus())
-            {
-                case ERROR:
-                    Exception cause = authResult.getCause();
-
-                    _logger.info("Authentication failed:" + (cause == null ? "" : cause.getMessage()));
-
-                    stateManager.changeState(AMQState.CONNECTION_CLOSING);
-
-                    ConnectionCloseBody closeBody =
-                            methodRegistry.createConnectionCloseBody(AMQConstant.NOT_ALLOWED.getCode(),    // replyCode
-                                                                     AMQConstant.NOT_ALLOWED.getName(),
-                                                                     body.getClazz(),
-                                                                     body.getMethod());
-
-                    session.writeFrame(closeBody.generateFrame(0));
-                    disposeSaslServer(session);
-                    break;
-
-                case SUCCESS:
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Connected as: " + authResult.getSubject());
-                    }
-                    session.setAuthorizedSubject(authResult.getSubject());
-
-                    stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
-
-                    ConnectionTuneBody tuneBody = methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT),
-                                                                                          BrokerProperties.FRAME_SIZE,
-                                                                                          (Integer)broker.getAttribute(Broker.CONNECTION_HEART_BEAT_DELAY));
-                    session.writeFrame(tuneBody.generateFrame(0));
-                    break;
-                case CONTINUE:
-                    stateManager.changeState(AMQState.CONNECTION_NOT_AUTH);
-
-                    ConnectionSecureBody secureBody = methodRegistry.createConnectionSecureBody(authResult.getChallenge());
-                    session.writeFrame(secureBody.generateFrame(0));
-            }
-        }
-        catch (SaslException e)
-        {
-            disposeSaslServer(session);
-            throw new AMQException("SASL error: " + e, e);
-        }
-    }
-
-    private void disposeSaslServer(AMQProtocolSession ps)
-    {
-        SaslServer ss = ps.getSaslServer();
-        if (ss != null)
-        {
-            ps.setSaslServer(null);
-            try
-            {
-                ss.dispose();
-            }
-            catch (SaslException e)
-            {
-                _logger.error("Error disposing of Sasl server: " + e);
-            }
-        }
-    }
-
-}
-
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
deleted file mode 100644
index 5fddab6576..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionTuneOkBody;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class ConnectionTuneOkMethodHandler implements StateAwareMethodListener<ConnectionTuneOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionTuneOkMethodHandler.class);
-
-    private static ConnectionTuneOkMethodHandler _instance = new ConnectionTuneOkMethodHandler();
-
-    public static ConnectionTuneOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ConnectionTuneOkBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug(body);
-        }
-        stateManager.changeState(AMQState.CONNECTION_NOT_OPENED);
-        session.initHeartbeats(body.getHeartbeat());
-        session.setMaxFrameSize(body.getFrameMax());
-
-        long maxChannelNumber = body.getChannelMax();
-        //0 means no implied limit, except that forced by protocol limitations (0xFFFF)
-        session.setMaximumNumberOfChannels( maxChannelNumber == 0 ? 0xFFFFL : maxChannelNumber);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
deleted file mode 100644
index 85f0a6fd3d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ExchangeBoundBody;
-import org.apache.qpid.framing.ExchangeBoundOkBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-/**
- * @author Apache Software Foundation
- *
- *
- */
-public class ExchangeBoundHandler implements StateAwareMethodListener<ExchangeBoundBody>
-{
-    private static final ExchangeBoundHandler _instance = new ExchangeBoundHandler();
-
-    public static final int OK = 0;
-
-    public static final int EXCHANGE_NOT_FOUND = 1;
-
-    public static final int QUEUE_NOT_FOUND = 2;
-
-    public static final int NO_BINDINGS = 3;
-
-    public static final int QUEUE_NOT_BOUND = 4;
-
-    public static final int NO_QUEUE_BOUND_WITH_RK = 5;
-
-    public static final int SPECIFIC_QUEUE_NOT_BOUND_WITH_RK = 6;
-
-    public static ExchangeBoundHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ExchangeBoundHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ExchangeBoundBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-
-        final AMQChannel channel = session.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        channel.sync();
-
-
-        AMQShortString exchangeName = body.getExchange();
-        AMQShortString queueName = body.getQueue();
-        AMQShortString routingKey = body.getRoutingKey();
-        if (exchangeName == null)
-        {
-            throw new AMQException("Exchange exchange must not be null");
-        }
-        Exchange exchange = virtualHost.getExchange(exchangeName.toString());
-        ExchangeBoundOkBody response;
-        if (exchange == null)
-        {
-
-
-            response = methodRegistry.createExchangeBoundOkBody(EXCHANGE_NOT_FOUND,
-                                                                new AMQShortString("Exchange " + exchangeName + " not found"));
-        }
-        else if (routingKey == null)
-        {
-            if (queueName == null)
-            {
-                if (exchange.hasBindings())
-                {
-                    response = methodRegistry.createExchangeBoundOkBody(OK, null);
-                }
-                else
-                {
-
-                    response = methodRegistry.createExchangeBoundOkBody(NO_BINDINGS,	// replyCode
-                        null);	// replyText
-                }
-            }
-            else
-            {
-
-                AMQQueue queue = queueRegistry.getQueue(queueName);
-                if (queue == null)
-                {
-
-                    response = methodRegistry.createExchangeBoundOkBody(QUEUE_NOT_FOUND,	// replyCode
-                        new AMQShortString("Queue " + queueName + " not found"));	// replyText
-                }
-                else
-                {
-                    if (exchange.isBound(queue))
-                    {
-
-                        response = methodRegistry.createExchangeBoundOkBody(OK,	// replyCode
-                            null);	// replyText
-                    }
-                    else
-                    {
-
-                        response = methodRegistry.createExchangeBoundOkBody(QUEUE_NOT_BOUND,	// replyCode
-                            new AMQShortString("Queue " + queueName + " not bound to exchange " + exchangeName));	// replyText
-                    }
-                }
-            }
-        }
-        else if (queueName != null)
-        {
-            AMQQueue queue = queueRegistry.getQueue(queueName);
-            if (queue == null)
-            {
-
-                response = methodRegistry.createExchangeBoundOkBody(QUEUE_NOT_FOUND,	// replyCode
-                    new AMQShortString("Queue " + queueName + " not found"));	// replyText
-            }
-            else
-            {
-                if (exchange.isBound(body.getRoutingKey(), queue))
-                {
-
-                    response = methodRegistry.createExchangeBoundOkBody(OK,	// replyCode
-                        null);	// replyText
-                }
-                else
-                {
-
-                    String message = "Queue " + queueName + " not bound with routing key " +
-                                        body.getRoutingKey() + " to exchange " + exchangeName;
-
-                    if(message.length()>255)
-                    {
-                        message = message.substring(0,254);
-                    }
-                    response = methodRegistry.createExchangeBoundOkBody(SPECIFIC_QUEUE_NOT_BOUND_WITH_RK,	// replyCode
-                        new AMQShortString(message));	// replyText
-                }
-            }
-        }
-        else
-        {
-            if (exchange.isBound(body.getRoutingKey()))
-            {
-
-                response = methodRegistry.createExchangeBoundOkBody(OK,	// replyCode
-                    null);	// replyText
-            }
-            else
-            {
-
-                response = methodRegistry.createExchangeBoundOkBody(NO_QUEUE_BOUND_WITH_RK,	// replyCode
-                    new AMQShortString("No queue bound with routing key " + body.getRoutingKey() +
-                    " to exchange " + exchangeName));	// replyText
-            }
-        }
-        session.writeFrame(response.generateFrame(channelId));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
deleted file mode 100644
index 4949fcd62b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQUnknownExchangeType;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ExchangeDeclareBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.ExchangeExistsException;
-import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class ExchangeDeclareHandler implements StateAwareMethodListener<ExchangeDeclareBody>
-{
-    private static final Logger _logger = Logger.getLogger(ExchangeDeclareHandler.class);
-
-    private static final ExchangeDeclareHandler _instance = new ExchangeDeclareHandler();
-
-    public static ExchangeDeclareHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ExchangeDeclareHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ExchangeDeclareBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        final AMQChannel channel = session.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        final AMQShortString exchangeName = body.getExchange();
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Request to declare exchange of type " + body.getType() + " with name " + exchangeName);
-        }
-
-        Exchange exchange;
-
-        if (body.getPassive())
-        {
-            exchange = virtualHost.getExchange(exchangeName == null ? null : exchangeName.toString());
-            if(exchange == null)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange: " + exchangeName);
-            }
-            else if (!exchange.getTypeShortString().equals(body.getType()) && !(body.getType() == null || body.getType().length() ==0))
-            {
-
-                throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: " +
-                                  exchangeName + " of type " + exchange.getTypeShortString()
-                                  + " to " + body.getType() +".",body.getClazz(), body.getMethod(),body.getMajor(),body.getMinor(),null);
-            }
-
-        }
-        else
-        {
-            try
-            {
-                exchange = virtualHost.createExchange(null,
-                                                      exchangeName == null ? null : exchangeName.intern().toString(),
-                                                      body.getType() == null ? null : body.getType().intern().toString(),
-                                                      body.getDurable(),
-                                                      body.getAutoDelete(),
-                        null);
-
-            }
-            catch(ReservedExchangeNameException e)
-            {
-                throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                          "Attempt to declare exchange: " + exchangeName +
-                                          " which begins with reserved prefix.");
-
-            }
-            catch(ExchangeExistsException e)
-            {
-                exchange = e.getExistingExchange();
-                if(!exchange.getTypeShortString().equals(body.getType()))
-                {
-                    throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: "
-                                                                              + exchangeName + " of type "
-                                                                              + exchange.getTypeShortString()
-                                                                              + " to " + body.getType() +".",
-                                                     body.getClazz(), body.getMethod(),
-                                                     body.getMajor(), body.getMinor(),null);
-                }
-            }
-            catch(AMQUnknownExchangeType e)
-            {
-                throw body.getConnectionException(AMQConstant.COMMAND_INVALID, "Unknown exchange: " + exchangeName,e);
-            }
-        }
-
-
-        if(!body.getNowait())
-        {
-            MethodRegistry methodRegistry = session.getMethodRegistry();
-            AMQMethodBody responseBody = methodRegistry.createExchangeDeclareOkBody();
-            channel.sync();
-            session.writeFrame(responseBody.generateFrame(channelId));
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
deleted file mode 100644
index 75f749fe9a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ExchangeDeleteBody;
-import org.apache.qpid.framing.ExchangeDeleteOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeInUseException;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
-import org.apache.qpid.server.virtualhost.RequiredExchangeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeDeleteBody>
-{
-    private static final ExchangeDeleteHandler _instance = new ExchangeDeleteHandler();
-
-    public static ExchangeDeleteHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ExchangeDeleteHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, ExchangeDeleteBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        final AMQChannel channel = session.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        channel.sync();
-        try
-        {
-            final String exchangeName = body.getExchange() == null ? null : body.getExchange().toString();
-
-            final Exchange exchange = virtualHost.getExchange(exchangeName);
-            if(exchange == null)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No such exchange: " + body.getExchange());
-            }
-
-            virtualHost.removeExchange(exchange, !body.getIfUnused());
-
-            ExchangeDeleteOkBody responseBody = session.getMethodRegistry().createExchangeDeleteOkBody();
-
-            session.writeFrame(responseBody.generateFrame(channelId));
-        }
-        catch (ExchangeInUseException e)
-        {
-            throw body.getChannelException(AMQConstant.IN_USE, "Exchange in use");
-            // TODO: sort out consistent channel close mechanism that does all clean up etc.
-        }
-
-        catch (ExchangeIsAlternateException e)
-        {
-            throw body.getChannelException(AMQConstant.NOT_ALLOWED, "Exchange in use as an alternate exchange");
-
-        }
-        catch (RequiredExchangeException e)
-        {
-            throw body.getChannelException(AMQConstant.NOT_ALLOWED, "Exchange '"+body.getExchange()+"' cannot be deleted");
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java
deleted file mode 100644
index 6ff511ea30..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/OnCurrentThreadExecutor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import java.util.concurrent.Executor;
-
-/**
- * An executor that executes the task on the current thread.
- */
-public class OnCurrentThreadExecutor implements Executor
-{
-    public void execute(Runnable command)
-    {
-        command.run();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
deleted file mode 100644
index 0eed82b9de..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.QueueBindBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.Map;
-
-public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
-{
-    private static final Logger _log = Logger.getLogger(QueueBindHandler.class);
-
-    private static final QueueBindHandler _instance = new QueueBindHandler();
-
-    public static QueueBindHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private QueueBindHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, QueueBindBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        final AMQQueue queue;
-        final AMQShortString routingKey;
-
-        if (body.getQueue() == null)
-        {
-
-            queue = channel.getDefaultQueue();
-
-            if (queue == null)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null");
-            }
-
-            if (body.getRoutingKey() == null)
-            {
-                routingKey = queue.getNameShortString();
-            }
-            else
-            {
-                routingKey = body.getRoutingKey().intern();
-            }
-        }
-        else
-        {
-            queue = queueRegistry.getQueue(body.getQueue());
-            routingKey = body.getRoutingKey() == null ? AMQShortString.EMPTY_STRING : body.getRoutingKey().intern();
-        }
-
-        if (queue == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
-        }
-        final String exchangeName = body.getExchange() == null ? null : body.getExchange().toString();
-        final Exchange exch = virtualHost.getExchange(exchangeName);
-        if (exch == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + exchangeName + " does not exist.");
-        }
-
-
-        try
-        {
-            if (queue.isExclusive() && !queue.isDurable())
-            {
-                AMQSessionModel session = queue.getExclusiveOwningSession();
-                if (session == null || session.getConnectionModel() != protocolConnection)
-                {
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue " + queue.getNameShortString() + " is exclusive, but not created on this Connection.");
-                }
-            }
-
-            if (!exch.isBound(routingKey, body.getArguments(), queue))
-            {
-                String bindingKey = String.valueOf(routingKey);
-                Map<String,Object> arguments = FieldTable.convertToMap(body.getArguments());
-
-                if(!exch.addBinding(bindingKey, queue, arguments))
-                {
-                    Binding oldBinding = exch.getBinding(bindingKey, queue, arguments);
-
-                    Map<String, Object> oldArgs = oldBinding.getArguments();
-                    if((oldArgs == null && !arguments.isEmpty()) || (oldArgs != null && !oldArgs.equals(arguments)))
-                    {
-                        exch.replaceBinding(oldBinding.getId(), bindingKey, queue, arguments);
-                    }
-                }
-            }
-        }
-        catch (AMQException e)
-        {
-            throw body.getChannelException(AMQConstant.CHANNEL_ERROR, e.toString());
-        }
-
-        if (_log.isInfoEnabled())
-        {
-            _log.info("Binding queue " + queue + " to exchange " + exch + " with routing key " + routingKey);
-        }
-        if (!body.getNowait())
-        {
-            channel.sync();
-            MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-            AMQMethodBody responseBody = methodRegistry.createQueueBindOkBody();
-            protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
deleted file mode 100644
index 9f887d881d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.QueueDeclareBody;
-import org.apache.qpid.framing.QueueDeclareOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
-import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.Map;
-import java.util.UUID;
-
-public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclareBody>
-{
-    private static final Logger _logger = Logger.getLogger(QueueDeclareHandler.class);
-
-    private static final QueueDeclareHandler _instance = new QueueDeclareHandler();
-
-    public static QueueDeclareHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, QueueDeclareBody body, int channelId) throws AMQException
-    {
-        final AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        final AMQSessionModel session = protocolConnection.getChannel(channelId);
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        DurableConfigurationStore store = virtualHost.getDurableConfigurationStore();
-
-        final AMQShortString queueName;
-
-        // if we aren't given a queue name, we create one which we return to the client
-        if ((body.getQueue() == null) || (body.getQueue().length() == 0))
-        {
-            queueName = createName();
-        }
-        else
-        {
-            queueName = body.getQueue().intern();
-        }
-
-        AMQQueue queue;
-
-        //TODO: do we need to check that the queue already exists with exactly the same "configuration"?
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        synchronized (queueRegistry)
-        {
-            queue = queueRegistry.getQueue(queueName);
-
-            AMQSessionModel owningSession = null;
-
-            if (queue != null)
-            {
-                owningSession = queue.getExclusiveOwningSession();
-            }
-
-            if (queue == null)
-            {
-                if (body.getPassive())
-                {
-                    String msg = "Queue: " + queueName + " not found on VirtualHost(" + virtualHost + ").";
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, msg);
-                }
-                else
-                {
-                    queue = createQueue(queueName, body, virtualHost, protocolConnection);
-                    queue.setAuthorizationHolder(protocolConnection);
-                    if (queue.isDurable() && !queue.isAutoDelete())
-                    {
-                        DurableConfigurationStoreHelper.createQueue(store, queue, body.getArguments());
-                    }
-                    if(body.getAutoDelete())
-                    {
-                        queue.setDeleteOnNoConsumers(true);
-                    }
-                    queueRegistry.registerQueue(queue);
-                    if (body.getExclusive())
-                    {
-                        queue.setExclusiveOwningSession(protocolConnection.getChannel(channelId));
-                        queue.setAuthorizationHolder(protocolConnection);
-
-                        if(!body.getDurable())
-                        {
-                            final AMQQueue q = queue;
-                            final AMQProtocolSession.Task sessionCloseTask = new AMQProtocolSession.Task()
-                            {
-                                public void doTask(AMQProtocolSession session) throws AMQException
-                                {
-                                    q.setExclusiveOwningSession(null);
-                                }
-                            };
-                            protocolConnection.addSessionCloseTask(sessionCloseTask);
-                            queue.addQueueDeleteTask(new AMQQueue.Task() {
-                                public void doTask(AMQQueue queue) throws AMQException
-                                {
-                                    protocolConnection.removeSessionCloseTask(sessionCloseTask);
-                                }
-                            });
-                        }
-                    }
-                }
-            }
-            else if (queue.isExclusive() && !queue.isDurable() && (owningSession == null || owningSession.getConnectionModel() != protocolConnection))
-            {
-                throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                  "Queue " + queue.getNameShortString() + " is exclusive, but not created on this Connection.");
-            }
-            else if(!body.getPassive() && ((queue.isExclusive()) != body.getExclusive()))
-            {
-
-                throw body.getChannelException(AMQConstant.ALREADY_EXISTS,
-                                                  "Cannot re-declare queue '" + queue.getNameShortString() + "' with different exclusivity (was: "
-                                                    + queue.isExclusive() + " requested " + body.getExclusive() + ")");
-            }
-            else if (!body.getPassive() && body.getExclusive() && !(queue.isDurable() ? String.valueOf(queue.getOwner()).equals(session.getClientID()) : (owningSession == null || owningSession.getConnectionModel() == protocolConnection)))
-            {
-                throw body.getChannelException(AMQConstant.ALREADY_EXISTS, "Cannot declare queue('" + queueName + "'), "
-                                                                           + "as exclusive queue with same name "
-                                                                           + "declared on another client ID('"
-                                                                           + queue.getOwner() + "') your clientID('" + session.getClientID() + "')");
-
-            }
-            else if(!body.getPassive() && queue.isAutoDelete() != body.getAutoDelete())
-            {
-                throw body.getChannelException(AMQConstant.ALREADY_EXISTS,
-                                                  "Cannot re-declare queue '" + queue.getNameShortString() + "' with different auto-delete (was: "
-                                                    + queue.isAutoDelete() + " requested " + body.getAutoDelete() + ")");
-            }
-            else if(!body.getPassive() && queue.isDurable() != body.getDurable())
-            {
-                throw body.getChannelException(AMQConstant.ALREADY_EXISTS,
-                                                  "Cannot re-declare queue '" + queue.getNameShortString() + "' with different durability (was: "
-                                                    + queue.isDurable() + " requested " + body.getDurable() + ")");
-            }
-
-
-
-            //set this as the default queue on the channel:
-            channel.setDefaultQueue(queue);
-        }
-
-        if (!body.getNowait())
-        {
-            channel.sync();
-            MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-            QueueDeclareOkBody responseBody =
-                    methodRegistry.createQueueDeclareOkBody(queueName,
-                                                            queue.getMessageCount(),
-                                                            queue.getConsumerCount());
-            protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-
-            _logger.info("Queue " + queueName + " declared successfully");
-        }
-    }
-
-    protected AMQShortString createName()
-    {
-        return new AMQShortString("tmp_" + UUID.randomUUID());
-    }
-
-    protected AMQQueue createQueue(final AMQShortString queueName,
-                                   QueueDeclareBody body,
-                                   VirtualHost virtualHost,
-                                   final AMQProtocolSession session)
-            throws AMQException
-    {
-        final QueueRegistry registry = virtualHost.getQueueRegistry();
-        String owner = body.getExclusive() ? AMQShortString.toString(session.getContextKey()) : null;
-
-        Map<String, Object> arguments = FieldTable.convertToMap(body.getArguments());
-        String queueNameString = AMQShortString.toString(queueName);
-
-        final AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateQueueUUID(queueNameString, virtualHost.getName()),
-                                                                  queueNameString, body.getDurable(), owner, body.getAutoDelete(),
-                                                                  body.getExclusive(),virtualHost, arguments);
-
-        if (body.getExclusive() && !body.getDurable())
-        {
-            final AMQProtocolSession.Task deleteQueueTask =
-                    new AMQProtocolSession.Task()
-                    {
-                        public void doTask(AMQProtocolSession session) throws AMQException
-                        {
-                            if (registry.getQueue(queueName) == queue)
-                            {
-                                queue.delete();
-                            }
-                        }
-                    };
-
-            session.addSessionCloseTask(deleteQueueTask);
-
-            queue.addQueueDeleteTask(new AMQQueue.Task()
-            {
-                public void doTask(AMQQueue queue)
-                {
-                    session.removeSessionCloseTask(deleteQueueTask);
-                }
-            });
-        }
-
-        return queue;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
deleted file mode 100644
index 6f5e0ea992..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.QueueDeleteBody;
-import org.apache.qpid.framing.QueueDeleteOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class QueueDeleteHandler implements StateAwareMethodListener<QueueDeleteBody>
-{
-    private static final QueueDeleteHandler _instance = new QueueDeleteHandler();
-
-    public static QueueDeleteHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private final boolean _failIfNotFound;
-
-    public QueueDeleteHandler()
-    {
-        this(true);
-    }
-
-    public QueueDeleteHandler(boolean failIfNotFound)
-    {
-        _failIfNotFound = failIfNotFound;
-
-    }
-
-    public void methodReceived(AMQStateManager stateManager, QueueDeleteBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        DurableConfigurationStore store = virtualHost.getDurableConfigurationStore();
-
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        channel.sync();
-        AMQQueue queue;
-        if (body.getQueue() == null)
-        {
-
-            //get the default queue on the channel:
-            queue = channel.getDefaultQueue();
-        }
-        else
-        {
-            queue = queueRegistry.getQueue(body.getQueue());
-        }
-
-        if (queue == null)
-        {
-            if (_failIfNotFound)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
-            }
-        }
-        else
-        {
-            if (body.getIfEmpty() && !queue.isEmpty())
-            {
-                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.getQueue() + " is not empty.");
-            }
-            else if (body.getIfUnused() && !queue.isUnused())
-            {
-                // TODO - Error code
-                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.getQueue() + " is still used.");
-            }
-            else
-            {
-                AMQSessionModel session = queue.getExclusiveOwningSession();
-                if (queue.isExclusive() && !queue.isDurable() && (session == null || session.getConnectionModel() != protocolConnection))
-                {
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue " + queue.getNameShortString() + " is exclusive, but not created on this Connection.");
-                }
-
-                int purged = queue.delete();
-
-                if (queue.isDurable())
-                {
-                    DurableConfigurationStoreHelper.removeQueue(store, queue);
-                }
-
-                MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-                QueueDeleteOkBody responseBody = methodRegistry.createQueueDeleteOkBody(purged);
-                protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
deleted file mode 100644
index e925eb7455..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.QueuePurgeBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBody>
-{
-    private static final QueuePurgeHandler _instance = new QueuePurgeHandler();
-
-    public static QueuePurgeHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private final boolean _failIfNotFound;
-
-    public QueuePurgeHandler()
-    {
-        this(true);
-    }
-
-    public QueuePurgeHandler(boolean failIfNotFound)
-    {
-        _failIfNotFound = failIfNotFound;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, QueuePurgeBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-        AMQQueue queue;
-        if(body.getQueue() == null)
-        {
-
-           //get the default queue on the channel:
-           queue = channel.getDefaultQueue();
-
-            if(queue == null)
-            {
-                if(_failIfNotFound)
-                {
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,"No queue specified.");
-                }
-            }
-        }
-        else
-        {
-            queue = queueRegistry.getQueue(body.getQueue());
-        }
-
-        if(queue == null)
-        {
-            if(_failIfNotFound)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
-            }
-        }
-        else
-        {
-                AMQSessionModel session = queue.getExclusiveOwningSession();
-
-                if (queue.isExclusive() && (session == null || session.getConnectionModel() != protocolConnection))
-                {
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue is exclusive, but not created on this Connection.");
-                }
-
-                long purged = queue.clearQueue();
-
-
-                if(!body.getNowait())
-                {
-                    channel.sync();
-                    MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
-                    AMQMethodBody responseBody = methodRegistry.createQueuePurgeOkBody(purged);
-                    protocolConnection.writeFrame(responseBody.generateFrame(channelId));
-
-                }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
deleted file mode 100644
index aad5446cb5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.QueueUnbindBody;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindBody>
-{
-    private static final Logger _log = Logger.getLogger(QueueUnbindHandler.class);
-
-    private static final QueueUnbindHandler _instance = new QueueUnbindHandler();
-
-    public static QueueUnbindHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private QueueUnbindHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, QueueUnbindBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-
-
-        final AMQQueue queue;
-        final AMQShortString routingKey;
-
-
-        AMQChannel channel = session.getChannel(channelId);
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        if (body.getQueue() == null)
-        {
-
-            queue = channel.getDefaultQueue();
-
-            if (queue == null)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null");
-            }
-
-            routingKey = body.getRoutingKey() == null ? null : body.getRoutingKey().intern();
-
-        }
-        else
-        {
-            queue = queueRegistry.getQueue(body.getQueue());
-            routingKey = body.getRoutingKey() == null ? null : body.getRoutingKey().intern();
-        }
-
-        if (queue == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
-        }
-        final Exchange exch = virtualHost.getExchange(body.getExchange() == null ? null : body.getExchange().toString());
-        if (exch == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + body.getExchange() + " does not exist.");
-        }
-
-        if(exch.getBinding(String.valueOf(routingKey), queue, FieldTable.convertToMap(body.getArguments())) == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND,"No such binding");
-        }
-        else
-        {
-            exch.removeBinding(String.valueOf(routingKey), queue, FieldTable.convertToMap(body.getArguments()));
-        }
-
-
-        if (_log.isInfoEnabled())
-        {
-            _log.info("Binding queue " + queue + " to exchange " + exch + " with routing key " + routingKey);
-        }
-
-        final MethodRegistry registry = session.getMethodRegistry();
-        final AMQMethodBody responseBody;
-        if (registry instanceof MethodRegistry_0_9)
-        {
-            responseBody = ((MethodRegistry_0_9)registry).createQueueUnbindOkBody();
-        }
-        else if (registry instanceof MethodRegistry_0_91)
-        {
-            responseBody = ((MethodRegistry_0_91)registry).createQueueUnbindOkBody();
-        }
-        else
-        {
-            // 0-8 does not support QueueUnbind
-            throw new AMQException(AMQConstant.COMMAND_INVALID, "QueueUnbind not present in AMQP version: " + session.getProtocolVersion(), null);
-        }
-        channel.sync();
-        session.writeFrame(responseBody.generateFrame(channelId));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
deleted file mode 100644
index 43e97c0cb6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.*;

-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;

-

-import java.util.HashMap;

-import java.util.Map;

-

-public class ServerMethodDispatcherImpl implements MethodDispatcher

-{

-    private final AMQStateManager _stateManager;

-

-    private static interface DispatcherFactory

-        {

-            public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager);

-        }

-

-        private static final Map<ProtocolVersion, DispatcherFactory> _dispatcherFactories =

-                new HashMap<ProtocolVersion, DispatcherFactory>();

-

-

-    static

-        {

-            _dispatcherFactories.put(ProtocolVersion.v8_0,

-                                     new DispatcherFactory()

-                                     {

-                                         public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager)

-                                         {

-                                             return new ServerMethodDispatcherImpl_8_0(stateManager);

-                                         }

-                                     });

-

-            _dispatcherFactories.put(ProtocolVersion.v0_9,

-                                     new DispatcherFactory()

-                                     {

-                                         public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager)

-                                         {

-                                             return new ServerMethodDispatcherImpl_0_9(stateManager);

-                                         }

-                                     });

-            _dispatcherFactories.put(ProtocolVersion.v0_91,

-                         new DispatcherFactory()

-                         {

-                             public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager)

-                             {

-                                 return new ServerMethodDispatcherImpl_0_91(stateManager);

-                             }

-                         });

-

-        }

-

-

-    private static final AccessRequestHandler _accessRequestHandler = AccessRequestHandler.getInstance();

-    private static final ChannelCloseHandler _channelCloseHandler = ChannelCloseHandler.getInstance();

-    private static final ChannelOpenHandler _channelOpenHandler = ChannelOpenHandler.getInstance();

-    private static final ChannelCloseOkHandler _channelCloseOkHandler = ChannelCloseOkHandler.getInstance();

-    private static final ConnectionCloseMethodHandler _connectionCloseMethodHandler = ConnectionCloseMethodHandler.getInstance();

-    private static final ConnectionCloseOkMethodHandler _connectionCloseOkMethodHandler = ConnectionCloseOkMethodHandler.getInstance();

-    private static final ConnectionOpenMethodHandler _connectionOpenMethodHandler = ConnectionOpenMethodHandler.getInstance();

-    private static final ConnectionTuneOkMethodHandler _connectionTuneOkMethodHandler = ConnectionTuneOkMethodHandler.getInstance();

-    private static final ConnectionSecureOkMethodHandler _connectionSecureOkMethodHandler = ConnectionSecureOkMethodHandler.getInstance();

-    private static final ConnectionStartOkMethodHandler _connectionStartOkMethodHandler = ConnectionStartOkMethodHandler.getInstance();

-    private static final ExchangeDeclareHandler _exchangeDeclareHandler = ExchangeDeclareHandler.getInstance();

-    private static final ExchangeDeleteHandler _exchangeDeleteHandler = ExchangeDeleteHandler.getInstance();

-    private static final ExchangeBoundHandler _exchangeBoundHandler = ExchangeBoundHandler.getInstance();

-    private static final BasicAckMethodHandler _basicAckMethodHandler = BasicAckMethodHandler.getInstance();

-    private static final BasicRecoverMethodHandler _basicRecoverMethodHandler = BasicRecoverMethodHandler.getInstance();

-    private static final BasicConsumeMethodHandler _basicConsumeMethodHandler = BasicConsumeMethodHandler.getInstance();

-    private static final BasicGetMethodHandler _basicGetMethodHandler = BasicGetMethodHandler.getInstance();

-    private static final BasicCancelMethodHandler _basicCancelMethodHandler = BasicCancelMethodHandler.getInstance();

-    private static final BasicPublishMethodHandler _basicPublishMethodHandler = BasicPublishMethodHandler.getInstance();

-    private static final BasicQosHandler _basicQosHandler = BasicQosHandler.getInstance();

-    private static final QueueBindHandler _queueBindHandler = QueueBindHandler.getInstance();

-    private static final QueueDeclareHandler _queueDeclareHandler = QueueDeclareHandler.getInstance();

-    private static final QueueDeleteHandler _queueDeleteHandler = QueueDeleteHandler.getInstance();

-    private static final QueuePurgeHandler _queuePurgeHandler = QueuePurgeHandler.getInstance();

-    private static final ChannelFlowHandler _channelFlowHandler = ChannelFlowHandler.getInstance();

-    private static final TxSelectHandler _txSelectHandler = TxSelectHandler.getInstance();

-    private static final TxCommitHandler _txCommitHandler = TxCommitHandler.getInstance();

-    private static final TxRollbackHandler _txRollbackHandler = TxRollbackHandler.getInstance();

-    private static final BasicRejectMethodHandler _basicRejectMethodHandler = BasicRejectMethodHandler.getInstance();

-

-

-

-    public static MethodDispatcher createMethodDispatcher(AMQStateManager stateManager, ProtocolVersion protocolVersion)

-    {

-        return _dispatcherFactories.get(protocolVersion).createMethodDispatcher(stateManager);

-    }

-

-

-    public ServerMethodDispatcherImpl(AMQStateManager stateManager)

-    {

-        _stateManager = stateManager;

-    }

-

-

-    protected AMQStateManager getStateManager()

-    {

-        return _stateManager;

-    }

-

-

-

-    public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException

-    {

-        _accessRequestHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException

-    {

-        _basicAckMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException

-    {

-        _basicCancelMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException

-    {

-        _basicConsumeMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException

-    {

-        _basicGetMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException

-    {

-        _basicPublishMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException

-    {

-        _basicQosHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException

-    {

-        _basicRecoverMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicReject(BasicRejectBody body, int channelId) throws AMQException

-    {

-        _basicRejectMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchChannelOpen(ChannelOpenBody body, int channelId) throws AMQException

-    {

-        _channelOpenHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-

-    public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicConsumeOk(BasicConsumeOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicDeliver(BasicDeliverBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicGetEmpty(BasicGetEmptyBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicGetOk(BasicGetOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicQosOk(BasicQosOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException

-    {

-        _channelCloseHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-

-    public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException

-    {

-        _channelCloseOkHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-

-    public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException

-    {

-        _channelFlowHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchChannelOpenOk(ChannelOpenOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-

-    public boolean dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException

-    {

-        _connectionOpenMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-

-    public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException

-    {

-        _connectionCloseMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-

-    public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException

-    {

-        _connectionCloseOkMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchConnectionOpenOk(ConnectionOpenOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchConnectionSecure(ConnectionSecureBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchConnectionStart(ConnectionStartBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchConnectionTune(ConnectionTuneBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchDtxSelectOk(DtxSelectOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchDtxStartOk(DtxStartOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchExchangeDeclareOk(ExchangeDeclareOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchExchangeDeleteOk(ExchangeDeleteOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileCancelOk(FileCancelOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileConsumeOk(FileConsumeOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileDeliver(FileDeliverBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileOpen(FileOpenBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileOpenOk(FileOpenOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileQosOk(FileQosOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileReturn(FileReturnBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchQueueDeclareOk(QueueDeclareOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchQueueDeleteOk(QueueDeleteOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchQueuePurgeOk(QueuePurgeOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchStreamCancelOk(StreamCancelOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchStreamConsumeOk(StreamConsumeOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchStreamDeliver(StreamDeliverBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchStreamQosOk(StreamQosOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchStreamReturn(StreamReturnBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-

-    public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException

-    {

-        _connectionSecureOkMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException

-    {

-        _connectionStartOkMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException

-    {

-        _connectionTuneOkMethodHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchDtxSelect(DtxSelectBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchDtxStart(DtxStartBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException

-    {

-        _exchangeBoundHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException

-    {

-        _exchangeDeclareHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException

-    {

-        _exchangeDeleteHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchFileAck(FileAckBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchFileCancel(FileCancelBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchFileConsume(FileConsumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchFilePublish(FilePublishBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchFileQos(FileQosBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchFileReject(FileRejectBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException

-    {

-        _queueBindHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException

-    {

-        _queueDeclareHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException

-    {

-        _queueDeleteHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException

-    {

-        _queuePurgeHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchStreamCancel(StreamCancelBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchStreamConsume(StreamConsumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchStreamPublish(StreamPublishBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchStreamQos(StreamQosBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTunnelRequest(TunnelRequestBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException

-    {

-        _txCommitHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException

-    {

-        _txRollbackHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-    public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException

-    {

-        _txSelectHandler.methodReceived(_stateManager, body, channelId);

-        return true;

-    }

-

-

-

-

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
deleted file mode 100644
index 1ee6d732c2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.*;

-import org.apache.qpid.framing.amqp_0_9.MethodDispatcher_0_9;

-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;

-

-

-

-public class ServerMethodDispatcherImpl_0_9

-        extends ServerMethodDispatcherImpl

-        implements MethodDispatcher_0_9

-

-{

-

-    private static final BasicRecoverSyncMethodHandler _basicRecoverSyncMethodHandler =

-            BasicRecoverSyncMethodHandler.getInstance();

-    private static final QueueUnbindHandler _queueUnbindHandler =

-            QueueUnbindHandler.getInstance();

-

-

-    public ServerMethodDispatcherImpl_0_9(AMQStateManager stateManager)

-    {

-        super(stateManager);

-    }

-

-    public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException

-    {

-        _basicRecoverSyncMethodHandler.methodReceived(getStateManager(), body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchChannelResume(ChannelResumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageCancel(MessageCancelBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageGet(MessageGetBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageRecover(MessageRecoverBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException

-    {

-        _queueUnbindHandler.methodReceived(getStateManager(),body,channelId);

-        return true;

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
deleted file mode 100644
index b11b9cff2b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.*;

-import org.apache.qpid.framing.amqp_0_91.MethodDispatcher_0_91;

-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;

-

-

-public class ServerMethodDispatcherImpl_0_91

-        extends ServerMethodDispatcherImpl

-        implements MethodDispatcher_0_91

-

-{

-

-    private static final BasicRecoverSyncMethodHandler _basicRecoverSyncMethodHandler =

-            BasicRecoverSyncMethodHandler.getInstance();

-    private static final QueueUnbindHandler _queueUnbindHandler =

-            QueueUnbindHandler.getInstance();

-

-

-    public ServerMethodDispatcherImpl_0_91(AMQStateManager stateManager)

-    {

-        super(stateManager);

-    }

-

-    public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException

-    {

-        _basicRecoverSyncMethodHandler.methodReceived(getStateManager(), body, channelId);

-        return true;

-    }

-

-    public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchChannelResume(ChannelResumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageCancel(MessageCancelBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageGet(MessageGetBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageRecover(MessageRecoverBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException

-    {

-        return false;  //To change body of implemented methods use File | Settings | File Templates.

-    }

-

-    public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException

-    {

-        _queueUnbindHandler.methodReceived(getStateManager(),body,channelId);

-        return true;

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
deleted file mode 100644
index f05219712f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.BasicRecoverOkBody;

-import org.apache.qpid.framing.ChannelAlertBody;

-import org.apache.qpid.framing.TestContentBody;

-import org.apache.qpid.framing.TestContentOkBody;

-import org.apache.qpid.framing.TestIntegerBody;

-import org.apache.qpid.framing.TestIntegerOkBody;

-import org.apache.qpid.framing.TestStringBody;

-import org.apache.qpid.framing.TestStringOkBody;

-import org.apache.qpid.framing.TestTableBody;

-import org.apache.qpid.framing.TestTableOkBody;

-import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;

-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;

-

-public class ServerMethodDispatcherImpl_8_0

-        extends ServerMethodDispatcherImpl

-        implements MethodDispatcher_8_0

-{

-    public ServerMethodDispatcherImpl_8_0(AMQStateManager stateManager)

-    {

-        super(stateManager);

-    }

-

-    public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws AMQException

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

-    public boolean dispatchTestContent(TestContentBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-

-    public boolean dispatchTestTableOk(TestTableOkBody body, int channelId) throws AMQException

-    {

-        return false;

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
deleted file mode 100644
index b257030a59..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.TxCommitBody;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class TxCommitHandler implements StateAwareMethodListener<TxCommitBody>
-{
-    private static final Logger _log = Logger.getLogger(TxCommitHandler.class);
-
-    private static TxCommitHandler _instance = new TxCommitHandler();
-
-    public static TxCommitHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private TxCommitHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, TxCommitBody body, final int channelId) throws AMQException
-    {
-        final AMQProtocolSession session = stateManager.getProtocolSession();
-
-        try
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Commit received on channel " + channelId);
-            }
-            AMQChannel channel = session.getChannel(channelId);
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(channelId);
-            }
-            channel.commit(new Runnable()
-            {
-
-                @Override
-                public void run()
-                {
-                    MethodRegistry methodRegistry = session.getMethodRegistry();
-                    AMQMethodBody responseBody = methodRegistry.createTxCommitOkBody();
-                    session.writeFrame(responseBody.generateFrame(channelId));
-                }
-            }, true);
-
-
-
-        }
-        catch (AMQException e)
-        {
-            throw body.getChannelException(e.getErrorCode(), "Failed to commit: " + e.getMessage());
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
deleted file mode 100644
index 19d0da007b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.TxRollbackBody;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class TxRollbackHandler implements StateAwareMethodListener<TxRollbackBody>
-{
-    private static TxRollbackHandler _instance = new TxRollbackHandler();
-
-    public static TxRollbackHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private TxRollbackHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, TxRollbackBody body, final int channelId) throws AMQException
-    {
-        final AMQProtocolSession session = stateManager.getProtocolSession();
-
-        try
-        {
-            AMQChannel channel = session.getChannel(channelId);
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(channelId);
-            }
-
-
-
-            final MethodRegistry methodRegistry = session.getMethodRegistry();
-            final AMQMethodBody responseBody = methodRegistry.createTxRollbackOkBody();
-
-            Runnable task = new Runnable()
-            {
-
-                public void run()
-                {
-                    session.writeFrame(responseBody.generateFrame(channelId));
-                }
-            };
-
-            channel.rollback(task);
-
-            //Now resend all the unacknowledged messages back to the original subscribers.
-            //(Must be done after the TxnRollback-ok response).
-            // Why, are we not allowed to send messages back to client before the ok method?
-            channel.resend(false);
-
-        }
-        catch (AMQException e)
-        {
-            throw body.getChannelException(e.getErrorCode(), "Failed to rollback: " + e.getMessage());
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
deleted file mode 100644
index a43e1ebdab..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.TxSelectBody;
-import org.apache.qpid.framing.TxSelectOkBody;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
-import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-
-public class TxSelectHandler implements StateAwareMethodListener<TxSelectBody>
-{
-    private static TxSelectHandler _instance = new TxSelectHandler();
-
-    public static TxSelectHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private TxSelectHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, TxSelectBody body, int channelId) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(channelId);
-        }
-
-        channel.setLocalTransactional();
-
-        MethodRegistry methodRegistry = session.getMethodRegistry();
-        TxSelectOkBody responseBody = methodRegistry.createTxSelectOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java
deleted file mode 100644
index 32a9f768ec..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/UnexpectedMethodException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol.v0_8.handler;

-

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AMQMethodBody;

-

-public class UnexpectedMethodException extends AMQException

-{

-

-    private static final long serialVersionUID = -255921574946294892L;

-

-    public UnexpectedMethodException(AMQMethodBody body)

-    {

-        super("Unexpected method recevied: " + body.getClass().getName());

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
deleted file mode 100644
index 48e42ce5a3..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-/*

- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.

- * Supported AMQP versions:

- *   8-0

- */

-package org.apache.qpid.server.protocol.v0_8.output;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AMQDataBlock;

-import org.apache.qpid.framing.AMQShortString;

-import org.apache.qpid.framing.ContentHeaderBody;

-import org.apache.qpid.framing.abstraction.MessagePublishInfo;

-import org.apache.qpid.server.message.MessageContentSource;

-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;

-import org.apache.qpid.server.queue.QueueEntry;

-

-public interface ProtocolOutputConverter

-{

-    void confirmConsumerAutoClose(int channelId, AMQShortString consumerTag);

-

-    interface Factory

-    {

-        ProtocolOutputConverter newInstance(AMQProtocolSession session);

-    }

-

-    void writeDeliver(QueueEntry entry, int channelId, long deliveryTag, AMQShortString consumerTag)

-            throws AMQException;

-

-    void writeGetOk(QueueEntry message, int channelId, long deliveryTag, int queueSize) throws AMQException;

-

-    byte getProtocolMinorVersion();

-

-    byte getProtocolMajorVersion();

-

-    void writeReturn(MessagePublishInfo messagePublishInfo, ContentHeaderBody header, MessageContentSource msgContent,  int channelId, int replyCode, AMQShortString replyText)

-                    throws AMQException;

-

-    void writeFrame(AMQDataBlock block);

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
deleted file mode 100644
index dd5e13e56a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.output;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQBody;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicCancelOkBody;
-import org.apache.qpid.framing.BasicGetOkBody;
-import org.apache.qpid.framing.BasicReturnBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
-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.protocol.v0_8.AMQMessage;
-import org.apache.qpid.server.message.MessageContentSource;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.QueueEntry;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-class ProtocolOutputConverterImpl implements ProtocolOutputConverter
-{
-    private static final int BASIC_CLASS_ID = 60;
-
-    private final MethodRegistry _methodRegistry;
-    private final AMQProtocolSession _protocolSession;
-
-    ProtocolOutputConverterImpl(AMQProtocolSession session, MethodRegistry methodRegistry)
-    {
-        _protocolSession = session;
-        _methodRegistry = methodRegistry;
-    }
-
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        return _protocolSession;
-    }
-
-    public void writeDeliver(QueueEntry entry, int channelId, long deliveryTag, AMQShortString consumerTag)
-            throws AMQException
-    {
-        AMQMessage msg = convertToAMQMessage(entry);
-        AMQBody deliverBody = createEncodedDeliverBody(msg, entry.isRedelivered(), deliveryTag, consumerTag);
-        writeMessageDelivery(msg, channelId, deliverBody);
-    }
-
-    private AMQMessage convertToAMQMessage(QueueEntry entry)
-    {
-        ServerMessage serverMessage = entry.getMessage();
-        if(serverMessage instanceof AMQMessage)
-        {
-            return (AMQMessage) serverMessage;
-        }
-        else
-        {
-            return getMessageConverter(serverMessage).convert(serverMessage, entry.getQueue().getVirtualHost());
-        }
-    }
-
-    private <M extends ServerMessage> MessageConverter<M, AMQMessage> getMessageConverter(M message)
-    {
-        Class<M> clazz = (Class<M>) message.getClass();
-        return MessageConverterRegistry.getConverter(clazz, AMQMessage.class);
-    }
-
-    private void writeMessageDelivery(AMQMessage message, int channelId, AMQBody deliverBody)
-            throws AMQException
-    {
-        writeMessageDelivery(message, message.getContentHeaderBody(), channelId, deliverBody);
-    }
-
-    private void writeMessageDelivery(MessageContentSource message, ContentHeaderBody contentHeaderBody, int channelId, AMQBody deliverBody)
-            throws AMQException
-    {
-
-
-        int bodySize = (int) message.getSize();
-
-        if(bodySize == 0)
-        {
-            SmallCompositeAMQBodyBlock compositeBlock = new SmallCompositeAMQBodyBlock(channelId, deliverBody,
-                                                                             contentHeaderBody);
-
-            writeFrame(compositeBlock);
-        }
-        else
-        {
-            int maxBodySize = (int) getProtocolSession().getMaxFrameSize() - AMQFrame.getFrameOverhead();
-
-
-            int capacity = bodySize > maxBodySize ? maxBodySize : bodySize;
-
-            int writtenSize = capacity;
-
-            AMQBody firstContentBody = new MessageContentSourceBody(message,0,capacity);
-
-            CompositeAMQBodyBlock
-                    compositeBlock = new CompositeAMQBodyBlock(channelId, deliverBody, contentHeaderBody, firstContentBody);
-            writeFrame(compositeBlock);
-
-            while(writtenSize < bodySize)
-            {
-                capacity = bodySize - writtenSize > maxBodySize ? maxBodySize : bodySize - writtenSize;
-                MessageContentSourceBody body = new MessageContentSourceBody(message, writtenSize, capacity);
-                writtenSize += capacity;
-
-                writeFrame(new AMQFrame(channelId, body));
-            }
-        }
-    }
-
-    private class MessageContentSourceBody implements AMQBody
-    {
-        public static final byte TYPE = 3;
-        private int _length;
-        private MessageContentSource _message;
-        private int _offset;
-
-        public MessageContentSourceBody(MessageContentSource message, int offset, int length)
-        {
-            _message = message;
-            _offset = offset;
-            _length = length;
-        }
-
-        public byte getFrameType()
-        {
-            return TYPE;
-        }
-
-        public int getSize()
-        {
-            return _length;
-        }
-
-        public void writePayload(DataOutput buffer) throws IOException
-        {
-            ByteBuffer buf = _message.getContent(_offset, _length);
-
-            if(buf.hasArray())
-            {
-                buffer.write(buf.array(), buf.arrayOffset()+buf.position(), buf.remaining());
-            }
-            else
-            {
-
-                byte[] data = new byte[_length];
-
-                buf.get(data);
-
-                buffer.write(data);
-            }
-        }
-
-        public void handle(int channelId, AMQVersionAwareProtocolSession amqProtocolSession) throws AMQException
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    public void writeGetOk(QueueEntry entry, int channelId, long deliveryTag, int queueSize) throws AMQException
-    {
-        AMQBody deliver = createEncodedGetOkBody(entry, deliveryTag, queueSize);
-        writeMessageDelivery(convertToAMQMessage(entry), channelId, deliver);
-    }
-
-
-    private AMQBody createEncodedDeliverBody(AMQMessage message,
-                                             boolean isRedelivered,
-                                             final long deliveryTag,
-                                             final AMQShortString consumerTag)
-            throws AMQException
-    {
-
-        final AMQShortString exchangeName;
-        final AMQShortString routingKey;
-
-        final MessagePublishInfo pb = message.getMessagePublishInfo();
-        exchangeName = pb.getExchange();
-        routingKey = pb.getRoutingKey();
-
-        final AMQBody returnBlock = new EncodedDeliveryBody(deliveryTag, routingKey, exchangeName, consumerTag, isRedelivered);
-        return returnBlock;
-    }
-
-    private class EncodedDeliveryBody implements AMQBody
-    {
-        private final long _deliveryTag;
-        private final AMQShortString _routingKey;
-        private final AMQShortString _exchangeName;
-        private final AMQShortString _consumerTag;
-        private final boolean _isRedelivered;
-        private AMQBody _underlyingBody;
-
-        private EncodedDeliveryBody(long deliveryTag, AMQShortString routingKey, AMQShortString exchangeName, AMQShortString consumerTag, boolean isRedelivered)
-        {
-            _deliveryTag = deliveryTag;
-            _routingKey = routingKey;
-            _exchangeName = exchangeName;
-            _consumerTag = consumerTag;
-            _isRedelivered = isRedelivered;
-        }
-
-        public AMQBody createAMQBody()
-        {
-            return _methodRegistry.createBasicDeliverBody(_consumerTag,
-                                                          _deliveryTag,
-                                                          _isRedelivered,
-                                                          _exchangeName,
-                                                          _routingKey);
-        }
-
-        public byte getFrameType()
-        {
-            return AMQMethodBody.TYPE;
-        }
-
-        public int getSize()
-        {
-            if(_underlyingBody == null)
-            {
-                _underlyingBody = createAMQBody();
-            }
-            return _underlyingBody.getSize();
-        }
-
-        public void writePayload(DataOutput buffer) throws IOException
-        {
-            if(_underlyingBody == null)
-            {
-                _underlyingBody = createAMQBody();
-            }
-            _underlyingBody.writePayload(buffer);
-        }
-
-        public void handle(final int channelId, final AMQVersionAwareProtocolSession amqMinaProtocolSession)
-            throws AMQException
-        {
-            throw new AMQException("This block should never be dispatched!");
-        }
-
-        @Override
-        public String toString()
-        {
-            return "[" + getClass().getSimpleName() + " underlyingBody: " + String.valueOf(_underlyingBody) + "]";
-        }
-    }
-
-    private AMQBody createEncodedGetOkBody(QueueEntry entry, long deliveryTag, int queueSize)
-            throws AMQException
-    {
-        final AMQShortString exchangeName;
-        final AMQShortString routingKey;
-
-        final AMQMessage message = convertToAMQMessage(entry);
-        final MessagePublishInfo pb = message.getMessagePublishInfo();
-        exchangeName = pb.getExchange();
-        routingKey = pb.getRoutingKey();
-
-        final boolean isRedelivered = entry.isRedelivered();
-
-        BasicGetOkBody getOkBody =
-                _methodRegistry.createBasicGetOkBody(deliveryTag,
-                                                    isRedelivered,
-                                                    exchangeName,
-                                                    routingKey,
-                                                    queueSize);
-
-        return getOkBody;
-    }
-
-    public byte getProtocolMinorVersion()
-    {
-        return _protocolSession.getProtocolMinorVersion();
-    }
-
-    public byte getProtocolMajorVersion()
-    {
-        return getProtocolSession().getProtocolMajorVersion();
-    }
-
-    private AMQBody createEncodedReturnFrame(MessagePublishInfo messagePublishInfo,
-                                             int replyCode,
-                                             AMQShortString replyText) throws AMQException
-    {
-
-        BasicReturnBody basicReturnBody =
-                _methodRegistry.createBasicReturnBody(replyCode,
-                                                     replyText,
-                                                     messagePublishInfo.getExchange(),
-                                                     messagePublishInfo.getRoutingKey());
-
-
-        return basicReturnBody;
-    }
-
-    public void writeReturn(MessagePublishInfo messagePublishInfo, ContentHeaderBody header, MessageContentSource message, int channelId, int replyCode, AMQShortString replyText)
-            throws AMQException
-    {
-
-        AMQBody returnFrame = createEncodedReturnFrame(messagePublishInfo, replyCode, replyText);
-
-        writeMessageDelivery(message, header, channelId, returnFrame);
-    }
-
-
-    public void writeFrame(AMQDataBlock block)
-    {
-        getProtocolSession().writeFrame(block);
-    }
-
-
-    public void confirmConsumerAutoClose(int channelId, AMQShortString consumerTag)
-    {
-
-        BasicCancelOkBody basicCancelOkBody = _methodRegistry.createBasicCancelOkBody(consumerTag);
-        writeFrame(basicCancelOkBody.generateFrame(channelId));
-
-    }
-
-
-    public static final class CompositeAMQBodyBlock extends AMQDataBlock
-    {
-        public static final int OVERHEAD = 3 * AMQFrame.getFrameOverhead();
-
-        private final AMQBody _methodBody;
-        private final AMQBody _headerBody;
-        private final AMQBody _contentBody;
-        private final int _channel;
-
-
-        public CompositeAMQBodyBlock(int channel, AMQBody methodBody, AMQBody headerBody, AMQBody contentBody)
-        {
-            _channel = channel;
-            _methodBody = methodBody;
-            _headerBody = headerBody;
-            _contentBody = contentBody;
-        }
-
-        public long getSize()
-        {
-            return OVERHEAD + _methodBody.getSize() + _headerBody.getSize() + _contentBody.getSize();
-        }
-
-        public void writePayload(DataOutput buffer) throws IOException
-        {
-            AMQFrame.writeFrames(buffer, _channel, _methodBody, _headerBody, _contentBody);
-        }
-
-        @Override
-        public String toString()
-        {
-            StringBuilder builder = new StringBuilder();
-            builder.append("[").append(getClass().getSimpleName())
-                .append(" methodBody=").append(_methodBody)
-                .append(", headerBody=").append(_headerBody)
-                .append(", contentBody=").append(_contentBody)
-                .append(", channel=").append(_channel).append("]");
-            return builder.toString();
-        }
-
-    }
-
-    public static final class SmallCompositeAMQBodyBlock extends AMQDataBlock
-    {
-        public static final int OVERHEAD = 2 * AMQFrame.getFrameOverhead();
-
-        private final AMQBody _methodBody;
-        private final AMQBody _headerBody;
-        private final int _channel;
-
-
-        public SmallCompositeAMQBodyBlock(int channel, AMQBody methodBody, AMQBody headerBody)
-        {
-            _channel = channel;
-            _methodBody = methodBody;
-            _headerBody = headerBody;
-
-        }
-
-        public long getSize()
-        {
-            return OVERHEAD + _methodBody.getSize() + _headerBody.getSize() ;
-        }
-
-        public void writePayload(DataOutput buffer) throws IOException
-        {
-            AMQFrame.writeFrames(buffer, _channel, _methodBody, _headerBody);
-        }
-
-        @Override
-        public String toString()
-        {
-            StringBuilder builder = new StringBuilder();
-            builder.append(getClass().getSimpleName())
-                .append("methodBody=").append(_methodBody)
-                .append(", headerBody=").append(_headerBody)
-                .append(", channel=").append(_channel).append("]");
-            return builder.toString();
-        }
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
deleted file mode 100644
index d4332b37ee..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-/*

- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.

- * Supported AMQP versions:

- *   8-0

- */

-package org.apache.qpid.server.protocol.v0_8.output;

-

-import org.apache.qpid.framing.MethodRegistry;

-import org.apache.qpid.framing.ProtocolVersion;

-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter.Factory;

-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;

-

-import java.util.HashMap;

-import java.util.Map;

-

-public class ProtocolOutputConverterRegistry

-{

-

-    private static final Map<ProtocolVersion, Factory> _registry =

-            new HashMap<ProtocolVersion, Factory>();

-

-

-    static

-    {

-        register(ProtocolVersion.v8_0);

-        register(ProtocolVersion.v0_9);

-        register(ProtocolVersion.v0_91);

-    }

-

-    private ProtocolOutputConverterRegistry()

-    {

-    }

-

-    private static void register(ProtocolVersion version)

-    {

-

-        _registry.put(version,new ConverterFactory(version));

-    }

-

-

-    public static ProtocolOutputConverter getConverter(AMQProtocolSession session)

-    {

-        return _registry.get(session.getProtocolVersion()).newInstance(session);

-    }

-

-    private static class ConverterFactory implements Factory

-    {

-        private ProtocolVersion _protocolVersion;

-        private MethodRegistry _methodRegistry;

-        private int _classId;

-

-        public ConverterFactory(ProtocolVersion pv)

-        {

-            _protocolVersion = pv;

-

-        }

-

-        public synchronized ProtocolOutputConverter newInstance(AMQProtocolSession session)

-        {

-            if(_methodRegistry == null)

-            {

-

-                _methodRegistry = MethodRegistry.getMethodRegistry(_protocolVersion);

-

-            }

-            return new ProtocolOutputConverterImpl(session, _methodRegistry);

-        }

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java
deleted file mode 100644
index ee97d5fa87..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQState.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.state;
-
-/**
- * States used in the AMQ protocol. Used by the finite state machine to determine
- * valid responses.
- */
-public enum AMQState
-{
-    CONNECTION_NOT_STARTED,
-    CONNECTION_NOT_AUTH,
-    CONNECTION_NOT_TUNED,
-    CONNECTION_NOT_OPENED,
-    CONNECTION_OPEN,
-    CONNECTION_CLOSING,
-    CONNECTION_CLOSED
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
deleted file mode 100644
index 0555bba98b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.state;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.framing.ChannelOpenBody;
-import org.apache.qpid.framing.MethodDispatcher;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQMethodListener;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.security.SecurityManager;
-import org.apache.qpid.server.security.SubjectCreator;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-
-import java.util.concurrent.CopyOnWriteArraySet;
-
-/**
- * The state manager is responsible for managing the state of the protocol session. <p/> For each AMQProtocolHandler
- * there is a separate state manager.
- */
-public class AMQStateManager implements AMQMethodListener
-{
-    private static final Logger _logger = Logger.getLogger(AMQStateManager.class);
-
-    private final Broker _broker;
-    private final AMQProtocolSession _protocolSession;
-    /** The current state */
-    private AMQState _currentState;
-
-    private CopyOnWriteArraySet<StateListener> _stateListeners = new CopyOnWriteArraySet<StateListener>();
-
-    public AMQStateManager(Broker broker, AMQProtocolSession protocolSession)
-    {
-        _broker = broker;
-        _protocolSession = protocolSession;
-        _currentState = AMQState.CONNECTION_NOT_STARTED;
-
-    }
-
-    /**
-     * Get the Broker instance
-     *
-     * @return the Broker
-     */
-    public Broker getBroker()
-    {
-        return _broker;
-    }
-
-    public AMQState getCurrentState()
-    {
-        return _currentState;
-    }
-
-    public void changeState(AMQState newState) throws AMQException
-    {
-        _logger.debug("State changing to " + newState + " from old state " + _currentState);
-        final AMQState oldState = _currentState;
-        _currentState = newState;
-
-        for (StateListener l : _stateListeners)
-        {
-            l.stateChanged(oldState, newState);
-        }
-    }
-
-    public void error(Exception e)
-    {
-        _logger.error("State manager received error notification[Current State:" + _currentState + "]: " + e, e);
-        for (StateListener l : _stateListeners)
-        {
-            l.error(e);
-        }
-    }
-
-    public <B extends AMQMethodBody> boolean methodReceived(AMQMethodEvent<B> evt) throws AMQException
-    {
-        MethodDispatcher dispatcher = _protocolSession.getMethodDispatcher();
-
-        final int channelId = evt.getChannelId();
-        B body = evt.getMethod();
-
-        if(channelId != 0 && _protocolSession.getChannel(channelId)== null)
-        {
-
-            if(! ((body instanceof ChannelOpenBody)
-                  || (body instanceof ChannelCloseOkBody)
-                  || (body instanceof ChannelCloseBody)))
-            {
-                throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "channel is closed won't process:" + body);
-            }
-
-        }
-
-        return body.execute(dispatcher, channelId);
-
-    }
-
-    private <B extends AMQMethodBody> void checkChannel(AMQMethodEvent<B> evt, AMQProtocolSession protocolSession)
-        throws AMQException
-    {
-        if ((evt.getChannelId() != 0) && !(evt.getMethod() instanceof ChannelOpenBody)
-                && (protocolSession.getChannel(evt.getChannelId()) == null)
-                && !protocolSession.channelAwaitingClosure(evt.getChannelId()))
-        {
-            throw evt.getMethod().getChannelNotFoundException(evt.getChannelId());
-        }
-    }
-
-    public void addStateListener(StateListener listener)
-    {
-        _logger.debug("Adding state listener");
-        _stateListeners.add(listener);
-    }
-
-    public void removeStateListener(StateListener listener)
-    {
-        _stateListeners.remove(listener);
-    }
-
-    public VirtualHostRegistry getVirtualHostRegistry()
-    {
-        return _broker.getVirtualHostRegistry();
-    }
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        SecurityManager.setThreadSubject(_protocolSession.getAuthorizedSubject());
-        return _protocolSession;
-    }
-
-
-    public SubjectCreator getSubjectCreator()
-    {
-        return _broker.getSubjectCreator(getProtocolSession().getLocalAddress());
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java
deleted file mode 100644
index f61553f8a2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/IllegalStateTransitionException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.state;
-
-import org.apache.qpid.AMQException;
-
-/**
- * @todo Not an AMQP exception as no status code.
- *
- * @todo Not used! Delete.
- */
-public class IllegalStateTransitionException extends AMQException
-{
-    private AMQState _originalState;
-
-    private Class _frame;
-
-    public IllegalStateTransitionException(AMQState originalState, Class frame)
-    {
-        super("No valid state transition defined for receiving frame " + frame + " from state " + originalState);
-        _originalState = originalState;
-        _frame = frame;
-    }
-
-    public AMQState getOriginalState()
-    {
-        return _originalState;
-    }
-
-    public Class getFrameClass()
-    {
-        return _frame;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
deleted file mode 100644
index 63ab23919d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.state;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-
-/**
- * A frame listener that is informed of the protocol state when invoked and has
- * the opportunity to update state.
- *
- */
-public interface StateAwareMethodListener<B extends AMQMethodBody>
-{
-    void methodReceived(AMQStateManager stateManager,  B evt, int channelId) throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java
deleted file mode 100644
index e065ae0d42..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.state;
-
-import org.apache.qpid.AMQException;
-
-public interface StateListener
-{
-    void stateChanged(AMQState oldState, AMQState newState) throws AMQException;
-
-    void error(Throwable t);
-}
diff --git a/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType b/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
deleted file mode 100644
index 43ad3adf13..0000000000
--- a/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-org.apache.qpid.server.protocol.v0_8.MessageMetaDataType_0_8
diff --git a/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator b/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
deleted file mode 100644
index 57ca615a04..0000000000
--- a/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-org.apache.qpid.server.protocol.v0_8.ProtocolEngineCreator_0_8
-org.apache.qpid.server.protocol.v0_8.ProtocolEngineCreator_0_9
-org.apache.qpid.server.protocol.v0_8.ProtocolEngineCreator_0_9_1
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index d413c4d4c9..701ccaab47 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.configuration.ConfigurationException;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.NullRootMessageLogger;
 import org.apache.qpid.server.util.BrokerTestHelper;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
deleted file mode 100644
index 0d4b4ba9f8..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
-package org.apache.qpid.server.protocol;
-
-import static org.mockito.Mockito.when;
-
-import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
-
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.TestNetworkConnection;
-
-public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
-{
-    private VirtualHost _virtualHost;
-    private Broker _broker;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _broker = BrokerTestHelper.createBrokerMock();
-        VirtualHostRegistry virtualHostRegistry = _broker.getVirtualHostRegistry();
-        when(_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST)).thenReturn("default");
-
-        // AMQP 1-0 connection needs default vhost to be present
-        _virtualHost = BrokerTestHelper.createVirtualHost("default", virtualHostRegistry);
-    }
-
-    @Override
-    protected void tearDown() throws Exception
-    {
-        try
-        {
-            _virtualHost.close();
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-            super.tearDown();
-        }
-    }
-
-    private static final byte[] AMQP_0_8_HEADER =
-        new byte[] { (byte) 'A',
-                     (byte) 'M',
-                     (byte) 'Q',
-                     (byte) 'P',
-                     (byte) 1,
-                     (byte) 1,
-                     (byte) 8,
-                     (byte) 0
-        };
-
-    private static final byte[] AMQP_0_9_HEADER =
-        new byte[] { (byte) 'A',
-                     (byte) 'M',
-                     (byte) 'Q',
-                     (byte) 'P',
-                     (byte) 1,
-                     (byte) 1,
-                     (byte) 0,
-                     (byte) 9
-        };
-
-    private static final byte[] AMQP_0_9_1_HEADER =
-        new byte[] { (byte) 'A',
-                     (byte) 'M',
-                     (byte) 'Q',
-                     (byte) 'P',
-                     (byte) 0,
-                     (byte) 0,
-                     (byte) 9,
-                     (byte) 1
-        };
-
-
-    private static final byte[] AMQP_0_10_HEADER =
-        new byte[] { (byte) 'A',
-                     (byte) 'M',
-                     (byte) 'Q',
-                     (byte) 'P',
-                     (byte) 1,
-                     (byte) 1,
-                     (byte) 0,
-                     (byte) 10
-        };
-
-
-    private static final byte[] AMQP_1_0_0_HEADER =
-            new byte[] {
-                    (byte)'A',
-                    (byte)'M',
-                    (byte)'Q',
-                    (byte)'P',
-                    (byte) 0,
-                    (byte) 1,
-                    (byte) 0,
-                    (byte) 0
-            };
-
-
-    private byte[] getAmqpHeader(final AmqpProtocolVersion version)
-    {
-        switch(version)
-        {
-            case v0_8:
-                return AMQP_0_8_HEADER;
-            case v0_9:
-                return AMQP_0_9_HEADER;
-            case v0_9_1:
-                return AMQP_0_9_1_HEADER;
-            case v0_10:
-                return AMQP_0_10_HEADER;
-            case v1_0_0:
-                return AMQP_1_0_0_HEADER;
-            default:
-                fail("unknown AMQP version, appropriate header must be added for new protocol version");
-                return null;
-        }
-    }
-
-    /**
-     * Test to verify that connections established using a MultiVersionProtocolEngine are assigned
-     * IDs from a common sequence, independent of the protocol version under use.
-     */
-    public void testDifferentProtocolVersionsShareCommonIDNumberingSequence()
-    {
-        Set<AmqpProtocolVersion> versions = EnumSet.allOf(AmqpProtocolVersion.class);
-
-        MultiVersionProtocolEngineFactory factory =
-            new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, null, null,
-                    org.apache.qpid.server.model.Transport.TCP);
-
-        //create a dummy to retrieve the 'current' ID number
-        long previousId = factory.newProtocolEngine().getConnectionId();
-
-        //create a protocol engine and send the AMQP header for all supported AMQP verisons,
-        //ensuring the ID assigned increases as expected
-        for(AmqpProtocolVersion version : versions)
-        {
-            long expectedID = previousId + 1;
-            byte[] header = getAmqpHeader(version);
-            assertNotNull("protocol header should not be null", header);
-
-            ServerProtocolEngine engine = factory.newProtocolEngine();
-            TestNetworkConnection conn = new TestNetworkConnection();
-            engine.setNetworkConnection(conn, conn.getSender());
-            assertEquals("ID did not increment as expected", expectedID, engine.getConnectionId());
-
-            //actually feed in the AMQP header for this protocol version, and ensure the ID remains consistent
-            engine.received(ByteBuffer.wrap(header));
-            assertEquals("ID was not as expected following receipt of the AMQP version header", expectedID, engine.getConnectionId());
-
-            previousId = expectedID;
-            engine.closed();
-        }
-    }
-
-    /**
-     * Test to verify that when requesting a ProtocolEngineFactory to produce engines having a default reply to unsupported
-     * version initiations, there is enforcement that the default reply is itself a supported protocol version.
-     */
-    public void testUnsupportedDefaultReplyCausesIllegalArgumentException()
-    {
-        Set<AmqpProtocolVersion> versions = EnumSet.allOf(AmqpProtocolVersion.class);
-        versions.remove(AmqpProtocolVersion.v0_9);
-
-        try
-        {
-            new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, AmqpProtocolVersion.v0_9, null,
-                    org.apache.qpid.server.model.Transport.TCP);
-            fail("should not have been allowed to create the factory");
-        }
-        catch(IllegalArgumentException iae)
-        {
-            //expected
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
deleted file mode 100644
index b358c7c5c5..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.message.MessageContentSource;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class AMQChannelTest extends QpidTestCase
-{
-    private VirtualHost _virtualHost;
-    private AMQProtocolSession _protocolSession;
-    private Map<Integer,String> _replies;
-    private Broker _broker;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _virtualHost = BrokerTestHelper.createVirtualHost(getTestName());
-        _broker = BrokerTestHelper.createBrokerMock();
-        _protocolSession = new InternalTestProtocolSession(_virtualHost, _broker)
-        {
-            @Override
-            public void writeReturn(MessagePublishInfo messagePublishInfo,
-                    ContentHeaderBody header,
-                    MessageContentSource msgContent,
-                    int channelId,
-                    int replyCode,
-                    AMQShortString replyText) throws AMQException
-                    {
-                        _replies.put(replyCode, replyText.asString());
-                    }
-        };
-        _replies = new HashMap<Integer, String>();
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            _virtualHost.close();
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-            super.tearDown();
-        }
-    }
-
-    public void testCompareTo() throws Exception
-    {
-        AMQChannel channel1 = new AMQChannel(_protocolSession, 1, _virtualHost.getMessageStore());
-
-        // create a channel with the same channelId but on a different session
-        AMQChannel channel2 = new AMQChannel(new InternalTestProtocolSession(_virtualHost, _broker), 1, _virtualHost.getMessageStore());
-        assertFalse("Unexpected compare result", channel1.compareTo(channel2) == 0);
-        assertEquals("Unexpected compare result", 0, channel1.compareTo(channel1));
-    }
-
-    public void testPublishContentHeaderWhenMessageAuthorizationFails() throws Exception
-    {
-        setTestSystemProperty(BrokerProperties.PROPERTY_MSG_AUTH, "true");
-        AMQChannel channel = new AMQChannel(_protocolSession, 1, _virtualHost.getMessageStore());
-        channel.setLocalTransactional();
-
-        MessagePublishInfo info = mock(MessagePublishInfo.class);
-        Exchange e = mock(Exchange.class);
-        ContentHeaderBody contentHeaderBody= mock(ContentHeaderBody.class);
-        BasicContentHeaderProperties properties = mock(BasicContentHeaderProperties.class);
-
-        when(contentHeaderBody.getProperties()).thenReturn(properties);
-        when(info.getExchange()).thenReturn(new AMQShortString("test"));
-        when(properties.getUserId()).thenReturn(new AMQShortString(_protocolSession.getAuthorizedPrincipal().getName() + "_incorrect"));
-
-        channel.setPublishFrame(info, e);
-        channel.publishContentHeader(contentHeaderBody);
-        channel.commit();
-
-        assertEquals("Unexpected number of replies", 1, _replies.size());
-        assertEquals("Message authorization passed", "Access Refused", _replies.get(403));
-    }
-
-    public void testPublishContentHeaderWhenMessageAuthorizationPasses() throws Exception
-    {
-        setTestSystemProperty(BrokerProperties.PROPERTY_MSG_AUTH, "true");
-        AMQChannel channel = new AMQChannel(_protocolSession, 1, _virtualHost.getMessageStore());
-        channel.setLocalTransactional();
-
-        MessagePublishInfo info = mock(MessagePublishInfo.class);
-        Exchange e = mock(Exchange.class);
-        ContentHeaderBody contentHeaderBody= mock(ContentHeaderBody.class);
-        BasicContentHeaderProperties properties = mock(BasicContentHeaderProperties.class);
-
-        when(contentHeaderBody.getProperties()).thenReturn(properties);
-        when(info.getExchange()).thenReturn(new AMQShortString("test"));
-        when(properties.getUserId()).thenReturn(new AMQShortString(_protocolSession.getAuthorizedPrincipal().getName()));
-
-        channel.setPublishFrame(info, e);
-        channel.publishContentHeader(contentHeaderBody);
-        channel.commit();
-
-        assertEquals("Unexpected number of replies", 0, _replies.size());
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
deleted file mode 100644
index f5e58cfd02..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.qpid.server.protocol.v0_8;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.properties.ConnectionStartProperties;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.network.NetworkConnection;
-
-public class AMQProtocolEngineTest extends QpidTestCase
-{
-    private Broker _broker;
-    private Port _port;
-    private NetworkConnection _network;
-    private Transport _transport;
-
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _broker = BrokerTestHelper.createBrokerMock();
-        when(_broker.getAttribute(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE)).thenReturn(true);
-
-        _port = mock(Port.class);
-        _network = mock(NetworkConnection.class);
-        _transport = Transport.TCP;
-    }
-
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            super.tearDown();
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-        }
-    }
-
-    public void testSetClientPropertiesForNoRouteProvidedAsString()
-    {
-        AMQProtocolEngine engine = new AMQProtocolEngine(_broker, _network, 0, _port, _transport);
-        assertTrue("Unexpected closeWhenNoRoute before client properties set", engine.isCloseWhenNoRoute());
-
-        Map<String, Object> clientProperties = new HashMap<String, Object>();
-        clientProperties.put(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE, Boolean.FALSE.toString());
-        engine.setClientProperties(FieldTable.convertToFieldTable(clientProperties));
-
-        assertFalse("Unexpected closeWhenNoRoute after client properties set", engine.isCloseWhenNoRoute());
-    }
-
-    public void testSetClientPropertiesForNoRouteProvidedAsBoolean()
-    {
-        AMQProtocolEngine engine = new AMQProtocolEngine(_broker, _network, 0, _port, _transport);
-        assertTrue("Unexpected closeWhenNoRoute before client properties set", engine.isCloseWhenNoRoute());
-
-        Map<String, Object> clientProperties = new HashMap<String, Object>();
-        clientProperties.put(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE, Boolean.FALSE);
-        engine.setClientProperties(FieldTable.convertToFieldTable(clientProperties));
-
-        assertFalse("Unexpected closeWhenNoRoute after client properties set", engine.isCloseWhenNoRoute());
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
deleted file mode 100644
index 4ab64ca100..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.flow.LimitlessCreditManager;
-import org.apache.qpid.server.flow.Pre0_10CreditManager;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.txn.AutoCommitTransaction;
-import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-/**
- * Tests that acknowledgements are handled correctly.
- */
-public class AckTest extends QpidTestCase
-{
-    private Subscription _subscription;
-
-    private AMQProtocolSession _protocolSession;
-
-    private TestableMemoryMessageStore _messageStore;
-
-    private AMQChannel _channel;
-
-    private AMQQueue _queue;
-
-    private static final AMQShortString DEFAULT_CONSUMER_TAG = new AMQShortString("conTag");
-    private VirtualHost _virtualHost;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _channel = BrokerTestHelper_0_8.createChannel(5);
-        _protocolSession = _channel.getProtocolSession();
-        _virtualHost = _protocolSession.getVirtualHost();
-        _queue = BrokerTestHelper.createQueue(getTestName(), _virtualHost);
-        _messageStore = (TestableMemoryMessageStore)_virtualHost.getMessageStore();
-    }
-
-    @Override
-    protected void tearDown() throws Exception
-    {
-        BrokerTestHelper.tearDown();
-        super.tearDown();
-    }
-
-    private void publishMessages(int count) throws AMQException
-    {
-        publishMessages(count, false);
-    }
-
-    private void publishMessages(int count, boolean persistent) throws AMQException
-    {
-        _queue.registerSubscription(_subscription,false);
-        for (int i = 1; i <= count; i++)
-        {
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Establish some way to determine the version for the test.
-            MessagePublishInfo publishBody = new MessagePublishInfo()
-            {
-
-                public AMQShortString getExchange()
-                {
-                    return new AMQShortString("someExchange");
-                }
-
-                public void setExchange(AMQShortString exchange)
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
-                public boolean isImmediate()
-                {
-                    return false;
-                }
-
-                public boolean isMandatory()
-                {
-                    return false;
-                }
-
-                public AMQShortString getRoutingKey()
-                {
-                    return new AMQShortString("rk");
-                }
-            };
-            final IncomingMessage msg = new IncomingMessage(publishBody);
-            //IncomingMessage msg2 = null;
-            BasicContentHeaderProperties b = new BasicContentHeaderProperties();
-            ContentHeaderBody cb = new ContentHeaderBody();
-            cb.setProperties(b);
-
-            if (persistent)
-            {
-                //This is DeliveryMode.PERSISTENT
-                b.setDeliveryMode((byte) 2);
-            }
-
-            msg.setContentHeaderBody(cb);
-
-            // we increment the reference here since we are not delivering the messaging to any queues, which is where
-            // the reference is normally incremented. The test is easier to construct if we have direct access to the
-            // subscription
-            ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
-            qs.add(_queue);
-            msg.enqueue(qs);
-            MessageMetaData mmd = msg.headersReceived(System.currentTimeMillis());
-            final StoredMessage storedMessage = _messageStore.addMessage(mmd);
-            msg.setStoredMessage(storedMessage);
-            final AMQMessage message = new AMQMessage(storedMessage);
-            if(msg.allContentReceived())
-            {
-                ServerTransaction txn = new AutoCommitTransaction(_messageStore);
-                txn.enqueue(_queue, message, new ServerTransaction.Action() {
-                    public void postCommit()
-                    {
-                        try
-                        {
-
-                            _queue.enqueue(message);
-                        }
-                        catch (AMQException e)
-                        {
-                             throw new RuntimeException(e);
-                        }
-                    }
-
-                    public void onRollback()
-                    {
-                        //To change body of implemented methods use File | Settings | File Templates.
-                    }
-                });
-
-            }
-            // we manually send the message to the subscription
-            //_subscription.send(new QueueEntry(_queue,msg), _queue);
-        }
-        try
-        {
-            Thread.sleep(2000L);
-        }
-        catch (InterruptedException e)
-        {
-            Thread.currentThread().interrupt();
-        }
-
-    }
-
-    /**
-     * Tests that the acknowledgements are correctly associated with a channel and
-     * order is preserved when acks are enabled
-     */
-    public void testAckChannelAssociationTest() throws AMQException
-    {
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, true, null, false, new LimitlessCreditManager());
-        final int msgCount = 10;
-        publishMessages(msgCount, true);
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertEquals("Unextpected size for unacknowledge message map",msgCount,map.size());
-
-        Set<Long> deliveryTagSet = map.getDeliveryTags();
-        int i = 1;
-        for (long deliveryTag : deliveryTagSet)
-        {
-            assertTrue(deliveryTag == i);
-            i++;
-            QueueEntry unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.getQueue() == _queue);
-        }
-
-    }
-
-    /**
-     * Tests that in no-ack mode no messages are retained
-     */
-    public void testNoAckMode() throws AMQException
-    {
-        // false arg means no acks expected
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, false, null, false, new LimitlessCreditManager());
-        final int msgCount = 10;
-        publishMessages(msgCount);
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertTrue(map.size() == 0);
-        assertTrue(_messageStore.getMessageCount() == 0);
-
-
-    }
-
-    /**
-     * Tests that in no-ack mode no messages are retained
-     */
-    public void testPersistentNoAckMode() throws AMQException
-    {
-        // false arg means no acks expected
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, false,null,false, new LimitlessCreditManager());
-        final int msgCount = 10;
-        publishMessages(msgCount, true);
-
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertTrue(map.size() == 0);
-        assertTrue(_messageStore.getMessageCount() == 0);
-
-
-    }
-
-    /**
-     * Tests that a single acknowledgement is handled correctly (i.e multiple flag not
-     * set case)
-     */
-    public void testSingleAckReceivedTest() throws AMQException
-    {
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, true,null,false, new LimitlessCreditManager());
-        final int msgCount = 10;
-        publishMessages(msgCount);
-
-        _channel.acknowledgeMessage(5, false);
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertEquals("Map not expected size",msgCount - 1,map.size());
-
-        Set<Long> deliveryTagSet = map.getDeliveryTags();
-        int i = 1;
-        for (long deliveryTag : deliveryTagSet)
-        {
-            assertTrue(deliveryTag == i);
-            QueueEntry unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.getQueue() == _queue);
-            // 5 is the delivery tag of the message that *should* be removed
-            if (++i == 5)
-            {
-                ++i;
-            }
-        }
-    }
-
-    /**
-     * Tests that a single acknowledgement is handled correctly (i.e multiple flag not
-     * set case)
-     */
-    public void testMultiAckReceivedTest() throws AMQException
-    {
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, true,null,false, new LimitlessCreditManager());
-        final int msgCount = 10;
-        publishMessages(msgCount);
-
-
-
-        _channel.acknowledgeMessage(5, true);
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertTrue(map.size() == 5);
-
-        Set<Long> deliveryTagSet = map.getDeliveryTags();
-        int i = 1;
-        for (long deliveryTag : deliveryTagSet)
-        {
-            assertTrue(deliveryTag == i + 5);
-            QueueEntry unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.getQueue() == _queue);
-            ++i;
-        }
-    }
-
-    /**
-     * Tests that a multiple acknowledgement is handled correctly. When ack'ing all pending msgs.
-     */
-    public void testMultiAckAllReceivedTest() throws AMQException
-    {
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, true,null,false, new LimitlessCreditManager());
-        final int msgCount = 10;
-        publishMessages(msgCount);
-
-        _channel.acknowledgeMessage(0, true);
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertTrue(map.size() == 0);
-
-        Set<Long> deliveryTagSet = map.getDeliveryTags();
-        int i = 1;
-        for (long deliveryTag : deliveryTagSet)
-        {
-            assertTrue(deliveryTag == i + 5);
-            QueueEntry unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.getQueue() == _queue);
-            ++i;
-        }
-    }
-
-            /**
-     * A regression fixing QPID-1136 showed this up
-     *
-     * @throws Exception
-     */
-    public void testMessageDequeueRestoresCreditTest() throws Exception
-    {
-        // Send 10 messages
-        Pre0_10CreditManager creditManager = new Pre0_10CreditManager(0l, 1);
-
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession,
-                                                                            DEFAULT_CONSUMER_TAG, true, null, false, creditManager);
-        final int msgCount = 1;
-        publishMessages(msgCount);
-
-        _queue.deliverAsync(_subscription);
-
-        _channel.acknowledgeMessage(1, false);
-
-        // Check credit available
-        assertTrue("No credit available", creditManager.hasCredit());
-
-    }
-
-
-/*
-    public void testPrefetchHighLow() throws AMQException
-    {
-        int lowMark = 5;
-        int highMark = 10;
-
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, true,null,false, new LimitlessCreditManager());
-        _channel.setPrefetchLowMarkCount(lowMark);
-        _channel.setPrefetchHighMarkCount(highMark);
-
-        assertTrue(_channel.getPrefetchLowMarkCount() == lowMark);
-        assertTrue(_channel.getPrefetchHighMarkCount() == highMark);
-
-        publishMessages(highMark);
-
-        // at this point we should have sent out only highMark messages
-        // which have not bee received so will be queued up in the channel
-        // which should be suspended
-        assertTrue(_subscription.isSuspended());
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertTrue(map.size() == highMark);
-
-        //acknowledge messages so we are just above lowMark
-        _channel.acknowledgeMessage(lowMark - 1, true);
-
-        //we should still be suspended
-        assertTrue(_subscription.isSuspended());
-        assertTrue(map.size() == lowMark + 1);
-
-        //acknowledge one more message
-        _channel.acknowledgeMessage(lowMark, true);
-
-        //and suspension should be lifted
-        assertTrue(!_subscription.isSuspended());
-
-        //pubilsh more msgs so we are just below the limit
-        publishMessages(lowMark - 1);
-
-        //we should not be suspended
-        assertTrue(!_subscription.isSuspended());
-
-        //acknowledge all messages
-        _channel.acknowledgeMessage(0, true);
-        try
-        {
-            Thread.sleep(3000);
-        }
-        catch (InterruptedException e)
-        {
-            _log.error("Error: " + e, e);
-        }
-        //map will be empty
-        assertTrue(map.size() == 0);
-    }
-
-*/
-/*
-    public void testPrefetch() throws AMQException
-    {
-        _subscription = SubscriptionFactoryImpl.INSTANCE.createSubscription(5, _protocolSession, DEFAULT_CONSUMER_TAG, true,null,false, new LimitlessCreditManager());
-        _channel.setMessageCredit(5);
-
-        assertTrue(_channel.getPrefetchCount() == 5);
-
-        final int msgCount = 5;
-        publishMessages(msgCount);
-
-        // at this point we should have sent out only 5 messages with a further 5 queued
-        // up in the channel which should now be suspended
-        assertTrue(_subscription.isSuspended());
-        UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
-        assertTrue(map.size() == 5);
-        _channel.acknowledgeMessage(5, true);
-        assertTrue(!_subscription.isSuspended());
-        try
-        {
-            Thread.sleep(3000);
-        }
-        catch (InterruptedException e)
-        {
-            _log.error("Error: " + e, e);
-        }
-        assertTrue(map.size() == 0);
-    }
-
-*/
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(AckTest.class);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
deleted file mode 100644
index a9eb0ebfe7..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.queue.SimpleAMQQueue;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-import java.util.List;
-
-public class AcknowledgeTest extends QpidTestCase
-{
-    private AMQChannel _channel;
-    private SimpleAMQQueue _queue;
-    private MessageStore _messageStore;
-    private String _queueName;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _channel = BrokerTestHelper_0_8.createChannel();
-        VirtualHost virtualHost = _channel.getVirtualHost();
-        _queueName = getTestName();
-        _queue = BrokerTestHelper.createQueue(_queueName, virtualHost);
-        _messageStore = virtualHost.getMessageStore();
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            if (_channel != null)
-            {
-                _channel.getVirtualHost().close();
-            }
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-            super.tearDown();
-        }
-    }
-
-    private AMQChannel getChannel()
-    {
-        return _channel;
-    }
-
-    private InternalTestProtocolSession getSession()
-    {
-        return (InternalTestProtocolSession)_channel.getProtocolSession();
-    }
-
-    private SimpleAMQQueue getQueue()
-    {
-        return _queue;
-    }
-
-    public void testTransactionalSingleAck() throws AMQException
-    {
-        getChannel().setLocalTransactional();
-        runMessageAck(1, 1, 1, false, 0);
-    }
-
-    public void testTransactionalMultiAck() throws AMQException
-    {
-        getChannel().setLocalTransactional();
-        runMessageAck(10, 1, 5, true, 5);
-    }
-
-    public void testTransactionalAckAll() throws AMQException
-    {
-        getChannel().setLocalTransactional();
-        runMessageAck(10, 1, 0, true, 0);
-    }
-
-    public void testNonTransactionalSingleAck() throws AMQException
-    {
-        runMessageAck(1, 1, 1, false, 0);
-    }
-
-    public void testNonTransactionalMultiAck() throws AMQException
-    {
-        runMessageAck(10, 1, 5, true, 5);
-    }
-
-    public void testNonTransactionalAckAll() throws AMQException
-    {
-        runMessageAck(10, 1, 0, true, 0);
-    }
-
-    protected void runMessageAck(int sendMessageCount, long firstDeliveryTag, long acknowledgeDeliveryTag, boolean acknowldegeMultiple, int remainingUnackedMessages) throws AMQException
-    {
-        //Check store is empty
-        checkStoreContents(0);
-
-        //Send required messsages to the queue
-        BrokerTestHelper_0_8.publishMessages(getChannel(),
-                sendMessageCount,
-                _queueName,
-                ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString());
-
-        if (getChannel().isTransactional())
-        {
-            getChannel().commit();
-        }
-
-        //Ensure they are stored
-        checkStoreContents(sendMessageCount);
-
-        //Check that there are no unacked messages
-        assertEquals("Channel should have no unacked msgs ", 0, getChannel().getUnacknowledgedMessageMap().size());
-
-        //Subscribe to the queue
-        AMQShortString subscriber = _channel.subscribeToQueue(null, _queue, true, null, false, true);
-
-        getQueue().deliverAsync();
-
-        //Wait for the messages to be delivered
-        getSession().awaitDelivery(sendMessageCount);
-
-        //Check that they are all waiting to be acknoledged
-        assertEquals("Channel should have unacked msgs", sendMessageCount, getChannel().getUnacknowledgedMessageMap().size());
-
-        List<InternalTestProtocolSession.DeliveryPair> messages = getSession().getDelivers(getChannel().getChannelId(), subscriber, sendMessageCount);
-
-        //Double check we received the right number of messages
-        assertEquals(sendMessageCount, messages.size());
-
-        //Check that the first message has the expected deliveryTag
-        assertEquals("First message does not have expected deliveryTag", firstDeliveryTag, messages.get(0).getDeliveryTag());
-
-        //Send required Acknowledgement
-        getChannel().acknowledgeMessage(acknowledgeDeliveryTag, acknowldegeMultiple);
-
-        if (getChannel().isTransactional())
-        {
-            getChannel().commit();
-        }
-
-        // Check Remaining Acknowledgements
-        assertEquals("Channel unacked msgs count incorrect", remainingUnackedMessages, getChannel().getUnacknowledgedMessageMap().size());
-
-        //Check store contents are also correct.
-        checkStoreContents(remainingUnackedMessages);
-    }
-
-    private void checkStoreContents(int messageCount)
-    {
-        assertEquals("Message header count incorrect in the MetaDataMap", messageCount, ((TestableMemoryMessageStore) _messageStore).getMessageCount());
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
deleted file mode 100644
index 0919607bd7..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class BrokerTestHelper_0_8 extends BrokerTestHelper
-{
-
-    public static AMQChannel createChannel(int channelId, AMQProtocolSession session) throws AMQException
-    {
-        AMQChannel channel = new AMQChannel(session, channelId, session.getVirtualHost().getMessageStore());
-        session.addChannel(channel);
-        return channel;
-    }
-
-    public static AMQChannel createChannel(int channelId) throws Exception
-    {
-        InternalTestProtocolSession session = createProtocolSession();
-        return createChannel(channelId, session);
-    }
-
-    public static AMQChannel createChannel() throws Exception
-    {
-        return createChannel(1);
-    }
-
-    public static InternalTestProtocolSession createProtocolSession() throws Exception
-    {
-        return createProtocolSession("test");
-    }
-
-    public static InternalTestProtocolSession createProtocolSession(String hostName) throws Exception
-    {
-        VirtualHost virtualHost = createVirtualHost(hostName);
-        return new InternalTestProtocolSession(virtualHost, createBrokerMock());
-    }
-
-    public static void publishMessages(AMQChannel channel, int numberOfMessages, String queueName, String exchangeName) throws AMQException
-    {
-        AMQShortString rouningKey = new AMQShortString(queueName);
-        AMQShortString exchangeNameAsShortString = new AMQShortString(exchangeName);
-        MessagePublishInfo info = mock(MessagePublishInfo.class);
-        when(info.getExchange()).thenReturn(exchangeNameAsShortString);
-        when(info.getRoutingKey()).thenReturn(rouningKey);
-
-        Exchange exchange = channel.getVirtualHost().getExchange(exchangeName);
-        for (int count = 0; count < numberOfMessages; count++)
-        {
-            channel.setPublishFrame(info, exchange);
-
-            // Set the body size
-            ContentHeaderBody _headerBody = new ContentHeaderBody();
-            _headerBody.setBodySize(0);
-
-            // Set Minimum properties
-            BasicContentHeaderProperties properties = new BasicContentHeaderProperties();
-
-            properties.setExpiration(0L);
-            properties.setTimestamp(System.currentTimeMillis());
-
-            // Make Message Persistent
-            properties.setDeliveryMode((byte) 2);
-
-            _headerBody.setProperties(properties);
-
-            channel.publishContentHeader(_headerBody);
-        }
-        channel.sync();
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
deleted file mode 100644
index 7f36b4a081..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import junit.framework.TestCase;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.queue.QueueEntryIterator;
-import org.apache.qpid.server.queue.SimpleQueueEntryList;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.TestMemoryMessageStore;
-import org.apache.qpid.server.subscription.MockSubscription;
-import org.apache.qpid.server.subscription.Subscription;
-
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-/**
- * QPID-1385 : Race condition between added to unacked map and resending due to a rollback.
- *
- * In AMQChannel _unackedMap.clear() was done after the visit. This meant that the clear was not in the same
- * synchronized block as as the preparation to resend.
- *
- * This clearing/prep for resend was done as a result of the rollback call. HOWEVER, the delivery thread was still
- * in the process of sending messages to the client. It is therefore possible that a message could block on the
- * _unackedMap lock waiting for the visit to compelete so that it can add the new message to the unackedMap....
- * which is then cleared by the resend/rollback thread.
- *
- * This problem was encountered by the testSend2ThenRollback test.
- *
- * To try and increase the chance of the race condition occuring this test will send multiple messages so that the
- * delivery thread will be in progress while the rollback method is called. Hopefully this will cause the
- * deliveryTag to be lost
- */
-public class ExtractResendAndRequeueTest extends TestCase
-{
-
-    private UnacknowledgedMessageMapImpl _unacknowledgedMessageMap;
-    private static final int INITIAL_MSG_COUNT = 10;
-    private AMQQueue _queue = new MockAMQQueue(getName());
-    private MessageStore _messageStore = new TestMemoryMessageStore();
-    private LinkedList<QueueEntry> _referenceList = new LinkedList<QueueEntry>();
-
-    @Override
-    public void setUp() throws AMQException
-    {
-        _unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(100);
-
-        long id = 0;
-        SimpleQueueEntryList list = new SimpleQueueEntryList(_queue);
-
-        // Add initial messages to QueueEntryList
-        for (int count = 0; count < INITIAL_MSG_COUNT; count++)
-        {
-            AMQMessage msg = new MockAMQMessage(id);
-
-            list.add(msg);
-
-            //Increment ID;
-            id++;
-        }
-
-        // Iterate through the QueueEntryList and add entries to unacknowledgeMessageMap and referecenList
-        QueueEntryIterator queueEntries = list.iterator();
-        while(queueEntries.advance())
-        {
-            QueueEntry entry = queueEntries.getNode();
-            _unacknowledgedMessageMap.add(entry.getMessage().getMessageNumber(), entry);
-
-            // Store the entry for future inspection
-            _referenceList.add(entry);
-        }
-
-        assertEquals("Map does not contain correct setup data", INITIAL_MSG_COUNT, _unacknowledgedMessageMap.size());
-    }
-
-    /**
-     * Helper method to create a new subscription and aquire the given messages.
-     *
-     * @param messageList The messages to aquire
-     *
-     * @return Subscription that performed the aquire
-     */
-    private Subscription createSubscriptionAndAquireMessages(LinkedList<QueueEntry> messageList)
-    {
-        Subscription subscription = new MockSubscription();
-
-        // Aquire messages in subscription
-        for (QueueEntry entry : messageList)
-        {
-            entry.acquire(subscription);
-        }
-
-        return subscription;
-    }
-
-    /**
-     * This is the normal consumer rollback method.
-     *
-     * An active consumer that has aquired messages expects those messasges to be reset when rollback is requested.
-     *
-     * This test validates that the msgToResend map includes all the messages and none are left behind.
-     *
-     * @throws AMQException the visit interface throws this
-     */
-    public void testResend() throws AMQException
-    {
-        //We don't need the subscription object here.
-        createSubscriptionAndAquireMessages(_referenceList);
-
-        final Map<Long, QueueEntry> msgToRequeue = new LinkedHashMap<Long, QueueEntry>();
-        final Map<Long, QueueEntry> msgToResend = new LinkedHashMap<Long, QueueEntry>();
-
-        // requeueIfUnabletoResend doesn't matter here.
-        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap, msgToRequeue,
-                                                                    msgToResend, true, _messageStore));
-
-        assertEquals("Message count for resend not correct.", INITIAL_MSG_COUNT, msgToResend.size());
-        assertEquals("Message count for requeue not correct.", 0, msgToRequeue.size());
-        assertEquals("Map was not emptied", 0, _unacknowledgedMessageMap.size());
-    }
-
-    /**
-     * This is the normal consumer close method.
-     *
-     * When a consumer that has aquired messages expects closes the messages that it has aquired should be removed from
-     * the unacknowledgeMap and placed in msgToRequeue
-     *
-     * This test validates that the msgToRequeue map includes all the messages and none are left behind.
-     *
-     * @throws AMQException the visit interface throws this
-     */
-    public void testRequeueDueToSubscriptionClosure() throws AMQException
-    {
-        Subscription subscription = createSubscriptionAndAquireMessages(_referenceList);
-
-        // Close subscription
-        subscription.close();
-
-        final Map<Long, QueueEntry> msgToRequeue = new LinkedHashMap<Long, QueueEntry>();
-        final Map<Long, QueueEntry> msgToResend = new LinkedHashMap<Long, QueueEntry>();
-
-        // requeueIfUnabletoResend doesn't matter here.
-        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap, msgToRequeue,
-                                                                    msgToResend, true, _messageStore));
-
-        assertEquals("Message count for resend not correct.", 0, msgToResend.size());
-        assertEquals("Message count for requeue not correct.", INITIAL_MSG_COUNT, msgToRequeue.size());
-        assertEquals("Map was not emptied", 0, _unacknowledgedMessageMap.size());
-    }
-
-    /**
-     * If the subscription is null, due to message being retrieved via a GET, And we request that messages are requeued
-     * requeueIfUnabletoResend(set to true) then all messages should be sent to the msgToRequeue map.
-     *
-     * @throws AMQException the visit interface throws this
-     */
-
-    public void testRequeueDueToMessageHavingNoConsumerTag() throws AMQException
-    {
-        final Map<Long, QueueEntry> msgToRequeue = new LinkedHashMap<Long, QueueEntry>();
-        final Map<Long, QueueEntry> msgToResend = new LinkedHashMap<Long, QueueEntry>();
-
-        // requeueIfUnabletoResend = true so all messages should go to msgToRequeue
-        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap, msgToRequeue,
-                                                                    msgToResend, true, _messageStore));
-
-        assertEquals("Message count for resend not correct.", 0, msgToResend.size());
-        assertEquals("Message count for requeue not correct.", INITIAL_MSG_COUNT, msgToRequeue.size());
-        assertEquals("Map was not emptied", 0, _unacknowledgedMessageMap.size());
-    }
-
-    /**
-     * If the subscription is null, due to message being retrieved via a GET, And we request that we don't
-     * requeueIfUnabletoResend(set to false) then all messages should be dropped as we do not have a dead letter queue.
-     *
-     * @throws AMQException the visit interface throws this
-     */
-
-    public void testDrop() throws AMQException
-    {
-        final Map<Long, QueueEntry> msgToRequeue = new LinkedHashMap<Long, QueueEntry>();
-        final Map<Long, QueueEntry> msgToResend = new LinkedHashMap<Long, QueueEntry>();
-
-        // requeueIfUnabletoResend = false so all messages should be dropped all maps should be empty
-        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap, msgToRequeue,
-                                                                    msgToResend, false, _messageStore));
-
-        assertEquals("Message count for resend not correct.", 0, msgToResend.size());
-        assertEquals("Message count for requeue not correct.", 0, msgToRequeue.size());
-        assertEquals("Map was not emptied", 0, _unacknowledgedMessageMap.size());
-
-
-        for (QueueEntry entry : _referenceList)
-        {
-            assertTrue("Message was not discarded", entry.isDeleted());
-        }
-
-    }
-
-    /**
-     * If the subscription is null, due to message being retrieved via a GET, AND the queue upon which the message was
-     * delivered has been deleted then it is not possible to requeue. Currently we simply discar the message but in the
-     * future we may wish to dead letter the message.
-     *
-     * Validate that at the end of the visit all Maps are empty and all messages are marked as deleted
-     *
-     * @throws AMQException the visit interface throws this
-     */
-    public void testDiscard() throws AMQException
-    {
-        final Map<Long, QueueEntry> msgToRequeue = new LinkedHashMap<Long, QueueEntry>();
-        final Map<Long, QueueEntry> msgToResend = new LinkedHashMap<Long, QueueEntry>();
-
-        _queue.delete();
-
-        // requeueIfUnabletoResend : value doesn't matter here as queue has been deleted
-        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap, msgToRequeue,
-                                                                    msgToResend, false, _messageStore));
-
-        assertEquals("Message count for resend not correct.", 0, msgToResend.size());
-        assertEquals("Message count for requeue not correct.", 0, msgToRequeue.size());
-        assertEquals("Map was not emptied", 0, _unacknowledgedMessageMap.size());
-
-        for (QueueEntry entry : _referenceList)
-        {
-            assertTrue("Message was not discarded", entry.isDeleted());
-        }
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
deleted file mode 100644
index e8fda2bc65..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
-import org.apache.qpid.server.message.MessageContentSource;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolEngine;
-import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.subscription.ClientDeliveryMethod;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.protocol.v0_8.SubscriptionImpl;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.TestNetworkConnection;
-
-import javax.security.auth.Subject;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class InternalTestProtocolSession extends AMQProtocolEngine implements ProtocolOutputConverter
-{
-    // ChannelID(LIST)  -> LinkedList<Pair>
-    private final Map<Integer, Map<AMQShortString, LinkedList<DeliveryPair>>> _channelDelivers;
-    private AtomicInteger _deliveryCount = new AtomicInteger(0);
-    private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
-
-    public InternalTestProtocolSession(VirtualHost virtualHost, Broker broker) throws AMQException
-    {
-        super(broker, new TestNetworkConnection(), ID_GENERATOR.getAndIncrement(), null, null);
-
-        _channelDelivers = new HashMap<Integer, Map<AMQShortString, LinkedList<DeliveryPair>>>();
-
-        setTestAuthorizedSubject();
-        setVirtualHost(virtualHost);
-    }
-
-    private void setTestAuthorizedSubject()
-    {
-        Principal principal = new AuthenticatedPrincipal(new UsernamePrincipal("InternalTestProtocolSession"));
-        Subject authorizedSubject = new Subject(
-                true,
-                Collections.singleton(principal),
-                Collections.emptySet(),
-                Collections.emptySet());
-
-        setAuthorizedSubject(authorizedSubject);
-    }
-
-    public ProtocolOutputConverter getProtocolOutputConverter()
-    {
-        return this;
-    }
-
-    public byte getProtocolMajorVersion()
-    {
-        return (byte) 8;
-    }
-
-    public void writeReturn(MessagePublishInfo messagePublishInfo,
-                            ContentHeaderBody header,
-                            MessageContentSource msgContent,
-                            int channelId,
-                            int replyCode,
-                            AMQShortString replyText) throws AMQException
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public byte getProtocolMinorVersion()
-    {
-        return (byte) 0;
-    }
-
-    // ***
-
-    public List<DeliveryPair> getDelivers(int channelId, AMQShortString consumerTag, int count)
-    {
-        synchronized (_channelDelivers)
-        {
-            List<DeliveryPair> all =_channelDelivers.get(channelId).get(consumerTag);
-
-            if (all == null)
-            {
-                return new ArrayList<DeliveryPair>(0);
-            }
-
-            List<DeliveryPair> msgs = all.subList(0, count);
-
-            List<DeliveryPair> response = new ArrayList<DeliveryPair>(msgs);
-
-            //Remove the msgs from the receivedList.
-            msgs.clear();
-
-            return response;
-        }
-    }
-
-    // *** ProtocolOutputConverter Implementation
-    public void writeReturn(AMQMessage message, int channelId, int replyCode, AMQShortString replyText) throws AMQException
-    {
-    }
-
-    public ClientDeliveryMethod createDeliveryMethod(int channelId)
-    {
-        return new InternalWriteDeliverMethod(channelId);
-    }
-
-    public void confirmConsumerAutoClose(int channelId, AMQShortString consumerTag)
-    {
-    }
-
-    public void writeDeliver(QueueEntry entry, int channelId, long deliveryTag, AMQShortString consumerTag) throws AMQException
-    {
-        _deliveryCount.incrementAndGet();
-
-        synchronized (_channelDelivers)
-        {
-            Map<AMQShortString, LinkedList<DeliveryPair>> consumers = _channelDelivers.get(channelId);
-
-            if (consumers == null)
-            {
-                consumers = new HashMap<AMQShortString, LinkedList<DeliveryPair>>();
-                _channelDelivers.put(channelId, consumers);
-            }
-
-            LinkedList<DeliveryPair> consumerDelivers = consumers.get(consumerTag);
-
-            if (consumerDelivers == null)
-            {
-                consumerDelivers = new LinkedList<DeliveryPair>();
-                consumers.put(consumerTag, consumerDelivers);
-            }
-
-            consumerDelivers.add(new DeliveryPair(deliveryTag, (AMQMessage)entry.getMessage()));
-        }
-    }
-
-    public void writeGetOk(QueueEntry message, int channelId, long deliveryTag, int queueSize) throws AMQException
-    {
-    }
-
-    public void awaitDelivery(int msgs)
-    {
-        while (msgs > _deliveryCount.get())
-        {
-            try
-            {
-                Thread.sleep(100);
-            }
-            catch (InterruptedException e)
-            {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public class DeliveryPair
-    {
-        private long _deliveryTag;
-        private AMQMessage _message;
-
-        public DeliveryPair(long deliveryTag, AMQMessage message)
-        {
-            _deliveryTag = deliveryTag;
-            _message = message;
-        }
-
-        public AMQMessage getMessage()
-        {
-            return _message;
-        }
-
-        public long getDeliveryTag()
-        {
-            return _deliveryTag;
-        }
-    }
-
-    public void closeProtocolSession()
-    {
-        // Override as we don't have a real IOSession to close.
-        //  The alternative is to fully implement the TestIOSession to return a CloseFuture from close();
-        //  Then the AMQMinaProtocolSession can join on the returning future without a NPE.
-    }
-
-    public void closeSession(AMQSessionModel session, AMQConstant cause, String message) throws AMQException
-    {
-        super.closeSession(session, cause, message);
-
-        //Simulate the Client responding with a CloseOK
-        // should really update the StateManger but we don't have access here
-        // changeState(AMQState.CONNECTION_CLOSED);
-        ((AMQChannel)session).getProtocolSession().closeSession();
-
-    }
-
-    private class InternalWriteDeliverMethod implements ClientDeliveryMethod
-    {
-        private int _channelId;
-
-        public InternalWriteDeliverMethod(int channelId)
-        {
-            _channelId = channelId;
-        }
-
-
-        public void deliverToClient(Subscription sub, QueueEntry entry, long deliveryTag) throws AMQException
-        {
-            _deliveryCount.incrementAndGet();
-
-            synchronized (_channelDelivers)
-            {
-                Map<AMQShortString, LinkedList<DeliveryPair>> consumers = _channelDelivers.get(_channelId);
-
-                if (consumers == null)
-                {
-                    consumers = new HashMap<AMQShortString, LinkedList<DeliveryPair>>();
-                    _channelDelivers.put(_channelId, consumers);
-                }
-
-                LinkedList<DeliveryPair> consumerDelivers = consumers.get(((SubscriptionImpl)sub).getConsumerTag());
-
-                if (consumerDelivers == null)
-                {
-                    consumerDelivers = new LinkedList<DeliveryPair>();
-                    consumers.put(((SubscriptionImpl)sub).getConsumerTag(), consumerDelivers);
-                }
-
-                consumerDelivers.add(new DeliveryPair(deliveryTag, (AMQMessage)entry.getMessage()));
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
deleted file mode 100644
index a77475c05f..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-/** Test class to test MBean operations for AMQMinaProtocolSession. */
-public class MaxChannelsTest extends QpidTestCase
-{
-    private AMQProtocolEngine _session;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _session = BrokerTestHelper_0_8.createProtocolSession();
-    }
-
-    public void testChannels() throws Exception
-    {
-        // check the channel count is correct
-        int channelCount = _session.getChannels().size();
-        assertEquals("Initial channel count wrong", 0, channelCount);
-
-        long maxChannels = 10L;
-        _session.setMaximumNumberOfChannels(maxChannels);
-        assertEquals("Number of channels not correctly set.", new Long(maxChannels), _session.getMaximumNumberOfChannels());
-
-        for (long currentChannel = 0L; currentChannel < maxChannels; currentChannel++)
-        {
-            _session.addChannel(new AMQChannel(_session, (int) currentChannel, null));
-        }
-
-        try
-        {
-            _session.addChannel(new AMQChannel(_session, (int) maxChannels, null));
-            fail("Cannot create more channels then maximum");
-        }
-        catch (AMQException e)
-        {
-            assertEquals("Wrong exception recevied.", e.getErrorCode(), AMQConstant.NOT_ALLOWED);
-        }
-        assertEquals("Maximum number of channels not set.", new Long(maxChannels), new Long(_session.getChannels().size()));
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            _session.getVirtualHost().close();
-            _session.closeSession();
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-            super.tearDown();
-        }
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
deleted file mode 100644
index 1cc3607298..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-public class MockAMQMessage extends AMQMessage
-{
-    public MockAMQMessage(long messageId)
-    {
-       super(new MockStoredMessage(messageId));
-    }
-
-    public MockAMQMessage(long messageId, String headerName, Object headerValue)
-    {
-       super(new MockStoredMessage(messageId, headerName, headerValue));
-    }
-
-    @Override
-    public long getSize()
-    {
-        return 0l;
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
deleted file mode 100644
index ab29e58a6c..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-
-public class MockMessagePublishInfo implements MessagePublishInfo
-{
-    public AMQShortString getExchange()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void setExchange(AMQShortString exchange)
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public boolean isImmediate()
-    {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public boolean isMandatory()
-    {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public AMQShortString getRoutingKey()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
deleted file mode 100755
index 15573a871f..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.store.StoreFuture;
-import org.apache.qpid.server.store.StoredMessage;
-
-import java.nio.ByteBuffer;
-
-public class MockStoredMessage implements StoredMessage<MessageMetaData>
-{
-    private long _messageId;
-    private MessageMetaData _metaData;
-    private final ByteBuffer _content;
-
-    public MockStoredMessage(long messageId)
-    {
-        this(messageId, (String)null, null);
-    }
-
-    public MockStoredMessage(long messageId, String headerName, Object headerValue)
-    {
-        this(messageId, new MockMessagePublishInfo(), new ContentHeaderBody(new BasicContentHeaderProperties(), 60), headerName, headerValue);
-    }
-
-    public MockStoredMessage(long messageId, MessagePublishInfo info, ContentHeaderBody chb)
-    {
-        this(messageId, info, chb, null, null);
-    }
-
-    public MockStoredMessage(long messageId, MessagePublishInfo info, ContentHeaderBody chb, String headerName, Object headerValue)
-    {
-        _messageId = messageId;
-        if (headerName != null)
-        {
-            FieldTable headers = new FieldTable();
-            headers.setString(headerName, headerValue == null? null :String.valueOf(headerValue));
-            ((BasicContentHeaderProperties)chb.getProperties()).setHeaders(headers);
-        }
-        _metaData = new MessageMetaData(info, chb, 0);
-        _content = ByteBuffer.allocate(_metaData.getContentSize());
-    }
-
-    public MessageMetaData getMetaData()
-    {
-        return _metaData;
-    }
-
-    public long getMessageNumber()
-    {
-        return _messageId;
-    }
-
-    public void addContent(int offsetInMessage, ByteBuffer src)
-    {
-        src = src.duplicate();
-        ByteBuffer dst = _content.duplicate();
-        dst.position(offsetInMessage);
-        dst.put(src);
-    }
-
-    public int getContent(int offset, ByteBuffer dst)
-    {
-        ByteBuffer src = _content.duplicate();
-        src.position(offset);
-        src = src.slice();
-        if(dst.remaining() < src.limit())
-        {
-            src.limit(dst.remaining());
-        }
-        dst.put(src);
-        return src.limit();
-    }
-
-
-
-    public ByteBuffer getContent(int offsetInMessage, int size)
-    {
-        ByteBuffer buf = ByteBuffer.allocate(size);
-        getContent(offsetInMessage, buf);
-        buf.position(0);
-        return  buf;
-    }
-
-    public StoreFuture flushToStore()
-    {
-        return StoreFuture.IMMEDIATE_FUTURE;
-    }
-
-    public void remove()
-    {
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
deleted file mode 100644
index 21142e7ab6..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.SimpleAMQQueue;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-import java.util.List;
-
-public class QueueBrowserUsesNoAckTest extends QpidTestCase
-{
-    private AMQChannel _channel;
-    private SimpleAMQQueue _queue;
-    private MessageStore _messageStore;
-    private String _queueName;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _channel = BrokerTestHelper_0_8.createChannel();
-        VirtualHost virtualHost = _channel.getVirtualHost();
-        _queueName = getTestName();
-        _queue = BrokerTestHelper.createQueue(_queueName, virtualHost);
-        _messageStore = virtualHost.getMessageStore();
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            if (_channel != null)
-            {
-                _channel.getVirtualHost().close();
-            }
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-            super.tearDown();
-        }
-    }
-
-    private AMQChannel getChannel()
-    {
-        return _channel;
-    }
-
-    private InternalTestProtocolSession getSession()
-    {
-        return (InternalTestProtocolSession)_channel.getProtocolSession();
-    }
-
-    private SimpleAMQQueue getQueue()
-    {
-        return _queue;
-    }
-
-    public void testQueueBrowserUsesNoAck() throws AMQException
-    {
-        int sendMessageCount = 2;
-        int prefetch = 1;
-
-        //Check store is empty
-        checkStoreContents(0);
-
-        //Send required messsages to the queue
-        BrokerTestHelper_0_8.publishMessages(getChannel(),
-                sendMessageCount,
-                _queueName,
-                ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString());
-
-        //Ensure they are stored
-        checkStoreContents(sendMessageCount);
-
-        //Check that there are no unacked messages
-        assertEquals("Channel should have no unacked msgs ", 0,
-                     getChannel().getUnacknowledgedMessageMap().size());
-
-        //Set the prefetch on the session to be less than the sent messages
-        getChannel().setCredit(0, prefetch);
-
-        //browse the queue
-        AMQShortString browser = browse(getChannel(), getQueue());
-
-        getQueue().deliverAsync();
-
-        //Wait for messages to fill the prefetch
-        getSession().awaitDelivery(prefetch);
-
-        //Get those messages
-        List<InternalTestProtocolSession.DeliveryPair> messages =
-                getSession().getDelivers(getChannel().getChannelId(), browser,
-                                     prefetch);
-
-        //Ensure we recevied the prefetched messages
-        assertEquals(prefetch, messages.size());
-
-        //Check the process didn't suspend the subscription as this would
-        // indicate we are using the prefetch credit. i.e. using acks not No-Ack
-        assertTrue("The subscription has been suspended",
-                   !getChannel().getSubscription(browser).getState()
-                           .equals(Subscription.State.SUSPENDED));
-    }
-
-    private void checkStoreContents(int messageCount)
-    {
-        assertEquals("Message header count incorrect in the MetaDataMap", messageCount, ((TestableMemoryMessageStore) _messageStore).getMessageCount());
-    }
-
-    private AMQShortString browse(AMQChannel channel, AMQQueue queue) throws AMQException
-    {
-        FieldTable filters = new FieldTable();
-        filters.put(AMQPFilterTypes.NO_CONSUME.getValue(), true);
-
-        return channel.subscribeToQueue(null, queue, true, filters, false, true);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
deleted file mode 100644
index 87fbcfa9b3..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-/**
- * Tests that reference counting works correctly with AMQMessage and the message store
- */
-public class ReferenceCountingTest extends QpidTestCase
-{
-    private TestableMemoryMessageStore _store;
-
-
-    protected void setUp() throws Exception
-    {
-        _store = new TestableMemoryMessageStore();
-    }
-
-    /**
-     * Check that when the reference count is decremented the message removes itself from the store
-     */
-    public void testMessageGetsRemoved() throws AMQException
-    {
-        ContentHeaderBody chb = createPersistentContentHeader();
-
-        MessagePublishInfo info = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-
-
-
-        MessageMetaData mmd = new MessageMetaData(info, chb, 0);
-        StoredMessage storedMessage = _store.addMessage(mmd);
-
-
-        AMQMessage message = new AMQMessage(storedMessage);
-
-        MessageReference ref = message.newReference();
-
-        assertEquals(1, _store.getMessageCount());
-
-        ref.release();
-
-        assertEquals(0, _store.getMessageCount());
-    }
-
-    private ContentHeaderBody createPersistentContentHeader()
-    {
-        ContentHeaderBody chb = new ContentHeaderBody();
-        BasicContentHeaderProperties bchp = new BasicContentHeaderProperties();
-        bchp.setDeliveryMode((byte)2);
-        chb.setProperties(bchp);
-        return chb;
-    }
-
-    public void testMessageRemains() throws AMQException
-    {
-
-        MessagePublishInfo info = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-
-        final ContentHeaderBody chb = createPersistentContentHeader();
-
-        MessageMetaData mmd = new MessageMetaData(info, chb, 0);
-        StoredMessage storedMessage = _store.addMessage(mmd);
-
-        AMQMessage message = new AMQMessage(storedMessage);
-
-
-        MessageReference ref = message.newReference();
-        // we call routing complete to set up the handle
-     //   message.routingComplete(_store, _storeContext, new MessageHandleFactory());
-
-        assertEquals(1, _store.getMessageCount());
-        MessageReference ref2 = message.newReference();
-        ref.release();
-        assertEquals(1, _store.getMessageCount());
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(ReferenceCountingTest.class);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
deleted file mode 100644
index e98dd63450..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8;
-
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.logging.UnitTestMessageLogger;
-import org.apache.qpid.server.logging.actors.GenericActor;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class SubscriptionFactoryImplTest extends QpidTestCase
-{
-    private AMQChannel _channel;
-    private AMQProtocolSession _session;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        BrokerTestHelper.setUp();
-        _channel = BrokerTestHelper_0_8.createChannel();
-        _session = _channel.getProtocolSession();
-        GenericActor.setDefaultMessageLogger(new UnitTestMessageLogger(false));
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            if (_channel != null)
-            {
-                _channel.getVirtualHost().close();
-            }
-        }
-        finally
-        {
-            BrokerTestHelper.tearDown();
-            super.tearDown();
-        }
-    }
-
-    /**
-     * Tests that while creating Subscriptions of various types, the
-     * ID numbers assigned are allocated from a common sequence
-     * (in increasing order).
-     */
-    public void testDifferingSubscriptionTypesShareCommonIdNumberingSequence() throws Exception
-    {
-        //create a No-Ack subscription, get the first Subscription ID
-        long previousId = 0;
-        Subscription noAckSub = SubscriptionFactoryImpl.INSTANCE.createSubscription(1, _session, new AMQShortString("1"), false, null, false, _channel.getCreditManager());
-        previousId = noAckSub.getSubscriptionID();
-
-        //create an ack subscription, verify the next Subscription ID is used
-        Subscription ackSub = SubscriptionFactoryImpl.INSTANCE.createSubscription(1, _session, new AMQShortString("1"), true, null, false, _channel.getCreditManager());
-        assertEquals("Unexpected Subscription ID allocated", previousId + 1, ackSub.getSubscriptionID());
-        previousId = ackSub.getSubscriptionID();
-
-        //create a browser subscription
-        FieldTable filters = new FieldTable();
-        filters.put(AMQPFilterTypes.NO_CONSUME.getValue(), true);
-        Subscription browerSub = SubscriptionFactoryImpl.INSTANCE.createSubscription(1, _session, new AMQShortString("1"), true, null, false, _channel.getCreditManager());
-        assertEquals("Unexpected Subscription ID allocated", previousId + 1, browerSub.getSubscriptionID());
-        previousId = browerSub.getSubscriptionID();
-
-        //create an BasicGet NoAck subscription
-        Subscription getNoAckSub = SubscriptionFactoryImpl.INSTANCE.createBasicGetNoAckSubscription(_channel, _session, new AMQShortString("1"), null, false,
-                _channel.getCreditManager(),_channel.getClientDeliveryMethod(), _channel.getRecordDeliveryMethod());
-        assertEquals("Unexpected Subscription ID allocated", previousId + 1, getNoAckSub.getSubscriptionID());
-        previousId = getNoAckSub.getSubscriptionID();
-
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
index e0b2a90cb0..d348c3e67b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
@@ -22,7 +22,6 @@ import junit.framework.TestCase;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
 import org.apache.qpid.server.queue.QueueEntry.EntryState;
 import org.apache.qpid.server.subscription.MockSubscription;
 import org.apache.qpid.server.subscription.Subscription;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
index 806606dd0f..7add2d4d43 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
@@ -23,7 +23,6 @@ import java.util.Collections;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
 import org.apache.qpid.server.message.ServerMessage;
 
 import java.util.Arrays;