You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/21 06:37:56 UTC

svn commit: r1783835 [1/4] - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ bd...

Author: kwall
Date: Tue Feb 21 06:37:53 2017
New Revision: 1783835

URL: http://svn.apache.org/viewvc?rev=1783835&view=rev
Log:
QPID-7622: [Java Broker] [0-8..0-91]  Move most 0-8..0-91 protocol specific classes into protocol plugin

Added:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrameDecodingException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolVersionException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQShortString.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQType.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypeMap.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypedValue.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodingUtils.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQConnectionException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQDecoder.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQDataBlock.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQDataBlock.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrame.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBodyImpl.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodListener.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolClassException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolClassException.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolHeaderException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolHeaderException.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolInstanceException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolInstanceException.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolVersionException.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolVersionException.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolWriter.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQVersionAwareProtocolSession.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicAckBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicContentHeaderProperties.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicDeliverBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetEmptyBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicNackBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicPublishBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRejectBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicReturnBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicReturnBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelAlertBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelAlertBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelMethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelMethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientChannelMethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientChannelMethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodDispatcher.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodDispatcher.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/CompositeAMQDataBlock.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionCloseBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionCloseBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionCloseOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionCloseOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionRedirectBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionRedirectBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderPropertiesFactory.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderPropertiesFactory.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/EncodableAMQDataBlock.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodableAMQDataBlock.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/FrameCreatingMethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfo.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MessagePublishInfo.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodDispatcher.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodDispatcher.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodRegistry.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolVersionAware.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ServerChannelMethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerChannelMethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ServerMethodDispatcher.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodDispatcher.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ServerMethodProcessor.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodProcessor.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxCommitBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxCommitOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxRollbackBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxRollbackOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectOkBody.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ClientDecoder.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
      - copied, changed from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java
Removed:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQPInvalidClassException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQDataBlock.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrame.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrameDecodingException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBodyImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolClassException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolHeaderException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolInstanceException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolVersionException.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQShortString.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQType.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypeMap.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypedValue.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicAckBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicContentHeaderProperties.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicDeliverBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetEmptyBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicNackBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicPublishBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRejectBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicReturnBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelAlertBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelMethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientChannelMethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodDispatcher.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/CompositeAMQDataBlock.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionCloseBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionCloseOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionRedirectBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderPropertiesFactory.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodableAMQDataBlock.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodingUtils.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MessagePublishInfo.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodDispatcher.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerChannelMethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodDispatcher.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodProcessor.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectOkBody.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
Modified:
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
    qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
    qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
    qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java
    qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverter.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
    qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
    qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
    qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
    qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
    qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java Tue Feb 21 06:37:53 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.store.ber
 import com.sleepycat.bind.tuple.TupleInput;
 import com.sleepycat.bind.tuple.TupleOutput;
 
-import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class AMQShortStringEncoding
 {

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@ import com.sleepycat.bind.tuple.TupleOut
 import com.sleepycat.je.DatabaseException;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 import org.apache.qpid.server.store.berkeleydb.tuple.ByteBufferBinding;
 
 import java.nio.ByteBuffer;

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java Tue Feb 21 06:37:53 2017
@@ -43,12 +43,12 @@ import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.common.AMQPFilterTypes;
 import org.apache.qpid.server.exchange.ExchangeDefaults;
-import org.apache.qpid.server.framing.AMQFrameDecodingException;
-import org.apache.qpid.server.framing.AMQProtocolVersionException;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.FieldTable;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQProtocolVersionException;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.store.StorableMessageMetaData;

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java Tue Feb 21 06:37:53 2017
@@ -52,8 +52,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.exchange.ExchangeDefaults;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Exchange;

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java Tue Feb 21 06:37:53 2017
@@ -21,7 +21,7 @@ package org.apache.qpid.server.store.ber
 import com.sleepycat.bind.tuple.TupleInput;
 import com.sleepycat.bind.tuple.TupleOutput;
 
-import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 /**

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Tue Feb 21 06:37:53 2017
@@ -29,10 +29,10 @@ import java.util.Arrays;
 import java.util.Collections;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.BasicContentHeaderProperties;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
+import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
+import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaDataType_0_10;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java Tue Feb 21 06:37:53 2017
@@ -39,8 +39,8 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.qpid.server.common.AMQPFilterTypes;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom4To5.BindingRecord;
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom4To5.BindingTuple;
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom4To5.MessageContentKey;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java Tue Feb 21 06:37:53 2017
@@ -27,7 +27,7 @@
 * 8-0
 */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol;
 
 import java.util.SortedSet;
 import java.util.Collections;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrameDecodingException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrameDecodingException.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrameDecodingException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.server.AMQException;
 import org.apache.qpid.server.protocol.ErrorCodes;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolVersionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolVersionException.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolVersionException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java Tue Feb 21 06:37:53 2017
@@ -1,5 +1,4 @@
 /*
- *
  * 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
@@ -18,17 +17,20 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 /**
- * AMQProtocolInstanceException indicates that the client and server differ on expected protocol version  in a header.
- * <p>
- * TODO Not an AMQP exception as no status code.
+ * AMQPInvalidClassException indicates an error when trying to store an illegally typed argument in a field table.
+ *
+ * <p>TODO Could just re-use an existing exception like IllegalArgumentException or ClassCastException.
  */
-public class AMQProtocolVersionException extends AMQProtocolHeaderException
+public class AMQPInvalidClassException extends RuntimeException
 {
-    public AMQProtocolVersionException(String message, Throwable cause)
+    /** Error message text when trying to store an unsupported class or null object */
+    public static final String INVALID_OBJECT_MSG = "Only Primitive objects allowed. Object is: ";
+
+    public AMQPInvalidClassException(String s)
     {
-        super(message, cause);
+        super(s);
     }
 }

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQShortString.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQShortString.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQShortString.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java Tue Feb 21 06:37:53 2017
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQType.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQType.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQType.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.math.BigDecimal;
 import java.util.Collection;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypeMap.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypeMap.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypeMap.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypedValue.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypedValue.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQTypedValue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.math.BigDecimal;
 import java.util.Collection;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodingUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodingUtils.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodingUtils.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.nio.charset.StandardCharsets;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.math.BigDecimal;
 import java.util.AbstractCollection;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -35,7 +35,6 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.server.AMQPInvalidClassException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
 public class FieldTable

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  *
  * 
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 public class FieldTableFactory
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java Tue Feb 21 06:37:53 2017
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.server;
 
-import org.apache.qpid.server.framing.AMQFrameDecodingException;
-import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 import org.apache.qpid.server.protocol.ErrorCodes;
 import org.apache.qpid.test.utils.QpidTestCase;
 

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java (from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java Tue Feb 21 06:37:53 2017
@@ -18,12 +18,11 @@
  *
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
-import org.apache.qpid.server.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidTestCase;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 public class AMQShortStringTest extends QpidTestCase
 {
@@ -44,19 +43,11 @@ public class AMQShortStringTest extends
 
     /**
      * Test method for
-     * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(byte[])}.
+     * {@link AMQShortString#AMQShortString(byte[])}.
      */
     public void testCreateAMQShortStringByteArray()
     {
-        byte[] bytes = null;
-        try
-        {
-            bytes = "test".getBytes("UTF-8");
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            fail("UTF-8 encoding is not supported anymore by JVM:" + e.getMessage());
-        }
+        byte[] bytes = "test".getBytes(StandardCharsets.UTF_8);
         AMQShortString string = new AMQShortString(bytes);
         assertEquals("constructed amq short string length differs from expected", 4, string.length());
 
@@ -65,7 +56,7 @@ public class AMQShortStringTest extends
 
     /**
      * Test method for
-     * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(java.lang.String)}
+     * {@link AMQShortString#AMQShortString(java.lang.String)}
      * <p>
      * Tests short string construction from string with length less than 255.
      */
@@ -79,22 +70,14 @@ public class AMQShortStringTest extends
 
     /**
      * Test method for
-     * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(byte[])}.
+     * {@link AMQShortString#AMQShortString(byte[])}.
      * <p>
      * Tests an attempt to create an AMQP short string from byte array with length over 255.
      */
     public void testCreateAMQShortStringByteArrayOver255()
     {
         String test = buildString('a', 256);
-        byte[] bytes = null;
-        try
-        {
-            bytes = test.getBytes("UTF-8");
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            fail("UTF-8 encoding is not supported anymore by JVM:" + e.getMessage());
-        }
+        byte[] bytes = test.getBytes(StandardCharsets.UTF_8);
         try
         {
             new AMQShortString(bytes);
@@ -109,7 +92,7 @@ public class AMQShortStringTest extends
 
     /**
      * Test method for
-     * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(java.lang.String)}
+     * {@link AMQShortString#AMQShortString(java.lang.String)}
      * <p>
      * Tests an attempt to create an AMQP short string from string with length over 255
      */

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java (from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java Tue Feb 21 06:37:53 2017
@@ -18,10 +18,9 @@
  *
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.EncodingUtils;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java (from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -30,8 +30,6 @@ import org.apache.qpid.server.bytebuffer
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.junit.Assert;
 
-import org.apache.qpid.server.AMQPInvalidClassException;
-
 public class FieldTableTest extends QpidTestCase
 {
     /**

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.AMQFrameDecodingException;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.MessagePublishInfo;
 import org.apache.qpid.server.plugin.MessageFormat;
 import org.apache.qpid.server.store.MessageHandle;
 import org.apache.qpid.server.store.MessageStore;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Tue Feb 21 06:37:53 2017
@@ -51,11 +51,9 @@ import com.google.common.util.concurrent
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.server.AMQConnectionException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.common.AMQPFilterTypes;
 import org.apache.qpid.server.exchange.ExchangeDefaults;
-import org.apache.qpid.server.framing.*;
 import org.apache.qpid.server.protocol.ErrorCodes;
 import org.apache.qpid.server.consumer.ConsumerOption;
 import org.apache.qpid.server.consumer.ConsumerTarget;
@@ -67,7 +65,6 @@ import org.apache.qpid.server.filter.Fil
 import org.apache.qpid.server.filter.MessageFilter;
 import org.apache.qpid.server.logging.EventLoggerProvider;
 import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.logging.messages.ChannelMessages;
 import org.apache.qpid.server.logging.messages.ExchangeMessages;
 import org.apache.qpid.server.message.InstanceProperties;
@@ -80,7 +77,9 @@ import org.apache.qpid.server.message.Ro
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.*;
 import org.apache.qpid.server.protocol.CapacityChecker;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 import org.apache.qpid.server.protocol.v0_8.UnacknowledgedMessageMap.Visitor;
+import org.apache.qpid.server.protocol.v0_8.transport.*;
 import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.session.AbstractAMQPSession;
 import org.apache.qpid.server.store.MessageHandle;
@@ -97,7 +96,6 @@ import org.apache.qpid.server.util.Serve
 import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
 import org.apache.qpid.server.virtualhost.RequiredExchangeException;
 import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
-import org.apache.qpid.server.transport.network.Ticker;
 
 public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0_8>
         implements AsyncAutoCommitTransaction.FutureRecorder,
@@ -474,7 +472,7 @@ public class AMQChannel extends Abstract
                             if (_confirmOnPublish)
                             {
                                 BasicAckBody responseBody = _connection.getMethodRegistry()
-                                        .createBasicAckBody(_confirmedMessageCounter, false);
+                                                                       .createBasicAckBody(_confirmedMessageCounter, false);
                                 _connection.writeFrame(responseBody.generateFrame(_channelId));
                             }
                             incrementUncommittedMessageSize(storedMessage);
@@ -2935,7 +2933,8 @@ public class AMQChannel extends Abstract
 
                         if (!nowait)
                         {
-                            ExchangeDeleteOkBody responseBody = _connection.getMethodRegistry().createExchangeDeleteOkBody();
+                            ExchangeDeleteOkBody
+                                    responseBody = _connection.getMethodRegistry().createExchangeDeleteOkBody();
                             _connection.writeFrame(responseBody.generateFrame(getChannelId()));
                         }
                     }

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQConnectionException.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQConnectionException.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQConnectionException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQConnectionException.java Tue Feb 21 06:37:53 2017
@@ -19,12 +19,11 @@
  *
  */
 
-package org.apache.qpid.server;
+package org.apache.qpid.server.protocol.v0_8;
 
-import org.apache.qpid.server.framing.AMQFrame;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.MethodRegistry;
 import org.apache.qpid.server.AMQException;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQFrame;
+import org.apache.qpid.server.protocol.v0_8.transport.MethodRegistry;
 
 /**
  * AMQConnectionException indicates that an error that requires the channel to be closed has occurred.

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQDecoder.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQDecoder.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQDecoder.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQDecoder.java Tue Feb 21 06:37:53 2017
@@ -18,14 +18,20 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.codec;
+package org.apache.qpid.server.protocol.v0_8;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.*;
 import org.apache.qpid.server.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQProtocolVersionException;
+import org.apache.qpid.server.protocol.v0_8.transport.ContentBody;
+import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
+import org.apache.qpid.server.protocol.v0_8.transport.HeartbeatBody;
+import org.apache.qpid.server.protocol.v0_8.transport.MethodProcessor;
+import org.apache.qpid.server.protocol.v0_8.transport.ProtocolInitiation;
 
 /**
  * AMQDecoder delegates the decoding of AMQP either to a data block decoder, or in the case of new connections, to a

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java Tue Feb 21 06:37:53 2017
@@ -20,10 +20,9 @@
  */
 package org.apache.qpid.server.protocol.v0_8;
 
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.BasicContentHeaderProperties;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
+import org.apache.qpid.server.protocol.v0_8.transport.ContentHeaderBody;
+import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.AbstractServerMessageImpl;
 import org.apache.qpid.server.store.StoredMessage;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Tue Feb 21 06:37:53 2017
@@ -20,11 +20,10 @@
  */
 package org.apache.qpid.server.protocol.v0_8;
 
-import org.apache.qpid.server.framing.AMQDataBlock;
-import org.apache.qpid.server.framing.MethodRegistry;
-import org.apache.qpid.server.framing.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQDataBlock;
+import org.apache.qpid.server.protocol.v0_8.transport.MethodRegistry;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 import org.apache.qpid.server.logging.EventLoggerProvider;
-import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ContextProvider;
 import org.apache.qpid.server.model.ManagedContextDefault;
 import org.apache.qpid.server.model.ManagedObject;



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