You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/09/28 17:22:10 UTC

svn commit: r1628074 [5/6] - in /qpid/branches/QPID-6125-ProtocolRefactoring/java: broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/...

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class ExchangeBoundBodyImpl extends AMQMethodBody_8_0 implements ExchangeBoundBody
+public class ExchangeBoundBodyImpl extends AMQMethodBodyImpl implements ExchangeBoundBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -117,7 +116,7 @@ public class ExchangeBoundBodyImpl exten
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchExchangeBound(this, channelId);
+        return dispatcher.dispatchExchangeBound(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class ExchangeBoundOkBodyImpl extends AMQMethodBody_8_0 implements ExchangeBoundOkBody
+public class ExchangeBoundOkBodyImpl extends AMQMethodBodyImpl implements ExchangeBoundOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -106,7 +105,7 @@ public class ExchangeBoundOkBodyImpl ext
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchExchangeBoundOk(this, channelId);
+        return dispatcher.dispatchExchangeBoundOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class ExchangeDeclareBodyImpl extends AMQMethodBody_8_0 implements ExchangeDeclareBody
+public class ExchangeDeclareBodyImpl extends AMQMethodBodyImpl implements ExchangeDeclareBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -181,7 +180,7 @@ public class ExchangeDeclareBodyImpl ext
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchExchangeDeclare(this, channelId);
+        return dispatcher.dispatchExchangeDeclare(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class ExchangeDeclareOkBodyImpl extends AMQMethodBody_8_0 implements ExchangeDeclareOkBody
+public class ExchangeDeclareOkBodyImpl extends AMQMethodBodyImpl implements ExchangeDeclareOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class ExchangeDeclareOkBodyImpl e
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchExchangeDeclareOk(this, channelId);
+        return dispatcher.dispatchExchangeDeclareOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class ExchangeDeleteBodyImpl extends AMQMethodBody_8_0 implements ExchangeDeleteBody
+public class ExchangeDeleteBodyImpl extends AMQMethodBodyImpl implements ExchangeDeleteBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -130,7 +129,7 @@ public class ExchangeDeleteBodyImpl exte
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchExchangeDelete(this, channelId);
+        return dispatcher.dispatchExchangeDelete(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class ExchangeDeleteOkBodyImpl extends AMQMethodBody_8_0 implements ExchangeDeleteOkBody
+public class ExchangeDeleteOkBodyImpl extends AMQMethodBodyImpl implements ExchangeDeleteOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class ExchangeDeleteOkBodyImpl ex
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchExchangeDeleteOk(this, channelId);
+        return dispatcher.dispatchExchangeDeleteOk(this, channelId);
 	}
 
     public String toString()

Added: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistrySource.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistrySource.java?rev=1628074&view=auto
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistrySource.java (added)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistrySource.java Sun Sep 28 15:22:03 2014
@@ -0,0 +1,26 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.framing;
+
+public interface MethodRegistrySource
+{
+    public MethodRegistry getMethodRegistry();
+}

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueueBindBodyImpl extends AMQMethodBody_8_0 implements QueueBindBody
+public class QueueBindBodyImpl extends AMQMethodBodyImpl implements QueueBindBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -151,7 +150,7 @@ public class QueueBindBodyImpl extends A
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueueBind(this, channelId);
+        return dispatcher.dispatchQueueBind(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueueBindOkBodyImpl extends AMQMethodBody_8_0 implements QueueBindOkBody
+public class QueueBindOkBodyImpl extends AMQMethodBodyImpl implements QueueBindOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class QueueBindOkBodyImpl extends
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueueBindOk(this, channelId);
+        return dispatcher.dispatchQueueBindOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueueDeclareBodyImpl extends AMQMethodBody_8_0 implements QueueDeclareBody
+public class QueueDeclareBodyImpl extends AMQMethodBodyImpl implements QueueDeclareBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -171,7 +170,7 @@ public class QueueDeclareBodyImpl extend
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueueDeclare(this, channelId);
+        return dispatcher.dispatchQueueDeclare(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueueDeclareOkBodyImpl extends AMQMethodBody_8_0 implements QueueDeclareOkBody
+public class QueueDeclareOkBodyImpl extends AMQMethodBodyImpl implements QueueDeclareOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -115,7 +114,7 @@ public class QueueDeclareOkBodyImpl exte
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueueDeclareOk(this, channelId);
+        return dispatcher.dispatchQueueDeclareOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueueDeleteBodyImpl extends AMQMethodBody_8_0 implements QueueDeleteBody
+public class QueueDeleteBodyImpl extends AMQMethodBodyImpl implements QueueDeleteBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -140,7 +139,7 @@ public class QueueDeleteBodyImpl extends
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueueDelete(this, channelId);
+        return dispatcher.dispatchQueueDelete(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueueDeleteOkBodyImpl extends AMQMethodBody_8_0 implements QueueDeleteOkBody
+public class QueueDeleteOkBodyImpl extends AMQMethodBodyImpl implements QueueDeleteOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -96,7 +95,7 @@ public class QueueDeleteOkBodyImpl exten
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueueDeleteOk(this, channelId);
+        return dispatcher.dispatchQueueDeleteOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueuePurgeBodyImpl extends AMQMethodBody_8_0 implements QueuePurgeBody
+public class QueuePurgeBodyImpl extends AMQMethodBodyImpl implements QueuePurgeBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -120,7 +119,7 @@ public class QueuePurgeBodyImpl extends 
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueuePurge(this, channelId);
+        return dispatcher.dispatchQueuePurge(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class QueuePurgeOkBodyImpl extends AMQMethodBody_8_0 implements QueuePurgeOkBody
+public class QueuePurgeOkBodyImpl extends AMQMethodBodyImpl implements QueuePurgeOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -96,7 +95,7 @@ public class QueuePurgeOkBodyImpl extend
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchQueuePurgeOk(this, channelId);
+        return dispatcher.dispatchQueuePurgeOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class TxCommitBodyImpl extends AMQMethodBody_8_0 implements TxCommitBody
+public class TxCommitBodyImpl extends AMQMethodBodyImpl implements TxCommitBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class TxCommitBodyImpl extends AM
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTxCommit(this, channelId);
+        return dispatcher.dispatchTxCommit(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class TxCommitOkBodyImpl extends AMQMethodBody_8_0 implements TxCommitOkBody
+public class TxCommitOkBodyImpl extends AMQMethodBodyImpl implements TxCommitOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class TxCommitOkBodyImpl extends 
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTxCommitOk(this, channelId);
+        return dispatcher.dispatchTxCommitOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class TxRollbackBodyImpl extends AMQMethodBody_8_0 implements TxRollbackBody
+public class TxRollbackBodyImpl extends AMQMethodBodyImpl implements TxRollbackBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class TxRollbackBodyImpl extends 
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTxRollback(this, channelId);
+        return dispatcher.dispatchTxRollback(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class TxRollbackOkBodyImpl extends AMQMethodBody_8_0 implements TxRollbackOkBody
+public class TxRollbackOkBodyImpl extends AMQMethodBodyImpl implements TxRollbackOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class TxRollbackOkBodyImpl extend
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTxRollbackOk(this, channelId);
+        return dispatcher.dispatchTxRollbackOk(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class TxSelectBodyImpl extends AMQMethodBody_8_0 implements TxSelectBody
+public class TxSelectBodyImpl extends AMQMethodBodyImpl implements TxSelectBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class TxSelectBodyImpl extends AM
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTxSelect(this, channelId);
+        return dispatcher.dispatchTxSelect(this, channelId);
 	}
 
     public String toString()

Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -25,16 +25,15 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
 
-public class TxSelectOkBodyImpl extends AMQMethodBody_8_0 implements TxSelectOkBody
+public class TxSelectOkBodyImpl extends AMQMethodBodyImpl implements TxSelectOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class TxSelectOkBodyImpl extends 
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTxSelectOk(this, channelId);
+        return dispatcher.dispatchTxSelectOk(this, channelId);
 	}
 
     public String toString()

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -27,14 +27,20 @@
 
 package org.apache.qpid.framing.amqp_0_9;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
+import org.apache.qpid.framing.AMQFrameDecodingException;
+import org.apache.qpid.framing.AMQMethodBody;
+import org.apache.qpid.framing.AMQMethodBodyImpl;
+import org.apache.qpid.framing.AMQMethodBodyInstanceFactory;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.AccessRequestBody;
+import org.apache.qpid.framing.MethodDispatcher;
 
-public class AccessRequestBodyImpl extends AMQMethodBody_0_9 implements AccessRequestBody
+public class AccessRequestBodyImpl extends AMQMethodBodyImpl implements AccessRequestBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class AccessRequestOkBodyImpl extends AMQMethodBody_0_9 implements AccessRequestOkBody
+public class AccessRequestOkBodyImpl extends AMQMethodBodyImpl implements AccessRequestOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class BasicRecoverSyncBodyImpl extends AMQMethodBody_0_9 implements BasicRecoverSyncBody
+public class BasicRecoverSyncBodyImpl extends AMQMethodBodyImpl implements BasicRecoverSyncBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class BasicRecoverSyncOkBodyImpl extends AMQMethodBody_0_9 implements BasicRecoverSyncOkBody
+public class BasicRecoverSyncOkBodyImpl extends AMQMethodBodyImpl implements BasicRecoverSyncOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ChannelOpenOkBodyImpl extends AMQMethodBody_0_9 implements ChannelOpenOkBody
+public class ChannelOpenOkBodyImpl extends AMQMethodBodyImpl implements ChannelOpenOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java Sun Sep 28 15:22:03 2014
@@ -34,64 +34,8 @@ public interface ClientMethodDispatcher_
 {
 
     public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicConsumeOk(BasicConsumeOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicDeliver(BasicDeliverBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicGetEmpty(BasicGetEmptyBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicGetOk(BasicGetOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicQosOk(BasicQosOkBody body, int channelId) throws AMQException;
     public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelOpenOk(ChannelOpenOkBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionOpenOk(ConnectionOpenOkBody body, int channelId) throws AMQException;
     public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionSecure(ConnectionSecureBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionStart(ConnectionStartBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionTune(ConnectionTuneBody body, int channelId) throws AMQException;
-    public boolean dispatchDtxSelectOk(DtxSelectOkBody body, int channelId) throws AMQException;
-    public boolean dispatchDtxStartOk(DtxStartOkBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDeclareOk(ExchangeDeclareOkBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDeleteOk(ExchangeDeleteOkBody body, int channelId) throws AMQException;
-    public boolean dispatchFileCancelOk(FileCancelOkBody body, int channelId) throws AMQException;
-    public boolean dispatchFileConsumeOk(FileConsumeOkBody body, int channelId) throws AMQException;
-    public boolean dispatchFileDeliver(FileDeliverBody body, int channelId) throws AMQException;
-    public boolean dispatchFileOpen(FileOpenBody body, int channelId) throws AMQException;
-    public boolean dispatchFileOpenOk(FileOpenOkBody body, int channelId) throws AMQException;
-    public boolean dispatchFileQosOk(FileQosOkBody body, int channelId) throws AMQException;
-    public boolean dispatchFileReturn(FileReturnBody body, int channelId) throws AMQException;
-    public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDeclareOk(QueueDeclareOkBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDeleteOk(QueueDeleteOkBody body, int channelId) throws AMQException;
-    public boolean dispatchQueuePurgeOk(QueuePurgeOkBody body, int channelId) throws AMQException;
     public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamCancelOk(StreamCancelOkBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamConsumeOk(StreamConsumeOkBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamDeliver(StreamDeliverBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamQosOk(StreamQosOkBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamReturn(StreamReturnBody body, int channelId) throws AMQException;
-    public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws AMQException;
 
-}
\ No newline at end of file
+}

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionCloseBodyImpl extends AMQMethodBody_0_9 implements ConnectionCloseBody
+public class ConnectionCloseBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionCloseOkBodyImpl extends AMQMethodBody_0_9 implements ConnectionCloseOkBody
+public class ConnectionCloseOkBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java Sun Sep 28 15:22:03 2014
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionRedirectBodyImpl extends AMQMethodBody_0_9 implements ConnectionRedirectBody
+public class ConnectionRedirectBodyImpl extends AMQMethodBodyImpl implements ConnectionRedirectBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java Sun Sep 28 15:22:03 2014
@@ -24,6 +24,7 @@ package org.apache.qpid.framing.amqp_0_9
 import org.apache.qpid.framing.AMQMethodBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicPublishBody;
+import org.apache.qpid.framing.BasicPublishBodyImpl;
 import org.apache.qpid.framing.abstraction.AbstractMethodConverter;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;

Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java?rev=1628074&r1=1628073&r2=1628074&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java Sun Sep 28 15:22:03 2014
@@ -27,17 +27,15 @@
 
 package org.apache.qpid.framing.amqp_0_9;
 
-import org.apache.qpid.framing.*;
-import org.apache.qpid.protocol.AMQConstant;
-
+import java.io.IOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-
-import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 import org.apache.qpid.codec.MarkableDataInput;
+import org.apache.qpid.framing.*;
+import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
+import org.apache.qpid.protocol.AMQConstant;
 
 
 public class MethodRegistry_0_9 extends MethodRegistry
@@ -47,7 +45,7 @@ public class MethodRegistry_0_9 extends 
 
     private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_0_9();
 
-    private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[121][];
+    private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[91][];
 
     public MethodRegistry_0_9()
     {
@@ -88,10 +86,6 @@ public class MethodRegistry_0_9 extends 
         _factories[20][21] = ChannelFlowOkBodyImpl.getFactory();
         _factories[20][40] = ChannelCloseBodyImpl.getFactory();
         _factories[20][41] = ChannelCloseOkBodyImpl.getFactory();
-        _factories[20][50] = ChannelResumeBodyImpl.getFactory();
-        _factories[20][60] = ChannelPingBodyImpl.getFactory();
-        _factories[20][70] = ChannelPongBodyImpl.getFactory();
-        _factories[20][80] = ChannelOkBodyImpl.getFactory();
 
 
 
@@ -158,43 +152,6 @@ public class MethodRegistry_0_9 extends 
 
 
 
-        // Register method body instance factories for the File class.
-
-        _factories[70] = new AMQMethodBodyInstanceFactory[101];
-
-        _factories[70][10] = FileQosBodyImpl.getFactory();
-        _factories[70][11] = FileQosOkBodyImpl.getFactory();
-        _factories[70][20] = FileConsumeBodyImpl.getFactory();
-        _factories[70][21] = FileConsumeOkBodyImpl.getFactory();
-        _factories[70][30] = FileCancelBodyImpl.getFactory();
-        _factories[70][31] = FileCancelOkBodyImpl.getFactory();
-        _factories[70][40] = FileOpenBodyImpl.getFactory();
-        _factories[70][41] = FileOpenOkBodyImpl.getFactory();
-        _factories[70][50] = FileStageBodyImpl.getFactory();
-        _factories[70][60] = FilePublishBodyImpl.getFactory();
-        _factories[70][70] = FileReturnBodyImpl.getFactory();
-        _factories[70][80] = FileDeliverBodyImpl.getFactory();
-        _factories[70][90] = FileAckBodyImpl.getFactory();
-        _factories[70][100] = FileRejectBodyImpl.getFactory();
-
-
-
-        // Register method body instance factories for the Stream class.
-
-        _factories[80] = new AMQMethodBodyInstanceFactory[61];
-
-        _factories[80][10] = StreamQosBodyImpl.getFactory();
-        _factories[80][11] = StreamQosOkBodyImpl.getFactory();
-        _factories[80][20] = StreamConsumeBodyImpl.getFactory();
-        _factories[80][21] = StreamConsumeOkBodyImpl.getFactory();
-        _factories[80][30] = StreamCancelBodyImpl.getFactory();
-        _factories[80][31] = StreamCancelOkBodyImpl.getFactory();
-        _factories[80][40] = StreamPublishBodyImpl.getFactory();
-        _factories[80][50] = StreamReturnBodyImpl.getFactory();
-        _factories[80][60] = StreamDeliverBodyImpl.getFactory();
-
-
-
         // Register method body instance factories for the Tx class.
 
         _factories[90] = new AMQMethodBodyInstanceFactory[32];
@@ -206,46 +163,6 @@ public class MethodRegistry_0_9 extends 
         _factories[90][30] = TxRollbackBodyImpl.getFactory();
         _factories[90][31] = TxRollbackOkBodyImpl.getFactory();
 
-
-
-        // Register method body instance factories for the Dtx class.
-
-        _factories[100] = new AMQMethodBodyInstanceFactory[22];
-
-        _factories[100][10] = DtxSelectBodyImpl.getFactory();
-        _factories[100][11] = DtxSelectOkBodyImpl.getFactory();
-        _factories[100][20] = DtxStartBodyImpl.getFactory();
-        _factories[100][21] = DtxStartOkBodyImpl.getFactory();
-
-
-
-        // Register method body instance factories for the Tunnel class.
-
-        _factories[110] = new AMQMethodBodyInstanceFactory[11];
-
-        _factories[110][10] = TunnelRequestBodyImpl.getFactory();
-
-
-
-        // Register method body instance factories for the Message class.
-
-        _factories[120] = new AMQMethodBodyInstanceFactory[531];
-
-        _factories[120][10] = MessageTransferBodyImpl.getFactory();
-        _factories[120][20] = MessageConsumeBodyImpl.getFactory();
-        _factories[120][30] = MessageCancelBodyImpl.getFactory();
-        _factories[120][40] = MessageGetBodyImpl.getFactory();
-        _factories[120][50] = MessageRecoverBodyImpl.getFactory();
-        _factories[120][60] = MessageOpenBodyImpl.getFactory();
-        _factories[120][70] = MessageCloseBodyImpl.getFactory();
-        _factories[120][80] = MessageAppendBodyImpl.getFactory();
-        _factories[120][90] = MessageCheckpointBodyImpl.getFactory();
-        _factories[120][100] = MessageResumeBodyImpl.getFactory();
-        _factories[120][110] = MessageQosBodyImpl.getFactory();
-        _factories[120][500] = MessageOkBodyImpl.getFactory();
-        _factories[120][510] = MessageEmptyBodyImpl.getFactory();
-        _factories[120][520] = MessageRejectBodyImpl.getFactory();
-        _factories[120][530] = MessageOffsetBodyImpl.getFactory();
     }
 
     public AMQMethodBody convertToBody(MarkableDataInput in, long size)
@@ -497,38 +414,6 @@ public class MethodRegistry_0_9 extends 
                                 );
     }
 
-    public ChannelResumeBody createChannelResumeBody(
-                                final byte[] channelId
-                                )
-    {
-        return new ChannelResumeBodyImpl(
-                                channelId
-                                );
-    }
-
-    public ChannelPingBody createChannelPingBody(
-                                )
-    {
-        return new ChannelPingBodyImpl(
-                                );
-    }
-
-    public ChannelPongBody createChannelPongBody(
-                                )
-    {
-        return new ChannelPongBodyImpl(
-                                );
-    }
-
-    public ChannelOkBody createChannelOkBody(
-                                )
-    {
-        return new ChannelOkBodyImpl(
-                                );
-    }
-
-
-
 
     public AccessRequestBody createAccessRequestBody(
                                 final AMQShortString realm,
@@ -986,308 +871,6 @@ public class MethodRegistry_0_9 extends 
                                 );
     }
 
-
-
-
-    public FileQosBody createFileQosBody(
-                                final long prefetchSize,
-                                final int prefetchCount,
-                                final boolean global
-                                )
-    {
-        return new FileQosBodyImpl(
-                                prefetchSize,
-                                prefetchCount,
-                                global
-                                );
-    }
-
-    public FileQosOkBody createFileQosOkBody(
-                                )
-    {
-        return new FileQosOkBodyImpl(
-                                );
-    }
-
-    public FileConsumeBody createFileConsumeBody(
-                                final int ticket,
-                                final AMQShortString queue,
-                                final AMQShortString consumerTag,
-                                final boolean noLocal,
-                                final boolean noAck,
-                                final boolean exclusive,
-                                final boolean nowait,
-                                final FieldTable filter
-                                )
-    {
-        return new FileConsumeBodyImpl(
-                                ticket,
-                                queue,
-                                consumerTag,
-                                noLocal,
-                                noAck,
-                                exclusive,
-                                nowait,
-                                filter
-                                );
-    }
-
-    public FileConsumeOkBody createFileConsumeOkBody(
-                                final AMQShortString consumerTag
-                                )
-    {
-        return new FileConsumeOkBodyImpl(
-                                consumerTag
-                                );
-    }
-
-    public FileCancelBody createFileCancelBody(
-                                final AMQShortString consumerTag,
-                                final boolean nowait
-                                )
-    {
-        return new FileCancelBodyImpl(
-                                consumerTag,
-                                nowait
-                                );
-    }
-
-    public FileCancelOkBody createFileCancelOkBody(
-                                final AMQShortString consumerTag
-                                )
-    {
-        return new FileCancelOkBodyImpl(
-                                consumerTag
-                                );
-    }
-
-    public FileOpenBody createFileOpenBody(
-                                final AMQShortString identifier,
-                                final long contentSize
-                                )
-    {
-        return new FileOpenBodyImpl(
-                                identifier,
-                                contentSize
-                                );
-    }
-
-    public FileOpenOkBody createFileOpenOkBody(
-                                final long stagedSize
-                                )
-    {
-        return new FileOpenOkBodyImpl(
-                                stagedSize
-                                );
-    }
-
-    public FileStageBody createFileStageBody(
-                                )
-    {
-        return new FileStageBodyImpl(
-                                );
-    }
-
-    public FilePublishBody createFilePublishBody(
-                                final int ticket,
-                                final AMQShortString exchange,
-                                final AMQShortString routingKey,
-                                final boolean mandatory,
-                                final boolean immediate,
-                                final AMQShortString identifier
-                                )
-    {
-        return new FilePublishBodyImpl(
-                                ticket,
-                                exchange,
-                                routingKey,
-                                mandatory,
-                                immediate,
-                                identifier
-                                );
-    }
-
-    public FileReturnBody createFileReturnBody(
-                                final int replyCode,
-                                final AMQShortString replyText,
-                                final AMQShortString exchange,
-                                final AMQShortString routingKey
-                                )
-    {
-        return new FileReturnBodyImpl(
-                                replyCode,
-                                replyText,
-                                exchange,
-                                routingKey
-                                );
-    }
-
-    public FileDeliverBody createFileDeliverBody(
-                                final AMQShortString consumerTag,
-                                final long deliveryTag,
-                                final boolean redelivered,
-                                final AMQShortString exchange,
-                                final AMQShortString routingKey,
-                                final AMQShortString identifier
-                                )
-    {
-        return new FileDeliverBodyImpl(
-                                consumerTag,
-                                deliveryTag,
-                                redelivered,
-                                exchange,
-                                routingKey,
-                                identifier
-                                );
-    }
-
-    public FileAckBody createFileAckBody(
-                                final long deliveryTag,
-                                final boolean multiple
-                                )
-    {
-        return new FileAckBodyImpl(
-                                deliveryTag,
-                                multiple
-                                );
-    }
-
-    public FileRejectBody createFileRejectBody(
-                                final long deliveryTag,
-                                final boolean requeue
-                                )
-    {
-        return new FileRejectBodyImpl(
-                                deliveryTag,
-                                requeue
-                                );
-    }
-
-
-
-
-    public StreamQosBody createStreamQosBody(
-                                final long prefetchSize,
-                                final int prefetchCount,
-                                final long consumeRate,
-                                final boolean global
-                                )
-    {
-        return new StreamQosBodyImpl(
-                                prefetchSize,
-                                prefetchCount,
-                                consumeRate,
-                                global
-                                );
-    }
-
-    public StreamQosOkBody createStreamQosOkBody(
-                                )
-    {
-        return new StreamQosOkBodyImpl(
-                                );
-    }
-
-    public StreamConsumeBody createStreamConsumeBody(
-                                final int ticket,
-                                final AMQShortString queue,
-                                final AMQShortString consumerTag,
-                                final boolean noLocal,
-                                final boolean exclusive,
-                                final boolean nowait,
-                                final FieldTable filter
-                                )
-    {
-        return new StreamConsumeBodyImpl(
-                                ticket,
-                                queue,
-                                consumerTag,
-                                noLocal,
-                                exclusive,
-                                nowait,
-                                filter
-                                );
-    }
-
-    public StreamConsumeOkBody createStreamConsumeOkBody(
-                                final AMQShortString consumerTag
-                                )
-    {
-        return new StreamConsumeOkBodyImpl(
-                                consumerTag
-                                );
-    }
-
-    public StreamCancelBody createStreamCancelBody(
-                                final AMQShortString consumerTag,
-                                final boolean nowait
-                                )
-    {
-        return new StreamCancelBodyImpl(
-                                consumerTag,
-                                nowait
-                                );
-    }
-
-    public StreamCancelOkBody createStreamCancelOkBody(
-                                final AMQShortString consumerTag
-                                )
-    {
-        return new StreamCancelOkBodyImpl(
-                                consumerTag
-                                );
-    }
-
-    public StreamPublishBody createStreamPublishBody(
-                                final int ticket,
-                                final AMQShortString exchange,
-                                final AMQShortString routingKey,
-                                final boolean mandatory,
-                                final boolean immediate
-                                )
-    {
-        return new StreamPublishBodyImpl(
-                                ticket,
-                                exchange,
-                                routingKey,
-                                mandatory,
-                                immediate
-                                );
-    }
-
-    public StreamReturnBody createStreamReturnBody(
-                                final int replyCode,
-                                final AMQShortString replyText,
-                                final AMQShortString exchange,
-                                final AMQShortString routingKey
-                                )
-    {
-        return new StreamReturnBodyImpl(
-                                replyCode,
-                                replyText,
-                                exchange,
-                                routingKey
-                                );
-    }
-
-    public StreamDeliverBody createStreamDeliverBody(
-                                final AMQShortString consumerTag,
-                                final long deliveryTag,
-                                final AMQShortString exchange,
-                                final AMQShortString queue
-                                )
-    {
-        return new StreamDeliverBodyImpl(
-                                consumerTag,
-                                deliveryTag,
-                                exchange,
-                                queue
-                                );
-    }
-
-
-
-
     public TxSelectBody createTxSelectBody(
                                 )
     {
@@ -1330,259 +913,6 @@ public class MethodRegistry_0_9 extends 
                                 );
     }
 
-
-
-
-    public DtxSelectBody createDtxSelectBody(
-                                )
-    {
-        return new DtxSelectBodyImpl(
-                                );
-    }
-
-    public DtxSelectOkBody createDtxSelectOkBody(
-                                )
-    {
-        return new DtxSelectOkBodyImpl(
-                                );
-    }
-
-    public DtxStartBody createDtxStartBody(
-                                final AMQShortString dtxIdentifier
-                                )
-    {
-        return new DtxStartBodyImpl(
-                                dtxIdentifier
-                                );
-    }
-
-    public DtxStartOkBody createDtxStartOkBody(
-                                )
-    {
-        return new DtxStartOkBodyImpl(
-                                );
-    }
-
-
-
-
-    public TunnelRequestBody createTunnelRequestBody(
-                                final FieldTable metaData
-                                )
-    {
-        return new TunnelRequestBodyImpl(
-                                metaData
-                                );
-    }
-
-
-
-
-    public MessageTransferBody createMessageTransferBody(
-                                final int ticket,
-                                final AMQShortString destination,
-                                final boolean redelivered,
-                                final boolean immediate,
-                                final long ttl,
-                                final short priority,
-                                final long timestamp,
-                                final short deliveryMode,
-                                final long expiration,
-                                final AMQShortString exchange,
-                                final AMQShortString routingKey,
-                                final AMQShortString messageId,
-                                final AMQShortString correlationId,
-                                final AMQShortString replyTo,
-                                final AMQShortString contentType,
-                                final AMQShortString contentEncoding,
-                                final AMQShortString userId,
-                                final AMQShortString appId,
-                                final AMQShortString transactionId,
-                                final byte[] securityToken,
-                                final FieldTable applicationHeaders,
-                                final Content body
-                                )
-    {
-        return new MessageTransferBodyImpl(
-                                ticket,
-                                destination,
-                                redelivered,
-                                immediate,
-                                ttl,
-                                priority,
-                                timestamp,
-                                deliveryMode,
-                                expiration,
-                                exchange,
-                                routingKey,
-                                messageId,
-                                correlationId,
-                                replyTo,
-                                contentType,
-                                contentEncoding,
-                                userId,
-                                appId,
-                                transactionId,
-                                securityToken,
-                                applicationHeaders,
-                                body
-                                );
-    }
-
-    public MessageConsumeBody createMessageConsumeBody(
-                                final int ticket,
-                                final AMQShortString queue,
-                                final AMQShortString destination,
-                                final boolean noLocal,
-                                final boolean noAck,
-                                final boolean exclusive,
-                                final FieldTable filter
-                                )
-    {
-        return new MessageConsumeBodyImpl(
-                                ticket,
-                                queue,
-                                destination,
-                                noLocal,
-                                noAck,
-                                exclusive,
-                                filter
-                                );
-    }
-
-    public MessageCancelBody createMessageCancelBody(
-                                final AMQShortString destination
-                                )
-    {
-        return new MessageCancelBodyImpl(
-                                destination
-                                );
-    }
-
-    public MessageGetBody createMessageGetBody(
-                                final int ticket,
-                                final AMQShortString queue,
-                                final AMQShortString destination,
-                                final boolean noAck
-                                )
-    {
-        return new MessageGetBodyImpl(
-                                ticket,
-                                queue,
-                                destination,
-                                noAck
-                                );
-    }
-
-    public MessageRecoverBody createMessageRecoverBody(
-                                final boolean requeue
-                                )
-    {
-        return new MessageRecoverBodyImpl(
-                                requeue
-                                );
-    }
-
-    public MessageOpenBody createMessageOpenBody(
-                                final byte[] reference
-                                )
-    {
-        return new MessageOpenBodyImpl(
-                                reference
-                                );
-    }
-
-    public MessageCloseBody createMessageCloseBody(
-                                final byte[] reference
-                                )
-    {
-        return new MessageCloseBodyImpl(
-                                reference
-                                );
-    }
-
-    public MessageAppendBody createMessageAppendBody(
-                                final byte[] reference,
-                                final byte[] bytes
-                                )
-    {
-        return new MessageAppendBodyImpl(
-                                reference,
-                                bytes
-                                );
-    }
-
-    public MessageCheckpointBody createMessageCheckpointBody(
-                                final byte[] reference,
-                                final AMQShortString identifier
-                                )
-    {
-        return new MessageCheckpointBodyImpl(
-                                reference,
-                                identifier
-                                );
-    }
-
-    public MessageResumeBody createMessageResumeBody(
-                                final byte[] reference,
-                                final AMQShortString identifier
-                                )
-    {
-        return new MessageResumeBodyImpl(
-                                reference,
-                                identifier
-                                );
-    }
-
-    public MessageQosBody createMessageQosBody(
-                                final long prefetchSize,
-                                final int prefetchCount,
-                                final boolean global
-                                )
-    {
-        return new MessageQosBodyImpl(
-                                prefetchSize,
-                                prefetchCount,
-                                global
-                                );
-    }
-
-    public MessageOkBody createMessageOkBody(
-                                )
-    {
-        return new MessageOkBodyImpl(
-                                );
-    }
-
-    public MessageEmptyBody createMessageEmptyBody(
-                                )
-    {
-        return new MessageEmptyBodyImpl(
-                                );
-    }
-
-    public MessageRejectBody createMessageRejectBody(
-                                final int code,
-                                final AMQShortString text
-                                )
-    {
-        return new MessageRejectBodyImpl(
-                                code,
-                                text
-                                );
-    }
-
-    public MessageOffsetBody createMessageOffsetBody(
-                                final long value
-                                )
-    {
-        return new MessageOffsetBodyImpl(
-                                value
-                                );
-    }
-
-
-
     public ProtocolVersionMethodConverter getProtocolVersionMethodConverter()
     {
         return _protocolVersionConverter;



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