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 [2/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...

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.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_8Impl.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_8Impl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java Tue Feb 21 06:37:53 2017
@@ -44,14 +44,10 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.server.AMQConnectionException;
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.codec.AMQDecoder;
-import org.apache.qpid.server.codec.ServerDecoder;
 import org.apache.qpid.server.common.ServerPropertyNames;
 import org.apache.qpid.server.configuration.CommonProperties;
-import org.apache.qpid.server.framing.*;
 import org.apache.qpid.server.properties.ConnectionStartProperties;
 import org.apache.qpid.server.protocol.ErrorCodes;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
@@ -64,6 +60,8 @@ import org.apache.qpid.server.model.Prot
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.port.AmqpPort;
 import org.apache.qpid.server.protocol.ConnectionClosingTicker;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.*;
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
 import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.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/BrokerDecoder.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/BrokerDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java Tue Feb 21 06:37:53 2017
@@ -29,8 +29,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.codec.ServerDecoder;
-import org.apache.qpid.server.framing.AMQFrameDecodingException;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 public class BrokerDecoder extends ServerDecoder

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.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/CachedFrame.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/CachedFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java Tue Feb 21 06:37:53 2017
@@ -21,7 +21,7 @@
 package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.AMQDataBlock;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQDataBlock;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 class CachedFrame extends AMQDataBlock

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_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/ConsumerTarget_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/ConsumerTarget_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java Tue Feb 21 06:37:53 2017
@@ -24,8 +24,6 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.qpid.server.QpidException;
 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.consumer.AbstractConsumerTarget;
 import org.apache.qpid.server.flow.FlowCreditManager;
 import org.apache.qpid.server.message.InstanceProperties;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.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/IncomingMessage.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/IncomingMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java Tue Feb 21 06:37:53 2017
@@ -23,10 +23,9 @@ package org.apache.qpid.server.protocol.
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.ContentBody;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+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.MessagePublishInfo;
 import org.apache.qpid.server.message.MessageDestination;
 
 public class IncomingMessage

Modified: 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
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/MessageConverter_Internal_to_v0_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/MessageConverter_Internal_to_v0_8.java (original)
+++ 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 Tue Feb 21 06:37:53 2017
@@ -32,11 +32,9 @@ import java.util.List;
 import java.util.Map;
 
 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.FieldTable;
-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.internal.InternalMessage;
 import org.apache.qpid.server.message.internal.InternalMessageHeader;
 import org.apache.qpid.server.model.NamedAddressSpace;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.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/MessageFormat_0_9_1.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/MessageFormat_0_9_1.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java Tue Feb 21 06:37:53 2017
@@ -25,11 +25,8 @@ 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.EncodingUtils;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+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.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/MessageMetaData.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/MessageMetaData.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/MessageMetaData.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java Tue Feb 21 06:37:53 2017
@@ -24,14 +24,10 @@ import java.util.Collection;
 import java.util.Set;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-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.BasicContentHeaderProperties;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.EncodingUtils;
-import org.apache.qpid.server.framing.FieldTable;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQProtocolVersionException;
+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.plugin.MessageMetaDataType;
 import org.apache.qpid.server.store.StorableMessageMetaData;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverter.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/ProtocolOutputConverter.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/ProtocolOutputConverter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverter.java Tue Feb 21 06:37:53 2017
@@ -26,10 +26,9 @@
  */
 package org.apache.qpid.server.protocol.v0_8;
 
-import org.apache.qpid.server.framing.AMQDataBlock;
-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.protocol.v0_8.transport.AMQDataBlock;
+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.InstanceProperties;
 import org.apache.qpid.server.message.MessageContentSource;
 import org.apache.qpid.server.message.ServerMessage;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.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/ProtocolOutputConverterImpl.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/ProtocolOutputConverterImpl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java Tue Feb 21 06:37:53 2017
@@ -29,16 +29,15 @@ import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.AMQBody;
-import org.apache.qpid.server.framing.AMQDataBlock;
-import org.apache.qpid.server.framing.AMQFrame;
-import org.apache.qpid.server.framing.AMQMethodBody;
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.BasicCancelOkBody;
-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.AMQVersionAwareProtocolSession;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQBody;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQDataBlock;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQFrame;
+import org.apache.qpid.server.protocol.v0_8.transport.AMQMethodBody;
+import org.apache.qpid.server.protocol.v0_8.transport.BasicCancelOkBody;
+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.protocol.v0_8.transport.AMQVersionAwareProtocolSession;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageContentSource;
 import org.apache.qpid.server.message.ServerMessage;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.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/ServerDecoder.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java Tue Feb 21 06:37:53 2017
@@ -18,12 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.codec;
+package org.apache.qpid.server.protocol.v0_8;
 
 import java.io.IOException;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.framing.*;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.*;
 
 public class ServerDecoder extends AMQDecoder<ServerMethodProcessor<? extends ServerChannelMethodProcessor>>
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQBody.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/transport/AMQBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQBody.java Tue Feb 21 06:37:53 2017
@@ -7,9 +7,9 @@
  * 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
@@ -18,15 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
-import org.apache.qpid.server.protocol.AMQVersionAwareProtocolSession;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 public interface AMQBody
 {
-    public  byte getFrameType();
+    byte getFrameType();
     
     /** 
      * Get the size of the body

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQDataBlock.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQDataBlock.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/transport/AMQDataBlock.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQDataBlock.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQDataBlock.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQDataBlock.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQDataBlock.java Tue Feb 21 06:37:53 2017
@@ -7,9 +7,9 @@
  * 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
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.transport.ByteBufferSender;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrame.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/transport/AMQFrame.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrame.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java Tue Feb 21 06:37:53 2017
@@ -7,9 +7,9 @@
  * 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
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.transport.ByteBufferSender;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBody.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/transport/AMQMethodBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java Tue Feb 21 06:37:53 2017
@@ -7,9 +7,9 @@
  * 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
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBodyImpl.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/transport/AMQMethodBodyImpl.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBodyImpl.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQMethodBodyImpl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java Tue Feb 21 06:37:53 2017
@@ -18,14 +18,16 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.protocol.AMQVersionAwareProtocolSession;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.EncodingUtils;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 public abstract class AMQMethodBodyImpl implements AMQMethodBody

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.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/transport/AMQMethodEvent.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java Tue Feb 21 06:37:53 2017
@@ -18,9 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.protocol;
 
-import org.apache.qpid.server.framing.AMQMethodBody;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 /**
  * AMQMethodEvent encapsulates an AMQP method call, and the channel on which that method call occurred.

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodListener.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.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/transport/AMQMethodListener.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodListener.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodListener.java Tue Feb 21 06:37:53 2017
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.protocol;
+
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
-import org.apache.qpid.server.framing.AMQMethodBody;
 
 /**
  * AMQMethodListener is a listener that receives notifications of AMQP methods. The methods are packaged as events in

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolClassException.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolClassException.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/transport/AMQProtocolClassException.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolClassException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolClassException.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolClassException.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolClassException.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.transport;
 
 /**
  * AMQProtocolInstanceException indicates that the protocol class is incorrect in a header.

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolHeaderException.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolHeaderException.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/transport/AMQProtocolHeaderException.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolHeaderException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolHeaderException.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolHeaderException.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolHeaderException.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.transport;
 
 import org.apache.qpid.server.transport.TransportException;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolInstanceException.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolInstanceException.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/transport/AMQProtocolInstanceException.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolInstanceException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolInstanceException.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AMQProtocolInstanceException.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolInstanceException.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.transport;
 
 /**
  * AMQProtocolInstanceException indicates that the protocol instance is incorrect in a header.

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolVersionException.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-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolVersionException.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolVersionException.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-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolVersionException.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,7 +17,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 /**
  * AMQProtocolInstanceException indicates that the client and server differ on expected protocol version  in a header.

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolWriter.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.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/transport/AMQProtocolWriter.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolWriter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolWriter.java Tue Feb 21 06:37:53 2017
@@ -18,9 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.protocol;
 
-import org.apache.qpid.server.framing.AMQDataBlock;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 /**
  * AMQProtocolWriter provides a method to write a frame of data 'to the wire', in the context of the object

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQVersionAwareProtocolSession.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.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/transport/AMQVersionAwareProtocolSession.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQVersionAwareProtocolSession.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQVersionAwareProtocolSession.java Tue Feb 21 06:37:53 2017
@@ -18,14 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.protocol;
+
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
-import org.apache.qpid.server.framing.AMQMethodBody;
-import org.apache.qpid.server.framing.ContentBody;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.HeartbeatBody;
-import org.apache.qpid.server.framing.MethodRegistry;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 
@@ -33,11 +29,11 @@ import org.apache.qpid.server.transport.
  * AMQVersionAwareProtocolSession is implemented by all AMQP session classes, that need to provide an awareness to
  * callers of the version of the AMQP protocol that they are able to work with.
  * <p>
- * TODO Why is this a seperate interface to {@link ProtocolVersionAware}, could they be combined into a single
+ * TODO Why is this a separate interface to {@link ProtocolVersionAware}, could they be combined into a single
  *       interface and one of them eliminated? Move getRegistry method to ProtocolVersionAware, make the sessions
  *       implement AMQProtocolWriter directly and drop this interface.
  */
-public interface AMQVersionAwareProtocolSession extends org.apache.qpid.server.protocol.AMQProtocolWriter, ProtocolVersionAware
+public interface AMQVersionAwareProtocolSession extends AMQProtocolWriter, ProtocolVersionAware
 {
     /**
      * Gets the method registry for a specific version of the AMQP.
@@ -48,12 +44,12 @@ public interface AMQVersionAwareProtocol
     MethodRegistry getMethodRegistry();
 
 
-    public void methodFrameReceived(int channelId, AMQMethodBody body) throws QpidException;
-    public void contentHeaderReceived(int channelId, ContentHeaderBody body) throws QpidException;
-    public void contentBodyReceived(int channelId, ContentBody body) throws QpidException;
-    public void heartbeatBodyReceived(int channelId, HeartbeatBody body) throws QpidException;
+    void methodFrameReceived(int channelId, AMQMethodBody body) throws QpidException;
+    void contentHeaderReceived(int channelId, ContentHeaderBody body) throws QpidException;
+    void contentBodyReceived(int channelId, ContentBody body) throws QpidException;
+    void heartbeatBodyReceived(int channelId, HeartbeatBody body) throws QpidException;
 
 
-    public void setSender(ByteBufferSender sender);
+    void setSender(ByteBufferSender sender);
 
 }

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestBody.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/transport/AccessRequestBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class AccessRequestBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestOkBody.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/transport/AccessRequestOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/AccessRequestOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicAckBody.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/transport/BasicAckBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicAckBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicAckBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelBody.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/transport/BasicCancelBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicCancelBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelOkBody.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/transport/BasicCancelOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicCancelOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicCancelOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeBody.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/transport/BasicConsumeBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,14 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.EncodingUtils;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 
 public class BasicConsumeBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeOkBody.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/transport/BasicConsumeOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicConsumeOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicConsumeOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicContentHeaderProperties.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/transport/BasicContentHeaderProperties.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicContentHeaderProperties.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicContentHeaderProperties.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java Tue Feb 21 06:37:53 2017
@@ -18,12 +18,17 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.EncodingUtils;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.FieldTableFactory;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 public class BasicContentHeaderProperties
@@ -477,7 +482,8 @@ public class BasicContentHeaderPropertie
 
     }
 
-    public synchronized void populatePropertiesFromBuffer(QpidByteBuffer buffer, int propertyFlags, int size) throws AMQFrameDecodingException
+    public synchronized void populatePropertiesFromBuffer(QpidByteBuffer buffer, int propertyFlags, int size) throws
+                                                                                                              AMQFrameDecodingException
     {
         _propertyFlags = propertyFlags;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicDeliverBody.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/transport/BasicDeliverBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicDeliverBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicDeliverBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicDeliverBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetBody.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/transport/BasicGetBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicGetBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetEmptyBody.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/transport/BasicGetEmptyBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetEmptyBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetEmptyBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicGetEmptyBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetOkBody.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/transport/BasicGetOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicGetOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicGetOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicNackBody.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/transport/BasicNackBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicNackBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicNackBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicPublishBody.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/transport/BasicPublishBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicPublishBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicPublishBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicPublishBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosBody.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/transport/BasicQosBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosOkBody.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/transport/BasicQosOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicQosOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverBody.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/transport/BasicRecoverBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 
 public class BasicRecoverBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncBody.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/transport/BasicRecoverSyncBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   0-91
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 
 public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncOkBody.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/transport/BasicRecoverSyncOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRecoverSyncOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   0-91
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 
 public class BasicRecoverSyncOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRejectBody.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/transport/BasicRejectBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRejectBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicRejectBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicReturnBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicReturnBody.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/transport/BasicReturnBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicReturnBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicReturnBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/BasicReturnBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicReturnBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class BasicReturnBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelAlertBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelAlertBody.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/transport/ChannelAlertBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelAlertBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelAlertBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelAlertBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelAlertBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,14 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.EncodingUtils;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 
 public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseBody.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/transport/ChannelCloseBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class ChannelCloseBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseOkBody.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/transport/ChannelCloseOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelCloseOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowBody.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/transport/ChannelFlowBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowOkBody.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/transport/ChannelFlowOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelFlowOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelMethodProcessor.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelMethodProcessor.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/transport/ChannelMethodProcessor.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelMethodProcessor.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelMethodProcessor.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelMethodProcessor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelMethodProcessor.java Tue Feb 21 06:37:53 2017
@@ -18,9 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public interface ChannelMethodProcessor
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenBody.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/transport/ChannelOpenBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,11 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class ChannelOpenBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenOkBody.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/transport/ChannelOpenOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ChannelOpenOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,12 +25,14 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import java.io.IOException;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.EncodingUtils;
 
 public class ChannelOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientChannelMethodProcessor.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientChannelMethodProcessor.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/transport/ClientChannelMethodProcessor.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientChannelMethodProcessor.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientChannelMethodProcessor.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientChannelMethodProcessor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientChannelMethodProcessor.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
+
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 
 public interface ClientChannelMethodProcessor extends ChannelMethodProcessor
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodDispatcher.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodDispatcher.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/transport/ClientMethodDispatcher.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodDispatcher.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodDispatcher.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodDispatcher.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodDispatcher.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.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodProcessor.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodProcessor.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/transport/ClientMethodProcessor.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodProcessor.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodProcessor.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ClientMethodProcessor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodProcessor.java Tue Feb 21 06:37:53 2017
@@ -18,7 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
+
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 
 public interface ClientMethodProcessor<T extends ClientChannelMethodProcessor> extends MethodProcessor<T>
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/CompositeAMQDataBlock.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/transport/CompositeAMQDataBlock.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/CompositeAMQDataBlock.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/CompositeAMQDataBlock.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java Tue Feb 21 06:37:53 2017
@@ -7,9 +7,9 @@
  * 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
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.transport.ByteBufferSender;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectBody.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/transport/ConfirmSelectBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectOkBody.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/transport/ConfirmSelectOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConfirmSelectOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   8-0
  */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import org.apache.qpid.server.QpidException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;



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