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

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

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenBody.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/ConnectionOpenBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenBody.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
@@ -25,10 +24,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 ConnectionOpenBody 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/ConnectionOpenOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenOkBody.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/ConnectionOpenOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionOpenOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenOkBody.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 ConnectionOpenOkBody 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/ConnectionRedirectBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionRedirectBody.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/ConnectionRedirectBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionRedirectBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionRedirectBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionRedirectBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionRedirectBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,12 @@
  *   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;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 
 public class ConnectionRedirectBody 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/ConnectionSecureBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureBody.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/ConnectionSecureBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,12 @@
  *   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.EncodingUtils;
 
 public class ConnectionSecureBody 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/ConnectionSecureOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureOkBody.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/ConnectionSecureOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionSecureOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureOkBody.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.EncodingUtils;
 
 public class ConnectionSecureOkBody 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/ConnectionStartBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartBody.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/ConnectionStartBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartBody.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
@@ -25,10 +24,13 @@
  *   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.EncodingUtils;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 
 public class ConnectionStartBody 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/ConnectionStartOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartOkBody.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/ConnectionStartOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionStartOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartOkBody.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 ConnectionStartOkBody 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/ConnectionTuneBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneBody.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/ConnectionTuneBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneBody.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/ConnectionTuneOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneOkBody.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/ConnectionTuneOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ConnectionTuneOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneOkBody.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/ContentBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentBody.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/ContentBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.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,13 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import java.nio.ByteBuffer;
 
 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.transport.ByteBufferSender;
 
 public class ContentBody implements AMQBody

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderBody.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/ContentHeaderBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderBody.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,11 +18,11 @@
  * 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.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.protocol.AMQVersionAwareProtocolSession;
+import org.apache.qpid.server.protocol.v0_8.AMQFrameDecodingException;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 public class ContentHeaderBody implements AMQBody

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderPropertiesFactory.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderPropertiesFactory.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/ContentHeaderPropertiesFactory.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderPropertiesFactory.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderPropertiesFactory.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ContentHeaderPropertiesFactory.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderPropertiesFactory.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,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.AMQFrameDecodingException;
 
 public class ContentHeaderPropertiesFactory
 {
@@ -37,7 +38,7 @@ public class ContentHeaderPropertiesFact
 
     public BasicContentHeaderProperties createContentHeaderProperties(int classId, int propertyFlags,
                                                                       QpidByteBuffer buffer, int size)
-             throws AMQFrameDecodingException
+            throws AMQFrameDecodingException
     {
         BasicContentHeaderProperties properties;
         if (classId == BasicConsumeBody.CLASS_ID)

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/EncodableAMQDataBlock.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodableAMQDataBlock.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/EncodableAMQDataBlock.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/EncodableAMQDataBlock.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodableAMQDataBlock.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/EncodableAMQDataBlock.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/EncodableAMQDataBlock.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;
 
 /**
  * Marker interface to indicate to MINA that a data block should be encoded with the
@@ -26,8 +26,7 @@ package org.apache.qpid.server.framing;
  *
  * Note that due to a bug in MINA all classes must directly implement this interface, even if
  * a superclass implements it.
- * TODO: fix MINA so that this is not necessary
- * 
+ *
  */
 public interface EncodableAMQDataBlock
 {

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundBody.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/ExchangeBoundBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundBody.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 ExchangeBoundBody 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/ExchangeBoundOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundOkBody.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/ExchangeBoundOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeBoundOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundOkBody.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 ExchangeBoundOkBody 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/ExchangeDeclareBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareBody.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/ExchangeDeclareBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareBody.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 ExchangeDeclareBody 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/ExchangeDeclareOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareOkBody.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/ExchangeDeclareOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeclareOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareOkBody.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/ExchangeDeleteBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteBody.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/ExchangeDeleteBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteBody.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 ExchangeDeleteBody 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/ExchangeDeleteOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteOkBody.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/ExchangeDeleteOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ExchangeDeleteOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteOkBody.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/FrameCreatingMethodProcessor.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.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/FrameCreatingMethodProcessor.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/FrameCreatingMethodProcessor.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/FrameCreatingMethodProcessor.java Tue Feb 21 06:37:53 2017
@@ -18,12 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 
 public class FrameCreatingMethodProcessor implements MethodProcessor<FrameCreatingMethodProcessor.ClientAndServerChannelMethodProcessor>,
                                                      ClientMethodProcessor<FrameCreatingMethodProcessor.ClientAndServerChannelMethodProcessor>,

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.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/HeartbeatBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.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,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
 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.AMQFrameDecodingException;
 import org.apache.qpid.server.transport.ByteBufferSender;
 
 public class HeartbeatBody implements AMQBody

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

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

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

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodRegistry.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.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/MethodRegistry.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodRegistry.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodRegistry.java Tue Feb 21 06:37:53 2017
@@ -27,10 +27,14 @@
   *   8-0
   */
 
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
 import java.util.Map;
 
+import org.apache.qpid.server.protocol.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
+
 public final class MethodRegistry
 {
     private ProtocolVersion _protocolVersion;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.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/ProtocolInitiation.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.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,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 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.transport.ByteBufferSender;
 
 public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQDataBlock
@@ -167,14 +167,10 @@ public class ProtocolInitiation extends
         {
             if(_protocolHeader[i] != AMQP_HEADER[i])
             {
-                try
-                {
-                    throw new AMQProtocolHeaderException("Protocol header is not correct: Got " + new String(_protocolHeader,"ISO-8859-1") + " should be: " + new String(AMQP_HEADER, "ISO-8859-1"), null);
-                }
-                catch (UnsupportedEncodingException e)
-                {
-                    
-                }
+                throw new AMQProtocolHeaderException("Protocol header is not correct: Got "
+                                                     + new String(_protocolHeader, StandardCharsets.ISO_8859_1)
+                                                     + " should be: "
+                                                     + new String(AMQP_HEADER, StandardCharsets.ISO_8859_1), null);
             }
         }
 
@@ -236,6 +232,7 @@ public class ProtocolInitiation extends
         return _protocolMinor;
     }
 
+    @Override
     public String toString()
     {
         StringBuffer buffer = new StringBuffer(new String(_protocolHeader, StandardCharsets.US_ASCII));

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolVersionAware.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.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/ProtocolVersionAware.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolVersionAware.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolVersionAware.java Tue Feb 21 06:37:53 2017
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.protocol;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
-import org.apache.qpid.server.framing.ProtocolVersion;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 
 /**
  * ProtocolVersionAware is implemented by all AMQP handling classes, that need to provide an awareness to callers of

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.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/QueueBindBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindBody.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 QueueBindBody 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/QueueBindOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.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/QueueBindOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindOkBody.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/QueueDeclareBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.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/QueueDeclareBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareBody.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 QueueDeclareBody 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/QueueDeclareOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.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/QueueDeclareOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareOkBody.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 QueueDeclareOkBody 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/QueueDeleteBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.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/QueueDeleteBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteBody.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 QueueDeleteBody 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/QueueDeleteOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.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/QueueDeleteOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteOkBody.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/QueuePurgeBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.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/QueuePurgeBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeBody.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 QueuePurgeBody 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/QueuePurgeOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.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/QueuePurgeOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeOkBody.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/QueueUnbindBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.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/QueueUnbindBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindBody.java Tue Feb 21 06:37:53 2017
@@ -25,10 +25,14 @@
  *   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.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 QueueUnbindBody 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/QueueUnbindOkBody.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.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/QueueUnbindOkBody.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindOkBody.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindOkBody.java Tue Feb 21 06:37:53 2017
@@ -25,7 +25,7 @@
  *   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;

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

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

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

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java Tue Feb 21 06:37:53 2017
@@ -42,10 +42,9 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.BasicContentHeaderProperties;
-import org.apache.qpid.server.framing.MethodRegistry;
-import org.apache.qpid.server.framing.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
+import org.apache.qpid.server.protocol.v0_8.transport.MethodRegistry;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 import org.apache.qpid.server.protocol.ErrorCodes;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java (from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java Tue Feb 21 06:37:53 2017
@@ -7,18 +7,18 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  */
-package org.apache.qpid.server.codec;
+package org.apache.qpid.server.protocol.v0_8;
 
 
 import java.io.IOException;
@@ -30,18 +30,16 @@ import java.util.List;
 import java.util.Random;
 
 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.AMQFrameDecodingException;
-import org.apache.qpid.server.framing.AMQProtocolVersionException;
-import org.apache.qpid.server.framing.BasicContentHeaderProperties;
-import org.apache.qpid.server.framing.ContentBody;
-import org.apache.qpid.server.framing.ContentHeaderBody;
-import org.apache.qpid.server.framing.FieldTable;
-import org.apache.qpid.server.framing.FrameCreatingMethodProcessor;
-import org.apache.qpid.server.framing.HeartbeatBody;
-import org.apache.qpid.server.framing.ProtocolVersion;
+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.AMQProtocolVersionException;
+import org.apache.qpid.server.protocol.v0_8.transport.BasicContentHeaderProperties;
+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.FrameCreatingMethodProcessor;
+import org.apache.qpid.server.protocol.v0_8.transport.HeartbeatBody;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.server.transport.ByteBufferSender;
 import org.apache.qpid.server.util.ByteBufferUtils;

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java Tue Feb 21 06:37:53 2017
@@ -30,10 +30,8 @@ import java.util.Collections;
 
 import javax.security.auth.Subject;
 
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.FieldTable;
-import org.apache.qpid.server.framing.ProtocolInitiation;
-import org.apache.qpid.server.framing.ProtocolVersion;
+import org.apache.qpid.server.protocol.v0_8.transport.ProtocolInitiation;
+import org.apache.qpid.server.protocol.ProtocolVersion;
 import org.apache.qpid.server.properties.ConnectionStartProperties;
 import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
 import org.apache.qpid.server.logging.EventLogger;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ClientDecoder.java (from r1783833, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ClientDecoder.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ClientDecoder.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ClientDecoder.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.nio.ByteBuffer;
 
 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 ClientDecoder extends AMQDecoder<ClientMethodProcessor<? extends ClientChannelMethodProcessor>>
 {

Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java Tue Feb 21 06:37:53 2017
@@ -23,9 +23,9 @@ package org.apache.qpid.server.protocol.
 import java.util.UUID;
 
 import org.apache.qpid.server.QpidException;
-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.EnqueueableMessage;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.store.MessageCounter;

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java (from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.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,9 +18,11 @@
  * 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.EncodingUtils;
+import org.apache.qpid.server.protocol.v0_8.FieldTable;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java (from r1783833, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java?p2=qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java&r1=1783833&r2=1783835&rev=1783835&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java Tue Feb 21 06:37:53 2017
@@ -18,10 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.framing.abstraction;
+package org.apache.qpid.server.protocol.v0_8.transport;
 
-import org.apache.qpid.server.framing.AMQShortString;
-import org.apache.qpid.server.framing.MessagePublishInfo;
+import org.apache.qpid.server.protocol.v0_8.AMQShortString;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class MessagePublishInfoImplTest extends QpidTestCase

Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=1783835&r1=1783834&r2=1783835&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Feb 21 06:37:53 2017
@@ -24,14 +24,14 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.AMQPInvalidClassException;
+import org.apache.qpid.server.protocol.v0_8.AMQPInvalidClassException;
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.exchange.ExchangeDefaults;
-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.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.FieldTable;
+import org.apache.qpid.server.protocol.v0_8.transport.MessagePublishInfo;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.NamedAddressSpace;



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