Remove duplicate method body implementations

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6125-ProtocolRefactoring@1628074 13f79535-47bb-0310-9956-ffa450edef68

380 files changed, 899 insertions, 29014 deletions

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index f6ef4256d0..4e1af5ddd6 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -464,8 +464,7 @@ public class AMQChannel<T extends AMQProtocolSession<T>>
                     AMQConstant.NO_ROUTE,
                     "No route for message " + currentMessageDescription(),
                     0, 0, // default class and method ids
-                    getProtocolSession().getProtocolVersion().getMajorVersion(),
-                    getProtocolSession().getProtocolVersion().getMinorVersion(),
+                    getProtocolSession().getMethodRegistry(),
                     (Throwable) null);
         }
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index a59f173d2f..1a746447b0 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -27,6 +27,8 @@ import java.nio.ByteBuffer;
 import java.security.AccessController;
 import java.security.Principal;
 import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -74,7 +76,7 @@ import org.apache.qpid.server.protocol.v0_8.handler.ServerMethodDispatcherImpl;
 import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
 import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverterRegistry;
 import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
+import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
 import org.apache.qpid.server.stats.StatisticsCounter;
 import org.apache.qpid.server.util.Action;
@@ -86,7 +88,7 @@ import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.util.BytesDataOutput;
 
-public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSession<AMQProtocolEngine>
+public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSession<AMQProtocolEngine>, MethodRegistrySource
 {
     private static final Logger _logger = Logger.getLogger(AMQProtocolEngine.class);
 
@@ -123,7 +125,8 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
     private final Set<AMQChannel<AMQProtocolEngine>> _channelsForCurrentMessage =
             new HashSet<AMQChannel<AMQProtocolEngine>>();
 
-    private final AMQStateManager _stateManager;
+    /** The current state */
+    private AMQState _currentState;
 
     private AMQDecoder _decoder;
 
@@ -189,7 +192,6 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         _transport = transport;
         _maxNoOfChannels = broker.getConnection_sessionCountLimit();
         _receivedLock = new ReentrantLock();
-        _stateManager = new AMQStateManager(broker, this);
         _decoder = new AMQDecoder(true, this);
         _connectionID = connectionId;
         _logSubject = new ConnectionLogSubject(this);
@@ -623,7 +625,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         {
             try
             {
-                boolean wasAnyoneInterested = _stateManager.methodReceived(evt);
+                boolean wasAnyoneInterested = methodReceived(evt);
 
                 if (!wasAnyoneInterested)
                 {
@@ -654,9 +656,9 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
                         _logger.info("Closing connection due to: " + e.getMessage());
                     }
 
-                    AMQConnectionException ce =
-                            evt.getMethod().getConnectionException(AMQConstant.CHANNEL_ERROR,
-                                                                   AMQConstant.CHANNEL_ERROR.getName().toString());
+                    AMQConnectionException ce = new AMQConnectionException(AMQConstant.CHANNEL_ERROR,
+                                                                           AMQConstant.CHANNEL_ERROR.getName().toString(),
+                                                                           methodBody, getMethodRegistry());
 
                     _logger.info(e.getMessage() + " whilst processing:" + methodBody);
                     closeConnection(channelId, ce);
@@ -675,6 +677,58 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
             closeProtocolSession();
         }
     }
+    private <B extends AMQMethodBody> boolean methodReceived(AMQMethodEvent<B> evt) throws AMQException
+    {
+        final MethodDispatcher dispatcher = getMethodDispatcher();
+
+        final int channelId = evt.getChannelId();
+        final B body = evt.getMethod();
+
+        final AMQChannel channel = getChannel(channelId);
+        if(channelId != 0 && channel == null)
+        {
+
+            if(! ((body instanceof ChannelOpenBody)
+                  || (body instanceof ChannelCloseOkBody)
+                  || (body instanceof ChannelCloseBody)))
+            {
+                throw new AMQConnectionException(AMQConstant.CHANNEL_ERROR, "channel is closed won't process:" + body, body, getMethodRegistry());
+            }
+
+        }
+        if(channel == null)
+        {
+            return body.execute(dispatcher, channelId);
+        }
+        else
+        {
+            try
+            {
+                return Subject.doAs(channel.getSubject(), new PrivilegedExceptionAction<Boolean>()
+                {
+                    @Override
+                    public Boolean run() throws AMQException
+                    {
+                        return body.execute(dispatcher, channelId);
+                    }
+                });
+            }
+            catch (PrivilegedActionException e)
+            {
+                if(e.getCause() instanceof AMQException)
+                {
+                    throw (AMQException) e.getCause();
+                }
+                else
+                {
+                    throw new ServerScopedRuntimeException(e.getCause());
+                }
+            }
+
+
+        }
+
+    }
 
     public void contentHeaderReceived(int channelId, ContentHeaderBody body) throws AMQException
     {
@@ -1056,8 +1110,8 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         {
             try
             {
-                _stateManager.changeState(AMQState.CONNECTION_CLOSING);
-                writeFrame(e.getCloseFrame(channelId));
+                changeState(AMQState.CONNECTION_CLOSING);
+                writeFrame(e.getCloseFrame());
             }
             finally
             {
@@ -1075,7 +1129,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
 
         try
         {
-            _stateManager.changeState(AMQState.CONNECTION_CLOSED);
+            changeState(AMQState.CONNECTION_CLOSED);
         }
         catch (ConnectionScopedRuntimeException e)
         {
@@ -1176,7 +1230,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         _protocolVersion = pv;
         _methodRegistry = MethodRegistry.getMethodRegistry(_protocolVersion);
         _protocolOutputConverter = ProtocolOutputConverterRegistry.getConverter(this);
-        _dispatcher = ServerMethodDispatcherImpl.createMethodDispatcher(_stateManager, _protocolVersion);
+        _dispatcher = ServerMethodDispatcherImpl.createMethodDispatcher(this);
     }
 
     public byte getProtocolMajorVersion()
@@ -1478,9 +1532,8 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
     public void close(AMQConstant cause, String message)
     {
         closeConnection(0, new AMQConnectionException(cause, message, 0, 0,
-		                getProtocolOutputConverter().getProtocolMajorVersion(),
-		                getProtocolOutputConverter().getProtocolMinorVersion(),
-		                null));
+                                                      getMethodRegistry(),
+		                                              null));
     }
 
     public void block()
@@ -1674,6 +1727,25 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         return _messageCompressionThreshold;
     }
 
+    @Override
+    public void changeState(AMQState newState)
+    {
+        _logger.debug("State changing to " + newState + " from old state " + _currentState);
+        _currentState = newState;
+    }
+
+    @Override
+    public Broker<?> getBroker()
+    {
+        return _broker;
+    }
+
+    @Override
+    public SubjectCreator getSubjectCreator()
+    {
+        return _broker.getSubjectCreator(getLocalAddress(), getTransport().isSecure());
+    }
+
     public EventLogger getEventLogger()
     {
         if(_virtualHost != null)
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
index 587669dadc..709ea409bf 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
@@ -35,9 +35,12 @@ import org.apache.qpid.framing.MethodDispatcher;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
+import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
+import org.apache.qpid.server.protocol.v0_8.state.AMQState;
 import org.apache.qpid.server.security.AuthorizationHolder;
+import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 
@@ -214,4 +217,10 @@ public interface AMQProtocolSession<T extends AMQProtocolSession<T>>
     boolean isCompressionSupported();
 
     int getMessageCompressionThreshold();
+
+    void changeState(AMQState state);
+
+    Broker<?> getBroker();
+
+    SubjectCreator getSubjectCreator();
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
index ae07d60c4e..bf89a812b9 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
@@ -30,7 +30,6 @@ import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
 import org.apache.qpid.protocol.AMQConstant;

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

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

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

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

 

 /**

@@ -52,16 +51,17 @@ public class AccessRequestHandler implements StateAwareMethodListener<AccessRequ
     {

     }

 

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

+    public void methodReceived(final AMQProtocolSession<?> connection,

+                               AccessRequestBody body,

+                               int channelId) throws AMQException

     {

-        AMQProtocolSession session = stateManager.getProtocolSession();

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

+        final AMQChannel channel = connection.getChannel(channelId);

         if (channel == null)

         {

-            throw body.getChannelNotFoundException(channelId);

+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());

         }

 

-        MethodRegistry methodRegistry = session.getMethodRegistry();

+        MethodRegistry methodRegistry = connection.getMethodRegistry();

 

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

         // always use the "0" ticket.

@@ -80,6 +80,6 @@ public class AccessRequestHandler implements StateAwareMethodListener<AccessRequ
         }

 

         channel.sync();

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

+        connection.writeFrame(response.generateFrame(channelId));

     }

 }

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
index f623d27e87..efc91800a1 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
@@ -26,7 +26,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicAckBody;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class BasicAckMethodHandler implements StateAwareMethodListener<BasicAckBody>
@@ -44,21 +43,21 @@ public class BasicAckMethodHandler implements StateAwareMethodListener<BasicAckB
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicAckBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicAckBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession protocolSession = stateManager.getProtocolSession();
-
 
         if (_log.isDebugEnabled())
         {
             _log.debug("Ack(Tag:" + body.getDeliveryTag() + ":Mult:" + body.getMultiple() + ") received on channel " + channelId);
         }
 
-        final AMQChannel channel = protocolSession.getChannel(channelId);
+        final AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         // this method throws an AMQException if the delivery tag is not known
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
index 5a6a7bdc18..16498b3e88 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
@@ -28,7 +28,6 @@ import org.apache.qpid.framing.BasicCancelOkBody;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class BasicCancelMethodHandler implements StateAwareMethodListener<BasicCancelBody>
@@ -46,16 +45,16 @@ public class BasicCancelMethodHandler implements StateAwareMethodListener<BasicC
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicCancelBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicCancelBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        final AMQChannel channel = session.getChannel(channelId);
+        final AMQChannel channel = connection.getChannel(channelId);
 
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         if (_log.isDebugEnabled())
@@ -67,10 +66,10 @@ public class BasicCancelMethodHandler implements StateAwareMethodListener<BasicC
         channel.unsubscribeConsumer(body.getConsumerTag());
         if (!body.getNowait())
         {
-            MethodRegistry methodRegistry = session.getMethodRegistry();
+            MethodRegistry methodRegistry = connection.getMethodRegistry();
             BasicCancelOkBody cancelOkBody = methodRegistry.createBasicCancelOkBody(body.getConsumerTag());
             channel.sync();
-            session.writeFrame(cancelOkBody.generateFrame(channelId));
+            connection.writeFrame(cancelOkBody.generateFrame(channelId));
         }
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
index c1e3d850ef..b4219fe29c 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
@@ -36,7 +36,6 @@ import org.apache.qpid.server.filter.AMQInvalidArgumentException;
 import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
@@ -56,16 +55,16 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicConsumeBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicConsumeBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
-        VirtualHostImpl<?,?,?> vHost = protocolConnection.getVirtualHost();
+        AMQChannel channel = connection.getChannel(channelId);
+        VirtualHostImpl<?,?,?> vHost = connection.getVirtualHost();
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         else
         {
@@ -119,12 +118,12 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
                 if (queueName != null)
                 {
                     String msg = "No such queue, '" + queueName + "'";
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, msg);
+                    throw body.getChannelException(AMQConstant.NOT_FOUND, msg, connection.getMethodRegistry());
                 }
                 else
                 {
                     String msg = "No queue name provided, no default queue defined.";
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED, msg);
+                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED, msg, connection.getMethodRegistry());
                 }
             }
             else
@@ -153,9 +152,9 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
                                                                                body.getNoLocal());
                         if (!body.getNowait())
                         {
-                            MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+                            MethodRegistry methodRegistry = connection.getMethodRegistry();
                             AMQMethodBody responseBody = methodRegistry.createBasicConsumeOkBody(consumerTag);
-                            protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+                            connection.writeFrame(responseBody.generateFrame(channelId));
 
                         }
                     }
@@ -163,12 +162,12 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
                     {
                         AMQShortString msg = AMQShortString.validValueOf("Non-unique consumer tag, '" + body.getConsumerTag() + "'");
 
-                        MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+                        MethodRegistry methodRegistry = connection.getMethodRegistry();
                         AMQMethodBody responseBody = methodRegistry.createConnectionCloseBody(AMQConstant.NOT_ALLOWED.getCode(),    // replyCode
                                                                  msg,               // replytext
                                                                  body.getClazz(),
                                                                  body.getMethod());
-                        protocolConnection.writeFrame(responseBody.generateFrame(0));
+                        connection.writeFrame(responseBody.generateFrame(0));
                     }
 
                 }
@@ -176,12 +175,12 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
                 {
                     _logger.debug("Closing connection due to invalid selector");
 
-                    MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+                    MethodRegistry methodRegistry = connection.getMethodRegistry();
                     AMQMethodBody responseBody = methodRegistry.createChannelCloseBody(AMQConstant.ARGUMENT_INVALID.getCode(),
                                                                                        AMQShortString.validValueOf(ise.getMessage()),
                                                                                        body.getClazz(),
                                                                                        body.getMethod());
-                    protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+                    connection.writeFrame(responseBody.generateFrame(channelId));
 
 
                 }
@@ -190,28 +189,28 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
                     throw body.getConnectionException(AMQConstant.ACCESS_REFUSED,
                                                       "Cannot subscribe to queue "
                                                       + queue.getName()
-                                                      + " as it already has an existing exclusive consumer");
+                                                      + " as it already has an existing exclusive consumer", connection.getMethodRegistry());
                 }
                 catch (AMQQueue.ExistingConsumerPreventsExclusive e)
                 {
                     throw body.getConnectionException(AMQConstant.ACCESS_REFUSED,
                                                       "Cannot subscribe to queue "
                                                       + queue.getName()
-                                                      + " exclusively as it already has a consumer");
+                                                      + " exclusively as it already has a consumer", connection.getMethodRegistry());
                 }
                 catch (AccessControlException e)
                 {
                     throw body.getConnectionException(AMQConstant.ACCESS_REFUSED,
                                                       "Cannot subscribe to queue "
                                                       + queue.getName()
-                                                      + " permission denied");
+                                                      + " permission denied", connection.getMethodRegistry());
                 }
                 catch (MessageSource.ConsumerAccessRefused consumerAccessRefused)
                 {
                     throw body.getConnectionException(AMQConstant.ACCESS_REFUSED,
                                                       "Cannot subscribe to queue "
                                                       + queue.getName()
-                                                      + " as it already has an incompatible exclusivity policy");
+                                                      + " as it already has an incompatible exclusivity policy", connection.getMethodRegistry());
                 }
 
             }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
index c3bdedf44d..d650292546 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
@@ -45,7 +45,6 @@ import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.ClientDeliveryMethod;
 import org.apache.qpid.server.protocol.v0_8.ConsumerTarget_0_8;
 import org.apache.qpid.server.protocol.v0_8.RecordDeliveryMethod;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
@@ -65,17 +64,17 @@ public class BasicGetMethodHandler implements StateAwareMethodListener<BasicGetB
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicGetBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicGetBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
 
+        VirtualHostImpl vHost = connection.getVirtualHost();
 
-        VirtualHostImpl vHost = protocolConnection.getVirtualHost();
-
-        AMQChannel channel = protocolConnection.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         else
         {
@@ -87,12 +86,12 @@ public class BasicGetMethodHandler implements StateAwareMethodListener<BasicGetB
                 if(body.getQueue()!=null)
                 {
                     throw body.getConnectionException(AMQConstant.NOT_FOUND,
-                                                      "No such queue, '" + body.getQueue()+ "'");
+                                                      "No such queue, '" + body.getQueue()+ "'", connection.getMethodRegistry());
                 }
                 else
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "No queue name provided, no default queue defined.");
+                                                      "No queue name provided, no default queue defined.", connection.getMethodRegistry());
                 }
             }
             else
@@ -100,36 +99,37 @@ public class BasicGetMethodHandler implements StateAwareMethodListener<BasicGetB
 
                 try
                 {
-                    if (!performGet(queue,protocolConnection, channel, !body.getNoAck()))
+                    if (!performGet(queue,connection, channel, !body.getNoAck()))
                     {
-                        MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+                        MethodRegistry methodRegistry = connection.getMethodRegistry();
                         // TODO - set clusterId
                         BasicGetEmptyBody responseBody = methodRegistry.createBasicGetEmptyBody(null);
 
 
-                        protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+                        connection.writeFrame(responseBody.generateFrame(channelId));
                     }
                 }
                 catch (AccessControlException e)
                 {
                     throw body.getConnectionException(AMQConstant.ACCESS_REFUSED,
-                                                      e.getMessage());
+                                                      e.getMessage(), connection.getMethodRegistry());
                 }
                 catch (MessageSource.ExistingExclusiveConsumer e)
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue has an exclusive consumer");
+                                                      "Queue has an exclusive consumer", connection.getMethodRegistry());
                 }
                 catch (MessageSource.ExistingConsumerPreventsExclusive e)
                 {
                     throw body.getConnectionException(AMQConstant.INTERNAL_ERROR,
                                                       "The GET request has been evaluated as an exclusive consumer, " +
-                                                      "this is likely due to a programming error in the Qpid broker");
+                                                      "this is likely due to a programming error in the Qpid broker",
+                                                      connection.getMethodRegistry());
                 }
                 catch (MessageSource.ConsumerAccessRefused consumerAccessRefused)
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue has an incompatible exclusivit policy");
+                                                      "Queue has an incompatible exclusivit policy", connection.getMethodRegistry());
                 }
             }
         }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
index 0d09c31ec8..e90744ab5e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.protocol.v0_8.handler;
 
+import java.security.AccessControlException;
+
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
@@ -30,12 +32,9 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
-import java.security.AccessControlException;
-
 public class BasicPublishMethodHandler implements StateAwareMethodListener<BasicPublishBody>
 {
     private static final Logger _logger = Logger.getLogger(BasicPublishMethodHandler.class);
@@ -52,16 +51,17 @@ public class BasicPublishMethodHandler implements StateAwareMethodListener<Basic
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicPublishBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicPublishBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
         if (_logger.isDebugEnabled())
         {
             _logger.debug("Publish received on channel " + channelId);
         }
 
         AMQShortString exchangeName = body.getExchange();
-        VirtualHostImpl vHost = session.getVirtualHost();
+        VirtualHostImpl vHost = connection.getVirtualHost();
 
         // TODO: check the delivery tag field details - is it unique across the broker or per subscriber?
 
@@ -79,21 +79,22 @@ public class BasicPublishMethodHandler implements StateAwareMethodListener<Basic
         // if the exchange does not exist we raise a channel exception
         if (destination == null)
         {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange name");
+            throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange name",
+                                           connection.getMethodRegistry());
         }
         else
         {
             // The partially populated BasicDeliver frame plus the received route body
             // is stored in the channel. Once the final body frame has been received
             // it is routed to the exchange.
-            AMQChannel channel = session.getChannel(channelId);
+            AMQChannel channel = connection.getChannel(channelId);
 
             if (channel == null)
             {
-                throw body.getChannelNotFoundException(channelId);
+                throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
             }
 
-            MessagePublishInfo info = session.getMethodRegistry().getProtocolVersionMethodConverter().convertToInfo(body);
+            MessagePublishInfo info = connection.getMethodRegistry().getProtocolVersionMethodConverter().convertToInfo(body);
             info.setExchange(exchangeName);
             try
             {
@@ -101,7 +102,7 @@ public class BasicPublishMethodHandler implements StateAwareMethodListener<Basic
             }
             catch (AccessControlException e)
             {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
             }
         }
     }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
index e4a6636a74..9464be4c6e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
@@ -26,7 +26,6 @@ import org.apache.qpid.framing.BasicQosBody;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class BasicQosHandler implements StateAwareMethodListener<BasicQosBody>
@@ -38,21 +37,22 @@ public class BasicQosHandler implements StateAwareMethodListener<BasicQosBody>
         return _instance;
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicQosBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicQosBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        AMQChannel channel = session.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         channel.sync();
         channel.setCredit(body.getPrefetchSize(), body.getPrefetchCount());
 
 
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
         AMQMethodBody responseBody = methodRegistry.createBasicQosOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
+        connection.writeFrame(responseBody.generateFrame(channelId));
 
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
index 606bcf1693..2f0468fd15 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
@@ -29,7 +29,6 @@ import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class BasicRecoverMethodHandler implements StateAwareMethodListener<BasicRecoverBody>
@@ -43,29 +42,29 @@ public class BasicRecoverMethodHandler implements StateAwareMethodListener<Basic
         return _instance;
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicRecoverBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicRecoverBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        _logger.debug("Recover received on protocol session " + session + " and channel " + channelId);
-        AMQChannel channel = session.getChannel(channelId);
+        _logger.debug("Recover received on protocol session " + connection + " and channel " + channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         channel.resend();
 
         // Qpid 0-8 hacks a synchronous -ok onto recover.
         // In Qpid 0-9 we create a separate sync-recover, sync-recover-ok pair to be "more" compliant
-        if(session.getProtocolVersion().equals(ProtocolVersion.v8_0))
+        if(connection.getProtocolVersion().equals(ProtocolVersion.v8_0))
         {
-            MethodRegistry_8_0 methodRegistry = (MethodRegistry_8_0) session.getMethodRegistry();
+            MethodRegistry_8_0 methodRegistry = (MethodRegistry_8_0) connection.getMethodRegistry();
             AMQMethodBody recoverOk = methodRegistry.createBasicRecoverOkBody();
             channel.sync();
-            session.writeFrame(recoverOk.generateFrame(channelId));
+            connection.writeFrame(recoverOk.generateFrame(channelId));
 
         }
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
index ef26e60a62..efcec299e9 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
@@ -31,7 +31,6 @@ import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
 import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;

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

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

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

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

 

 public class BasicRecoverSyncMethodHandler implements StateAwareMethodListener<BasicRecoverSyncBody>

@@ -45,35 +44,36 @@ public class BasicRecoverSyncMethodHandler implements StateAwareMethodListener<B
         return _instance;

     }

 

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

+    public void methodReceived(final AMQProtocolSession<?> connection,

+                               BasicRecoverSyncBody body,

+                               int channelId) throws AMQException

     {

-        AMQProtocolSession session = stateManager.getProtocolSession();

 

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

-        AMQChannel channel = session.getChannel(channelId);

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

+        AMQChannel channel = connection.getChannel(channelId);

 

 

         if (channel == null)

         {

-            throw body.getChannelNotFoundException(channelId);

+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());

         }

         channel.sync();

         channel.resend();

 

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

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

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

+        if(connection.getProtocolVersion().equals(ProtocolVersion.v0_9))

         {

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

+            MethodRegistry_0_9 methodRegistry = (MethodRegistry_0_9) connection.getMethodRegistry();

             AMQMethodBody recoverOk = methodRegistry.createBasicRecoverSyncOkBody();

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

+            connection.writeFrame(recoverOk.generateFrame(channelId));

 

         }

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

+        else if(connection.getProtocolVersion().equals(ProtocolVersion.v0_91))

         {

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

+            MethodRegistry_0_91 methodRegistry = (MethodRegistry_0_91) connection.getMethodRegistry();

             AMQMethodBody recoverOk = methodRegistry.createBasicRecoverSyncOkBody();

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

+            connection.writeFrame(recoverOk.generateFrame(channelId));

 

         }

 

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
index fdbd44b06d..1f299893f9 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
@@ -27,8 +27,6 @@ import org.apache.qpid.framing.BasicRejectBody;
 import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class BasicRejectMethodHandler implements StateAwareMethodListener<BasicRejectBody>
@@ -46,15 +44,16 @@ public class BasicRejectMethodHandler implements StateAwareMethodListener<BasicR
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, BasicRejectBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               BasicRejectBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
 
-        AMQChannel channel = session.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         if (_logger.isDebugEnabled())
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
index e96d098618..a9e52c5240 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
@@ -29,7 +29,6 @@ import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class ChannelCloseHandler implements StateAwareMethodListener<ChannelCloseBody>
@@ -47,9 +46,10 @@ public class ChannelCloseHandler implements StateAwareMethodListener<ChannelClos
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ChannelCloseBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ChannelCloseBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
 
         if (_logger.isInfoEnabled())
         {
@@ -58,19 +58,19 @@ public class ChannelCloseHandler implements StateAwareMethodListener<ChannelClos
         }
 
 
-        AMQChannel channel = session.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "Trying to close unknown channel");
+            throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "Trying to close unknown channel", connection.getMethodRegistry());
         }
         channel.sync();
-        session.closeChannel(channelId);
+        connection.closeChannel(channelId);
         // Client requested closure so we don't wait for ok we send it
-        stateManager.getProtocolSession().closeChannelOk(channelId);
+        connection.closeChannelOk(channelId);
 
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
         ChannelCloseOkBody responseBody = methodRegistry.createChannelCloseOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
+        connection.writeFrame(responseBody.generateFrame(channelId));
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
index 2a220ff78d..fe9d20e151 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseOkHandler.java
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
+import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class ChannelCloseOkHandler implements StateAwareMethodListener<ChannelCloseOkBody>
@@ -42,12 +42,14 @@ public class ChannelCloseOkHandler implements StateAwareMethodListener<ChannelCl
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ChannelCloseOkBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ChannelCloseOkBody body,
+                               int channelId) throws AMQException
     {
 
         _logger.info("Received channel-close-ok for channel-id " + channelId);
 
         // Let the Protocol Session know the channel is now closed.
-        stateManager.getProtocolSession().closeChannelOk(channelId);
+        connection.closeChannelOk(channelId);
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
index cc1677c93e..99c0e3b2de 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
@@ -28,7 +28,6 @@ import org.apache.qpid.framing.ChannelFlowBody;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class ChannelFlowHandler implements StateAwareMethodListener<ChannelFlowBody>
@@ -46,23 +45,24 @@ public class ChannelFlowHandler implements StateAwareMethodListener<ChannelFlowB
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ChannelFlowBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ChannelFlowBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
 
 
-        AMQChannel channel = session.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         channel.sync();
         channel.setSuspended(!body.getActive());
         _logger.debug("Channel.Flow for channel " + channelId + ", active=" + body.getActive());
 
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
         AMQMethodBody responseBody = methodRegistry.createChannelFlowOkBody(body.getActive());
-        session.writeFrame(responseBody.generateFrame(channelId));
+        connection.writeFrame(responseBody.generateFrame(channelId));
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
index 63c6857216..dbfe07840f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
@@ -20,6 +20,11 @@
  */
 package org.apache.qpid.server.protocol.v0_8.handler;
 
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.UUID;
+
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
@@ -33,16 +38,10 @@ import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
 public class ChannelOpenHandler implements StateAwareMethodListener<ChannelOpenBody>
 {
     private static final Logger _logger = Logger.getLogger(ChannelOpenHandler.class);
@@ -58,10 +57,11 @@ public class ChannelOpenHandler implements StateAwareMethodListener<ChannelOpenB
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ChannelOpenBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ChannelOpenBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
 
         // Protect the broker against out of order frame request.
         if (virtualHost == null)
@@ -70,13 +70,13 @@ public class ChannelOpenHandler implements StateAwareMethodListener<ChannelOpenB
         }
         _logger.info("Connecting to: " + virtualHost.getName());
 
-        final AMQChannel channel = new AMQChannel(session,channelId, virtualHost.getMessageStore());
+        final AMQChannel channel = new AMQChannel(connection,channelId, virtualHost.getMessageStore());
 
-        session.addChannel(channel);
+        connection.addChannel(channel);
 
         ChannelOpenOkBody response;
 
-        ProtocolVersion pv = session.getProtocolVersion();
+        ProtocolVersion pv = connection.getProtocolVersion();
 
         if(pv.equals(ProtocolVersion.v8_0))
         {
@@ -138,6 +138,6 @@ public class ChannelOpenHandler implements StateAwareMethodListener<ChannelOpenB
         }
 
 
-        session.writeFrame(response.generateFrame(channelId));
+        connection.writeFrame(response.generateFrame(channelId));
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
index 60f9c1d495..c4a8eb4acb 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
@@ -27,7 +27,6 @@ import org.apache.qpid.framing.ConnectionCloseBody;
 import org.apache.qpid.framing.ConnectionCloseOkBody;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class ConnectionCloseMethodHandler implements StateAwareMethodListener<ConnectionCloseBody>
@@ -45,28 +44,29 @@ public class ConnectionCloseMethodHandler implements StateAwareMethodListener<Co
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ConnectionCloseBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ConnectionCloseBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
         if (_logger.isInfoEnabled())
         {
             _logger.info("ConnectionClose received with reply code/reply text " + body.getReplyCode() + "/" +
-                         body.getReplyText() + " for " + session);
+                         body.getReplyText() + " for " + connection);
         }
         try
         {
-            session.closeSession();
+            connection.closeSession();
         }
         catch (Exception e)
         {
             _logger.error("Error closing protocol session: " + e, e);
         }
 
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
         ConnectionCloseOkBody responseBody = methodRegistry.createConnectionCloseOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
+        connection.writeFrame(responseBody.generateFrame(channelId));
 
-        session.closeProtocolSession();
+        connection.closeProtocolSession();
 
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
index fe46b6c0cd..03c43cc80a 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
@@ -26,7 +26,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.ConnectionCloseOkBody;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class ConnectionCloseOkMethodHandler implements StateAwareMethodListener<ConnectionCloseOkBody>
@@ -44,16 +43,17 @@ public class ConnectionCloseOkMethodHandler implements StateAwareMethodListener<
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ConnectionCloseOkBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ConnectionCloseOkBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
         //todo should this not do more than just log the method?
         _logger.info("Received Connection-close-ok");
 
         try
         {
-            stateManager.changeState(AMQState.CONNECTION_CLOSED);
-            session.closeSession();
+            connection.changeState(AMQState.CONNECTION_CLOSED);
+            connection.closeSession();
         }
         catch (Exception e)
         {
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
index 632f751756..20c5e90f5d 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
@@ -34,7 +34,6 @@ import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.port.AmqpPort;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
@@ -58,9 +57,10 @@ public class ConnectionOpenMethodHandler implements StateAwareMethodListener<Con
         return new AMQShortString(Long.toString(System.currentTimeMillis()));
     }
 
-    public void methodReceived(AMQStateManager stateManager, ConnectionOpenBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ConnectionOpenBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
 
         //ignore leading '/'
         String virtualHostName;
@@ -73,42 +73,44 @@ public class ConnectionOpenMethodHandler implements StateAwareMethodListener<Con
             virtualHostName = body.getVirtualHost() == null ? null : String.valueOf(body.getVirtualHost());
         }
 
-        VirtualHostImpl virtualHost = ((AmqpPort)stateManager.getProtocolSession().getPort()).getVirtualHost(virtualHostName);
+        VirtualHostImpl virtualHost = ((AmqpPort)connection.getPort()).getVirtualHost(virtualHostName);
 
         if (virtualHost == null)
         {
-            throw body.getConnectionException(AMQConstant.NOT_FOUND, "Unknown virtual host: '" + virtualHostName + "'");
+            throw body.getConnectionException(AMQConstant.NOT_FOUND, "Unknown virtual host: '" + virtualHostName + "'",
+                                              connection.getMethodRegistry());
         }
         else
         {
             // Check virtualhost access
             if (virtualHost.getState() != State.ACTIVE)
             {
-                throw body.getConnectionException(AMQConstant.CONNECTION_FORCED, "Virtual host '" + virtualHost.getName() + "' is not active");
+                throw body.getConnectionException(AMQConstant.CONNECTION_FORCED, "Virtual host '" + virtualHost.getName() + "' is not active",
+                                                  connection.getMethodRegistry());
             }
 
-            session.setVirtualHost(virtualHost);
+            connection.setVirtualHost(virtualHost);
             try
             {
-                virtualHost.getSecurityManager().authoriseCreateConnection(session);
+                virtualHost.getSecurityManager().authoriseCreateConnection(connection);
             }
             catch (AccessControlException e)
             {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
             }
 
             // See Spec (0.8.2). Section  3.1.2 Virtual Hosts
-            if (session.getContextKey() == null)
+            if (connection.getContextKey() == null)
             {
-                session.setContextKey(generateClientID());
+                connection.setContextKey(generateClientID());
             }
 
-            MethodRegistry methodRegistry = session.getMethodRegistry();
+            MethodRegistry methodRegistry = connection.getMethodRegistry();
             AMQMethodBody responseBody =  methodRegistry.createConnectionOpenOkBody(body.getVirtualHost());
 
-            stateManager.changeState(AMQState.CONNECTION_OPEN);
+            connection.changeState(AMQState.CONNECTION_OPEN);
 
-            session.writeFrame(responseBody.generateFrame(channelId));
+            connection.writeFrame(responseBody.generateFrame(channelId));
         }
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
index 8a1160314b..7a0c0945e1 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
@@ -36,7 +36,6 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
@@ -56,19 +55,20 @@ public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ConnectionSecureOkBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ConnectionSecureOkBody body,
+                               int channelId) throws AMQException
     {
-        Broker<?> broker = stateManager.getBroker();
-        AMQProtocolSession session = stateManager.getProtocolSession();
+        Broker<?> broker = connection.getBroker();
 
-        SubjectCreator subjectCreator = stateManager.getSubjectCreator();
+        SubjectCreator subjectCreator = connection.getSubjectCreator();
 
-        SaslServer ss = session.getSaslServer();
+        SaslServer ss = connection.getSaslServer();
         if (ss == null)
         {
             throw new AMQException("No SASL context set up in session");
         }
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
         SubjectAuthenticationResult authResult = subjectCreator.authenticate(ss, body.getResponse());
         switch (authResult.getStatus())
         {
@@ -78,7 +78,7 @@ public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener
                 _logger.info("Authentication failed:" + (cause == null ? "" : cause.getMessage()));
 
                 // This should be abstracted
-                stateManager.changeState(AMQState.CONNECTION_CLOSING);
+                connection.changeState(AMQState.CONNECTION_CLOSING);
 
                 ConnectionCloseBody connectionCloseBody =
                         methodRegistry.createConnectionCloseBody(AMQConstant.NOT_ALLOWED.getCode(),
@@ -86,15 +86,15 @@ public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener
                                                                  body.getClazz(),
                                                                  body.getMethod());
 
-                session.writeFrame(connectionCloseBody.generateFrame(0));
-                disposeSaslServer(session);
+                connection.writeFrame(connectionCloseBody.generateFrame(0));
+                disposeSaslServer(connection);
                 break;
             case SUCCESS:
                 if (_logger.isInfoEnabled())
                 {
                     _logger.info("Connected as: " + authResult.getSubject());
                 }
-                stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
+                connection.changeState(AMQState.CONNECTION_NOT_TUNED);
 
                 int frameMax = broker.getContextValue(Integer.class, Broker.BROKER_FRAME_SIZE);
 
@@ -107,15 +107,15 @@ public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener
                         methodRegistry.createConnectionTuneBody(broker.getConnection_sessionCountLimit(),
                                                                 frameMax,
                                                                 broker.getConnection_heartBeatDelay());
-                session.writeFrame(tuneBody.generateFrame(0));
-                session.setAuthorizedSubject(authResult.getSubject());
-                disposeSaslServer(session);
+                connection.writeFrame(tuneBody.generateFrame(0));
+                connection.setAuthorizedSubject(authResult.getSubject());
+                disposeSaslServer(connection);
                 break;
             case CONTINUE:
-                stateManager.changeState(AMQState.CONNECTION_NOT_AUTH);
+                connection.changeState(AMQState.CONNECTION_NOT_AUTH);
 
                 ConnectionSecureBody secureBody = methodRegistry.createConnectionSecureBody(authResult.getChallenge());
-                session.writeFrame(secureBody.generateFrame(0));
+                connection.writeFrame(secureBody.generateFrame(0));
         }
     }
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
index e59032b87f..311b596979 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
@@ -35,7 +35,6 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
@@ -56,32 +55,36 @@ public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ConnectionStartOkBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ConnectionStartOkBody body,
+                               int channelId) throws AMQException
     {
-        Broker<?> broker = stateManager.getBroker();
-        AMQProtocolSession session = stateManager.getProtocolSession();
+        Broker<?> broker = connection.getBroker();
 
         _logger.info("SASL Mechanism selected: " + body.getMechanism());
         _logger.info("Locale selected: " + body.getLocale());
 
-        SubjectCreator subjectCreator = stateManager.getSubjectCreator();
+        SubjectCreator subjectCreator = connection.getSubjectCreator();
         SaslServer ss = null;
         try
         {
-            ss = subjectCreator.createSaslServer(String.valueOf(body.getMechanism()), session.getLocalFQDN(), session.getPeerPrincipal());
+            ss = subjectCreator.createSaslServer(String.valueOf(body.getMechanism()),
+                                                 connection.getLocalFQDN(),
+                                                 connection.getPeerPrincipal());
 
             if (ss == null)
             {
-                throw body.getConnectionException(AMQConstant.RESOURCE_ERROR, "Unable to create SASL Server:" + body.getMechanism());
+                throw body.getConnectionException(AMQConstant.RESOURCE_ERROR, "Unable to create SASL Server:" + body.getMechanism(),
+                                                  connection.getMethodRegistry());
             }
 
-            session.setSaslServer(ss);
+            connection.setSaslServer(ss);
 
             final SubjectAuthenticationResult authResult = subjectCreator.authenticate(ss, body.getResponse());
             //save clientProperties
-            session.setClientProperties(body.getClientProperties());
+            connection.setClientProperties(body.getClientProperties());
 
-            MethodRegistry methodRegistry = session.getMethodRegistry();
+            MethodRegistry methodRegistry = connection.getMethodRegistry();
 
             switch (authResult.getStatus())
             {
@@ -90,7 +93,7 @@ public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<
 
                     _logger.info("Authentication failed:" + (cause == null ? "" : cause.getMessage()));
 
-                    stateManager.changeState(AMQState.CONNECTION_CLOSING);
+                    connection.changeState(AMQState.CONNECTION_CLOSING);
 
                     ConnectionCloseBody closeBody =
                             methodRegistry.createConnectionCloseBody(AMQConstant.NOT_ALLOWED.getCode(),    // replyCode
@@ -98,8 +101,8 @@ public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<
                                                                      body.getClazz(),
                                                                      body.getMethod());
 
-                    session.writeFrame(closeBody.generateFrame(0));
-                    disposeSaslServer(session);
+                    connection.writeFrame(closeBody.generateFrame(0));
+                    disposeSaslServer(connection);
                     break;
 
                 case SUCCESS:
@@ -107,9 +110,9 @@ public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<
                     {
                         _logger.info("Connected as: " + authResult.getSubject());
                     }
-                    session.setAuthorizedSubject(authResult.getSubject());
+                    connection.setAuthorizedSubject(authResult.getSubject());
 
-                    stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
+                    connection.changeState(AMQState.CONNECTION_NOT_TUNED);
                     int frameMax = broker.getContextValue(Integer.class, Broker.BROKER_FRAME_SIZE);
 
                     if(frameMax <= 0)
@@ -120,18 +123,18 @@ public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<
                     ConnectionTuneBody tuneBody = methodRegistry.createConnectionTuneBody(broker.getConnection_sessionCountLimit(),
                                                                                           frameMax,
                                                                                           broker.getConnection_heartBeatDelay());
-                    session.writeFrame(tuneBody.generateFrame(0));
+                    connection.writeFrame(tuneBody.generateFrame(0));
                     break;
                 case CONTINUE:
-                    stateManager.changeState(AMQState.CONNECTION_NOT_AUTH);
+                    connection.changeState(AMQState.CONNECTION_NOT_AUTH);
 
                     ConnectionSecureBody secureBody = methodRegistry.createConnectionSecureBody(authResult.getChallenge());
-                    session.writeFrame(secureBody.generateFrame(0));
+                    connection.writeFrame(secureBody.generateFrame(0));
             }
         }
         catch (SaslException e)
         {
-            disposeSaslServer(session);
+            disposeSaslServer(connection);
             throw new AMQException("SASL error: " + e, e);
         }
     }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
index fb4818d3ed..d5f066063d 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
@@ -29,7 +29,6 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.AMQState;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class ConnectionTuneOkMethodHandler implements StateAwareMethodListener<ConnectionTuneOkBody>
@@ -43,19 +42,20 @@ public class ConnectionTuneOkMethodHandler implements StateAwareMethodListener<C
         return _instance;
     }
 
-    public void methodReceived(AMQStateManager stateManager, ConnectionTuneOkBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ConnectionTuneOkBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
 
         if (_logger.isDebugEnabled())
         {
             _logger.debug(body);
         }
-        stateManager.changeState(AMQState.CONNECTION_NOT_OPENED);
+        connection.changeState(AMQState.CONNECTION_NOT_OPENED);
 
-        session.initHeartbeats(body.getHeartbeat());
+        connection.initHeartbeats(body.getHeartbeat());
 
-        int brokerFrameMax = stateManager.getBroker().getContextValue(Integer.class,Broker.BROKER_FRAME_SIZE);
+        int brokerFrameMax = connection.getBroker().getContextValue(Integer.class,Broker.BROKER_FRAME_SIZE);
         if(brokerFrameMax <= 0)
         {
             brokerFrameMax = Integer.MAX_VALUE;
@@ -68,7 +68,7 @@ public class ConnectionTuneOkMethodHandler implements StateAwareMethodListener<C
                                              + "greater than the broker will allow: "
                                              + brokerFrameMax,
                                              body.getClazz(), body.getMethod(),
-                                             body.getMajor(), body.getMinor(),null);
+                                             connection.getMethodRegistry(),null);
         }
         else if(body.getFrameMax() > 0 && body.getFrameMax() < AMQConstant.FRAME_MIN_SIZE.getCode())
         {
@@ -77,13 +77,13 @@ public class ConnectionTuneOkMethodHandler implements StateAwareMethodListener<C
                                              + "which is smaller than the specification definined minimum: "
                                              + AMQConstant.FRAME_MIN_SIZE.getCode(),
                                              body.getClazz(), body.getMethod(),
-                                             body.getMajor(), body.getMinor(),null);
+                                             connection.getMethodRegistry(),null);
         }
         int frameMax = body.getFrameMax() == 0 ? brokerFrameMax : (int) body.getFrameMax();
-        session.setMaxFrameSize(frameMax);
+        connection.setMaxFrameSize(frameMax);
 
         long maxChannelNumber = body.getChannelMax();
         //0 means no implied limit, except that forced by protocol limitations (0xFFFF)
-        session.setMaximumNumberOfChannels( maxChannelNumber == 0 ? 0xFFFFL : maxChannelNumber);
+        connection.setMaximumNumberOfChannels(maxChannelNumber == 0 ? 0xFFFFL : maxChannelNumber);
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
index 2ea638a358..22e377c219 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
@@ -29,7 +29,6 @@ import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
@@ -65,16 +64,17 @@ public class ExchangeBoundHandler implements StateAwareMethodListener<ExchangeBo
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ExchangeBoundBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ExchangeBoundBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = session.getVirtualHost();
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
 
-        final AMQChannel channel = session.getChannel(channelId);
+        final AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         channel.sync();
 
@@ -227,7 +227,7 @@ public class ExchangeBoundHandler implements StateAwareMethodListener<ExchangeBo
                 }
             }
         }
-        session.writeFrame(response.generateFrame(channelId));
+        connection.writeFrame(response.generateFrame(channelId));
     }
 
     protected boolean isDefaultExchange(final AMQShortString exchangeName)
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
index 3f48b413ef..f90f47d77c 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
@@ -41,7 +41,6 @@ import org.apache.qpid.server.model.NoFactoryForTypeException;
 import org.apache.qpid.server.model.UnknownConfiguredObjectException;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.ExchangeExistsException;
 import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
@@ -62,14 +61,15 @@ public class ExchangeDeclareHandler implements StateAwareMethodListener<Exchange
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ExchangeDeclareBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ExchangeDeclareBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = session.getVirtualHost();
-        final AMQChannel channel = session.getChannel(channelId);
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
+        final AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         final AMQShortString exchangeName = body.getExchange();
@@ -89,7 +89,7 @@ public class ExchangeDeclareHandler implements StateAwareMethodListener<Exchange
                                                                           + ExchangeDefaults.DIRECT_EXCHANGE_CLASS
                                                                           + " to " + body.getType() +".",
                                                  body.getClazz(), body.getMethod(),
-                                                 body.getMajor(), body.getMinor(),null);
+                                                 connection.getMethodRegistry(),null);
             }
         }
         else
@@ -99,14 +99,15 @@ public class ExchangeDeclareHandler implements StateAwareMethodListener<Exchange
                 exchange = virtualHost.getExchange(exchangeName.toString());
                 if(exchange == null)
                 {
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange: " + exchangeName);
+                    throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange: " + exchangeName,
+                                                   connection.getMethodRegistry());
                 }
                 else if (!(body.getType() == null || body.getType().length() ==0) && !exchange.getType().equals(body.getType().asString()))
                 {
 
                     throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: " +
                                       exchangeName + " of type " + exchange.getType()
-                                      + " to " + body.getType() +".",body.getClazz(), body.getMethod(),body.getMajor(),body.getMinor(),null);
+                                      + " to " + body.getType() +".",body.getClazz(), body.getMethod(),connection.getMethodRegistry(),null);
                 }
 
             }
@@ -139,7 +140,7 @@ public class ExchangeDeclareHandler implements StateAwareMethodListener<Exchange
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
                                               "Attempt to declare exchange: " + exchangeName +
-                                              " which begins with reserved prefix.");
+                                              " which begins with reserved prefix.", connection.getMethodRegistry());
 
                 }
                 catch(ExchangeExistsException e)
@@ -147,40 +148,44 @@ public class ExchangeDeclareHandler implements StateAwareMethodListener<Exchange
                     exchange = e.getExistingExchange();
                     if(!new AMQShortString(exchange.getType()).equals(body.getType()))
                     {
-                        throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: "
-                                                                                  + exchangeName + " of type "
-                                                                                  + exchange.getType()
-                                                                                  + " to " + body.getType() +".",
-                                                         body.getClazz(), body.getMethod(),
-                                                         body.getMajor(), body.getMinor(),null);
+                        throw body.getConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: "
+                                                                                   + exchangeName + " of type "
+                                                                                   + exchange.getType()
+                                                                                   + " to " + body.getType() + ".",
+                                                          connection.getMethodRegistry());
                     }
                 }
                 catch(NoFactoryForTypeException e)
                 {
-                    throw body.getConnectionException(AMQConstant.COMMAND_INVALID, "Unknown exchange: " + exchangeName,e);
+                    throw body.getConnectionException(AMQConstant.COMMAND_INVALID, "Unknown exchange type '"+e.getType()+"' for exchange '" + exchangeName + "'", connection.getMethodRegistry());
                 }
                 catch (AccessControlException e)
                 {
-                    throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                    throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
                 }
                 catch (UnknownConfiguredObjectException e)
                 {
                     // note - since 0-8/9/9-1 can't set the alt. exchange this exception should never occur
-                    throw body.getConnectionException(AMQConstant.NOT_FOUND, "Unknown alternate exchange",e);
+                    throw body.getConnectionException(AMQConstant.NOT_FOUND,
+                                                      "Unknown alternate exchange "
+                                                        + (e.getName() != null
+                                                              ? "name: \"" + e.getName() + "\""
+                                                              : "id: " + e.getId()),
+                                                      connection.getMethodRegistry());
                 }
                 catch (IllegalArgumentException e)
                 {
-                    throw body.getConnectionException(AMQConstant.COMMAND_INVALID, "Error creating exchange",e);
+                    throw body.getConnectionException(AMQConstant.COMMAND_INVALID, "Error creating exchange '"+exchangeName+"': " + e.getMessage(),connection.getMethodRegistry());
                 }
             }
         }
 
         if(!body.getNowait())
         {
-            MethodRegistry methodRegistry = session.getMethodRegistry();
+            MethodRegistry methodRegistry = connection.getMethodRegistry();
             AMQMethodBody responseBody = methodRegistry.createExchangeDeclareOkBody();
             channel.sync();
-            session.writeFrame(responseBody.generateFrame(channelId));
+            connection.writeFrame(responseBody.generateFrame(channelId));
         }
     }
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
index 1c01a24f63..b5c10c190e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.protocol.v0_8.handler;
 
+import java.security.AccessControlException;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ExchangeDeleteBody;
@@ -28,14 +30,11 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
 import org.apache.qpid.server.virtualhost.RequiredExchangeException;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
-import java.security.AccessControlException;
-
 public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeDeleteBody>
 {
     private static final ExchangeDeleteHandler _instance = new ExchangeDeleteHandler();
@@ -49,14 +48,15 @@ public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeD
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, ExchangeDeleteBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               ExchangeDeleteBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = session.getVirtualHost();
-        final AMQChannel channel = session.getChannel(channelId);
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
+        final AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         channel.sync();
         try
@@ -64,7 +64,7 @@ public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeD
 
             if(isDefaultExchange(body.getExchange()))
             {
-                throw body.getConnectionException(AMQConstant.NOT_ALLOWED, "Default Exchange cannot be deleted");
+                throw body.getConnectionException(AMQConstant.NOT_ALLOWED, "Default Exchange cannot be deleted", connection.getMethodRegistry());
             }
 
             final String exchangeName = body.getExchange().toString();
@@ -72,28 +72,31 @@ public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeD
             final ExchangeImpl exchange = virtualHost.getExchange(exchangeName);
             if(exchange == null)
             {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No such exchange: " + body.getExchange());
+                throw body.getChannelException(AMQConstant.NOT_FOUND, "No such exchange: " + body.getExchange(),
+                                               connection.getMethodRegistry());
             }
 
             virtualHost.removeExchange(exchange, !body.getIfUnused());
 
-            ExchangeDeleteOkBody responseBody = session.getMethodRegistry().createExchangeDeleteOkBody();
+            ExchangeDeleteOkBody responseBody = connection.getMethodRegistry().createExchangeDeleteOkBody();
 
-            session.writeFrame(responseBody.generateFrame(channelId));
+            connection.writeFrame(responseBody.generateFrame(channelId));
         }
 
         catch (ExchangeIsAlternateException e)
         {
-            throw body.getChannelException(AMQConstant.NOT_ALLOWED, "Exchange in use as an alternate exchange");
+            throw body.getChannelException(AMQConstant.NOT_ALLOWED, "Exchange in use as an alternate exchange",
+                                           connection.getMethodRegistry());
 
         }
         catch (RequiredExchangeException e)
         {
-            throw body.getChannelException(AMQConstant.NOT_ALLOWED, "Exchange '"+body.getExchange()+"' cannot be deleted");
+            throw body.getChannelException(AMQConstant.NOT_ALLOWED, "Exchange '"+body.getExchange()+"' cannot be deleted",
+                                           connection.getMethodRegistry());
         }
         catch (AccessControlException e)
         {
-            throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+            throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
         }
     }
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
index 0140d2ec7e..c47a4b528f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
@@ -36,7 +36,6 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
@@ -56,15 +55,16 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, QueueBindBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               QueueBindBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
-        AMQChannel channel = protocolConnection.getChannel(channelId);
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         final AMQQueue queue;
@@ -79,7 +79,8 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
 
             if (queue == null)
             {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null");
+                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null",
+                                               connection.getMethodRegistry());
             }
 
             if (body.getRoutingKey() == null)
@@ -99,12 +100,14 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
 
         if (queue == null)
         {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + queueName + " does not exist.");
+            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + queueName + " does not exist.",
+                                           connection.getMethodRegistry());
         }
 
         if(isDefaultExchange(body.getExchange()))
         {
-            throw body.getConnectionException(AMQConstant.NOT_ALLOWED, "Cannot bind the queue " + queueName + " to the default exchange");
+            throw body.getConnectionException(AMQConstant.NOT_ALLOWED, "Cannot bind the queue " + queueName + " to the default exchange",
+                                              connection.getMethodRegistry());
         }
 
         final String exchangeName = body.getExchange().toString();
@@ -112,7 +115,8 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
         final ExchangeImpl exch = virtualHost.getExchange(exchangeName);
         if (exch == null)
         {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + exchangeName + " does not exist.");
+            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + exchangeName + " does not exist.",
+                                           connection.getMethodRegistry());
         }
 
 
@@ -133,7 +137,7 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
         }
         catch (AccessControlException e)
         {
-            throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+            throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
         }
 
         if (_log.isInfoEnabled())
@@ -143,9 +147,9 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
         if (!body.getNowait())
         {
             channel.sync();
-            MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+            MethodRegistry methodRegistry = connection.getMethodRegistry();
             AMQMethodBody responseBody = methodRegistry.createQueueBindOkBody();
-            protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+            connection.writeFrame(responseBody.generateFrame(channelId));
 
         }
     }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
index ef8d01d89f..0e1016c319 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
@@ -39,7 +39,6 @@ import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueArgumentsConverter;
@@ -57,11 +56,12 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
         return _instance;
     }
 
-    public void methodReceived(AMQStateManager stateManager, QueueDeclareBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               QueueDeclareBody body,
+                               int channelId) throws AMQException
     {
-        final AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        final AMQSessionModel session = protocolConnection.getChannel(channelId);
-        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
+        final AMQSessionModel session = connection.getChannel(channelId);
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
 
         final AMQShortString queueName;
 
@@ -79,11 +79,11 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
 
         //TODO: do we need to check that the queue already exists with exactly the same "configuration"?
 
-        AMQChannel channel = protocolConnection.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         if(body.getPassive())
@@ -92,14 +92,15 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
             if (queue == null)
             {
                 String msg = "Queue: " + queueName + " not found on VirtualHost(" + virtualHost + ").";
-                throw body.getChannelException(AMQConstant.NOT_FOUND, msg);
+                throw body.getChannelException(AMQConstant.NOT_FOUND, msg, connection.getMethodRegistry());
             }
             else
             {
                 if (!queue.verifySessionAccess(channel))
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue " + queue.getName() + " is exclusive, but not created on this Connection.");
+                                                      "Queue " + queue.getName() + " is exclusive, but not created on this Connection.",
+                                                      connection.getMethodRegistry());
                 }
 
                 //set this as the default queue on the channel:
@@ -112,7 +113,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
             try
             {
 
-                queue = createQueue(channel, queueName, body, virtualHost, protocolConnection);
+                queue = createQueue(channel, queueName, body, virtualHost, connection);
 
             }
             catch(QueueExistsException qe)
@@ -123,33 +124,37 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
                 if (!queue.verifySessionAccess(channel))
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue " + queue.getName() + " is exclusive, but not created on this Connection.");
+                                                      "Queue " + queue.getName() + " is exclusive, but not created on this Connection.",
+                                                      connection.getMethodRegistry());
                 }
                 else if(queue.isExclusive() != body.getExclusive())
                 {
 
                     throw body.getChannelException(AMQConstant.ALREADY_EXISTS,
                             "Cannot re-declare queue '" + queue.getName() + "' with different exclusivity (was: "
-                            + queue.isExclusive() + " requested " + body.getExclusive() + ")");
+                            + queue.isExclusive() + " requested " + body.getExclusive() + ")",
+                            connection.getMethodRegistry());
                 }
                 else if((body.getAutoDelete() && queue.getLifetimePolicy() != LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS)
                     || (!body.getAutoDelete() && queue.getLifetimePolicy() != ((body.getExclusive() && !body.getDurable()) ? LifetimePolicy.DELETE_ON_CONNECTION_CLOSE : LifetimePolicy.PERMANENT)))
                 {
                     throw body.getChannelException(AMQConstant.ALREADY_EXISTS,
                                                       "Cannot re-declare queue '" + queue.getName() + "' with different lifetime policy (was: "
-                                                        + queue.getLifetimePolicy() + " requested autodelete: " + body.getAutoDelete() + ")");
+                                                        + queue.getLifetimePolicy() + " requested autodelete: " + body.getAutoDelete() + ")",
+                                                      connection.getMethodRegistry());
                 }
                 else if(queue.isDurable() != body.getDurable())
                 {
                     throw body.getChannelException(AMQConstant.ALREADY_EXISTS,
                                                       "Cannot re-declare queue '" + queue.getName() + "' with different durability (was: "
-                                                        + queue.isDurable() + " requested " + body.getDurable() + ")");
+                                                        + queue.isDurable() + " requested " + body.getDurable() + ")",
+                                                      connection.getMethodRegistry());
                 }
 
             }
             catch (AccessControlException e)
             {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
             }
 
             //set this as the default queue on the channel:
@@ -159,12 +164,12 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
         if (!body.getNowait())
         {
             channel.sync();
-            MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+            MethodRegistry methodRegistry = connection.getMethodRegistry();
             QueueDeclareOkBody responseBody =
                     methodRegistry.createQueueDeclareOkBody(queueName,
                                                             queue.getQueueDepthMessages(),
                                                             queue.getConsumerCount());
-            protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+            connection.writeFrame(responseBody.generateFrame(channelId));
 
             _logger.info("Queue " + queueName + " declared successfully");
         }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
index 84efcb68b8..123c076a25 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.protocol.v0_8.handler;
 
+import java.security.AccessControlException;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.framing.QueueDeleteBody;
@@ -27,14 +29,10 @@ import org.apache.qpid.framing.QueueDeleteOkBody;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
-import java.security.AccessControlException;
-
 public class QueueDeleteHandler implements StateAwareMethodListener<QueueDeleteBody>
 {
     private static final QueueDeleteHandler _instance = new QueueDeleteHandler();
@@ -57,18 +55,17 @@ public class QueueDeleteHandler implements StateAwareMethodListener<QueueDeleteB
 
     }
 
-    public void methodReceived(AMQStateManager stateManager, QueueDeleteBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               QueueDeleteBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
-        DurableConfigurationStore store = virtualHost.getDurableConfigurationStore();
-
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
 
-        AMQChannel channel = protocolConnection.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         channel.sync();
         AMQQueue queue;
@@ -87,26 +84,30 @@ public class QueueDeleteHandler implements StateAwareMethodListener<QueueDeleteB
         {
             if (_failIfNotFound)
             {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
+                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.",
+                                               connection.getMethodRegistry());
             }
         }
         else
         {
             if (body.getIfEmpty() && !queue.isEmpty())
             {
-                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.getQueue() + " is not empty.");
+                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.getQueue() + " is not empty.",
+                                               connection.getMethodRegistry());
             }
             else if (body.getIfUnused() && !queue.isUnused())
             {
                 // TODO - Error code
-                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.getQueue() + " is still used.");
+                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.getQueue() + " is still used.",
+                                               connection.getMethodRegistry());
             }
             else
             {
                 if (!queue.verifySessionAccess(channel))
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue " + queue.getName() + " is exclusive, but not created on this Connection.");
+                                                      "Queue " + queue.getName() + " is exclusive, but not created on this Connection.",
+                                                      connection.getMethodRegistry());
                 }
 
                 int purged = 0;
@@ -116,12 +117,12 @@ public class QueueDeleteHandler implements StateAwareMethodListener<QueueDeleteB
                 }
                 catch (AccessControlException e)
                 {
-                    throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                    throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
                 }
 
-                MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+                MethodRegistry methodRegistry = connection.getMethodRegistry();
                 QueueDeleteOkBody responseBody = methodRegistry.createQueueDeleteOkBody(purged);
-                protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+                connection.writeFrame(responseBody.generateFrame(channelId));
             }
         }
     }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
index 68ecf0324c..2c06fef1e2 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
@@ -21,6 +21,8 @@
 
 package org.apache.qpid.server.protocol.v0_8.handler;
 
+import java.security.AccessControlException;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQMethodBody;
 import org.apache.qpid.framing.MethodRegistry;
@@ -28,13 +30,10 @@ import org.apache.qpid.framing.QueuePurgeBody;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
+import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
-import java.security.AccessControlException;
-
 public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBody>
 {
     private static final QueuePurgeHandler _instance = new QueuePurgeHandler();
@@ -56,15 +55,16 @@ public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBod
         _failIfNotFound = failIfNotFound;
     }
 
-    public void methodReceived(AMQStateManager stateManager, QueuePurgeBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               QueuePurgeBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
 
-        AMQChannel channel = protocolConnection.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
         AMQQueue queue;
         if(body.getQueue() == null)
@@ -77,7 +77,7 @@ public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBod
             {
                 if(_failIfNotFound)
                 {
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,"No queue specified.");
+                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,"No queue specified.", connection.getMethodRegistry());
                 }
             }
         }
@@ -90,7 +90,8 @@ public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBod
         {
             if(_failIfNotFound)
             {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
+                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.",
+                                               connection.getMethodRegistry());
             }
         }
         else
@@ -98,7 +99,7 @@ public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBod
                 if (!queue.verifySessionAccess(channel))
                 {
                     throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-                                                      "Queue is exclusive, but not created on this Connection.");
+                                                      "Queue is exclusive, but not created on this Connection.", connection.getMethodRegistry());
                 }
 
             long purged = 0;
@@ -108,16 +109,16 @@ public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBod
             }
             catch (AccessControlException e)
             {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
             }
 
 
             if(!body.getNowait())
                 {
                     channel.sync();
-                    MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
+                    MethodRegistry methodRegistry = connection.getMethodRegistry();
                     AMQMethodBody responseBody = methodRegistry.createQueuePurgeOkBody(purged);
-                    protocolConnection.writeFrame(responseBody.generateFrame(channelId));
+                    connection.writeFrame(responseBody.generateFrame(channelId));
 
                 }
         }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
index 4e2d1bc8a2..9ae66b889c 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.protocol.v0_8.handler;
 
+import java.security.AccessControlException;
+
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
@@ -33,13 +35,10 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
+import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
-import java.security.AccessControlException;
-
 public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindBody>
 {
     private static final Logger _log = Logger.getLogger(QueueUnbindHandler.class);
@@ -55,19 +54,20 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, QueueUnbindBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               QueueUnbindBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHostImpl virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = connection.getVirtualHost();
 
         final AMQQueue queue;
         final AMQShortString routingKey;
 
 
-        AMQChannel channel = session.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         if (body.getQueue() == null)
@@ -77,7 +77,8 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB
 
             if (queue == null)
             {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null");
+                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null",
+                                               connection.getMethodRegistry());
             }
 
             routingKey = body.getRoutingKey() == null ? null : body.getRoutingKey().intern(false);
@@ -91,23 +92,28 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB
 
         if (queue == null)
         {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
+            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.",
+                                           connection.getMethodRegistry());
         }
 
         if(isDefaultExchange(body.getExchange()))
         {
-            throw body.getConnectionException(AMQConstant.NOT_ALLOWED, "Cannot unbind the queue " + queue.getName() + " from the default exchange");
+            throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
+                                              "Cannot unbind the queue "
+                                              + queue.getName()
+                                              + " from the default exchange", connection.getMethodRegistry());
         }
 
         final ExchangeImpl exch = virtualHost.getExchange(body.getExchange() == null ? null : body.getExchange().toString());
         if (exch == null)
         {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + body.getExchange() + " does not exist.");
+            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + body.getExchange() + " does not exist.",
+                                           connection.getMethodRegistry());
         }
 
         if(!exch.hasBinding(String.valueOf(routingKey), queue))
         {
-            throw body.getChannelException(AMQConstant.NOT_FOUND,"No such binding");
+            throw body.getChannelException(AMQConstant.NOT_FOUND,"No such binding", connection.getMethodRegistry());
         }
         else
         {
@@ -117,7 +123,7 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB
             }
             catch (AccessControlException e)
             {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
+                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
             }
         }
 
@@ -127,7 +133,7 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB
             _log.info("Binding queue " + queue + " to exchange " + exch + " with routing key " + routingKey);
         }
 
-        final MethodRegistry registry = session.getMethodRegistry();
+        final MethodRegistry registry = connection.getMethodRegistry();
         final AMQMethodBody responseBody;
         if (registry instanceof MethodRegistry_0_9)
         {
@@ -140,10 +146,10 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB
         else
         {
             // 0-8 does not support QueueUnbind
-            throw new AMQException(AMQConstant.COMMAND_INVALID, "QueueUnbind not present in AMQP version: " + session.getProtocolVersion(), null);
+            throw new AMQException(AMQConstant.COMMAND_INVALID, "QueueUnbind not present in AMQP version: " + connection.getProtocolVersion(), null);
         }
         channel.sync();
-        session.writeFrame(responseBody.generateFrame(channelId));
+        connection.writeFrame(responseBody.generateFrame(channelId));
     }
 
     protected boolean isDefaultExchange(final AMQShortString exchangeName)
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
index 43e97c0cb6..429b5875bc 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
@@ -20,20 +20,20 @@
  */

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

 

-import org.apache.qpid.AMQException;

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

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

-

 import java.util.HashMap;

 import java.util.Map;

 

+import org.apache.qpid.AMQException;

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

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

+

 public class ServerMethodDispatcherImpl implements MethodDispatcher

 {

-    private final AMQStateManager _stateManager;

+    private final AMQProtocolSession<?> _connection;

 

     private static interface DispatcherFactory

         {

-            public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager);

+            public MethodDispatcher createMethodDispatcher(AMQProtocolSession<?> connection);

         }

 

         private static final Map<ProtocolVersion, DispatcherFactory> _dispatcherFactories =

@@ -45,26 +45,26 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
             _dispatcherFactories.put(ProtocolVersion.v8_0,

                                      new DispatcherFactory()

                                      {

-                                         public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager)

+                                         public MethodDispatcher createMethodDispatcher(AMQProtocolSession<?> connection)

                                          {

-                                             return new ServerMethodDispatcherImpl_8_0(stateManager);

+                                             return new ServerMethodDispatcherImpl_8_0(connection);

                                          }

                                      });

 

             _dispatcherFactories.put(ProtocolVersion.v0_9,

                                      new DispatcherFactory()

                                      {

-                                         public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager)

+                                         public MethodDispatcher createMethodDispatcher(AMQProtocolSession<?> connection)

                                          {

-                                             return new ServerMethodDispatcherImpl_0_9(stateManager);

+                                             return new ServerMethodDispatcherImpl_0_9(connection);

                                          }

                                      });

             _dispatcherFactories.put(ProtocolVersion.v0_91,

                          new DispatcherFactory()

                          {

-                             public MethodDispatcher createMethodDispatcher(AMQStateManager stateManager)

+                             public MethodDispatcher createMethodDispatcher(AMQProtocolSession<?> connection)

                              {

-                                 return new ServerMethodDispatcherImpl_0_91(stateManager);

+                                 return new ServerMethodDispatcherImpl_0_91(connection);

                              }

                          });

 

@@ -103,82 +103,80 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
 

 

 

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

+    public static MethodDispatcher createMethodDispatcher(AMQProtocolSession<?> connection)

     {

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

+        return _dispatcherFactories.get(connection.getProtocolVersion()).createMethodDispatcher(connection);

     }

 

 

-    public ServerMethodDispatcherImpl(AMQStateManager stateManager)

+    public ServerMethodDispatcherImpl(AMQProtocolSession<?> connection)

     {

-        _stateManager = stateManager;

+        _connection = connection;

     }

 

 

-    protected AMQStateManager getStateManager()

+    protected final AMQProtocolSession<?> getConnection()

     {

-        return _stateManager;

+        return _connection;

     }

 

-

-

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

     {

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

+        _accessRequestHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicAckMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicCancelMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicConsumeMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicGetMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicPublishMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicQosHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicRecoverMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _basicRejectMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _channelOpenHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

@@ -225,21 +223,21 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
 

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

     {

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

+        _channelCloseHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

 

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

     {

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

+        _channelCloseOkHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

 

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

     {

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

+        _channelFlowHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

@@ -256,21 +254,23 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
 

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

     {

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

+        _connectionOpenMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

 

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

     {

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

+        _connectionCloseMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

 

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

     {

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

+        _connectionCloseOkMethodHandler.methodReceived(

+                getConnection(),

+                                                       body, channelId);

         return true;

     }

 

@@ -299,15 +299,6 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
         throw new UnexpectedMethodException(body);

     }

 

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

 

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

     {

@@ -324,46 +315,6 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
         throw new UnexpectedMethodException(body);

     }

 

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

     {

         throw new UnexpectedMethodException(body);

@@ -384,31 +335,6 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
         throw new UnexpectedMethodException(body);

     }

 

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

-    {

-        throw new UnexpectedMethodException(body);

-    }

-

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

     {

         throw new UnexpectedMethodException(body);

@@ -427,144 +353,84 @@ public class ServerMethodDispatcherImpl implements MethodDispatcher
 

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

     {

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

+        _connectionSecureOkMethodHandler.methodReceived(

+                getConnection(),

+                                                        body, channelId);

         return true;

     }

 

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

     {

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

+        _connectionStartOkMethodHandler.methodReceived(

+                getConnection(),

+                                                       body, channelId);

         return true;

     }

 

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

     {

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

+        _connectionTuneOkMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

     {

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

+        _exchangeBoundHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _exchangeDeclareHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _exchangeDeleteHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

     {

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

+        _queueBindHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _queueDeclareHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _queueDeleteHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _queuePurgeHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

 

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

     {

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

+        _txCommitHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _txRollbackHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

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

     {

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

+        _txSelectHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
index 1ee6d732c2..4d66d0f999 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java
@@ -24,7 +24,7 @@ package org.apache.qpid.server.protocol.v0_8.handler;
 import org.apache.qpid.AMQException;

 import org.apache.qpid.framing.*;

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

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

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

 

 

 

@@ -40,14 +40,14 @@ public class ServerMethodDispatcherImpl_0_9
             QueueUnbindHandler.getInstance();

 

 

-    public ServerMethodDispatcherImpl_0_9(AMQStateManager stateManager)

+    public ServerMethodDispatcherImpl_0_9(AMQProtocolSession<?> connection)

     {

-        super(stateManager);

+        super(connection);

     }

 

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

     {

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

+        _basicRecoverSyncMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

@@ -56,101 +56,6 @@ public class ServerMethodDispatcherImpl_0_9
         throw new UnexpectedMethodException(body);

     }

 

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

     {

         throw new UnexpectedMethodException(body);

@@ -158,7 +63,7 @@ public class ServerMethodDispatcherImpl_0_9
 

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

     {

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

+        _queueUnbindHandler.methodReceived(getConnection(), body,channelId);

         return true;

     }

 }

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
index b11b9cff2b..711dfe12ff 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java
@@ -24,7 +24,7 @@ package org.apache.qpid.server.protocol.v0_8.handler;
 import org.apache.qpid.AMQException;

 import org.apache.qpid.framing.*;

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

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

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

 

 

 public class ServerMethodDispatcherImpl_0_91

@@ -39,14 +39,14 @@ public class ServerMethodDispatcherImpl_0_91
             QueueUnbindHandler.getInstance();

 

 

-    public ServerMethodDispatcherImpl_0_91(AMQStateManager stateManager)

+    public ServerMethodDispatcherImpl_0_91(AMQProtocolSession<?> connection)

     {

-        super(stateManager);

+        super(connection);

     }

 

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

     {

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

+        _basicRecoverSyncMethodHandler.methodReceived(getConnection(), body, channelId);

         return true;

     }

 

@@ -55,106 +55,6 @@ public class ServerMethodDispatcherImpl_0_91
         throw new UnexpectedMethodException(body);

     }

 

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

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

-    }

-

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

     {

         throw new UnexpectedMethodException(body);

@@ -162,7 +62,7 @@ public class ServerMethodDispatcherImpl_0_91
 

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

     {

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

+        _queueUnbindHandler.methodReceived(getConnection(), body,channelId);

         return true;

     }

 }

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
index f05219712f..df2306428f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
@@ -23,24 +23,16 @@ package org.apache.qpid.server.protocol.v0_8.handler;
 import org.apache.qpid.AMQException;

 import org.apache.qpid.framing.BasicRecoverOkBody;

 import org.apache.qpid.framing.ChannelAlertBody;

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

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

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

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

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

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

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

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

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

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

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

 

 public class ServerMethodDispatcherImpl_8_0

         extends ServerMethodDispatcherImpl

         implements MethodDispatcher_8_0

 {

-    public ServerMethodDispatcherImpl_8_0(AMQStateManager stateManager)

+    public ServerMethodDispatcherImpl_8_0(AMQProtocolSession<?> connection)

     {

-        super(stateManager);

+        super(connection);

     }

 

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

@@ -53,43 +45,4 @@ public class ServerMethodDispatcherImpl_8_0
         throw new UnexpectedMethodException(body);

     }

 

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

-

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

-    {

-        return false;

-    }

 }

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
index b257030a59..cb08b1fd4f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
@@ -28,7 +28,6 @@ import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.framing.TxCommitBody;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class TxCommitHandler implements StateAwareMethodListener<TxCommitBody>
@@ -46,21 +45,21 @@ public class TxCommitHandler implements StateAwareMethodListener<TxCommitBody>
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, TxCommitBody body, final int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               TxCommitBody body,
+                               final int channelId) throws AMQException
     {
-        final AMQProtocolSession session = stateManager.getProtocolSession();
-
         try
         {
             if (_log.isDebugEnabled())
             {
                 _log.debug("Commit received on channel " + channelId);
             }
-            AMQChannel channel = session.getChannel(channelId);
+            AMQChannel channel = connection.getChannel(channelId);
 
             if (channel == null)
             {
-                throw body.getChannelNotFoundException(channelId);
+                throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
             }
             channel.commit(new Runnable()
             {
@@ -68,9 +67,9 @@ public class TxCommitHandler implements StateAwareMethodListener<TxCommitBody>
                 @Override
                 public void run()
                 {
-                    MethodRegistry methodRegistry = session.getMethodRegistry();
+                    MethodRegistry methodRegistry = connection.getMethodRegistry();
                     AMQMethodBody responseBody = methodRegistry.createTxCommitOkBody();
-                    session.writeFrame(responseBody.generateFrame(channelId));
+                    connection.writeFrame(responseBody.generateFrame(channelId));
                 }
             }, true);
 
@@ -79,7 +78,8 @@ public class TxCommitHandler implements StateAwareMethodListener<TxCommitBody>
         }
         catch (AMQException e)
         {
-            throw body.getChannelException(e.getErrorCode(), "Failed to commit: " + e.getMessage());
+            throw body.getChannelException(e.getErrorCode(), "Failed to commit: " + e.getMessage(),
+                                           connection.getMethodRegistry());
         }
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
index 69ad1a0a21..08c1c2378b 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
@@ -26,7 +26,6 @@ import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.framing.TxRollbackBody;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class TxRollbackHandler implements StateAwareMethodListener<TxRollbackBody>
@@ -42,22 +41,22 @@ public class TxRollbackHandler implements StateAwareMethodListener<TxRollbackBod
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, TxRollbackBody body, final int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               TxRollbackBody body,
+                               final int channelId) throws AMQException
     {
-        final AMQProtocolSession session = stateManager.getProtocolSession();
-
         try
         {
-            AMQChannel channel = session.getChannel(channelId);
+            AMQChannel channel = connection.getChannel(channelId);
 
             if (channel == null)
             {
-                throw body.getChannelNotFoundException(channelId);
+                throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
             }
 
 
 
-            final MethodRegistry methodRegistry = session.getMethodRegistry();
+            final MethodRegistry methodRegistry = connection.getMethodRegistry();
             final AMQMethodBody responseBody = methodRegistry.createTxRollbackOkBody();
 
             Runnable task = new Runnable()
@@ -65,7 +64,7 @@ public class TxRollbackHandler implements StateAwareMethodListener<TxRollbackBod
 
                 public void run()
                 {
-                    session.writeFrame(responseBody.generateFrame(channelId));
+                    connection.writeFrame(responseBody.generateFrame(channelId));
                 }
             };
 
@@ -79,7 +78,8 @@ public class TxRollbackHandler implements StateAwareMethodListener<TxRollbackBod
         }
         catch (AMQException e)
         {
-            throw body.getChannelException(e.getErrorCode(), "Failed to rollback: " + e.getMessage());
+            throw body.getChannelException(e.getErrorCode(), "Failed to rollback: " + e.getMessage(),
+                                           connection.getMethodRegistry());
         }
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
index a43e1ebdab..d6ac194b09 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
@@ -26,7 +26,6 @@ import org.apache.qpid.framing.TxSelectBody;
 import org.apache.qpid.framing.TxSelectOkBody;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 
 public class TxSelectHandler implements StateAwareMethodListener<TxSelectBody>
@@ -42,21 +41,21 @@ public class TxSelectHandler implements StateAwareMethodListener<TxSelectBody>
     {
     }
 
-    public void methodReceived(AMQStateManager stateManager, TxSelectBody body, int channelId) throws AMQException
+    public void methodReceived(final AMQProtocolSession<?> connection,
+                               TxSelectBody body,
+                               int channelId) throws AMQException
     {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        AMQChannel channel = session.getChannel(channelId);
+        AMQChannel channel = connection.getChannel(channelId);
 
         if (channel == null)
         {
-            throw body.getChannelNotFoundException(channelId);
+            throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
         }
 
         channel.setLocalTransactional();
 
-        MethodRegistry methodRegistry = session.getMethodRegistry();
+        MethodRegistry methodRegistry = connection.getMethodRegistry();
         TxSelectOkBody responseBody = methodRegistry.createTxSelectOkBody();
-        session.writeFrame(responseBody.generateFrame(channelId));
+        connection.writeFrame(responseBody.generateFrame(channelId));
     }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
deleted file mode 100644
index 3c1f1dedc3..0000000000
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol.v0_8.state;
-
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import javax.security.auth.Subject;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.framing.ChannelOpenBody;
-import org.apache.qpid.framing.MethodDispatcher;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQMethodListener;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
-import org.apache.qpid.server.security.SubjectCreator;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
-
-/**
- * The state manager is responsible for managing the state of the protocol session.
- * <p>
- * For each AMQProtocolHandler there is a separate state manager.
- */
-public class AMQStateManager implements AMQMethodListener
-{
-    private static final Logger _logger = Logger.getLogger(AMQStateManager.class);
-
-    private final Broker<?> _broker;
-    private final AMQProtocolSession _protocolSession;
-    /** The current state */
-    private AMQState _currentState;
-
-    public AMQStateManager(Broker<?> broker, AMQProtocolSession protocolSession)
-    {
-        _broker = broker;
-        _protocolSession = protocolSession;
-        _currentState = AMQState.CONNECTION_NOT_STARTED;
-
-    }
-
-    /**
-     * Get the Broker instance
-     *
-     * @return the Broker
-     */
-    public Broker<?> getBroker()
-    {
-        return _broker;
-    }
-
-    public void changeState(AMQState newState)
-    {
-        _logger.debug("State changing to " + newState + " from old state " + _currentState);
-        final AMQState oldState = _currentState;
-        _currentState = newState;
-
-    }
-
-    public void error(Exception e)
-    {
-        _logger.error("State manager received error notification[Current State:" + _currentState + "]: " + e, e);
-    }
-
-    public <B extends AMQMethodBody> boolean methodReceived(AMQMethodEvent<B> evt) throws AMQException
-    {
-        final MethodDispatcher dispatcher = _protocolSession.getMethodDispatcher();
-
-        final int channelId = evt.getChannelId();
-        final B body = evt.getMethod();
-
-        final AMQChannel channel = _protocolSession.getChannel(channelId);
-        if(channelId != 0 && channel == null)
-        {
-
-            if(! ((body instanceof ChannelOpenBody)
-                  || (body instanceof ChannelCloseOkBody)
-                  || (body instanceof ChannelCloseBody)))
-            {
-                throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "channel is closed won't process:" + body);
-            }
-
-        }
-        if(channel == null)
-        {
-            return body.execute(dispatcher, channelId);
-        }
-        else
-        {
-            try
-            {
-                return Subject.doAs(channel.getSubject(), new PrivilegedExceptionAction<Boolean>()
-                {
-                    @Override
-                    public Boolean run() throws AMQException
-                    {
-                        return body.execute(dispatcher, channelId);
-                    }
-                });
-            }
-            catch (PrivilegedActionException e)
-            {
-                if(e.getCause() instanceof AMQException)
-                {
-                    throw (AMQException) e.getCause();
-                }
-                else
-                {
-                    throw new ServerScopedRuntimeException(e.getCause());
-                }
-            }
-
-
-        }
-
-    }
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        return _protocolSession;
-    }
-
-
-    public SubjectCreator getSubjectCreator()
-    {
-        return _broker.getSubjectCreator(getProtocolSession().getLocalAddress(), getProtocolSession().getTransport().isSecure());
-    }
-}
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
index 63ab23919d..d767c7e326 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/StateAwareMethodListener.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.protocol.v0_8.state;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQMethodBody;
+import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 
 /**
  * A frame listener that is informed of the protocol state when invoked and has
@@ -30,5 +31,5 @@ import org.apache.qpid.framing.AMQMethodBody;
  */
 public interface StateAwareMethodListener<B extends AMQMethodBody>
 {
-    void methodReceived(AMQStateManager stateManager,  B evt, int channelId) throws AMQException;
+    void methodReceived(final AMQProtocolSession<?> connection, B evt, int channelId) throws AMQException;
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
index d76fdf25e6..29a064b712 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
@@ -244,16 +244,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         return false;
     }
 
-    public boolean dispatchStreamCancelOk(StreamCancelOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchStreamConsumeOk(StreamConsumeOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
     public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException
     {
         throw new AMQMethodNotImplementedException(body);
@@ -324,16 +314,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchDtxSelect(DtxSelectBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchDtxStart(DtxStartBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
     public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException
     {
         throw new AMQMethodNotImplementedException(body);
@@ -349,36 +329,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchFileAck(FileAckBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileCancel(FileCancelBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileConsume(FileConsumeBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFilePublish(FilePublishBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileQos(FileQosBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileReject(FileRejectBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
     public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException
     {
         throw new AMQMethodNotImplementedException(body);
@@ -399,30 +349,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchStreamCancel(StreamCancelBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchStreamConsume(StreamConsumeBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchStreamPublish(StreamPublishBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchStreamQos(StreamQosBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchTunnelRequest(TunnelRequestBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
 
     public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException
     {
@@ -439,16 +365,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchDtxSelectOk(DtxSelectOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchDtxStartOk(DtxStartOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
     public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws AMQException
     {
         _exchangeBoundOkMethodHandler.methodReceived(_session, body, channelId);
@@ -465,46 +381,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         return false;
     }
 
-    public boolean dispatchFileCancelOk(FileCancelOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileConsumeOk(FileConsumeOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileDeliver(FileDeliverBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileOpen(FileOpenBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileOpenOk(FileOpenOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileQosOk(FileQosOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileReturn(FileReturnBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
     public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws AMQException
     {
         return false;
@@ -515,21 +391,6 @@ public class ClientMethodDispatcherImpl implements MethodDispatcher
         return false;
     }
 
-    public boolean dispatchStreamDeliver(StreamDeliverBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchStreamQosOk(StreamQosOkBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchStreamReturn(StreamReturnBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
     public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws AMQException
     {
         return false;
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
index f4fc3a4715..7be75414ca 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
@@ -43,101 +43,6 @@ public class ClientMethodDispatcherImpl_0_9 extends ClientMethodDispatcherImpl i
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchChannelResume(ChannelResumeBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageCancel(MessageCancelBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageGet(MessageGetBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageRecover(MessageRecoverBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
     public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException
     {
         throw new AMQMethodNotImplementedException(body);
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
index 5f33561a8f..284bd675a8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
@@ -43,114 +43,14 @@ public class ClientMethodDispatcherImpl_0_91 extends ClientMethodDispatcherImpl
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchChannelResume(ChannelResumeBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageCancel(MessageCancelBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageGet(MessageGetBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageRecover(MessageRecoverBody body, int channelId) throws AMQException
-    {
-        throw new AMQMethodNotImplementedException(body);
-    }
-
-    public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
     public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException
     {
         throw new AMQMethodNotImplementedException(body);
     }
 
-    public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
     public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException
     {
         return false;
     }
 
-}
\ No newline at end of file
+}
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
index 28ad6037d4..d2ae057e6d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
@@ -24,14 +24,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.client.protocol.AMQProtocolSession;
 import org.apache.qpid.framing.BasicRecoverOkBody;
 import org.apache.qpid.framing.ChannelAlertBody;
-import org.apache.qpid.framing.TestContentBody;
-import org.apache.qpid.framing.TestContentOkBody;
-import org.apache.qpid.framing.TestIntegerBody;
-import org.apache.qpid.framing.TestIntegerOkBody;
-import org.apache.qpid.framing.TestStringBody;
-import org.apache.qpid.framing.TestStringOkBody;
-import org.apache.qpid.framing.TestTableBody;
-import org.apache.qpid.framing.TestTableOkBody;
 import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;
 
 public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl implements MethodDispatcher_8_0
@@ -51,43 +43,4 @@ public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl i
         return false;
     }
 
-    public boolean dispatchTestContent(TestContentBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException
-    {
-        return false;
-    }
-
-    public boolean dispatchTestTableOk(TestTableOkBody body, int channelId) throws AMQException
-    {
-        return false;  
-    }
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 2c69aa1b51..89bf684b3d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -47,6 +47,7 @@ import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.HeartbeatBody;
 import org.apache.qpid.framing.MethodDispatcher;
 import org.apache.qpid.framing.MethodRegistry;
+import org.apache.qpid.framing.MethodRegistrySource;
 import org.apache.qpid.framing.ProtocolInitiation;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.protocol.AMQConstant;
@@ -60,7 +61,7 @@ import org.apache.qpid.transport.TransportException;
  * <p>
  * The underlying protocol session is still available but clients should not use it to obtain session attributes.
  */
-public class AMQProtocolSession implements AMQVersionAwareProtocolSession
+public class AMQProtocolSession implements AMQVersionAwareProtocolSession, MethodRegistrySource
 {
     protected static final int LAST_WRITE_FUTURE_JOIN_TIMEOUT = 1000 * 60 * 2;
 
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java b/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
index c56cf9a72b..63d3fe57b0 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
+++ b/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
@@ -23,7 +23,7 @@ package org.apache.qpid.client;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.transport.TestNetworkConnection;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.amqp_0_91.QueueDeclareOkBodyImpl;
+import org.apache.qpid.framing.QueueDeclareOkBodyImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.url.AMQBindingURL;
diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index 55f0fe57b0..2264dee682 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
@@ -23,7 +23,6 @@ package org.apache.qpid;
 import org.apache.qpid.framing.AMQFrame;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.protocol.AMQConstant;
 
 /**
@@ -34,23 +33,25 @@ public class AMQChannelException extends AMQException
     private final int _classId;
     private final int _methodId;
     /* AMQP version for which exception ocurred */
-    private final byte major;
-    private final byte minor;
+    private final MethodRegistry _methodRegistry;
 
-    public AMQChannelException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor,
-        Throwable cause)
+
+    public AMQChannelException(AMQConstant errorCode,
+                               String msg,
+                               int classId,
+                               int methodId,
+                               MethodRegistry methodRegistry)
     {
-        super(errorCode, msg, cause);
+        super(errorCode, msg);
         _classId = classId;
         _methodId = methodId;
-        this.major = major;
-        this.minor = minor;
+        _methodRegistry = methodRegistry;
+
     }
 
     public AMQFrame getCloseFrame(int channel)
     {
-        MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor));
-        return new AMQFrame(channel, reg.createChannelCloseBody(getErrorCode() == null ? AMQConstant.INTERNAL_ERROR.getCode() : getErrorCode().getCode(),
+        return new AMQFrame(channel, _methodRegistry.createChannelCloseBody(getErrorCode() == null ? AMQConstant.INTERNAL_ERROR.getCode() : getErrorCode().getCode(),
                 AMQShortString.validValueOf(getMessage()),_classId,_methodId));
     }
 
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
index 096c4ede80..c8ae5a7787 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
@@ -22,6 +22,7 @@
 package org.apache.qpid;
 
 import org.apache.qpid.framing.AMQFrame;
+import org.apache.qpid.framing.AMQMethodBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.framing.ProtocolVersion;
@@ -35,32 +36,36 @@ public class AMQConnectionException extends AMQException
     private final int _classId;
     private final int _methodId;
 
-    /** AMQP version for which exception ocurred, major code. */
-    private final byte major;
-
-    /** AMQP version for which exception ocurred, minor code. */
-    private final byte minor;
-
-    private boolean _closeConnetion;
+    private final MethodRegistry _methodRegistry;
 
     public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor,
         Throwable cause)
     {
+        this(errorCode, msg, classId, methodId, MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor)), cause);
+    }
+
+    public AMQConnectionException(AMQConstant errorCode, String msg, AMQMethodBody body, MethodRegistry methodRegistry)
+    {
+        this(errorCode, msg, body.getClazz(), body.getMethod(), methodRegistry, null);
+    }
+
+    public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, MethodRegistry methodRegistry,
+                                  Throwable cause)
+    {
         super(errorCode, msg, cause);
         _classId = classId;
         _methodId = methodId;
-        this.major = major;
-        this.minor = minor;
+        _methodRegistry = methodRegistry;
+
     }
 
-    public AMQFrame getCloseFrame(int channel)
+    public AMQFrame getCloseFrame()
     {
-        MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor));
         return new AMQFrame(0,
-                            reg.createConnectionCloseBody(getErrorCode().getCode(),
-                                    AMQShortString.validValueOf(getMessage()),
-                                                          _classId,
-                                                          _methodId));
+                            _methodRegistry.createConnectionCloseBody(getErrorCode().getCode(),
+                                                                      AMQShortString.validValueOf(getMessage()),
+                                                                      _classId,
+                                                                      _methodId));
 
     }
 
diff --git a/java/common/src/main/java/org/apache/qpid/AMQException.java b/java/common/src/main/java/org/apache/qpid/AMQException.java
index 3741cb9902..7d2521a057 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQException.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid;
 
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.protocol.AMQConstant;
 
 /**
@@ -72,7 +71,6 @@ public class AMQException extends Exception
         this(null, (msg == null) ? "" : msg);
     }
 
-    @Deprecated
     public AMQException(AMQConstant errorCode, String msg)
     {
         this(errorCode, (msg == null) ? "" : msg, null);
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java b/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
index 53e8c998c9..d5c2f7bd1a 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
+++ b/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
@@ -38,8 +38,8 @@ import org.apache.qpid.framing.AMQProtocolVersionException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ByteArrayDataInput;
 import org.apache.qpid.framing.EncodingUtils;
+import org.apache.qpid.framing.MethodRegistrySource;
 import org.apache.qpid.framing.ProtocolInitiation;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
 
 /**
  * AMQDecoder delegates the decoding of AMQP either to a data block decoder, or in the case of new connections, to a
@@ -74,16 +74,15 @@ public class AMQDecoder
      * Creates a new AMQP decoder.
      *
      * @param expectProtocolInitiation <tt>true</tt> if this decoder needs to handle protocol initiation.
-     * @param session protocol session (connection)
+     * @param registrySource method registry source
      */
-    public AMQDecoder(boolean expectProtocolInitiation, AMQVersionAwareProtocolSession session)
+    public AMQDecoder(boolean expectProtocolInitiation, MethodRegistrySource registrySource)
     {
         _expectProtocolInitiation = expectProtocolInitiation;
-        _bodyFactory = new AMQMethodBodyFactory(session);
+        _bodyFactory = new AMQMethodBodyFactory(registrySource);
     }
 
 
-
     /**
      * Sets the protocol initation flag, that determines whether decoding is handled by the data decoder of the protocol
      * initation decoder. This method is expected to be called with <tt>false</tt> once protocol initation completes.
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
index 250b8e87d1..23315d4787 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
@@ -20,28 +20,18 @@
  */
 package org.apache.qpid.framing;
 
+import java.io.DataOutput;
+import java.io.IOException;
+
 import org.apache.qpid.AMQChannelException;
 import org.apache.qpid.AMQConnectionException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.protocol.AMQConstant;
 
-import java.io.DataOutput;
-import java.io.IOException;
-
 public interface AMQMethodBody extends AMQBody
 {
     public static final byte TYPE = 1;
 
-    /** AMQP major version 
-     * @return the major version*/
-    public byte getMajor();
-
-    /** AMQP minor version 
-     * @return the minor version*/
-    public byte getMinor();
-
-
-
     /** @return unsigned short */
     public int getClazz();
 
@@ -66,18 +56,18 @@ public interface AMQMethodBody extends AMQBody
      *
      * @param channelId The channel id that is not found
      *
+     * @param methodRegistry
      * @return new AMQChannelException
      */
-    public AMQChannelException getChannelNotFoundException(int channelId);
-
-    public AMQChannelException getChannelException(AMQConstant code, String message);
-
-    public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause);
-
-    public AMQConnectionException getConnectionException(AMQConstant code, String message);
+    public AMQChannelException getChannelNotFoundException(int channelId, final MethodRegistry methodRegistry);
 
+    public AMQChannelException getChannelException(AMQConstant code,
+                                                   String message,
+                                                   final MethodRegistry methodRegistry);
 
-    public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause);
+    public AMQConnectionException getConnectionException(AMQConstant code,
+                                                         String message,
+                                                         final MethodRegistry methodRegistry);
 
 
     public boolean execute(MethodDispatcher methodDispatcher, int channelId) throws AMQException;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
index 7fe293b6b7..fc49afb131 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
@@ -20,27 +20,26 @@
  */
 package org.apache.qpid.framing;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.codec.MarkableDataInput;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
-
-import java.io.IOException;
 
 public class AMQMethodBodyFactory implements BodyFactory
 {
     private static final Logger _log = LoggerFactory.getLogger(AMQMethodBodyFactory.class);
 
-    private final AMQVersionAwareProtocolSession _protocolSession;
+    private final MethodRegistrySource _registrySource;
 
-    public AMQMethodBodyFactory(AMQVersionAwareProtocolSession protocolSession)
+    public AMQMethodBodyFactory(MethodRegistrySource registrySource)
     {
-        _protocolSession = protocolSession;
+        _registrySource = registrySource;
     }
 
     public AMQBody createBody(MarkableDataInput in, long bodySize) throws AMQFrameDecodingException, IOException
     {
-        return _protocolSession.getMethodRegistry().convertToBody(in, bodySize);
+        return _registrySource.getMethodRegistry().convertToBody(in, bodySize);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
index b1e8a73a0d..d3e58c4444 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
@@ -21,6 +21,10 @@
 package org.apache.qpid.framing;
 
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import org.apache.qpid.AMQChannelException;
 import org.apache.qpid.AMQConnectionException;
 import org.apache.qpid.AMQException;
@@ -28,10 +32,6 @@ import org.apache.qpid.codec.MarkableDataInput;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
 public abstract class AMQMethodBodyImpl implements AMQMethodBody
 {
     public static final byte TYPE = 1;
@@ -67,31 +67,26 @@ public abstract class AMQMethodBodyImpl implements AMQMethodBody
      *
      * @param channelId The channel id that is not found
      *
+     * @param methodRegistry
      * @return new AMQChannelException
      */
-    public AMQChannelException getChannelNotFoundException(int channelId)
-    {
-        return getChannelException(AMQConstant.NOT_FOUND, "Channel not found for id:" + channelId);
-    }
-
-    public AMQChannelException getChannelException(AMQConstant code, String message)
+    public AMQChannelException getChannelNotFoundException(int channelId, final MethodRegistry methodRegistry)
     {
-        return new AMQChannelException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), null);
+        return getChannelException(AMQConstant.NOT_FOUND, "Channel not found for id:" + channelId, methodRegistry);
     }
 
-    public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause)
+    public AMQChannelException getChannelException(AMQConstant code,
+                                                   String message,
+                                                   final MethodRegistry methodRegistry)
     {
-        return new AMQChannelException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), cause);
+        return new AMQChannelException(code, message, getClazz(), getMethod(), methodRegistry);
     }
 
-    public AMQConnectionException getConnectionException(AMQConstant code, String message)
+    public AMQConnectionException getConnectionException(AMQConstant code,
+                                                         String message,
+                                                         final MethodRegistry methodRegistry)
     {
-        return new AMQConnectionException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), null);
-    }
-
-    public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause)
-    {
-        return new AMQConnectionException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), cause);
+        return new AMQConnectionException(code, message, this, methodRegistry);
     }
 
     public void handle(final int channelId, final AMQVersionAwareProtocolSession session) throws AMQException
@@ -198,20 +193,6 @@ public abstract class AMQMethodBodyImpl implements AMQMethodBody
         EncodingUtils.writeShort(buffer, s);
     }
 
-    protected Content readContent(DataInput buffer)
-    {
-        return null;
-    }
-
-    protected int getSizeOf(Content body)
-    {
-        return 0;
-    }
-
-    protected void writeContent(DataOutput buffer, Content body)
-    {
-    }
-
     protected byte readBitfield(DataInput buffer) throws IOException
     {
         return readByte(buffer);
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicAckBodyImpl.java
index 81f84ecf7f..617feabfb1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicAckBodyImpl.java
@@ -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 BasicAckBodyImpl extends AMQMethodBody_8_0 implements BasicAckBody
+public class BasicAckBodyImpl extends AMQMethodBodyImpl implements BasicAckBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -110,7 +109,7 @@ public class BasicAckBodyImpl extends AMQMethodBody_8_0 implements BasicAckBody
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicAck(this, channelId);
+        return dispatcher.dispatchBasicAck(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBodyImpl.java
index 196268654b..fdfb981b86 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBodyImpl.java
@@ -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 BasicCancelBodyImpl extends AMQMethodBody_8_0 implements BasicCancelBody
+public class BasicCancelBodyImpl extends AMQMethodBodyImpl implements BasicCancelBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -111,7 +110,7 @@ public class BasicCancelBodyImpl extends AMQMethodBody_8_0 implements BasicCance
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicCancel(this, channelId);
+        return dispatcher.dispatchBasicCancel(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBodyImpl.java
index 082348616d..c1232b9047 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBodyImpl.java
@@ -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 BasicCancelOkBodyImpl extends AMQMethodBody_8_0 implements BasicCancelOkBody
+public class BasicCancelOkBodyImpl extends AMQMethodBodyImpl implements BasicCancelOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class BasicCancelOkBodyImpl extends AMQMethodBody_8_0 implements BasicCan
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicCancelOk(this, channelId);
+        return dispatcher.dispatchBasicCancelOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBodyImpl.java
index d11f18986f..ea13064979 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBodyImpl.java
@@ -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 BasicConsumeBodyImpl extends AMQMethodBody_8_0 implements BasicConsumeBody
+public class BasicConsumeBodyImpl extends AMQMethodBodyImpl implements BasicConsumeBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -171,7 +170,7 @@ public class BasicConsumeBodyImpl extends AMQMethodBody_8_0 implements BasicCons
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicConsume(this, channelId);
+        return dispatcher.dispatchBasicConsume(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBodyImpl.java
index 7327b2da3f..c7f590012b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBodyImpl.java
@@ -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 BasicConsumeOkBodyImpl extends AMQMethodBody_8_0 implements BasicConsumeOkBody
+public class BasicConsumeOkBodyImpl extends AMQMethodBodyImpl implements BasicConsumeOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class BasicConsumeOkBodyImpl extends AMQMethodBody_8_0 implements BasicCo
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicConsumeOk(this, channelId);
+        return dispatcher.dispatchBasicConsumeOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBodyImpl.java
index 58cf16fe55..e1e6e1aa03 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBodyImpl.java
@@ -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 BasicDeliverBodyImpl extends AMQMethodBody_8_0 implements BasicDeliverBody
+public class BasicDeliverBodyImpl extends AMQMethodBodyImpl implements BasicDeliverBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -141,7 +140,7 @@ public class BasicDeliverBodyImpl extends AMQMethodBody_8_0 implements BasicDeli
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicDeliver(this, channelId);
+        return dispatcher.dispatchBasicDeliver(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicGetBodyImpl.java
index d348101cee..3ec7d47ce8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicGetBodyImpl.java
@@ -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 BasicGetBodyImpl extends AMQMethodBody_8_0 implements BasicGetBody
+public class BasicGetBodyImpl extends AMQMethodBodyImpl implements BasicGetBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -120,7 +119,7 @@ public class BasicGetBodyImpl extends AMQMethodBody_8_0 implements BasicGetBody
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicGet(this, channelId);
+        return dispatcher.dispatchBasicGet(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBodyImpl.java
index 3e49be1eb1..bea04254f1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBodyImpl.java
@@ -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 BasicGetEmptyBodyImpl extends AMQMethodBody_8_0 implements BasicGetEmptyBody
+public class BasicGetEmptyBodyImpl extends AMQMethodBodyImpl implements BasicGetEmptyBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class BasicGetEmptyBodyImpl extends AMQMethodBody_8_0 implements BasicGet
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicGetEmpty(this, channelId);
+        return dispatcher.dispatchBasicGetEmpty(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBodyImpl.java
index bcfefe2e34..f2573ab25d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBodyImpl.java
@@ -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 BasicGetOkBodyImpl extends AMQMethodBody_8_0 implements BasicGetOkBody
+public class BasicGetOkBodyImpl extends AMQMethodBodyImpl implements BasicGetOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -140,7 +139,7 @@ public class BasicGetOkBodyImpl extends AMQMethodBody_8_0 implements BasicGetOkB
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicGetOk(this, channelId);
+        return dispatcher.dispatchBasicGetOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBodyImpl.java
index dc5d82a5b4..db49a34081 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBodyImpl.java
@@ -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 BasicPublishBodyImpl extends AMQMethodBody_8_0 implements BasicPublishBody
+public class BasicPublishBodyImpl extends AMQMethodBodyImpl implements BasicPublishBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -140,7 +139,7 @@ public class BasicPublishBodyImpl extends AMQMethodBody_8_0 implements BasicPubl
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicPublish(this, channelId);
+        return dispatcher.dispatchBasicPublish(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicQosBodyImpl.java
index 76fdfac3cd..b96fa0b67d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicQosBodyImpl.java
@@ -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 BasicQosBodyImpl extends AMQMethodBody_8_0 implements BasicQosBody
+public class BasicQosBodyImpl extends AMQMethodBodyImpl implements BasicQosBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -119,7 +118,7 @@ public class BasicQosBodyImpl extends AMQMethodBody_8_0 implements BasicQosBody
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicQos(this, channelId);
+        return dispatcher.dispatchBasicQos(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBodyImpl.java
index a9d7ca998c..9f60a2225c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBodyImpl.java
@@ -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 BasicQosOkBodyImpl extends AMQMethodBody_8_0 implements BasicQosOkBody
+public class BasicQosOkBodyImpl extends AMQMethodBodyImpl implements BasicQosOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class BasicQosOkBodyImpl extends AMQMethodBody_8_0 implements BasicQosOkB
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicQosOk(this, channelId);
+        return dispatcher.dispatchBasicQosOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBodyImpl.java
index 2ad62004bc..12f79e37f5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBodyImpl.java
@@ -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 BasicRecoverBodyImpl extends AMQMethodBody_8_0 implements BasicRecoverBody
+public class BasicRecoverBodyImpl extends AMQMethodBodyImpl implements BasicRecoverBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -101,7 +100,7 @@ public class BasicRecoverBodyImpl extends AMQMethodBody_8_0 implements BasicReco
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicRecover(this, channelId);
+        return dispatcher.dispatchBasicRecover(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBodyImpl.java
index b1ae381f12..a4cce3cb50 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBodyImpl.java
@@ -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 BasicRejectBodyImpl extends AMQMethodBody_8_0 implements BasicRejectBody
+public class BasicRejectBodyImpl extends AMQMethodBodyImpl implements BasicRejectBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -110,7 +109,7 @@ public class BasicRejectBodyImpl extends AMQMethodBody_8_0 implements BasicRejec
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicReject(this, channelId);
+        return dispatcher.dispatchBasicReject(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBodyImpl.java
index 9675aec1a1..e19227bb19 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBodyImpl.java
@@ -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 BasicReturnBodyImpl extends AMQMethodBody_8_0 implements BasicReturnBody
+public class BasicReturnBodyImpl extends AMQMethodBodyImpl implements BasicReturnBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -126,7 +125,7 @@ public class BasicReturnBodyImpl extends AMQMethodBody_8_0 implements BasicRetur
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchBasicReturn(this, channelId);
+        return dispatcher.dispatchBasicReturn(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBodyImpl.java
index dccb691dc8..2fc0e1557e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBodyImpl.java
@@ -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 ChannelCloseBodyImpl extends AMQMethodBody_8_0 implements ChannelCloseBody
+public class ChannelCloseBodyImpl extends AMQMethodBodyImpl implements ChannelCloseBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -124,7 +123,7 @@ public class ChannelCloseBodyImpl extends AMQMethodBody_8_0 implements ChannelCl
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchChannelClose(this, channelId);
+        return dispatcher.dispatchChannelClose(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBodyImpl.java
index ed3eab5da9..6b9f14c46b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBodyImpl.java
@@ -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 ChannelCloseOkBodyImpl extends AMQMethodBody_8_0 implements ChannelCloseOkBody
+public class ChannelCloseOkBodyImpl extends AMQMethodBodyImpl implements ChannelCloseOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -87,7 +86,7 @@ public class ChannelCloseOkBodyImpl extends AMQMethodBody_8_0 implements Channel
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchChannelCloseOk(this, channelId);
+        return dispatcher.dispatchChannelCloseOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBodyImpl.java
index 12886543cf..cfefa9f45a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBodyImpl.java
@@ -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 ChannelFlowBodyImpl extends AMQMethodBody_8_0 implements ChannelFlowBody
+public class ChannelFlowBodyImpl extends AMQMethodBodyImpl implements ChannelFlowBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -101,7 +100,7 @@ public class ChannelFlowBodyImpl extends AMQMethodBody_8_0 implements ChannelFlo
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchChannelFlow(this, channelId);
+        return dispatcher.dispatchChannelFlow(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBodyImpl.java
index 8b6ae9c444..1f4d3b6f80 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBodyImpl.java
@@ -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 ChannelFlowOkBodyImpl extends AMQMethodBody_8_0 implements ChannelFlowOkBody
+public class ChannelFlowOkBodyImpl extends AMQMethodBodyImpl implements ChannelFlowOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -101,7 +100,7 @@ public class ChannelFlowOkBodyImpl extends AMQMethodBody_8_0 implements ChannelF
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchChannelFlowOk(this, channelId);
+        return dispatcher.dispatchChannelFlowOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java
deleted file mode 100644
index 4f332aea8f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface ChannelOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBodyImpl.java
index c4dab6343d..0473d9289e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBodyImpl.java
@@ -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 ChannelOpenBodyImpl extends AMQMethodBody_8_0 implements ChannelOpenBody
+public class ChannelOpenBodyImpl extends AMQMethodBodyImpl implements ChannelOpenBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class ChannelOpenBodyImpl extends AMQMethodBody_8_0 implements ChannelOpe
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchChannelOpen(this, channelId);
+        return dispatcher.dispatchChannelOpen(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java
deleted file mode 100644
index 29f2013e79..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface ChannelPingBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java
deleted file mode 100644
index 2ac2388246..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface ChannelPongBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java
deleted file mode 100644
index f3b77e1db9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface ChannelResumeBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public byte[] getChannelId();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBodyImpl.java
index 7745a8de0a..3d7b4a5620 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBodyImpl.java
@@ -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 ConnectionOpenBodyImpl extends AMQMethodBody_8_0 implements ConnectionOpenBody
+public class ConnectionOpenBodyImpl extends AMQMethodBodyImpl implements ConnectionOpenBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -121,7 +120,7 @@ public class ConnectionOpenBodyImpl extends AMQMethodBody_8_0 implements Connect
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionOpen(this, channelId);
+        return dispatcher.dispatchConnectionOpen(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBodyImpl.java
index b74a2857cd..34bce76500 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBodyImpl.java
@@ -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 ConnectionOpenOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionOpenOkBody
+public class ConnectionOpenOkBodyImpl extends AMQMethodBodyImpl implements ConnectionOpenOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class ConnectionOpenOkBodyImpl extends AMQMethodBody_8_0 implements Conne
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionOpenOk(this, channelId);
+        return dispatcher.dispatchConnectionOpenOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBodyImpl.java
index 29b341463e..429ad56855 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBodyImpl.java
@@ -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 ConnectionSecureBodyImpl extends AMQMethodBody_8_0 implements ConnectionSecureBody
+public class ConnectionSecureBodyImpl extends AMQMethodBodyImpl implements ConnectionSecureBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class ConnectionSecureBodyImpl extends AMQMethodBody_8_0 implements Conne
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionSecure(this, channelId);
+        return dispatcher.dispatchConnectionSecure(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBodyImpl.java
index 046abf439c..1fbec8b627 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBodyImpl.java
@@ -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 ConnectionSecureOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionSecureOkBody
+public class ConnectionSecureOkBodyImpl extends AMQMethodBodyImpl implements ConnectionSecureOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -97,7 +96,7 @@ public class ConnectionSecureOkBodyImpl extends AMQMethodBody_8_0 implements Con
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionSecureOk(this, channelId);
+        return dispatcher.dispatchConnectionSecureOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBodyImpl.java
index 1f23a9da6e..12c1a55b56 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBodyImpl.java
@@ -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 ConnectionStartBodyImpl extends AMQMethodBody_8_0 implements ConnectionStartBody
+public class ConnectionStartBodyImpl extends AMQMethodBodyImpl implements ConnectionStartBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -135,7 +134,7 @@ public class ConnectionStartBodyImpl extends AMQMethodBody_8_0 implements Connec
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionStart(this, channelId);
+        return dispatcher.dispatchConnectionStart(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBodyImpl.java
index 24ecf380ac..f197f651ba 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBodyImpl.java
@@ -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 ConnectionStartOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionStartOkBody
+public class ConnectionStartOkBodyImpl extends AMQMethodBodyImpl implements ConnectionStartOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -127,7 +126,7 @@ public class ConnectionStartOkBodyImpl extends AMQMethodBody_8_0 implements Conn
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionStartOk(this, channelId);
+        return dispatcher.dispatchConnectionStartOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBodyImpl.java
index 83aff93055..0c35ad839a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBodyImpl.java
@@ -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 ConnectionTuneBodyImpl extends AMQMethodBody_8_0 implements ConnectionTuneBody
+public class ConnectionTuneBodyImpl extends AMQMethodBodyImpl implements ConnectionTuneBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -114,7 +113,7 @@ public class ConnectionTuneBodyImpl extends AMQMethodBody_8_0 implements Connect
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionTune(this, channelId);
+        return dispatcher.dispatchConnectionTune(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBodyImpl.java
index a6221b9815..529b5eecc8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBodyImpl.java
@@ -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 ConnectionTuneOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionTuneOkBody
+public class ConnectionTuneOkBodyImpl extends AMQMethodBodyImpl implements ConnectionTuneOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
@@ -114,7 +113,7 @@ public class ConnectionTuneOkBodyImpl extends AMQMethodBody_8_0 implements Conne
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionTuneOk(this, channelId);
+        return dispatcher.dispatchConnectionTuneOk(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java b/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
index 55961db06b..4e2f5ebceb 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
@@ -20,8 +20,6 @@
  */
 package org.apache.qpid.framing;
 
-import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
-
 import java.io.DataInput;
 import java.io.IOException;
 
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java b/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java
deleted file mode 100644
index d6d7c87e23..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface DtxSelectBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java
deleted file mode 100644
index 9ea4585b35..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface DtxSelectOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java b/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java
deleted file mode 100644
index e721bfcdd1..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface DtxStartBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getDtxIdentifier();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java
deleted file mode 100644
index c16e9d7447..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface DtxStartOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
index f0dcad4916..86eba9e0a8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
@@ -20,15 +20,15 @@
  */
 package org.apache.qpid.framing;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class EncodingUtils
 {
     private static final Logger _logger = LoggerFactory.getLogger(EncodingUtils.class);
@@ -218,12 +218,6 @@ public class EncodingUtils
         }
     }
 
-    public static int encodedContentLength(Content table)
-    {
-        // TODO: New Content class required for AMQP 0-9.
-        return 0;
-    }
-
     public static void writeShortStringBytes(DataOutput buffer, String s) throws IOException
     {
         if (s != null)
@@ -374,11 +368,6 @@ public class EncodingUtils
         }
     }
 
-    public static void writeContentBytes(DataOutput buffer, Content content)
-    {
-        // TODO: New Content class required for AMQP 0-9.
-    }
-
     public static void writeBooleans(DataOutput buffer, boolean[] values) throws IOException
     {
         byte packedValue = 0;
@@ -656,12 +645,6 @@ public class EncodingUtils
         }
     }
 
-    public static Content readContent(DataInput buffer) throws AMQFrameDecodingException
-    {
-        // TODO: New Content class required for AMQP 0-9.
-        return null;
-    }
-
     public static AMQShortString readAMQShortString(DataInput buffer) throws IOException
     {
         return AMQShortString.readFromBuffer(buffer);
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBodyImpl.java
index c391f1b7ee..ccc0bec072 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements Exchange
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBodyImpl.java
index cfbe77d70e..24348ebcd2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeBoundOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements Exchan
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBodyImpl.java
index de47e0b867..cf46e4ae0c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements Exchan
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBodyImpl.java
index 8d8ca793b8..ca30257192 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeclareOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements Exch
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBodyImpl.java
index 2bfc0f13f4..9d7a60a6e4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements Exchang
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBodyImpl.java
index 996072088c..7c78a9e384 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ExchangeDeleteOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements Excha
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java
deleted file mode 100644
index 9d5f186521..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileAckBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getDeliveryTag();
-
-    public boolean getMultiple();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java
deleted file mode 100644
index ac85455ff5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileCancelBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-
-    public boolean getNowait();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java
deleted file mode 100644
index 40364887c8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileCancelOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java
deleted file mode 100644
index 632bc1cf85..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileConsumeBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-
-    public boolean getExclusive();
-
-
-    public boolean getNoAck();
-
-    public boolean getNoLocal();
-
-    public boolean getNowait();
-
-    public AMQShortString getQueue();
-
-    public int getTicket();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java
deleted file mode 100644
index dd6dd3f64b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileConsumeOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java
deleted file mode 100644
index 3b8fa3fe79..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileDeliverBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-
-    public long getDeliveryTag();
-
-    public AMQShortString getExchange();
-
-    public AMQShortString getIdentifier();
-
-    public boolean getRedelivered();
-
-    public AMQShortString getRoutingKey();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java
deleted file mode 100644
index 25ea3834bc..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileOpenBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getContentSize();
-
-    public AMQShortString getIdentifier();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java
deleted file mode 100644
index 4edff34eb4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileOpenOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getStagedSize();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java b/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java
deleted file mode 100644
index 5377882c27..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FilePublishBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getExchange();
-
-    public AMQShortString getIdentifier();
-
-    public boolean getImmediate();
-
-    public boolean getMandatory();
-
-    public AMQShortString getRoutingKey();
-
-    public int getTicket();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java
deleted file mode 100644
index 378b6a3b5d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileQosBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public boolean getGlobal();
-
-    public int getPrefetchCount();
-
-    public long getPrefetchSize();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java
deleted file mode 100644
index 7296b36cc2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileQosOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java
deleted file mode 100644
index c569d8ed9f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileRejectBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getDeliveryTag();
-
-    public boolean getRequeue();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java
deleted file mode 100644
index 8bd5825141..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileReturnBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getExchange();
-
-    public int getReplyCode();
-
-    public AMQShortString getReplyText();
-
-    public AMQShortString getRoutingKey();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java b/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java
deleted file mode 100644
index 976fa3b0da..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface FileStageBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java
deleted file mode 100644
index c981ad00f8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageAppendBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public byte[] getBytes();
-
-    public byte[] getReference();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java
deleted file mode 100644
index e440aca42f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageCancelBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getDestination();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java
deleted file mode 100644
index 1cc6dc598b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageCheckpointBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getIdentifier();
-
-    public byte[] getReference();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java
deleted file mode 100644
index 6898edec00..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageCloseBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public byte[] getReference();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java
deleted file mode 100644
index 13fe4aec2b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageConsumeBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getDestination();
-
-    public boolean getExclusive();
-
-    public FieldTable getFilter();
-
-    public boolean getNoAck();
-
-    public boolean getNoLocal();
-
-    public AMQShortString getQueue();
-
-    public int getTicket();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java
deleted file mode 100644
index d4f1c6e02a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageEmptyBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java
deleted file mode 100644
index c2641679a8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageGetBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getDestination();
-
-    public boolean getNoAck();
-
-    public AMQShortString getQueue();
-
-    public int getTicket();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java
deleted file mode 100644
index 3b7d94ae2e..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageOffsetBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getValue();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java
deleted file mode 100644
index c349acd2bb..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java
deleted file mode 100644
index da021bd42c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageOpenBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public byte[] getReference();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java
deleted file mode 100644
index ecedcebcee..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageQosBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public boolean getGlobal();
-
-    public int getPrefetchCount();
-
-    public long getPrefetchSize();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java
deleted file mode 100644
index 37188d5dc9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageRecoverBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public boolean getRequeue();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java
deleted file mode 100644
index 3bd858c20d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageRejectBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public int getCode();
-
-    public AMQShortString getText();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java
deleted file mode 100644
index ef68b97c19..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageResumeBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getIdentifier();
-
-    public byte[] getReference();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java b/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java
deleted file mode 100644
index 11f8848431..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface MessageTransferBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getAppId();
-
-    public FieldTable getApplicationHeaders();
-
-    public Content getBody();
-
-    public AMQShortString getContentEncoding();
-
-    public AMQShortString getContentType();
-
-    public AMQShortString getCorrelationId();
-
-    public short getDeliveryMode();
-
-    public AMQShortString getDestination();
-
-    public AMQShortString getExchange();
-
-    public long getExpiration();
-
-    public boolean getImmediate();
-
-    public AMQShortString getMessageId();
-
-    public short getPriority();
-
-    public boolean getRedelivered();
-
-    public AMQShortString getReplyTo();
-
-    public AMQShortString getRoutingKey();
-
-    public byte[] getSecurityToken();
-
-    public int getTicket();
-
-    public long getTimestamp();
-
-    public AMQShortString getTransactionId();
-
-    public long getTtl();
-
-    public AMQShortString getUserId();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/Content.java b/java/common/src/main/java/org/apache/qpid/framing/MethodRegistrySource.java
index e5feeec2a4..4d2eda68b2 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/Content.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/MethodRegistrySource.java
@@ -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
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.framing;
 
-public interface Content
+public interface MethodRegistrySource
 {
-	// TODO: New Content class required for AMQP 0-9.
+    public MethodRegistry getMethodRegistry();
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueueBindBodyImpl.java
index b4acb6ae06..d68e3d4267 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueueBindBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements QueueBindBod
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBodyImpl.java
index 6a0b78db2d..b58fbfca52 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueBindOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements QueueBindO
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBodyImpl.java
index 4e835bd12b..4765aa140c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements QueueDecl
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBodyImpl.java
index 09abf5865e..bb243feb4a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeclareOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements QueueDe
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBodyImpl.java
index ada079c4c1..781bf7f1b1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements QueueDelet
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBodyImpl.java
index 54eea482fa..72a02230b0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueueDeleteOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements QueueDel
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBodyImpl.java
index ae4f9d3483..857a2e567c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements QueuePurgeB
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBodyImpl.java
index 576e175044..c9e484ad50 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/QueuePurgeOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements QueuePurg
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java
deleted file mode 100644
index f5325ae4c0..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamCancelBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-
-    public boolean getNowait();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java
deleted file mode 100644
index f19410d97f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamCancelOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java
deleted file mode 100644
index 0226547fd8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamConsumeBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-
-    public boolean getExclusive();
-
-
-    public boolean getNoLocal();
-
-    public boolean getNowait();
-
-    public AMQShortString getQueue();
-
-    public int getTicket();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java
deleted file mode 100644
index 3d089823e2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamConsumeOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java
deleted file mode 100644
index 76a6231ad6..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamDeliverBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getConsumerTag();
-
-    public long getDeliveryTag();
-
-    public AMQShortString getExchange();
-
-    public AMQShortString getQueue();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java
deleted file mode 100644
index 98860389bc..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamPublishBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getExchange();
-
-    public boolean getImmediate();
-
-    public boolean getMandatory();
-
-    public AMQShortString getRoutingKey();
-
-    public int getTicket();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java
deleted file mode 100644
index e28c4abd59..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamQosBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getConsumeRate();
-
-    public boolean getGlobal();
-
-    public int getPrefetchCount();
-
-    public long getPrefetchSize();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java
deleted file mode 100644
index 1a71ba1dfa..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamQosOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java b/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java
deleted file mode 100644
index e87863080d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface StreamReturnBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public AMQShortString getExchange();
-
-    public int getReplyCode();
-
-    public AMQShortString getReplyText();
-
-    public AMQShortString getRoutingKey();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java
deleted file mode 100644
index 96b5a056c5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestContentBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java
deleted file mode 100644
index 9da514a20b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestContentOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getContentChecksum();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java
deleted file mode 100644
index a024aba9c6..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestIntegerBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public short getInteger1();
-
-    public int getInteger2();
-
-    public long getInteger3();
-
-    public long getInteger4();
-
-    public short getOperation();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java
deleted file mode 100644
index 7f7003031c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestIntegerOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getResult();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java
deleted file mode 100644
index 9474521aad..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestStringBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public short getOperation();
-
-    public AMQShortString getString1();
-
-    public byte[] getString2();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java
deleted file mode 100644
index 7dc519a92e..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestStringOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public byte[] getResult();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java
deleted file mode 100644
index 4b80b72771..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestTableBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public short getIntegerOp();
-
-    public short getStringOp();
-
-    public FieldTable getTable();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java b/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java
deleted file mode 100644
index af3f3ca864..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TestTableOkBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public long getIntegerResult();
-
-    public byte[] getStringResult();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java b/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java
deleted file mode 100644
index 98785aa4cc..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
-  *   0-9
-  *   0-91
-  *   8-0
-  */
-
-package org.apache.qpid.framing;
-
-public interface TunnelRequestBody extends EncodableAMQDataBlock, AMQMethodBody
-{
-
-    public FieldTable getMetaData();
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/TxCommitBodyImpl.java
index 096c401c02..e98a939e70 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/TxCommitBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements TxCommitBody
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBodyImpl.java
index 76274be34a..3bee9d210d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxCommitOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements TxCommitOkB
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBodyImpl.java
index f68f881861..7acb99984f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements TxRollbackB
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBodyImpl.java
index 7ec3d8b83b..0412028472 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxRollbackOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBodyImpl.java
@@ -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 extends AMQMethodBody_8_0 implements TxRollbac
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/TxSelectBodyImpl.java
index 69f4dd2ec5..7d7172df7f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/TxSelectBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements TxSelectBody
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBodyImpl.java
index fc1279c908..ddb62a270f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TxSelectOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBodyImpl.java
@@ -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 AMQMethodBody_8_0 implements TxSelectOkB
 
     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()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
deleted file mode 100644
index 8d51343507..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.framing.amqp_0_9;
-
-public abstract class AMQMethodBody_0_9 extends org.apache.qpid.framing.AMQMethodBodyImpl
-{
-
-    public byte getMajor()
-    {
-        return 0;
-    }
-
-    public byte getMinor()
-    {
-        return 9;
-    }   
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
index 88897e0ff6..7d25099045 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
@@ -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;
-
-public class AccessRequestBodyImpl extends AMQMethodBody_0_9 implements AccessRequestBody
+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 AMQMethodBodyImpl implements AccessRequestBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
index 95087228f2..055deb64e0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java
deleted file mode 100644
index b1f9757391..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicAckBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicAckBodyImpl extends AMQMethodBody_0_9 implements BasicAckBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicAckBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 80;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [multiple]
-
-    // Constructor
-    public BasicAckBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicAckBodyImpl(
-                                long deliveryTag,
-                                boolean multiple
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( multiple )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getMultiple()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicAck(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicAckBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "multiple=" );
-        buf.append(  getMultiple() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java
deleted file mode 100644
index f536b9d8a5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelBodyImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicCancelBodyImpl extends AMQMethodBody_0_9 implements BasicCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public BasicCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicCancelBodyImpl(
-                                AMQShortString consumerTag,
-                                boolean nowait
-                            )
-    {
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicCancelBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java
deleted file mode 100644
index ae2fe58ff9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicCancelOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicCancelOkBodyImpl extends AMQMethodBody_0_9 implements BasicCancelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicCancelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public BasicCancelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public BasicCancelOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicCancelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicCancelOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java
deleted file mode 100644
index 177dc6ace2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeBodyImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicConsumeBodyImpl extends AMQMethodBody_0_9 implements BasicConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [noLocal, noAck, exclusive, nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public BasicConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public BasicConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString consumerTag,
-                                boolean noLocal,
-                                boolean noAck,
-                                boolean exclusive,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java
deleted file mode 100644
index 647c58cbc4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicConsumeOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicConsumeOkBodyImpl extends AMQMethodBody_0_9 implements BasicConsumeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicConsumeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public BasicConsumeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public BasicConsumeOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicConsumeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicConsumeOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java
deleted file mode 100644
index 3d2602e605..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicDeliverBodyImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicDeliverBodyImpl extends AMQMethodBody_0_9 implements BasicDeliverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicDeliverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [redelivered]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public BasicDeliverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public BasicDeliverBodyImpl(
-                                AMQShortString consumerTag,
-                                long deliveryTag,
-                                boolean redelivered,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _consumerTag = consumerTag;
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicDeliver(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicDeliverBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java
deleted file mode 100644
index 0b21ddf8e9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetBodyImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicGetBodyImpl extends AMQMethodBody_0_9 implements BasicGetBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicGetBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 70;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [noAck]
-
-    // Constructor
-    public BasicGetBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicGetBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean noAck
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicGet(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicGetBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java
deleted file mode 100644
index 29cf72d053..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetEmptyBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicGetEmptyBodyImpl extends AMQMethodBody_0_9 implements BasicGetEmptyBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicGetEmptyBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 72;
-
-    // Fields declared in specification
-    private final AMQShortString _clusterId; // [clusterId]
-
-    // Constructor
-    public BasicGetEmptyBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _clusterId = readAMQShortString( buffer );
-    }
-
-    public BasicGetEmptyBodyImpl(
-                                AMQShortString clusterId
-                            )
-    {
-        _clusterId = clusterId;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getClusterId()
-    {
-        return _clusterId;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _clusterId );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _clusterId );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicGetEmpty(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicGetEmptyBodyImpl: ");
-        buf.append( "clusterId=" );
-        buf.append(  getClusterId() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java
deleted file mode 100644
index 00bbdd7082..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicGetOkBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicGetOkBodyImpl extends AMQMethodBody_0_9 implements BasicGetOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicGetOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 71;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [redelivered]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final long _messageCount; // [messageCount]
-
-    // Constructor
-    public BasicGetOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _messageCount = readUnsignedInteger( buffer );
-    }
-
-    public BasicGetOkBodyImpl(
-                                long deliveryTag,
-                                boolean redelivered,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                long messageCount
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _messageCount = messageCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 13;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeUnsignedInteger( buffer, _messageCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicGetOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicGetOkBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java
deleted file mode 100644
index b9f941b85e..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicPublishBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicPublishBodyImpl extends AMQMethodBody_0_9 implements BasicPublishBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicPublishBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [mandatory, immediate]
-
-    // Constructor
-    public BasicPublishBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicPublishBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean mandatory,
-                                boolean immediate
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( mandatory )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getMandatory()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicPublish(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicPublishBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "mandatory=" );
-        buf.append(  getMandatory() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java
deleted file mode 100644
index c461f6b118..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosBodyImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicQosBodyImpl extends AMQMethodBody_0_9 implements BasicQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public BasicQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 7;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java
deleted file mode 100644
index 9bc5d6f3b8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicQosOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicQosOkBodyImpl extends AMQMethodBody_0_9 implements BasicQosOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicQosOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public BasicQosOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public BasicQosOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicQosOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicQosOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java
deleted file mode 100644
index 498e8f85dc..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicRecoverBodyImpl extends AMQMethodBody_0_9 implements BasicRecoverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicRecoverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 100;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public BasicRecoverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicRecoverBodyImpl(
-                                boolean requeue
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicRecover(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicRecoverBodyImpl: ");
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
index 05390ea493..cfad3a1ff6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
index 0b889e4a21..91ef3e9343 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java
deleted file mode 100644
index 3e8cf6b825..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRejectBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicRejectBodyImpl extends AMQMethodBody_0_9 implements BasicRejectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicRejectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 90;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public BasicRejectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicRejectBodyImpl(
-                                long deliveryTag,
-                                boolean requeue
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicReject(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicRejectBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java
deleted file mode 100644
index c88391dca3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicReturnBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class BasicReturnBodyImpl extends AMQMethodBody_0_9 implements BasicReturnBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicReturnBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public BasicReturnBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public BasicReturnBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchBasicReturn(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicReturnBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java
deleted file mode 100644
index ceadeb8f7c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseBodyImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelCloseBodyImpl extends AMQMethodBody_0_9 implements ChannelCloseBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelCloseBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final int _classId; // [classId]
-    private final int _methodId; // [methodId]
-
-    // Constructor
-    public ChannelCloseBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _classId = readUnsignedShort( buffer );
-        _methodId = readUnsignedShort( buffer );
-    }
-
-    public ChannelCloseBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                int classId,
-                                int methodId
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _classId = classId;
-        _methodId = methodId;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final int getClassId()
-    {
-        return _classId;
-    }
-    public final int getMethodId()
-    {
-        return _methodId;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 6;
-        size += getSizeOf( _replyText );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeUnsignedShort( buffer, _classId );
-        writeUnsignedShort( buffer, _methodId );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelClose(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelCloseBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "classId=" );
-        buf.append(  getClassId() );
-        buf.append( ", " );
-        buf.append( "methodId=" );
-        buf.append(  getMethodId() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java
deleted file mode 100644
index 5df83134f7..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelCloseOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelCloseOkBodyImpl extends AMQMethodBody_0_9 implements ChannelCloseOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelCloseOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ChannelCloseOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ChannelCloseOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelCloseOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelCloseOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java
deleted file mode 100644
index 62e9bf90a0..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelFlowBodyImpl extends AMQMethodBody_0_9 implements ChannelFlowBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelFlowBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [active]
-
-    // Constructor
-    public ChannelFlowBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ChannelFlowBodyImpl(
-                                boolean active
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( active )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getActive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelFlow(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelFlowBodyImpl: ");
-        buf.append( "active=" );
-        buf.append(  getActive() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java
deleted file mode 100644
index 5c73bd2ff4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelFlowOkBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelFlowOkBodyImpl extends AMQMethodBody_0_9 implements ChannelFlowOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelFlowOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [active]
-
-    // Constructor
-    public ChannelFlowOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ChannelFlowOkBodyImpl(
-                                boolean active
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( active )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getActive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelFlowOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelFlowOkBodyImpl: ");
-        buf.append( "active=" );
-        buf.append(  getActive() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java
deleted file mode 100644
index 7945fcec47..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelOkBodyImpl extends AMQMethodBody_0_9 implements ChannelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 80;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ChannelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ChannelOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java
deleted file mode 100644
index 10c06cb132..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelOpenBodyImpl extends AMQMethodBody_0_9 implements ChannelOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final AMQShortString _outOfBand; // [outOfBand]
-
-    // Constructor
-    public ChannelOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _outOfBand = readAMQShortString( buffer );
-    }
-
-    public ChannelOpenBodyImpl(
-                                AMQShortString outOfBand
-                            )
-    {
-        _outOfBand = outOfBand;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getOutOfBand()
-    {
-        return _outOfBand;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _outOfBand );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _outOfBand );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelOpenBodyImpl: ");
-        buf.append( "outOfBand=" );
-        buf.append(  getOutOfBand() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
index 1c2a3f4a57..fa6ce1873b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java
deleted file mode 100644
index ba02f17b99..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPingBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelPingBodyImpl extends AMQMethodBody_0_9 implements ChannelPingBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelPingBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ChannelPingBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ChannelPingBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelPing(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelPingBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java
deleted file mode 100644
index da37e5127e..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelPongBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelPongBodyImpl extends AMQMethodBody_0_9 implements ChannelPongBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelPongBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 70;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ChannelPongBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ChannelPongBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelPong(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelPongBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java
deleted file mode 100644
index 47fc5c60be..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelResumeBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ChannelResumeBodyImpl extends AMQMethodBody_0_9 implements ChannelResumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelResumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-    private final byte[] _channelId; // [channelId]
-
-    // Constructor
-    public ChannelResumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _channelId = readBytes( buffer );
-    }
-
-    public ChannelResumeBodyImpl(
-                                byte[] channelId
-                            )
-    {
-        _channelId = channelId;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getChannelId()
-    {
-        return _channelId;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _channelId );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _channelId );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchChannelResume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelResumeBodyImpl: ");
-        buf.append( "channelId=" );
-        buf.append(  getChannelId() == null  ? "null" : java.util.Arrays.toString( getChannelId() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
index f1bf0d5a53..7c636140e9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
@@ -34,64 +34,8 @@ public interface ClientMethodDispatcher_0_9 extends 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
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
index e0f8704f67..b2e01f5c37 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
index 98f73b0beb..77a5b5f1b9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java
deleted file mode 100644
index 86c40656bb..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenBodyImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionOpenBodyImpl extends AMQMethodBody_0_9 implements ConnectionOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final AMQShortString _virtualHost; // [virtualHost]
-    private final AMQShortString _capabilities; // [capabilities]
-    private final byte _bitfield0; // [insist]
-
-    // Constructor
-    public ConnectionOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _virtualHost = readAMQShortString( buffer );
-        _capabilities = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ConnectionOpenBodyImpl(
-                                AMQShortString virtualHost,
-                                AMQShortString capabilities,
-                                boolean insist
-                            )
-    {
-        _virtualHost = virtualHost;
-        _capabilities = capabilities;
-        byte bitfield0 = (byte)0;
-        if( insist )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getVirtualHost()
-    {
-        return _virtualHost;
-    }
-    public final AMQShortString getCapabilities()
-    {
-        return _capabilities;
-    }
-    public final boolean getInsist()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _virtualHost );
-        size += getSizeOf( _capabilities );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _virtualHost );
-        writeAMQShortString( buffer, _capabilities );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionOpenBodyImpl: ");
-        buf.append( "virtualHost=" );
-        buf.append(  getVirtualHost() );
-        buf.append( ", " );
-        buf.append( "capabilities=" );
-        buf.append(  getCapabilities() );
-        buf.append( ", " );
-        buf.append( "insist=" );
-        buf.append(  getInsist() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java
deleted file mode 100644
index 0439fc01b8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionOpenOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionOpenOkBodyImpl extends AMQMethodBody_0_9 implements ConnectionOpenOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionOpenOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final AMQShortString _knownHosts; // [knownHosts]
-
-    // Constructor
-    public ConnectionOpenOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _knownHosts = readAMQShortString( buffer );
-    }
-
-    public ConnectionOpenOkBodyImpl(
-                                AMQShortString knownHosts
-                            )
-    {
-        _knownHosts = knownHosts;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getKnownHosts()
-    {
-        return _knownHosts;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _knownHosts );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _knownHosts );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionOpenOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionOpenOkBodyImpl: ");
-        buf.append( "knownHosts=" );
-        buf.append(  getKnownHosts() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
index 270161db47..0a9ace2458 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
@@ -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()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java
deleted file mode 100644
index 19b9532f5b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionSecureBodyImpl extends AMQMethodBody_0_9 implements ConnectionSecureBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionSecureBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final byte[] _challenge; // [challenge]
-
-    // Constructor
-    public ConnectionSecureBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _challenge = readBytes( buffer );
-    }
-
-    public ConnectionSecureBodyImpl(
-                                byte[] challenge
-                            )
-    {
-        _challenge = challenge;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getChallenge()
-    {
-        return _challenge;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _challenge );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _challenge );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionSecure(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionSecureBodyImpl: ");
-        buf.append( "challenge=" );
-        buf.append(  getChallenge() == null  ? "null" : java.util.Arrays.toString( getChallenge() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java
deleted file mode 100644
index 7891d7d24c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionSecureOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionSecureOkBodyImpl extends AMQMethodBody_0_9 implements ConnectionSecureOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionSecureOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final byte[] _response; // [response]
-
-    // Constructor
-    public ConnectionSecureOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _response = readBytes( buffer );
-    }
-
-    public ConnectionSecureOkBodyImpl(
-                                byte[] response
-                            )
-    {
-        _response = response;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getResponse()
-    {
-        return _response;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _response );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _response );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionSecureOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionSecureOkBodyImpl: ");
-        buf.append( "response=" );
-        buf.append(  getResponse() == null  ? "null" : java.util.Arrays.toString( getResponse() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java
deleted file mode 100644
index ec82327f4d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartBodyImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionStartBodyImpl extends AMQMethodBody_0_9 implements ConnectionStartBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionStartBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final short _versionMajor; // [versionMajor]
-    private final short _versionMinor; // [versionMinor]
-    private final FieldTable _serverProperties; // [serverProperties]
-    private final byte[] _mechanisms; // [mechanisms]
-    private final byte[] _locales; // [locales]
-
-    // Constructor
-    public ConnectionStartBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _versionMajor = readUnsignedByte( buffer );
-        _versionMinor = readUnsignedByte( buffer );
-        _serverProperties = readFieldTable( buffer );
-        _mechanisms = readBytes( buffer );
-        _locales = readBytes( buffer );
-    }
-
-    public ConnectionStartBodyImpl(
-                                short versionMajor,
-                                short versionMinor,
-                                FieldTable serverProperties,
-                                byte[] mechanisms,
-                                byte[] locales
-                            )
-    {
-        _versionMajor = versionMajor;
-        _versionMinor = versionMinor;
-        _serverProperties = serverProperties;
-        _mechanisms = mechanisms;
-        _locales = locales;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final short getVersionMajor()
-    {
-        return _versionMajor;
-    }
-    public final short getVersionMinor()
-    {
-        return _versionMinor;
-    }
-    public final FieldTable getServerProperties()
-    {
-        return _serverProperties;
-    }
-    public final byte[] getMechanisms()
-    {
-        return _mechanisms;
-    }
-    public final byte[] getLocales()
-    {
-        return _locales;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _serverProperties );
-        size += getSizeOf( _mechanisms );
-        size += getSizeOf( _locales );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedByte( buffer, _versionMajor );
-        writeUnsignedByte( buffer, _versionMinor );
-        writeFieldTable( buffer, _serverProperties );
-        writeBytes( buffer, _mechanisms );
-        writeBytes( buffer, _locales );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionStart(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionStartBodyImpl: ");
-        buf.append( "versionMajor=" );
-        buf.append(  getVersionMajor() );
-        buf.append( ", " );
-        buf.append( "versionMinor=" );
-        buf.append(  getVersionMinor() );
-        buf.append( ", " );
-        buf.append( "serverProperties=" );
-        buf.append(  getServerProperties() );
-        buf.append( ", " );
-        buf.append( "mechanisms=" );
-        buf.append(  getMechanisms() == null  ? "null" : java.util.Arrays.toString( getMechanisms() ) );
-        buf.append( ", " );
-        buf.append( "locales=" );
-        buf.append(  getLocales() == null  ? "null" : java.util.Arrays.toString( getLocales() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java
deleted file mode 100644
index cdc77c87fd..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionStartOkBodyImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionStartOkBodyImpl extends AMQMethodBody_0_9 implements ConnectionStartOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionStartOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-    private final FieldTable _clientProperties; // [clientProperties]
-    private final AMQShortString _mechanism; // [mechanism]
-    private final byte[] _response; // [response]
-    private final AMQShortString _locale; // [locale]
-
-    // Constructor
-    public ConnectionStartOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _clientProperties = readFieldTable( buffer );
-        _mechanism = readAMQShortString( buffer );
-        _response = readBytes( buffer );
-        _locale = readAMQShortString( buffer );
-    }
-
-    public ConnectionStartOkBodyImpl(
-                                FieldTable clientProperties,
-                                AMQShortString mechanism,
-                                byte[] response,
-                                AMQShortString locale
-                            )
-    {
-        _clientProperties = clientProperties;
-        _mechanism = mechanism;
-        _response = response;
-        _locale = locale;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final FieldTable getClientProperties()
-    {
-        return _clientProperties;
-    }
-    public final AMQShortString getMechanism()
-    {
-        return _mechanism;
-    }
-    public final byte[] getResponse()
-    {
-        return _response;
-    }
-    public final AMQShortString getLocale()
-    {
-        return _locale;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _clientProperties );
-        size += getSizeOf( _mechanism );
-        size += getSizeOf( _response );
-        size += getSizeOf( _locale );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeFieldTable( buffer, _clientProperties );
-        writeAMQShortString( buffer, _mechanism );
-        writeBytes( buffer, _response );
-        writeAMQShortString( buffer, _locale );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionStartOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionStartOkBodyImpl: ");
-        buf.append( "clientProperties=" );
-        buf.append(  getClientProperties() );
-        buf.append( ", " );
-        buf.append( "mechanism=" );
-        buf.append(  getMechanism() );
-        buf.append( ", " );
-        buf.append( "response=" );
-        buf.append(  getResponse() == null  ? "null" : java.util.Arrays.toString( getResponse() ) );
-        buf.append( ", " );
-        buf.append( "locale=" );
-        buf.append(  getLocale() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java
deleted file mode 100644
index a5cb1f4d77..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneBodyImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionTuneBodyImpl extends AMQMethodBody_0_9 implements ConnectionTuneBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionTuneBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final int _channelMax; // [channelMax]
-    private final long _frameMax; // [frameMax]
-    private final int _heartbeat; // [heartbeat]
-
-    // Constructor
-    public ConnectionTuneBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _channelMax = readUnsignedShort( buffer );
-        _frameMax = readUnsignedInteger( buffer );
-        _heartbeat = readUnsignedShort( buffer );
-    }
-
-    public ConnectionTuneBodyImpl(
-                                int channelMax,
-                                long frameMax,
-                                int heartbeat
-                            )
-    {
-        _channelMax = channelMax;
-        _frameMax = frameMax;
-        _heartbeat = heartbeat;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getChannelMax()
-    {
-        return _channelMax;
-    }
-    public final long getFrameMax()
-    {
-        return _frameMax;
-    }
-    public final int getHeartbeat()
-    {
-        return _heartbeat;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _channelMax );
-        writeUnsignedInteger( buffer, _frameMax );
-        writeUnsignedShort( buffer, _heartbeat );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionTune(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionTuneBodyImpl: ");
-        buf.append( "channelMax=" );
-        buf.append(  getChannelMax() );
-        buf.append( ", " );
-        buf.append( "frameMax=" );
-        buf.append(  getFrameMax() );
-        buf.append( ", " );
-        buf.append( "heartbeat=" );
-        buf.append(  getHeartbeat() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java
deleted file mode 100644
index 2dee4765f5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionTuneOkBodyImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ConnectionTuneOkBodyImpl extends AMQMethodBody_0_9 implements ConnectionTuneOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionTuneOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final int _channelMax; // [channelMax]
-    private final long _frameMax; // [frameMax]
-    private final int _heartbeat; // [heartbeat]
-
-    // Constructor
-    public ConnectionTuneOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _channelMax = readUnsignedShort( buffer );
-        _frameMax = readUnsignedInteger( buffer );
-        _heartbeat = readUnsignedShort( buffer );
-    }
-
-    public ConnectionTuneOkBodyImpl(
-                                int channelMax,
-                                long frameMax,
-                                int heartbeat
-                            )
-    {
-        _channelMax = channelMax;
-        _frameMax = frameMax;
-        _heartbeat = heartbeat;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getChannelMax()
-    {
-        return _channelMax;
-    }
-    public final long getFrameMax()
-    {
-        return _frameMax;
-    }
-    public final int getHeartbeat()
-    {
-        return _heartbeat;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _channelMax );
-        writeUnsignedInteger( buffer, _frameMax );
-        writeUnsignedShort( buffer, _heartbeat );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchConnectionTuneOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionTuneOkBodyImpl: ");
-        buf.append( "channelMax=" );
-        buf.append(  getChannelMax() );
-        buf.append( ", " );
-        buf.append( "frameMax=" );
-        buf.append(  getFrameMax() );
-        buf.append( ", " );
-        buf.append( "heartbeat=" );
-        buf.append(  getHeartbeat() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java
deleted file mode 100644
index 5739697389..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class DtxSelectBodyImpl extends AMQMethodBody_0_9 implements DtxSelectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxSelectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-
-    // Constructor
-    public DtxSelectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public DtxSelectBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchDtxSelect(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxSelectBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java
deleted file mode 100644
index b379501617..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxSelectOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class DtxSelectOkBodyImpl extends AMQMethodBody_0_9 implements DtxSelectOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxSelectOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public DtxSelectOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public DtxSelectOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchDtxSelectOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxSelectOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java
deleted file mode 100644
index 162c0b31ad..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class DtxStartBodyImpl extends AMQMethodBody_0_9 implements DtxStartBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxStartBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final AMQShortString _dtxIdentifier; // [dtxIdentifier]
-
-    // Constructor
-    public DtxStartBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _dtxIdentifier = readAMQShortString( buffer );
-    }
-
-    public DtxStartBodyImpl(
-                                AMQShortString dtxIdentifier
-                            )
-    {
-        _dtxIdentifier = dtxIdentifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getDtxIdentifier()
-    {
-        return _dtxIdentifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _dtxIdentifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _dtxIdentifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchDtxStart(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxStartBodyImpl: ");
-        buf.append( "dtxIdentifier=" );
-        buf.append(  getDtxIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java
deleted file mode 100644
index fbe9b86e56..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/DtxStartOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class DtxStartOkBodyImpl extends AMQMethodBody_0_9 implements DtxStartOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxStartOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public DtxStartOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public DtxStartOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchDtxStartOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxStartOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java
deleted file mode 100644
index 92ba4edc03..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundBodyImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ExchangeBoundBodyImpl extends AMQMethodBody_0_9 implements ExchangeBoundBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeBoundBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 22;
-
-    // Fields declared in specification
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final AMQShortString _queue; // [queue]
-
-    // Constructor
-    public ExchangeBoundBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _queue = readAMQShortString( buffer );
-    }
-
-    public ExchangeBoundBodyImpl(
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                AMQShortString queue
-                            )
-    {
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _queue = queue;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeAMQShortString( buffer, _queue );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchExchangeBound(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeBoundBodyImpl: ");
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java
deleted file mode 100644
index 4f594b9a70..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeBoundOkBodyImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ExchangeBoundOkBodyImpl extends AMQMethodBody_0_9 implements ExchangeBoundOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeBoundOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 23;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-
-    // Constructor
-    public ExchangeBoundOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-    }
-
-    public ExchangeBoundOkBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchExchangeBoundOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeBoundOkBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java
deleted file mode 100644
index 50b6889735..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareBodyImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ExchangeDeclareBodyImpl extends AMQMethodBody_0_9 implements ExchangeDeclareBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeclareBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _type; // [type]
-    private final byte _bitfield0; // [passive, durable, autoDelete, internal, nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public ExchangeDeclareBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _type = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public ExchangeDeclareBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString type,
-                                boolean passive,
-                                boolean durable,
-                                boolean autoDelete,
-                                boolean internal,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _type = type;
-        byte bitfield0 = (byte)0;
-        if( passive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( durable )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( autoDelete )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( internal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 4));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getType()
-    {
-        return _type;
-    }
-    public final boolean getPassive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getDurable()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getAutoDelete()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getInternal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 4)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _type );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _type );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchExchangeDeclare(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeclareBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "type=" );
-        buf.append(  getType() );
-        buf.append( ", " );
-        buf.append( "passive=" );
-        buf.append(  getPassive() );
-        buf.append( ", " );
-        buf.append( "durable=" );
-        buf.append(  getDurable() );
-        buf.append( ", " );
-        buf.append( "autoDelete=" );
-        buf.append(  getAutoDelete() );
-        buf.append( ", " );
-        buf.append( "internal=" );
-        buf.append(  getInternal() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java
deleted file mode 100644
index adaff55cc8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeclareOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ExchangeDeclareOkBodyImpl extends AMQMethodBody_0_9 implements ExchangeDeclareOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeclareOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ExchangeDeclareOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ExchangeDeclareOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchExchangeDeclareOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeclareOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java
deleted file mode 100644
index 60da6c8330..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteBodyImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ExchangeDeleteBodyImpl extends AMQMethodBody_0_9 implements ExchangeDeleteBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeleteBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final byte _bitfield0; // [ifUnused, nowait]
-
-    // Constructor
-    public ExchangeDeleteBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ExchangeDeleteBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                boolean ifUnused,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        byte bitfield0 = (byte)0;
-        if( ifUnused )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final boolean getIfUnused()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchExchangeDelete(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeleteBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "ifUnused=" );
-        buf.append(  getIfUnused() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java
deleted file mode 100644
index 89eab25c74..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ExchangeDeleteOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class ExchangeDeleteOkBodyImpl extends AMQMethodBody_0_9 implements ExchangeDeleteOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeleteOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ExchangeDeleteOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ExchangeDeleteOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchExchangeDeleteOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeleteOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java
deleted file mode 100644
index b2e0727fc3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileAckBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileAckBodyImpl extends AMQMethodBody_0_9 implements FileAckBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileAckBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 90;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [multiple]
-
-    // Constructor
-    public FileAckBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileAckBodyImpl(
-                                long deliveryTag,
-                                boolean multiple
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( multiple )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getMultiple()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileAck(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileAckBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "multiple=" );
-        buf.append(  getMultiple() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java
deleted file mode 100644
index a1cddb1bc1..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelBodyImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileCancelBodyImpl extends AMQMethodBody_0_9 implements FileCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public FileCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileCancelBodyImpl(
-                                AMQShortString consumerTag,
-                                boolean nowait
-                            )
-    {
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileCancelBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java
deleted file mode 100644
index 258b55f6d8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileCancelOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileCancelOkBodyImpl extends AMQMethodBody_0_9 implements FileCancelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileCancelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public FileCancelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public FileCancelOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileCancelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileCancelOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java
deleted file mode 100644
index d841fab69d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeBodyImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileConsumeBodyImpl extends AMQMethodBody_0_9 implements FileConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [noLocal, noAck, exclusive, nowait]
-    private final FieldTable _filter; // [filter]
-
-    // Constructor
-    public FileConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _filter = readFieldTable( buffer );
-    }
-
-    public FileConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString consumerTag,
-                                boolean noLocal,
-                                boolean noAck,
-                                boolean exclusive,
-                                boolean nowait,
-                                FieldTable filter
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        _bitfield0 = bitfield0;
-        _filter = filter;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final FieldTable getFilter()
-    {
-        return _filter;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _filter );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _filter );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "filter=" );
-        buf.append(  getFilter() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java
deleted file mode 100644
index 139ab0cbce..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileConsumeOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileConsumeOkBodyImpl extends AMQMethodBody_0_9 implements FileConsumeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileConsumeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public FileConsumeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public FileConsumeOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileConsumeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileConsumeOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java
deleted file mode 100644
index 5e4b15ef74..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileDeliverBodyImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileDeliverBodyImpl extends AMQMethodBody_0_9 implements FileDeliverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileDeliverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 80;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [redelivered]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final AMQShortString _identifier; // [identifier]
-
-    // Constructor
-    public FileDeliverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _identifier = readAMQShortString( buffer );
-    }
-
-    public FileDeliverBodyImpl(
-                                AMQShortString consumerTag,
-                                long deliveryTag,
-                                boolean redelivered,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                AMQShortString identifier
-                            )
-    {
-        _consumerTag = consumerTag;
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _identifier = identifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeAMQShortString( buffer, _identifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileDeliver(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileDeliverBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java
deleted file mode 100644
index 7c2352eee3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenBodyImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileOpenBodyImpl extends AMQMethodBody_0_9 implements FileOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final AMQShortString _identifier; // [identifier]
-    private final long _contentSize; // [contentSize]
-
-    // Constructor
-    public FileOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _identifier = readAMQShortString( buffer );
-        _contentSize = readLong( buffer );
-    }
-
-    public FileOpenBodyImpl(
-                                AMQShortString identifier,
-                                long contentSize
-                            )
-    {
-        _identifier = identifier;
-        _contentSize = contentSize;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-    public final long getContentSize()
-    {
-        return _contentSize;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _identifier );
-        writeLong( buffer, _contentSize );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileOpenBodyImpl: ");
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append( ", " );
-        buf.append( "contentSize=" );
-        buf.append(  getContentSize() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java
deleted file mode 100644
index 05a132cce2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileOpenOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileOpenOkBodyImpl extends AMQMethodBody_0_9 implements FileOpenOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileOpenOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final long _stagedSize; // [stagedSize]
-
-    // Constructor
-    public FileOpenOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _stagedSize = readLong( buffer );
-    }
-
-    public FileOpenOkBodyImpl(
-                                long stagedSize
-                            )
-    {
-        _stagedSize = stagedSize;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getStagedSize()
-    {
-        return _stagedSize;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _stagedSize );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileOpenOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileOpenOkBodyImpl: ");
-        buf.append( "stagedSize=" );
-        buf.append(  getStagedSize() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java
deleted file mode 100644
index f04a869bcc..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FilePublishBodyImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FilePublishBodyImpl extends AMQMethodBody_0_9 implements FilePublishBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FilePublishBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [mandatory, immediate]
-    private final AMQShortString _identifier; // [identifier]
-
-    // Constructor
-    public FilePublishBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _identifier = readAMQShortString( buffer );
-    }
-
-    public FilePublishBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean mandatory,
-                                boolean immediate,
-                                AMQShortString identifier
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( mandatory )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        _bitfield0 = bitfield0;
-        _identifier = identifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getMandatory()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _identifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFilePublish(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FilePublishBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "mandatory=" );
-        buf.append(  getMandatory() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append( ", " );
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java
deleted file mode 100644
index 0d6fe98029..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosBodyImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileQosBodyImpl extends AMQMethodBody_0_9 implements FileQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public FileQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 7;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java
deleted file mode 100644
index b7703c633a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileQosOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileQosOkBodyImpl extends AMQMethodBody_0_9 implements FileQosOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileQosOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public FileQosOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public FileQosOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileQosOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileQosOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java
deleted file mode 100644
index b73014ebe2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileRejectBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileRejectBodyImpl extends AMQMethodBody_0_9 implements FileRejectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileRejectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 100;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public FileRejectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileRejectBodyImpl(
-                                long deliveryTag,
-                                boolean requeue
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileReject(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileRejectBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java
deleted file mode 100644
index 4a0d600f13..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileReturnBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileReturnBodyImpl extends AMQMethodBody_0_9 implements FileReturnBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileReturnBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 70;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public FileReturnBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public FileReturnBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileReturn(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileReturnBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java
deleted file mode 100644
index dfb76279e8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/FileStageBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class FileStageBodyImpl extends AMQMethodBody_0_9 implements FileStageBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileStageBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-
-    // Constructor
-    public FileStageBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public FileStageBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchFileStage(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileStageBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java
deleted file mode 100644
index 4964c77ab6..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageAppendBodyImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageAppendBodyImpl extends AMQMethodBody_0_9 implements MessageAppendBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageAppendBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 80;
-
-    // Fields declared in specification
-    private final byte[] _reference; // [reference]
-    private final byte[] _bytes; // [bytes]
-
-    // Constructor
-    public MessageAppendBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _reference = readBytes( buffer );
-        _bytes = readBytes( buffer );
-    }
-
-    public MessageAppendBodyImpl(
-                                byte[] reference,
-                                byte[] bytes
-                            )
-    {
-        _reference = reference;
-        _bytes = bytes;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getReference()
-    {
-        return _reference;
-    }
-    public final byte[] getBytes()
-    {
-        return _bytes;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _reference );
-        size += getSizeOf( _bytes );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _reference );
-        writeBytes( buffer, _bytes );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageAppend(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageAppendBodyImpl: ");
-        buf.append( "reference=" );
-        buf.append(  getReference() == null  ? "null" : java.util.Arrays.toString( getReference() ) );
-        buf.append( ", " );
-        buf.append( "bytes=" );
-        buf.append(  getBytes() == null  ? "null" : java.util.Arrays.toString( getBytes() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java
deleted file mode 100644
index 661b6cd9a3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCancelBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageCancelBodyImpl extends AMQMethodBody_0_9 implements MessageCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _destination; // [destination]
-
-    // Constructor
-    public MessageCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _destination = readAMQShortString( buffer );
-    }
-
-    public MessageCancelBodyImpl(
-                                AMQShortString destination
-                            )
-    {
-        _destination = destination;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getDestination()
-    {
-        return _destination;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _destination );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _destination );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageCancelBodyImpl: ");
-        buf.append( "destination=" );
-        buf.append(  getDestination() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java
deleted file mode 100644
index 921348ac71..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCheckpointBodyImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageCheckpointBodyImpl extends AMQMethodBody_0_9 implements MessageCheckpointBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageCheckpointBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 90;
-
-    // Fields declared in specification
-    private final byte[] _reference; // [reference]
-    private final AMQShortString _identifier; // [identifier]
-
-    // Constructor
-    public MessageCheckpointBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _reference = readBytes( buffer );
-        _identifier = readAMQShortString( buffer );
-    }
-
-    public MessageCheckpointBodyImpl(
-                                byte[] reference,
-                                AMQShortString identifier
-                            )
-    {
-        _reference = reference;
-        _identifier = identifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getReference()
-    {
-        return _reference;
-    }
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _reference );
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _reference );
-        writeAMQShortString( buffer, _identifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageCheckpoint(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageCheckpointBodyImpl: ");
-        buf.append( "reference=" );
-        buf.append(  getReference() == null  ? "null" : java.util.Arrays.toString( getReference() ) );
-        buf.append( ", " );
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java
deleted file mode 100644
index 78185ec507..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageCloseBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageCloseBodyImpl extends AMQMethodBody_0_9 implements MessageCloseBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageCloseBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 70;
-
-    // Fields declared in specification
-    private final byte[] _reference; // [reference]
-
-    // Constructor
-    public MessageCloseBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _reference = readBytes( buffer );
-    }
-
-    public MessageCloseBodyImpl(
-                                byte[] reference
-                            )
-    {
-        _reference = reference;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getReference()
-    {
-        return _reference;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _reference );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _reference );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageClose(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageCloseBodyImpl: ");
-        buf.append( "reference=" );
-        buf.append(  getReference() == null  ? "null" : java.util.Arrays.toString( getReference() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java
deleted file mode 100644
index fe72503c17..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageConsumeBodyImpl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageConsumeBodyImpl extends AMQMethodBody_0_9 implements MessageConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _destination; // [destination]
-    private final byte _bitfield0; // [noLocal, noAck, exclusive]
-    private final FieldTable _filter; // [filter]
-
-    // Constructor
-    public MessageConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _destination = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _filter = readFieldTable( buffer );
-    }
-
-    public MessageConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString destination,
-                                boolean noLocal,
-                                boolean noAck,
-                                boolean exclusive,
-                                FieldTable filter
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _destination = destination;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        _bitfield0 = bitfield0;
-        _filter = filter;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getDestination()
-    {
-        return _destination;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final FieldTable getFilter()
-    {
-        return _filter;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _destination );
-        size += getSizeOf( _filter );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _destination );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _filter );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "destination=" );
-        buf.append(  getDestination() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "filter=" );
-        buf.append(  getFilter() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java
deleted file mode 100644
index 1383836f8e..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageEmptyBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageEmptyBodyImpl extends AMQMethodBody_0_9 implements MessageEmptyBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageEmptyBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 510;
-
-    // Fields declared in specification
-
-    // Constructor
-    public MessageEmptyBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public MessageEmptyBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageEmpty(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageEmptyBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java
deleted file mode 100644
index b812309ac0..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageGetBodyImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageGetBodyImpl extends AMQMethodBody_0_9 implements MessageGetBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageGetBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _destination; // [destination]
-    private final byte _bitfield0; // [noAck]
-
-    // Constructor
-    public MessageGetBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _destination = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public MessageGetBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString destination,
-                                boolean noAck
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _destination = destination;
-        byte bitfield0 = (byte)0;
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getDestination()
-    {
-        return _destination;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _destination );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _destination );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageGet(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageGetBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "destination=" );
-        buf.append(  getDestination() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java
deleted file mode 100644
index 52d907df2b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOffsetBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageOffsetBodyImpl extends AMQMethodBody_0_9 implements MessageOffsetBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageOffsetBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 530;
-
-    // Fields declared in specification
-    private final long _value; // [value]
-
-    // Constructor
-    public MessageOffsetBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _value = readLong( buffer );
-    }
-
-    public MessageOffsetBodyImpl(
-                                long value
-                            )
-    {
-        _value = value;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getValue()
-    {
-        return _value;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _value );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageOffset(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageOffsetBodyImpl: ");
-        buf.append( "value=" );
-        buf.append(  getValue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java
deleted file mode 100644
index c0477e2c13..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageOkBodyImpl extends AMQMethodBody_0_9 implements MessageOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 500;
-
-    // Fields declared in specification
-
-    // Constructor
-    public MessageOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public MessageOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java
deleted file mode 100644
index d500317bfe..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageOpenBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageOpenBodyImpl extends AMQMethodBody_0_9 implements MessageOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final byte[] _reference; // [reference]
-
-    // Constructor
-    public MessageOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _reference = readBytes( buffer );
-    }
-
-    public MessageOpenBodyImpl(
-                                byte[] reference
-                            )
-    {
-        _reference = reference;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getReference()
-    {
-        return _reference;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _reference );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _reference );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageOpenBodyImpl: ");
-        buf.append( "reference=" );
-        buf.append(  getReference() == null  ? "null" : java.util.Arrays.toString( getReference() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java
deleted file mode 100644
index ce4b655131..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageQosBodyImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageQosBodyImpl extends AMQMethodBody_0_9 implements MessageQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 110;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public MessageQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public MessageQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 7;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java
deleted file mode 100644
index 7fac0d9a46..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRecoverBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageRecoverBodyImpl extends AMQMethodBody_0_9 implements MessageRecoverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageRecoverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public MessageRecoverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public MessageRecoverBodyImpl(
-                                boolean requeue
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageRecover(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageRecoverBodyImpl: ");
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java
deleted file mode 100644
index eb15a960c5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageRejectBodyImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageRejectBodyImpl extends AMQMethodBody_0_9 implements MessageRejectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageRejectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 520;
-
-    // Fields declared in specification
-    private final int _code; // [code]
-    private final AMQShortString _text; // [text]
-
-    // Constructor
-    public MessageRejectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _code = readUnsignedShort( buffer );
-        _text = readAMQShortString( buffer );
-    }
-
-    public MessageRejectBodyImpl(
-                                int code,
-                                AMQShortString text
-                            )
-    {
-        _code = code;
-        _text = text;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getCode()
-    {
-        return _code;
-    }
-    public final AMQShortString getText()
-    {
-        return _text;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _text );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _code );
-        writeAMQShortString( buffer, _text );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageReject(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageRejectBodyImpl: ");
-        buf.append( "code=" );
-        buf.append(  getCode() );
-        buf.append( ", " );
-        buf.append( "text=" );
-        buf.append(  getText() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java
deleted file mode 100644
index b8bcb2f309..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageResumeBodyImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageResumeBodyImpl extends AMQMethodBody_0_9 implements MessageResumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageResumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 100;
-
-    // Fields declared in specification
-    private final byte[] _reference; // [reference]
-    private final AMQShortString _identifier; // [identifier]
-
-    // Constructor
-    public MessageResumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _reference = readBytes( buffer );
-        _identifier = readAMQShortString( buffer );
-    }
-
-    public MessageResumeBodyImpl(
-                                byte[] reference,
-                                AMQShortString identifier
-                            )
-    {
-        _reference = reference;
-        _identifier = identifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getReference()
-    {
-        return _reference;
-    }
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _reference );
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _reference );
-        writeAMQShortString( buffer, _identifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageResume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageResumeBodyImpl: ");
-        buf.append( "reference=" );
-        buf.append(  getReference() == null  ? "null" : java.util.Arrays.toString( getReference() ) );
-        buf.append( ", " );
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java
deleted file mode 100644
index 947334812c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MessageTransferBodyImpl.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class MessageTransferBodyImpl extends AMQMethodBody_0_9 implements MessageTransferBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new MessageTransferBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _destination; // [destination]
-    private final byte _bitfield0; // [redelivered, immediate]
-    private final long _ttl; // [ttl]
-    private final short _priority; // [priority]
-    private final long _timestamp; // [timestamp]
-    private final short _deliveryMode; // [deliveryMode]
-    private final long _expiration; // [expiration]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final AMQShortString _messageId; // [messageId]
-    private final AMQShortString _correlationId; // [correlationId]
-    private final AMQShortString _replyTo; // [replyTo]
-    private final AMQShortString _contentType; // [contentType]
-    private final AMQShortString _contentEncoding; // [contentEncoding]
-    private final AMQShortString _userId; // [userId]
-    private final AMQShortString _appId; // [appId]
-    private final AMQShortString _transactionId; // [transactionId]
-    private final byte[] _securityToken; // [securityToken]
-    private final FieldTable _applicationHeaders; // [applicationHeaders]
-    private final Content _body; // [body]
-
-    // Constructor
-    public MessageTransferBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _destination = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _ttl = readLong( buffer );
-        _priority = readUnsignedByte( buffer );
-        _timestamp = readTimestamp( buffer );
-        _deliveryMode = readUnsignedByte( buffer );
-        _expiration = readTimestamp( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _messageId = readAMQShortString( buffer );
-        _correlationId = readAMQShortString( buffer );
-        _replyTo = readAMQShortString( buffer );
-        _contentType = readAMQShortString( buffer );
-        _contentEncoding = readAMQShortString( buffer );
-        _userId = readAMQShortString( buffer );
-        _appId = readAMQShortString( buffer );
-        _transactionId = readAMQShortString( buffer );
-        _securityToken = readBytes( buffer );
-        _applicationHeaders = readFieldTable( buffer );
-        _body = readContent( buffer );
-    }
-
-    public MessageTransferBodyImpl(
-                                int ticket,
-                                AMQShortString destination,
-                                boolean redelivered,
-                                boolean immediate,
-                                long ttl,
-                                short priority,
-                                long timestamp,
-                                short deliveryMode,
-                                long expiration,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                AMQShortString messageId,
-                                AMQShortString correlationId,
-                                AMQShortString replyTo,
-                                AMQShortString contentType,
-                                AMQShortString contentEncoding,
-                                AMQShortString userId,
-                                AMQShortString appId,
-                                AMQShortString transactionId,
-                                byte[] securityToken,
-                                FieldTable applicationHeaders,
-                                Content body
-                            )
-    {
-        _ticket = ticket;
-        _destination = destination;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        _bitfield0 = bitfield0;
-        _ttl = ttl;
-        _priority = priority;
-        _timestamp = timestamp;
-        _deliveryMode = deliveryMode;
-        _expiration = expiration;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _messageId = messageId;
-        _correlationId = correlationId;
-        _replyTo = replyTo;
-        _contentType = contentType;
-        _contentEncoding = contentEncoding;
-        _userId = userId;
-        _appId = appId;
-        _transactionId = transactionId;
-        _securityToken = securityToken;
-        _applicationHeaders = applicationHeaders;
-        _body = body;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getDestination()
-    {
-        return _destination;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final long getTtl()
-    {
-        return _ttl;
-    }
-    public final short getPriority()
-    {
-        return _priority;
-    }
-    public final long getTimestamp()
-    {
-        return _timestamp;
-    }
-    public final short getDeliveryMode()
-    {
-        return _deliveryMode;
-    }
-    public final long getExpiration()
-    {
-        return _expiration;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final AMQShortString getMessageId()
-    {
-        return _messageId;
-    }
-    public final AMQShortString getCorrelationId()
-    {
-        return _correlationId;
-    }
-    public final AMQShortString getReplyTo()
-    {
-        return _replyTo;
-    }
-    public final AMQShortString getContentType()
-    {
-        return _contentType;
-    }
-    public final AMQShortString getContentEncoding()
-    {
-        return _contentEncoding;
-    }
-    public final AMQShortString getUserId()
-    {
-        return _userId;
-    }
-    public final AMQShortString getAppId()
-    {
-        return _appId;
-    }
-    public final AMQShortString getTransactionId()
-    {
-        return _transactionId;
-    }
-    public final byte[] getSecurityToken()
-    {
-        return _securityToken;
-    }
-    public final FieldTable getApplicationHeaders()
-    {
-        return _applicationHeaders;
-    }
-    public final Content getBody()
-    {
-        return _body;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 29;
-        size += getSizeOf( _destination );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _messageId );
-        size += getSizeOf( _correlationId );
-        size += getSizeOf( _replyTo );
-        size += getSizeOf( _contentType );
-        size += getSizeOf( _contentEncoding );
-        size += getSizeOf( _userId );
-        size += getSizeOf( _appId );
-        size += getSizeOf( _transactionId );
-        size += getSizeOf( _securityToken );
-        size += getSizeOf( _applicationHeaders );
-        size += getSizeOf( _body );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _destination );
-        writeBitfield( buffer, _bitfield0 );
-        writeLong( buffer, _ttl );
-        writeUnsignedByte( buffer, _priority );
-        writeTimestamp( buffer, _timestamp );
-        writeUnsignedByte( buffer, _deliveryMode );
-        writeTimestamp( buffer, _expiration );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeAMQShortString( buffer, _messageId );
-        writeAMQShortString( buffer, _correlationId );
-        writeAMQShortString( buffer, _replyTo );
-        writeAMQShortString( buffer, _contentType );
-        writeAMQShortString( buffer, _contentEncoding );
-        writeAMQShortString( buffer, _userId );
-        writeAMQShortString( buffer, _appId );
-        writeAMQShortString( buffer, _transactionId );
-        writeBytes( buffer, _securityToken );
-        writeFieldTable( buffer, _applicationHeaders );
-        writeContent( buffer, _body );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchMessageTransfer(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[MessageTransferBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "destination=" );
-        buf.append(  getDestination() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append( ", " );
-        buf.append( "ttl=" );
-        buf.append(  getTtl() );
-        buf.append( ", " );
-        buf.append( "priority=" );
-        buf.append(  getPriority() );
-        buf.append( ", " );
-        buf.append( "timestamp=" );
-        buf.append(  getTimestamp() );
-        buf.append( ", " );
-        buf.append( "deliveryMode=" );
-        buf.append(  getDeliveryMode() );
-        buf.append( ", " );
-        buf.append( "expiration=" );
-        buf.append(  getExpiration() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "messageId=" );
-        buf.append(  getMessageId() );
-        buf.append( ", " );
-        buf.append( "correlationId=" );
-        buf.append(  getCorrelationId() );
-        buf.append( ", " );
-        buf.append( "replyTo=" );
-        buf.append(  getReplyTo() );
-        buf.append( ", " );
-        buf.append( "contentType=" );
-        buf.append(  getContentType() );
-        buf.append( ", " );
-        buf.append( "contentEncoding=" );
-        buf.append(  getContentEncoding() );
-        buf.append( ", " );
-        buf.append( "userId=" );
-        buf.append(  getUserId() );
-        buf.append( ", " );
-        buf.append( "appId=" );
-        buf.append(  getAppId() );
-        buf.append( ", " );
-        buf.append( "transactionId=" );
-        buf.append(  getTransactionId() );
-        buf.append( ", " );
-        buf.append( "securityToken=" );
-        buf.append(  getSecurityToken() == null  ? "null" : java.util.Arrays.toString( getSecurityToken() ) );
-        buf.append( ", " );
-        buf.append( "applicationHeaders=" );
-        buf.append(  getApplicationHeaders() );
-        buf.append( ", " );
-        buf.append( "body=" );
-        buf.append(  getBody() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
index 6456eacab1..9fd961bb13 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
@@ -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;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
index f0e317fc1e..5fb7695aee 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
@@ -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 MethodRegistry
 
     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 MethodRegistry
         _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 MethodRegistry
 
 
 
-        // 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 MethodRegistry
         _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 MethodRegistry
                                 );
     }
 
-    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 MethodRegistry
                                 );
     }
 
-
-
-
-    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 MethodRegistry
                                 );
     }
 
-
-
-
-    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;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java
deleted file mode 100644
index 989a6d4877..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindBodyImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueueBindBodyImpl extends AMQMethodBody_0_9 implements QueueBindBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueBindBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public QueueBindBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public QueueBindBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueueBind(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueBindBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java
deleted file mode 100644
index 1469912b2b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueBindOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueueBindOkBodyImpl extends AMQMethodBody_0_9 implements QueueBindOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueBindOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public QueueBindOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public QueueBindOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueueBindOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueBindOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java
deleted file mode 100644
index 7b2926f32f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareBodyImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueueDeclareBodyImpl extends AMQMethodBody_0_9 implements QueueDeclareBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeclareBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [passive, durable, exclusive, autoDelete, nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public QueueDeclareBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public QueueDeclareBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean passive,
-                                boolean durable,
-                                boolean exclusive,
-                                boolean autoDelete,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( passive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( durable )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( autoDelete )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 4));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getPassive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getDurable()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getAutoDelete()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 4)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueueDeclare(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeclareBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "passive=" );
-        buf.append(  getPassive() );
-        buf.append( ", " );
-        buf.append( "durable=" );
-        buf.append(  getDurable() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "autoDelete=" );
-        buf.append(  getAutoDelete() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java
deleted file mode 100644
index 1c76725d2b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeclareOkBodyImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueueDeclareOkBodyImpl extends AMQMethodBody_0_9 implements QueueDeclareOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeclareOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-    private final AMQShortString _queue; // [queue]
-    private final long _messageCount; // [messageCount]
-    private final long _consumerCount; // [consumerCount]
-
-    // Constructor
-    public QueueDeclareOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _queue = readAMQShortString( buffer );
-        _messageCount = readUnsignedInteger( buffer );
-        _consumerCount = readUnsignedInteger( buffer );
-    }
-
-    public QueueDeclareOkBodyImpl(
-                                AMQShortString queue,
-                                long messageCount,
-                                long consumerCount
-                            )
-    {
-        _queue = queue;
-        _messageCount = messageCount;
-        _consumerCount = consumerCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-    public final long getConsumerCount()
-    {
-        return _consumerCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _queue );
-        writeUnsignedInteger( buffer, _messageCount );
-        writeUnsignedInteger( buffer, _consumerCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueueDeclareOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeclareOkBodyImpl: ");
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append( ", " );
-        buf.append( "consumerCount=" );
-        buf.append(  getConsumerCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java
deleted file mode 100644
index ea48a1d24a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueueDeleteBodyImpl extends AMQMethodBody_0_9 implements QueueDeleteBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeleteBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [ifUnused, ifEmpty, nowait]
-
-    // Constructor
-    public QueueDeleteBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public QueueDeleteBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean ifUnused,
-                                boolean ifEmpty,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( ifUnused )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( ifEmpty )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getIfUnused()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getIfEmpty()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueueDelete(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeleteBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "ifUnused=" );
-        buf.append(  getIfUnused() );
-        buf.append( ", " );
-        buf.append( "ifEmpty=" );
-        buf.append(  getIfEmpty() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java
deleted file mode 100644
index acc7a59887..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueDeleteOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueueDeleteOkBodyImpl extends AMQMethodBody_0_9 implements QueueDeleteOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeleteOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final long _messageCount; // [messageCount]
-
-    // Constructor
-    public QueueDeleteOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _messageCount = readUnsignedInteger( buffer );
-    }
-
-    public QueueDeleteOkBodyImpl(
-                                long messageCount
-                            )
-    {
-        _messageCount = messageCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 4;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _messageCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueueDeleteOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeleteOkBodyImpl: ");
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java
deleted file mode 100644
index 8a1a4e206c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeBodyImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueuePurgeBodyImpl extends AMQMethodBody_0_9 implements QueuePurgeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueuePurgeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public QueuePurgeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public QueuePurgeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueuePurge(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueuePurgeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java
deleted file mode 100644
index db50a822f6..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueuePurgeOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class QueuePurgeOkBodyImpl extends AMQMethodBody_0_9 implements QueuePurgeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueuePurgeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final long _messageCount; // [messageCount]
-
-    // Constructor
-    public QueuePurgeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _messageCount = readUnsignedInteger( buffer );
-    }
-
-    public QueuePurgeOkBodyImpl(
-                                long messageCount
-                            )
-    {
-        _messageCount = messageCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 4;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _messageCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchQueuePurgeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueuePurgeOkBodyImpl: ");
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
index fd5bb7b953..1ecbe2c6fd 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class QueueUnbindBodyImpl extends AMQMethodBody_0_9 implements QueueUnbindBody
+public class QueueUnbindBodyImpl extends AMQMethodBodyImpl implements QueueUnbindBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
index 03544b17d6..24e70bd5ca 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class QueueUnbindOkBodyImpl extends AMQMethodBody_0_9 implements QueueUnbindOkBody
+public class QueueUnbindOkBodyImpl extends AMQMethodBodyImpl implements QueueUnbindOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
index 4100e7a031..128af0e2a7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
@@ -35,71 +35,7 @@ public interface ServerMethodDispatcher_0_9 extends ServerMethodDispatcher
 {
 
     public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException;
     public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicReject(BasicRejectBody 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 dispatchChannelOpen(ChannelOpenBody 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 dispatchChannelResume(ChannelResumeBody 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 dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException;
-    public boolean dispatchDtxSelect(DtxSelectBody body, int channelId) throws AMQException;
-    public boolean dispatchDtxStart(DtxStartBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException;
-    public boolean dispatchFileAck(FileAckBody body, int channelId) throws AMQException;
-    public boolean dispatchFileCancel(FileCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchFileConsume(FileConsumeBody 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 dispatchFilePublish(FilePublishBody body, int channelId) throws AMQException;
-    public boolean dispatchFileQos(FileQosBody body, int channelId) throws AMQException;
-    public boolean dispatchFileReject(FileRejectBody 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 dispatchMessageCancel(MessageCancelBody 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 dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageGet(MessageGetBody 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 dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException;
-    public boolean dispatchMessageRecover(MessageRecoverBody 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 dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException;
-    public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException;
     public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamCancel(StreamCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamConsume(StreamConsumeBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamPublish(StreamPublishBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamQos(StreamQosBody body, int channelId) throws AMQException;
-    public boolean dispatchTunnelRequest(TunnelRequestBody body, int channelId) throws AMQException;
-    public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException;
-    public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException;
-    public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException;
 
-}
\ No newline at end of file
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java
deleted file mode 100644
index 81ec1102f5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelBodyImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamCancelBodyImpl extends AMQMethodBody_0_9 implements StreamCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public StreamCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamCancelBodyImpl(
-                                AMQShortString consumerTag,
-                                boolean nowait
-                            )
-    {
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamCancelBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java
deleted file mode 100644
index ec9676d782..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamCancelOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamCancelOkBodyImpl extends AMQMethodBody_0_9 implements StreamCancelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamCancelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public StreamCancelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public StreamCancelOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamCancelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamCancelOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java
deleted file mode 100644
index ff4712d091..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeBodyImpl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamConsumeBodyImpl extends AMQMethodBody_0_9 implements StreamConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [noLocal, exclusive, nowait]
-    private final FieldTable _filter; // [filter]
-
-    // Constructor
-    public StreamConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _filter = readFieldTable( buffer );
-    }
-
-    public StreamConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString consumerTag,
-                                boolean noLocal,
-                                boolean exclusive,
-                                boolean nowait,
-                                FieldTable filter
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        _bitfield0 = bitfield0;
-        _filter = filter;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final FieldTable getFilter()
-    {
-        return _filter;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _filter );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _filter );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "filter=" );
-        buf.append(  getFilter() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java
deleted file mode 100644
index cca83758e4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamConsumeOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamConsumeOkBodyImpl extends AMQMethodBody_0_9 implements StreamConsumeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamConsumeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public StreamConsumeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public StreamConsumeOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamConsumeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamConsumeOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java
deleted file mode 100644
index 87e341ee5c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamDeliverBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamDeliverBodyImpl extends AMQMethodBody_0_9 implements StreamDeliverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamDeliverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final long _deliveryTag; // [deliveryTag]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _queue; // [queue]
-
-    // Constructor
-    public StreamDeliverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _deliveryTag = readLong( buffer );
-        _exchange = readAMQShortString( buffer );
-        _queue = readAMQShortString( buffer );
-    }
-
-    public StreamDeliverBodyImpl(
-                                AMQShortString consumerTag,
-                                long deliveryTag,
-                                AMQShortString exchange,
-                                AMQShortString queue
-                            )
-    {
-        _consumerTag = consumerTag;
-        _deliveryTag = deliveryTag;
-        _exchange = exchange;
-        _queue = queue;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeLong( buffer, _deliveryTag );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _queue );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamDeliver(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamDeliverBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java
deleted file mode 100644
index 59161fe291..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamPublishBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamPublishBodyImpl extends AMQMethodBody_0_9 implements StreamPublishBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamPublishBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [mandatory, immediate]
-
-    // Constructor
-    public StreamPublishBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamPublishBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean mandatory,
-                                boolean immediate
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( mandatory )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getMandatory()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamPublish(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamPublishBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "mandatory=" );
-        buf.append(  getMandatory() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java
deleted file mode 100644
index b9413d3ef2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosBodyImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamQosBodyImpl extends AMQMethodBody_0_9 implements StreamQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final long _consumeRate; // [consumeRate]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public StreamQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _consumeRate = readUnsignedInteger( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                long consumeRate,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        _consumeRate = consumeRate;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final long getConsumeRate()
-    {
-        return _consumeRate;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 11;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeUnsignedInteger( buffer, _consumeRate );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "consumeRate=" );
-        buf.append(  getConsumeRate() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java
deleted file mode 100644
index a5119c7f6d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamQosOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamQosOkBodyImpl extends AMQMethodBody_0_9 implements StreamQosOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamQosOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public StreamQosOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public StreamQosOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamQosOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamQosOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java
deleted file mode 100644
index bb60ea982e..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/StreamReturnBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class StreamReturnBodyImpl extends AMQMethodBody_0_9 implements StreamReturnBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamReturnBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public StreamReturnBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public StreamReturnBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchStreamReturn(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamReturnBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java
deleted file mode 100644
index fae6e1c3b9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TunnelRequestBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TunnelRequestBodyImpl extends AMQMethodBody_0_9 implements TunnelRequestBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TunnelRequestBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  110;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final FieldTable _metaData; // [metaData]
-
-    // Constructor
-    public TunnelRequestBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _metaData = readFieldTable( buffer );
-    }
-
-    public TunnelRequestBodyImpl(
-                                FieldTable metaData
-                            )
-    {
-        _metaData = metaData;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final FieldTable getMetaData()
-    {
-        return _metaData;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _metaData );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeFieldTable( buffer, _metaData );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTunnelRequest(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TunnelRequestBodyImpl: ");
-        buf.append( "metaData=" );
-        buf.append(  getMetaData() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java
deleted file mode 100644
index 9663cc86f5..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TxCommitBodyImpl extends AMQMethodBody_0_9 implements TxCommitBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxCommitBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxCommitBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxCommitBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTxCommit(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxCommitBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java
deleted file mode 100644
index fa009903b9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxCommitOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TxCommitOkBodyImpl extends AMQMethodBody_0_9 implements TxCommitOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxCommitOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxCommitOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxCommitOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTxCommitOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxCommitOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java
deleted file mode 100644
index c143c34081..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TxRollbackBodyImpl extends AMQMethodBody_0_9 implements TxRollbackBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxRollbackBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxRollbackBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxRollbackBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTxRollback(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxRollbackBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java
deleted file mode 100644
index a5238b8804..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxRollbackOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TxRollbackOkBodyImpl extends AMQMethodBody_0_9 implements TxRollbackOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxRollbackOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxRollbackOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxRollbackOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTxRollbackOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxRollbackOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java
deleted file mode 100644
index 9a43987fa2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TxSelectBodyImpl extends AMQMethodBody_0_9 implements TxSelectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxSelectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxSelectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxSelectBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTxSelect(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxSelectBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java
deleted file mode 100644
index c06bf4c501..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/TxSelectOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-9
- */
-
-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;
-
-public class TxSelectOkBodyImpl extends AMQMethodBody_0_9 implements TxSelectOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxSelectOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxSelectOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxSelectOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_9)dispatcher).dispatchTxSelectOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxSelectOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
deleted file mode 100644
index 60b8a7e1a6..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-public abstract class AMQMethodBody_0_91 extends org.apache.qpid.framing.AMQMethodBodyImpl
-{
-
-    public byte getMajor()
-    {
-        return 0;
-    }
-
-    public byte getMinor()
-    {
-        return 91;
-    }
-
-}
\ No newline at end of file
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java
deleted file mode 100644
index 059ae8fab8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicAckBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicAckBodyImpl extends AMQMethodBody_0_91 implements BasicAckBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicAckBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 80;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [multiple]
-
-    // Constructor
-    public BasicAckBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicAckBodyImpl(
-                                long deliveryTag,
-                                boolean multiple
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( multiple )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getMultiple()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicAck(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicAckBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "multiple=" );
-        buf.append(  getMultiple() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java
deleted file mode 100644
index 08a07960ac..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelBodyImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicCancelBodyImpl extends AMQMethodBody_0_91 implements BasicCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public BasicCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicCancelBodyImpl(
-                                AMQShortString consumerTag,
-                                boolean nowait
-                            )
-    {
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicCancelBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java
deleted file mode 100644
index 380fa70a18..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicCancelOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicCancelOkBodyImpl extends AMQMethodBody_0_91 implements BasicCancelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicCancelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public BasicCancelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public BasicCancelOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicCancelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicCancelOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java
deleted file mode 100644
index b299c5c0d4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeBodyImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicConsumeBodyImpl extends AMQMethodBody_0_91 implements BasicConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [noLocal, noAck, exclusive, nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public BasicConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public BasicConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString consumerTag,
-                                boolean noLocal,
-                                boolean noAck,
-                                boolean exclusive,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java
deleted file mode 100644
index 2241370c75..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicConsumeOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicConsumeOkBodyImpl extends AMQMethodBody_0_91 implements BasicConsumeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicConsumeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public BasicConsumeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public BasicConsumeOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicConsumeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicConsumeOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java
deleted file mode 100644
index a1a9bf6113..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicDeliverBodyImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicDeliverBodyImpl extends AMQMethodBody_0_91 implements BasicDeliverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicDeliverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [redelivered]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public BasicDeliverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public BasicDeliverBodyImpl(
-                                AMQShortString consumerTag,
-                                long deliveryTag,
-                                boolean redelivered,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _consumerTag = consumerTag;
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicDeliver(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicDeliverBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java
deleted file mode 100644
index 2f9ca99673..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetBodyImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicGetBodyImpl extends AMQMethodBody_0_91 implements BasicGetBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicGetBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 70;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [noAck]
-
-    // Constructor
-    public BasicGetBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicGetBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean noAck
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicGet(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicGetBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java
deleted file mode 100644
index 2f40867d71..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetEmptyBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicGetEmptyBodyImpl extends AMQMethodBody_0_91 implements BasicGetEmptyBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicGetEmptyBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 72;
-
-    // Fields declared in specification
-    private final AMQShortString _clusterId; // [clusterId]
-
-    // Constructor
-    public BasicGetEmptyBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _clusterId = readAMQShortString( buffer );
-    }
-
-    public BasicGetEmptyBodyImpl(
-                                AMQShortString clusterId
-                            )
-    {
-        _clusterId = clusterId;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getClusterId()
-    {
-        return _clusterId;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _clusterId );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _clusterId );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicGetEmpty(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicGetEmptyBodyImpl: ");
-        buf.append( "clusterId=" );
-        buf.append(  getClusterId() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java
deleted file mode 100644
index 9666f447f1..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicGetOkBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicGetOkBodyImpl extends AMQMethodBody_0_91 implements BasicGetOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicGetOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 71;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [redelivered]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final long _messageCount; // [messageCount]
-
-    // Constructor
-    public BasicGetOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _messageCount = readUnsignedInteger( buffer );
-    }
-
-    public BasicGetOkBodyImpl(
-                                long deliveryTag,
-                                boolean redelivered,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                long messageCount
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _messageCount = messageCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 13;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeUnsignedInteger( buffer, _messageCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicGetOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicGetOkBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java
deleted file mode 100644
index b347420128..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicPublishBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicPublishBodyImpl extends AMQMethodBody_0_91 implements BasicPublishBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicPublishBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [mandatory, immediate]
-
-    // Constructor
-    public BasicPublishBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicPublishBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean mandatory,
-                                boolean immediate
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( mandatory )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getMandatory()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicPublish(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicPublishBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "mandatory=" );
-        buf.append(  getMandatory() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java
deleted file mode 100644
index 00372b9c49..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosBodyImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicQosBodyImpl extends AMQMethodBody_0_91 implements BasicQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public BasicQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 7;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java
deleted file mode 100644
index a36b2e6d66..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicQosOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicQosOkBodyImpl extends AMQMethodBody_0_91 implements BasicQosOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicQosOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public BasicQosOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public BasicQosOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicQosOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicQosOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java
deleted file mode 100644
index e21c382a24..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicRecoverBodyImpl extends AMQMethodBody_0_91 implements BasicRecoverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicRecoverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 100;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public BasicRecoverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicRecoverBodyImpl(
-                                boolean requeue
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicRecover(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicRecoverBodyImpl: ");
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
index c0679cf939..595876a8e3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class BasicRecoverSyncBodyImpl extends AMQMethodBody_0_91 implements BasicRecoverSyncBody
+public class BasicRecoverSyncBodyImpl extends AMQMethodBodyImpl implements BasicRecoverSyncBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
index a75d344831..da906a4a10 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class BasicRecoverSyncOkBodyImpl extends AMQMethodBody_0_91 implements BasicRecoverSyncOkBody
+public class BasicRecoverSyncOkBodyImpl extends AMQMethodBodyImpl implements BasicRecoverSyncOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java
deleted file mode 100644
index b5b549d4a9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRejectBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicRejectBodyImpl extends AMQMethodBody_0_91 implements BasicRejectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicRejectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 90;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public BasicRejectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public BasicRejectBodyImpl(
-                                long deliveryTag,
-                                boolean requeue
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicReject(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicRejectBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java
deleted file mode 100644
index 26ba2f8b95..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicReturnBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class BasicReturnBodyImpl extends AMQMethodBody_0_91 implements BasicReturnBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new BasicReturnBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  60;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public BasicReturnBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public BasicReturnBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicReturn(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[BasicReturnBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java
deleted file mode 100644
index 77f0dc2c9a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseBodyImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ChannelCloseBodyImpl extends AMQMethodBody_0_91 implements ChannelCloseBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelCloseBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final int _classId; // [classId]
-    private final int _methodId; // [methodId]
-
-    // Constructor
-    public ChannelCloseBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _classId = readUnsignedShort( buffer );
-        _methodId = readUnsignedShort( buffer );
-    }
-
-    public ChannelCloseBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                int classId,
-                                int methodId
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _classId = classId;
-        _methodId = methodId;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final int getClassId()
-    {
-        return _classId;
-    }
-    public final int getMethodId()
-    {
-        return _methodId;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 6;
-        size += getSizeOf( _replyText );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeUnsignedShort( buffer, _classId );
-        writeUnsignedShort( buffer, _methodId );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchChannelClose(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelCloseBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "classId=" );
-        buf.append(  getClassId() );
-        buf.append( ", " );
-        buf.append( "methodId=" );
-        buf.append(  getMethodId() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java
deleted file mode 100644
index 91dd7b998a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelCloseOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ChannelCloseOkBodyImpl extends AMQMethodBody_0_91 implements ChannelCloseOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelCloseOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ChannelCloseOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ChannelCloseOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchChannelCloseOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelCloseOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java
deleted file mode 100644
index ce22049d31..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ChannelFlowBodyImpl extends AMQMethodBody_0_91 implements ChannelFlowBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelFlowBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [active]
-
-    // Constructor
-    public ChannelFlowBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ChannelFlowBodyImpl(
-                                boolean active
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( active )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getActive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchChannelFlow(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelFlowBodyImpl: ");
-        buf.append( "active=" );
-        buf.append(  getActive() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java
deleted file mode 100644
index 427acd045c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelFlowOkBodyImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ChannelFlowOkBodyImpl extends AMQMethodBody_0_91 implements ChannelFlowOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelFlowOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final byte _bitfield0; // [active]
-
-    // Constructor
-    public ChannelFlowOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ChannelFlowOkBodyImpl(
-                                boolean active
-                            )
-    {
-        byte bitfield0 = (byte)0;
-        if( active )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final boolean getActive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchChannelFlowOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelFlowOkBodyImpl: ");
-        buf.append( "active=" );
-        buf.append(  getActive() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java
deleted file mode 100644
index e204006fb3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ChannelOpenBodyImpl extends AMQMethodBody_0_91 implements ChannelOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ChannelOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  20;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final AMQShortString _outOfBand; // [outOfBand]
-
-    // Constructor
-    public ChannelOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _outOfBand = readAMQShortString( buffer );
-    }
-
-    public ChannelOpenBodyImpl(
-                                AMQShortString outOfBand
-                            )
-    {
-        _outOfBand = outOfBand;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getOutOfBand()
-    {
-        return _outOfBand;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _outOfBand );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _outOfBand );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchChannelOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ChannelOpenBodyImpl: ");
-        buf.append( "outOfBand=" );
-        buf.append(  getOutOfBand() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
index d891cb3374..b00769dc64 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ChannelOpenOkBodyImpl extends AMQMethodBody_0_91 implements ChannelOpenOkBody
+public class ChannelOpenOkBodyImpl extends AMQMethodBodyImpl implements ChannelOpenOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
index e60a4b6d0c..11fd973ec8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
@@ -33,35 +33,7 @@ import org.apache.qpid.framing.*;
 public interface ClientMethodDispatcher_0_91 extends ClientMethodDispatcher
 {
 
-    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 dispatchChannelOpenOk(ChannelOpenOkBody 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 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 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 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 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
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
index 92c78ac484..c63d33b48a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionCloseBodyImpl extends AMQMethodBody_0_91 implements ConnectionCloseBody
+public class ConnectionCloseBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
index 8bf23cb8fb..4f9c5dabde 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionCloseOkBodyImpl extends AMQMethodBody_0_91 implements ConnectionCloseOkBody
+public class ConnectionCloseOkBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java
deleted file mode 100644
index 20284f6462..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenBodyImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionOpenBodyImpl extends AMQMethodBody_0_91 implements ConnectionOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final AMQShortString _virtualHost; // [virtualHost]
-    private final AMQShortString _capabilities; // [capabilities]
-    private final byte _bitfield0; // [insist]
-
-    // Constructor
-    public ConnectionOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _virtualHost = readAMQShortString( buffer );
-        _capabilities = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ConnectionOpenBodyImpl(
-                                AMQShortString virtualHost,
-                                AMQShortString capabilities,
-                                boolean insist
-                            )
-    {
-        _virtualHost = virtualHost;
-        _capabilities = capabilities;
-        byte bitfield0 = (byte)0;
-        if( insist )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getVirtualHost()
-    {
-        return _virtualHost;
-    }
-    public final AMQShortString getCapabilities()
-    {
-        return _capabilities;
-    }
-    public final boolean getInsist()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _virtualHost );
-        size += getSizeOf( _capabilities );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _virtualHost );
-        writeAMQShortString( buffer, _capabilities );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionOpenBodyImpl: ");
-        buf.append( "virtualHost=" );
-        buf.append(  getVirtualHost() );
-        buf.append( ", " );
-        buf.append( "capabilities=" );
-        buf.append(  getCapabilities() );
-        buf.append( ", " );
-        buf.append( "insist=" );
-        buf.append(  getInsist() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java
deleted file mode 100644
index 346b26f039..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionOpenOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionOpenOkBodyImpl extends AMQMethodBody_0_91 implements ConnectionOpenOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionOpenOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final AMQShortString _knownHosts; // [knownHosts]
-
-    // Constructor
-    public ConnectionOpenOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _knownHosts = readAMQShortString( buffer );
-    }
-
-    public ConnectionOpenOkBodyImpl(
-                                AMQShortString knownHosts
-                            )
-    {
-        _knownHosts = knownHosts;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getKnownHosts()
-    {
-        return _knownHosts;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _knownHosts );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _knownHosts );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionOpenOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionOpenOkBodyImpl: ");
-        buf.append( "knownHosts=" );
-        buf.append(  getKnownHosts() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java
deleted file mode 100644
index 1573403c41..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionSecureBodyImpl extends AMQMethodBody_0_91 implements ConnectionSecureBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionSecureBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final byte[] _challenge; // [challenge]
-
-    // Constructor
-    public ConnectionSecureBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _challenge = readBytes( buffer );
-    }
-
-    public ConnectionSecureBodyImpl(
-                                byte[] challenge
-                            )
-    {
-        _challenge = challenge;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getChallenge()
-    {
-        return _challenge;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _challenge );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _challenge );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionSecure(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionSecureBodyImpl: ");
-        buf.append( "challenge=" );
-        buf.append(  getChallenge() == null  ? "null" : java.util.Arrays.toString( getChallenge() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java
deleted file mode 100644
index bf44d51a00..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionSecureOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionSecureOkBodyImpl extends AMQMethodBody_0_91 implements ConnectionSecureOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionSecureOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final byte[] _response; // [response]
-
-    // Constructor
-    public ConnectionSecureOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _response = readBytes( buffer );
-    }
-
-    public ConnectionSecureOkBodyImpl(
-                                byte[] response
-                            )
-    {
-        _response = response;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getResponse()
-    {
-        return _response;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _response );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _response );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionSecureOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionSecureOkBodyImpl: ");
-        buf.append( "response=" );
-        buf.append(  getResponse() == null  ? "null" : java.util.Arrays.toString( getResponse() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java
deleted file mode 100644
index b849c4fcfb..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartBodyImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionStartBodyImpl extends AMQMethodBody_0_91 implements ConnectionStartBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionStartBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final short _versionMajor; // [versionMajor]
-    private final short _versionMinor; // [versionMinor]
-    private final FieldTable _serverProperties; // [serverProperties]
-    private final byte[] _mechanisms; // [mechanisms]
-    private final byte[] _locales; // [locales]
-
-    // Constructor
-    public ConnectionStartBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _versionMajor = readUnsignedByte( buffer );
-        _versionMinor = readUnsignedByte( buffer );
-        _serverProperties = readFieldTable( buffer );
-        _mechanisms = readBytes( buffer );
-        _locales = readBytes( buffer );
-    }
-
-    public ConnectionStartBodyImpl(
-                                short versionMajor,
-                                short versionMinor,
-                                FieldTable serverProperties,
-                                byte[] mechanisms,
-                                byte[] locales
-                            )
-    {
-        _versionMajor = versionMajor;
-        _versionMinor = versionMinor;
-        _serverProperties = serverProperties;
-        _mechanisms = mechanisms;
-        _locales = locales;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final short getVersionMajor()
-    {
-        return _versionMajor;
-    }
-    public final short getVersionMinor()
-    {
-        return _versionMinor;
-    }
-    public final FieldTable getServerProperties()
-    {
-        return _serverProperties;
-    }
-    public final byte[] getMechanisms()
-    {
-        return _mechanisms;
-    }
-    public final byte[] getLocales()
-    {
-        return _locales;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _serverProperties );
-        size += getSizeOf( _mechanisms );
-        size += getSizeOf( _locales );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedByte( buffer, _versionMajor );
-        writeUnsignedByte( buffer, _versionMinor );
-        writeFieldTable( buffer, _serverProperties );
-        writeBytes( buffer, _mechanisms );
-        writeBytes( buffer, _locales );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionStart(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionStartBodyImpl: ");
-        buf.append( "versionMajor=" );
-        buf.append(  getVersionMajor() );
-        buf.append( ", " );
-        buf.append( "versionMinor=" );
-        buf.append(  getVersionMinor() );
-        buf.append( ", " );
-        buf.append( "serverProperties=" );
-        buf.append(  getServerProperties() );
-        buf.append( ", " );
-        buf.append( "mechanisms=" );
-        buf.append(  getMechanisms() == null  ? "null" : java.util.Arrays.toString( getMechanisms() ) );
-        buf.append( ", " );
-        buf.append( "locales=" );
-        buf.append(  getLocales() == null  ? "null" : java.util.Arrays.toString( getLocales() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java
deleted file mode 100644
index 59bbf147e3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionStartOkBodyImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionStartOkBodyImpl extends AMQMethodBody_0_91 implements ConnectionStartOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionStartOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-    private final FieldTable _clientProperties; // [clientProperties]
-    private final AMQShortString _mechanism; // [mechanism]
-    private final byte[] _response; // [response]
-    private final AMQShortString _locale; // [locale]
-
-    // Constructor
-    public ConnectionStartOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _clientProperties = readFieldTable( buffer );
-        _mechanism = readAMQShortString( buffer );
-        _response = readBytes( buffer );
-        _locale = readAMQShortString( buffer );
-    }
-
-    public ConnectionStartOkBodyImpl(
-                                FieldTable clientProperties,
-                                AMQShortString mechanism,
-                                byte[] response,
-                                AMQShortString locale
-                            )
-    {
-        _clientProperties = clientProperties;
-        _mechanism = mechanism;
-        _response = response;
-        _locale = locale;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final FieldTable getClientProperties()
-    {
-        return _clientProperties;
-    }
-    public final AMQShortString getMechanism()
-    {
-        return _mechanism;
-    }
-    public final byte[] getResponse()
-    {
-        return _response;
-    }
-    public final AMQShortString getLocale()
-    {
-        return _locale;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _clientProperties );
-        size += getSizeOf( _mechanism );
-        size += getSizeOf( _response );
-        size += getSizeOf( _locale );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeFieldTable( buffer, _clientProperties );
-        writeAMQShortString( buffer, _mechanism );
-        writeBytes( buffer, _response );
-        writeAMQShortString( buffer, _locale );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionStartOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionStartOkBodyImpl: ");
-        buf.append( "clientProperties=" );
-        buf.append(  getClientProperties() );
-        buf.append( ", " );
-        buf.append( "mechanism=" );
-        buf.append(  getMechanism() );
-        buf.append( ", " );
-        buf.append( "response=" );
-        buf.append(  getResponse() == null  ? "null" : java.util.Arrays.toString( getResponse() ) );
-        buf.append( ", " );
-        buf.append( "locale=" );
-        buf.append(  getLocale() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java
deleted file mode 100644
index 2c98b56858..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneBodyImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionTuneBodyImpl extends AMQMethodBody_0_91 implements ConnectionTuneBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionTuneBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final int _channelMax; // [channelMax]
-    private final long _frameMax; // [frameMax]
-    private final int _heartbeat; // [heartbeat]
-
-    // Constructor
-    public ConnectionTuneBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _channelMax = readUnsignedShort( buffer );
-        _frameMax = readUnsignedInteger( buffer );
-        _heartbeat = readUnsignedShort( buffer );
-    }
-
-    public ConnectionTuneBodyImpl(
-                                int channelMax,
-                                long frameMax,
-                                int heartbeat
-                            )
-    {
-        _channelMax = channelMax;
-        _frameMax = frameMax;
-        _heartbeat = heartbeat;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getChannelMax()
-    {
-        return _channelMax;
-    }
-    public final long getFrameMax()
-    {
-        return _frameMax;
-    }
-    public final int getHeartbeat()
-    {
-        return _heartbeat;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _channelMax );
-        writeUnsignedInteger( buffer, _frameMax );
-        writeUnsignedShort( buffer, _heartbeat );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionTune(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionTuneBodyImpl: ");
-        buf.append( "channelMax=" );
-        buf.append(  getChannelMax() );
-        buf.append( ", " );
-        buf.append( "frameMax=" );
-        buf.append(  getFrameMax() );
-        buf.append( ", " );
-        buf.append( "heartbeat=" );
-        buf.append(  getHeartbeat() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java
deleted file mode 100644
index 8a6a6aac3a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionTuneOkBodyImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ConnectionTuneOkBodyImpl extends AMQMethodBody_0_91 implements ConnectionTuneOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ConnectionTuneOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  10;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final int _channelMax; // [channelMax]
-    private final long _frameMax; // [frameMax]
-    private final int _heartbeat; // [heartbeat]
-
-    // Constructor
-    public ConnectionTuneOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _channelMax = readUnsignedShort( buffer );
-        _frameMax = readUnsignedInteger( buffer );
-        _heartbeat = readUnsignedShort( buffer );
-    }
-
-    public ConnectionTuneOkBodyImpl(
-                                int channelMax,
-                                long frameMax,
-                                int heartbeat
-                            )
-    {
-        _channelMax = channelMax;
-        _frameMax = frameMax;
-        _heartbeat = heartbeat;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getChannelMax()
-    {
-        return _channelMax;
-    }
-    public final long getFrameMax()
-    {
-        return _frameMax;
-    }
-    public final int getHeartbeat()
-    {
-        return _heartbeat;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _channelMax );
-        writeUnsignedInteger( buffer, _frameMax );
-        writeUnsignedShort( buffer, _heartbeat );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionTuneOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ConnectionTuneOkBodyImpl: ");
-        buf.append( "channelMax=" );
-        buf.append(  getChannelMax() );
-        buf.append( ", " );
-        buf.append( "frameMax=" );
-        buf.append(  getFrameMax() );
-        buf.append( ", " );
-        buf.append( "heartbeat=" );
-        buf.append(  getHeartbeat() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java
deleted file mode 100644
index 69e70d7477..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundBodyImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ExchangeBoundBodyImpl extends AMQMethodBody_0_91 implements ExchangeBoundBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeBoundBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 22;
-
-    // Fields declared in specification
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final AMQShortString _queue; // [queue]
-
-    // Constructor
-    public ExchangeBoundBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _queue = readAMQShortString( buffer );
-    }
-
-    public ExchangeBoundBodyImpl(
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                AMQShortString queue
-                            )
-    {
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _queue = queue;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeAMQShortString( buffer, _queue );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchExchangeBound(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeBoundBodyImpl: ");
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java
deleted file mode 100644
index c21838081f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeBoundOkBodyImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ExchangeBoundOkBodyImpl extends AMQMethodBody_0_91 implements ExchangeBoundOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeBoundOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 23;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-
-    // Constructor
-    public ExchangeBoundOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-    }
-
-    public ExchangeBoundOkBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchExchangeBoundOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeBoundOkBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java
deleted file mode 100644
index 68b9ce084d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareBodyImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ExchangeDeclareBodyImpl extends AMQMethodBody_0_91 implements ExchangeDeclareBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeclareBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _type; // [type]
-    private final byte _bitfield0; // [passive, durable, autoDelete, internal, nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public ExchangeDeclareBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _type = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public ExchangeDeclareBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString type,
-                                boolean passive,
-                                boolean durable,
-                                boolean autoDelete,
-                                boolean internal,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _type = type;
-        byte bitfield0 = (byte)0;
-        if( passive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( durable )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( autoDelete )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( internal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 4));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getType()
-    {
-        return _type;
-    }
-    public final boolean getPassive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getDurable()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getAutoDelete()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getInternal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 4)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _type );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _type );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchExchangeDeclare(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeclareBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "type=" );
-        buf.append(  getType() );
-        buf.append( ", " );
-        buf.append( "passive=" );
-        buf.append(  getPassive() );
-        buf.append( ", " );
-        buf.append( "durable=" );
-        buf.append(  getDurable() );
-        buf.append( ", " );
-        buf.append( "autoDelete=" );
-        buf.append(  getAutoDelete() );
-        buf.append( ", " );
-        buf.append( "internal=" );
-        buf.append(  getInternal() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java
deleted file mode 100644
index 2861d1e954..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeclareOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ExchangeDeclareOkBodyImpl extends AMQMethodBody_0_91 implements ExchangeDeclareOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeclareOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ExchangeDeclareOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ExchangeDeclareOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchExchangeDeclareOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeclareOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java
deleted file mode 100644
index f259d6433d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteBodyImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ExchangeDeleteBodyImpl extends AMQMethodBody_0_91 implements ExchangeDeleteBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeleteBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final byte _bitfield0; // [ifUnused, nowait]
-
-    // Constructor
-    public ExchangeDeleteBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public ExchangeDeleteBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                boolean ifUnused,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        byte bitfield0 = (byte)0;
-        if( ifUnused )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final boolean getIfUnused()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchExchangeDelete(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeleteBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "ifUnused=" );
-        buf.append(  getIfUnused() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java
deleted file mode 100644
index fc4ef99a5b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ExchangeDeleteOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ExchangeDeleteOkBodyImpl extends AMQMethodBody_0_91 implements ExchangeDeleteOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new ExchangeDeleteOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  40;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public ExchangeDeleteOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public ExchangeDeleteOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchExchangeDeleteOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[ExchangeDeleteOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
index e25dc8a022..3977013581 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
@@ -24,6 +24,7 @@ package org.apache.qpid.framing.amqp_0_91;
 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;
@@ -63,4 +64,4 @@ public class MethodConverter_0_91 extends AbstractMethodConverter implements Pro
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
index 40970f2266..00ec40f8cc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
@@ -27,17 +27,15 @@
 
 package org.apache.qpid.framing.amqp_0_91;
 
-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_91 extends MethodRegistry
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java
deleted file mode 100644
index 3c79181d1d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindBodyImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueueBindBodyImpl extends AMQMethodBody_0_91 implements QueueBindBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueBindBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public QueueBindBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public QueueBindBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueueBind(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueBindBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java
deleted file mode 100644
index b73ed8840d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueBindOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueueBindOkBodyImpl extends AMQMethodBody_0_91 implements QueueBindOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueBindOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public QueueBindOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public QueueBindOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueueBindOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueBindOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java
deleted file mode 100644
index 3f315cd239..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareBodyImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueueDeclareBodyImpl extends AMQMethodBody_0_91 implements QueueDeclareBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeclareBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [passive, durable, exclusive, autoDelete, nowait]
-    private final FieldTable _arguments; // [arguments]
-
-    // Constructor
-    public QueueDeclareBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _arguments = readFieldTable( buffer );
-    }
-
-    public QueueDeclareBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean passive,
-                                boolean durable,
-                                boolean exclusive,
-                                boolean autoDelete,
-                                boolean nowait,
-                                FieldTable arguments
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( passive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( durable )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( autoDelete )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 4));
-        }
-
-        _bitfield0 = bitfield0;
-        _arguments = arguments;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getPassive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getDurable()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getAutoDelete()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 4)) != 0;
-    }
-    public final FieldTable getArguments()
-    {
-        return _arguments;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _arguments );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-        writeFieldTable( buffer, _arguments );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueueDeclare(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeclareBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "passive=" );
-        buf.append(  getPassive() );
-        buf.append( ", " );
-        buf.append( "durable=" );
-        buf.append(  getDurable() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "autoDelete=" );
-        buf.append(  getAutoDelete() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append( ", " );
-        buf.append( "arguments=" );
-        buf.append(  getArguments() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java
deleted file mode 100644
index 6f4452199d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeclareOkBodyImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueueDeclareOkBodyImpl extends AMQMethodBody_0_91 implements QueueDeclareOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeclareOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-    private final AMQShortString _queue; // [queue]
-    private final long _messageCount; // [messageCount]
-    private final long _consumerCount; // [consumerCount]
-
-    // Constructor
-    public QueueDeclareOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _queue = readAMQShortString( buffer );
-        _messageCount = readUnsignedInteger( buffer );
-        _consumerCount = readUnsignedInteger( buffer );
-    }
-
-    public QueueDeclareOkBodyImpl(
-                                AMQShortString queue,
-                                long messageCount,
-                                long consumerCount
-                            )
-    {
-        _queue = queue;
-        _messageCount = messageCount;
-        _consumerCount = consumerCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-    public final long getConsumerCount()
-    {
-        return _consumerCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _queue );
-        writeUnsignedInteger( buffer, _messageCount );
-        writeUnsignedInteger( buffer, _consumerCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueueDeclareOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeclareOkBodyImpl: ");
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append( ", " );
-        buf.append( "consumerCount=" );
-        buf.append(  getConsumerCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java
deleted file mode 100644
index 1d021d9c18..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueueDeleteBodyImpl extends AMQMethodBody_0_91 implements QueueDeleteBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeleteBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [ifUnused, ifEmpty, nowait]
-
-    // Constructor
-    public QueueDeleteBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public QueueDeleteBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean ifUnused,
-                                boolean ifEmpty,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( ifUnused )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( ifEmpty )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getIfUnused()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getIfEmpty()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueueDelete(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeleteBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "ifUnused=" );
-        buf.append(  getIfUnused() );
-        buf.append( ", " );
-        buf.append( "ifEmpty=" );
-        buf.append(  getIfEmpty() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java
deleted file mode 100644
index 30e54e15a2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueDeleteOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueueDeleteOkBodyImpl extends AMQMethodBody_0_91 implements QueueDeleteOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueueDeleteOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final long _messageCount; // [messageCount]
-
-    // Constructor
-    public QueueDeleteOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _messageCount = readUnsignedInteger( buffer );
-    }
-
-    public QueueDeleteOkBodyImpl(
-                                long messageCount
-                            )
-    {
-        _messageCount = messageCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 4;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _messageCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueueDeleteOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueueDeleteOkBodyImpl: ");
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java
deleted file mode 100644
index b217a8b3f2..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeBodyImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueuePurgeBodyImpl extends AMQMethodBody_0_91 implements QueuePurgeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueuePurgeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public QueuePurgeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public QueuePurgeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueuePurge(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueuePurgeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java
deleted file mode 100644
index 268ebcff54..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueuePurgeOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class QueuePurgeOkBodyImpl extends AMQMethodBody_0_91 implements QueuePurgeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new QueuePurgeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  50;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final long _messageCount; // [messageCount]
-
-    // Constructor
-    public QueuePurgeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _messageCount = readUnsignedInteger( buffer );
-    }
-
-    public QueuePurgeOkBodyImpl(
-                                long messageCount
-                            )
-    {
-        _messageCount = messageCount;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getMessageCount()
-    {
-        return _messageCount;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 4;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _messageCount );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchQueuePurgeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[QueuePurgeOkBodyImpl: ");
-        buf.append( "messageCount=" );
-        buf.append(  getMessageCount() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
index d29db36ffa..6a64e59d24 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class QueueUnbindBodyImpl extends AMQMethodBody_0_91 implements QueueUnbindBody
+public class QueueUnbindBodyImpl extends AMQMethodBodyImpl implements QueueUnbindBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
index 01747fa536..6efd2fd596 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class QueueUnbindOkBodyImpl extends AMQMethodBody_0_91 implements QueueUnbindOkBody
+public class QueueUnbindOkBodyImpl extends AMQMethodBodyImpl implements QueueUnbindOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java
index b24b8253d2..7f85c2beb7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java
@@ -34,36 +34,7 @@ import org.apache.qpid.framing.*;
 public interface ServerMethodDispatcher_0_91 extends ServerMethodDispatcher
 {
 
-    public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException;
     public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicReject(BasicRejectBody 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 dispatchChannelOpen(ChannelOpenBody 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 dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException;
-    public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException;
     public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException;
-    public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException;
-    public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException;
-    public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException;
 
-}
\ No newline at end of file
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java
deleted file mode 100644
index 8e2427efc4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TxCommitBodyImpl extends AMQMethodBody_0_91 implements TxCommitBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxCommitBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxCommitBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxCommitBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchTxCommit(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxCommitBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java
deleted file mode 100644
index df7af95c0f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxCommitOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TxCommitOkBodyImpl extends AMQMethodBody_0_91 implements TxCommitOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxCommitOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxCommitOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxCommitOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchTxCommitOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxCommitOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java
deleted file mode 100644
index 3b3e1d5366..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TxRollbackBodyImpl extends AMQMethodBody_0_91 implements TxRollbackBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxRollbackBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxRollbackBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxRollbackBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchTxRollback(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxRollbackBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java
deleted file mode 100644
index 0d820a4b82..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxRollbackOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TxRollbackOkBodyImpl extends AMQMethodBody_0_91 implements TxRollbackOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxRollbackOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxRollbackOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxRollbackOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchTxRollbackOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxRollbackOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java
deleted file mode 100644
index ad0fe78e9a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TxSelectBodyImpl extends AMQMethodBody_0_91 implements TxSelectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxSelectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxSelectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxSelectBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchTxSelect(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxSelectBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java
deleted file mode 100644
index bfc6296b24..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/TxSelectOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   0-91
- */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TxSelectOkBodyImpl extends AMQMethodBody_0_91 implements TxSelectOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TxSelectOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  90;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TxSelectOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TxSelectOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchTxSelectOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TxSelectOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
deleted file mode 100644
index 35645854c0..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-public abstract class AMQMethodBody_8_0 extends org.apache.qpid.framing.AMQMethodBodyImpl
-{
-
-    public byte getMajor()
-    {
-        return 8;
-    }
-
-    public byte getMinor()
-    {
-        return 0;
-    }
-
-
-        
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
index a29363f293..8f1f6ffab6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
@@ -27,14 +27,20 @@
 
 package org.apache.qpid.framing.amqp_8_0;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
-
-public class AccessRequestBodyImpl extends AMQMethodBody_8_0 implements AccessRequestBody
+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 AMQMethodBodyImpl implements AccessRequestBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
index 5c207b59d4..6f28c88015 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class AccessRequestOkBodyImpl extends AMQMethodBody_8_0 implements AccessRequestOkBody
+public class AccessRequestOkBodyImpl extends AMQMethodBodyImpl implements AccessRequestOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
index 4d247b7edd..28b13920b7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
@@ -27,14 +27,19 @@
 
 package org.apache.qpid.framing.amqp_8_0;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
-
-public class BasicRecoverOkBodyImpl extends AMQMethodBody_8_0 implements BasicRecoverOkBody
+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.BasicRecoverOkBody;
+import org.apache.qpid.framing.MethodDispatcher;
+
+public class BasicRecoverOkBodyImpl extends AMQMethodBodyImpl implements BasicRecoverOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
index eecd44b026..14f4515ff4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ChannelAlertBodyImpl extends AMQMethodBody_8_0 implements ChannelAlertBody
+public class ChannelAlertBodyImpl extends AMQMethodBodyImpl implements ChannelAlertBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
index f84a0c314d..991c682c9d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ChannelOpenOkBodyImpl extends AMQMethodBody_8_0 implements ChannelOpenOkBody
+public class ChannelOpenOkBodyImpl extends AMQMethodBodyImpl implements ChannelOpenOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
index 52e44a8e4d..bcc43a6987 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
@@ -34,59 +34,8 @@ public interface ClientMethodDispatcher_8_0 extends 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 dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws AMQException;
     public boolean dispatchChannelAlert(ChannelAlertBody 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 dispatchChannelOpenOk(ChannelOpenOkBody 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 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 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 dispatchTestContent(TestContentBody body, int channelId) throws AMQException;
-    public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException;
-    public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException;
-    public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException;
-    public boolean dispatchTestTableOk(TestTableOkBody 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
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
index eab4ef05ee..4d6ba149a6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionCloseBodyImpl extends AMQMethodBody_8_0 implements ConnectionCloseBody
+public class ConnectionCloseBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
index 876715a37b..97154c7f94 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionCloseOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionCloseOkBody
+public class ConnectionCloseOkBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseOkBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
index 59eadf1be3..19ff78dee4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
 
-public class ConnectionRedirectBodyImpl extends AMQMethodBody_8_0 implements ConnectionRedirectBody
+public class ConnectionRedirectBodyImpl extends AMQMethodBodyImpl implements ConnectionRedirectBody
 {
     private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java
deleted file mode 100644
index ac2ff8b225..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class DtxSelectBodyImpl extends AMQMethodBody_8_0 implements DtxSelectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxSelectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-
-    // Constructor
-    public DtxSelectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public DtxSelectBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchDtxSelect(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxSelectBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java
deleted file mode 100644
index 2281853e00..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxSelectOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class DtxSelectOkBodyImpl extends AMQMethodBody_8_0 implements DtxSelectOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxSelectOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public DtxSelectOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public DtxSelectOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchDtxSelectOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxSelectOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java
deleted file mode 100644
index b5a1faa760..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class DtxStartBodyImpl extends AMQMethodBody_8_0 implements DtxStartBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxStartBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final AMQShortString _dtxIdentifier; // [dtxIdentifier]
-
-    // Constructor
-    public DtxStartBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _dtxIdentifier = readAMQShortString( buffer );
-    }
-
-    public DtxStartBodyImpl(
-                                AMQShortString dtxIdentifier
-                            )
-    {
-        _dtxIdentifier = dtxIdentifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getDtxIdentifier()
-    {
-        return _dtxIdentifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _dtxIdentifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _dtxIdentifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchDtxStart(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxStartBodyImpl: ");
-        buf.append( "dtxIdentifier=" );
-        buf.append(  getDtxIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java
deleted file mode 100644
index 73fd13e7d3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/DtxStartOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class DtxStartOkBodyImpl extends AMQMethodBody_8_0 implements DtxStartOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new DtxStartOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  100;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-
-    // Constructor
-    public DtxStartOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public DtxStartOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchDtxStartOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[DtxStartOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java
deleted file mode 100644
index 1efad0825a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileAckBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileAckBodyImpl extends AMQMethodBody_8_0 implements FileAckBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileAckBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 90;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [multiple]
-
-    // Constructor
-    public FileAckBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileAckBodyImpl(
-                                long deliveryTag,
-                                boolean multiple
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( multiple )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getMultiple()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileAck(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileAckBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "multiple=" );
-        buf.append(  getMultiple() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java
deleted file mode 100644
index 422f6d8f16..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelBodyImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileCancelBodyImpl extends AMQMethodBody_8_0 implements FileCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public FileCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileCancelBodyImpl(
-                                AMQShortString consumerTag,
-                                boolean nowait
-                            )
-    {
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileCancelBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java
deleted file mode 100644
index b100ce9f1b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileCancelOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileCancelOkBodyImpl extends AMQMethodBody_8_0 implements FileCancelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileCancelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public FileCancelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public FileCancelOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileCancelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileCancelOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java
deleted file mode 100644
index 0a6aa06da4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeBodyImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileConsumeBodyImpl extends AMQMethodBody_8_0 implements FileConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [noLocal, noAck, exclusive, nowait]
-
-    // Constructor
-    public FileConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString consumerTag,
-                                boolean noLocal,
-                                boolean noAck,
-                                boolean exclusive,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( noAck )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 3));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getNoAck()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 3)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "noAck=" );
-        buf.append(  getNoAck() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java
deleted file mode 100644
index cde5176f42..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileConsumeOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileConsumeOkBodyImpl extends AMQMethodBody_8_0 implements FileConsumeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileConsumeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public FileConsumeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public FileConsumeOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileConsumeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileConsumeOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java
deleted file mode 100644
index 3cfd508dd7..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileDeliverBodyImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileDeliverBodyImpl extends AMQMethodBody_8_0 implements FileDeliverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileDeliverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 80;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [redelivered]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final AMQShortString _identifier; // [identifier]
-
-    // Constructor
-    public FileDeliverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _identifier = readAMQShortString( buffer );
-    }
-
-    public FileDeliverBodyImpl(
-                                AMQShortString consumerTag,
-                                long deliveryTag,
-                                boolean redelivered,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                AMQShortString identifier
-                            )
-    {
-        _consumerTag = consumerTag;
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( redelivered )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        _bitfield0 = bitfield0;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        _identifier = identifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRedelivered()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeAMQShortString( buffer, _identifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileDeliver(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileDeliverBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "redelivered=" );
-        buf.append(  getRedelivered() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java
deleted file mode 100644
index aa79d22961..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenBodyImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileOpenBodyImpl extends AMQMethodBody_8_0 implements FileOpenBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileOpenBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final AMQShortString _identifier; // [identifier]
-    private final long _contentSize; // [contentSize]
-
-    // Constructor
-    public FileOpenBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _identifier = readAMQShortString( buffer );
-        _contentSize = readLong( buffer );
-    }
-
-    public FileOpenBodyImpl(
-                                AMQShortString identifier,
-                                long contentSize
-                            )
-    {
-        _identifier = identifier;
-        _contentSize = contentSize;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-    public final long getContentSize()
-    {
-        return _contentSize;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _identifier );
-        writeLong( buffer, _contentSize );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileOpen(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileOpenBodyImpl: ");
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append( ", " );
-        buf.append( "contentSize=" );
-        buf.append(  getContentSize() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java
deleted file mode 100644
index 48845f7074..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileOpenOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileOpenOkBodyImpl extends AMQMethodBody_8_0 implements FileOpenOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileOpenOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final long _stagedSize; // [stagedSize]
-
-    // Constructor
-    public FileOpenOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _stagedSize = readLong( buffer );
-    }
-
-    public FileOpenOkBodyImpl(
-                                long stagedSize
-                            )
-    {
-        _stagedSize = stagedSize;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getStagedSize()
-    {
-        return _stagedSize;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _stagedSize );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileOpenOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileOpenOkBodyImpl: ");
-        buf.append( "stagedSize=" );
-        buf.append(  getStagedSize() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java
deleted file mode 100644
index c3e01ec686..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FilePublishBodyImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FilePublishBodyImpl extends AMQMethodBody_8_0 implements FilePublishBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FilePublishBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [mandatory, immediate]
-    private final AMQShortString _identifier; // [identifier]
-
-    // Constructor
-    public FilePublishBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-        _identifier = readAMQShortString( buffer );
-    }
-
-    public FilePublishBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean mandatory,
-                                boolean immediate,
-                                AMQShortString identifier
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( mandatory )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        _bitfield0 = bitfield0;
-        _identifier = identifier;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getMandatory()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final AMQShortString getIdentifier()
-    {
-        return _identifier;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        size += getSizeOf( _identifier );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-        writeAMQShortString( buffer, _identifier );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFilePublish(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FilePublishBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "mandatory=" );
-        buf.append(  getMandatory() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append( ", " );
-        buf.append( "identifier=" );
-        buf.append(  getIdentifier() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java
deleted file mode 100644
index f78156d8df..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosBodyImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileQosBodyImpl extends AMQMethodBody_8_0 implements FileQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public FileQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 7;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java
deleted file mode 100644
index 17076f49b3..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileQosOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileQosOkBodyImpl extends AMQMethodBody_8_0 implements FileQosOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileQosOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public FileQosOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public FileQosOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileQosOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileQosOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java
deleted file mode 100644
index a4e7a57540..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileRejectBodyImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileRejectBodyImpl extends AMQMethodBody_8_0 implements FileRejectBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileRejectBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 100;
-
-    // Fields declared in specification
-    private final long _deliveryTag; // [deliveryTag]
-    private final byte _bitfield0; // [requeue]
-
-    // Constructor
-    public FileRejectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _deliveryTag = readLong( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public FileRejectBodyImpl(
-                                long deliveryTag,
-                                boolean requeue
-                            )
-    {
-        _deliveryTag = deliveryTag;
-        byte bitfield0 = (byte)0;
-        if( requeue )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final boolean getRequeue()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 9;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _deliveryTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileReject(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileRejectBodyImpl: ");
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "requeue=" );
-        buf.append(  getRequeue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java
deleted file mode 100644
index bf696ca668..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileReturnBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileReturnBodyImpl extends AMQMethodBody_8_0 implements FileReturnBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileReturnBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 70;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public FileReturnBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public FileReturnBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileReturn(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileReturnBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java
deleted file mode 100644
index 8e2185801b..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/FileStageBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class FileStageBodyImpl extends AMQMethodBody_8_0 implements FileStageBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new FileStageBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  70;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-
-    // Constructor
-    public FileStageBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public FileStageBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchFileStage(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[FileStageBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
index 5e50c2b3fb..761c39172e 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
@@ -24,6 +24,7 @@ package org.apache.qpid.framing.amqp_8_0;
 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;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
index f3c1888e2a..a4c901d19b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
@@ -27,17 +27,15 @@
 
 package org.apache.qpid.framing.amqp_8_0;
 
-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_8_0 extends MethodRegistry
@@ -47,7 +45,7 @@ public class MethodRegistry_8_0 extends MethodRegistry
 
     private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_8_0();
 
-    private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[121][];
+    private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[91][];
 
     public MethodRegistry_8_0()
     {
@@ -152,43 +150,6 @@ public class MethodRegistry_8_0 extends MethodRegistry
 
 
 
-        // 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];
@@ -200,39 +161,6 @@ public class MethodRegistry_8_0 extends MethodRegistry
         _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 Test class.
-
-        _factories[120] = new AMQMethodBodyInstanceFactory[42];
-
-        _factories[120][10] = TestIntegerBodyImpl.getFactory();
-        _factories[120][11] = TestIntegerOkBodyImpl.getFactory();
-        _factories[120][20] = TestStringBodyImpl.getFactory();
-        _factories[120][21] = TestStringOkBodyImpl.getFactory();
-        _factories[120][30] = TestTableBodyImpl.getFactory();
-        _factories[120][31] = TestTableOkBodyImpl.getFactory();
-        _factories[120][40] = TestContentBodyImpl.getFactory();
-        _factories[120][41] = TestContentOkBodyImpl.getFactory();
     }
 
     public AMQMethodBody convertToBody(MarkableDataInput in, long size)
@@ -922,303 +850,6 @@ public class MethodRegistry_8_0 extends MethodRegistry
     }
 
 
-
-
-    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
-                                )
-    {
-        return new FileConsumeBodyImpl(
-                                ticket,
-                                queue,
-                                consumerTag,
-                                noLocal,
-                                noAck,
-                                exclusive,
-                                nowait
-                                );
-    }
-
-    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
-                                )
-    {
-        return new StreamConsumeBodyImpl(
-                                ticket,
-                                queue,
-                                consumerTag,
-                                noLocal,
-                                exclusive,
-                                nowait
-                                );
-    }
-
-    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(
                                 )
     {
@@ -1264,140 +895,6 @@ public class MethodRegistry_8_0 extends MethodRegistry
 
 
 
-    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 TestIntegerBody createTestIntegerBody(
-                                final short integer1,
-                                final int integer2,
-                                final long integer3,
-                                final long integer4,
-                                final short operation
-                                )
-    {
-        return new TestIntegerBodyImpl(
-                                integer1,
-                                integer2,
-                                integer3,
-                                integer4,
-                                operation
-                                );
-    }
-
-    public TestIntegerOkBody createTestIntegerOkBody(
-                                final long result
-                                )
-    {
-        return new TestIntegerOkBodyImpl(
-                                result
-                                );
-    }
-
-    public TestStringBody createTestStringBody(
-                                final AMQShortString string1,
-                                final byte[] string2,
-                                final short operation
-                                )
-    {
-        return new TestStringBodyImpl(
-                                string1,
-                                string2,
-                                operation
-                                );
-    }
-
-    public TestStringOkBody createTestStringOkBody(
-                                final byte[] result
-                                )
-    {
-        return new TestStringOkBodyImpl(
-                                result
-                                );
-    }
-
-    public TestTableBody createTestTableBody(
-                                final FieldTable table,
-                                final short integerOp,
-                                final short stringOp
-                                )
-    {
-        return new TestTableBodyImpl(
-                                table,
-                                integerOp,
-                                stringOp
-                                );
-    }
-
-    public TestTableOkBody createTestTableOkBody(
-                                final long integerResult,
-                                final byte[] stringResult
-                                )
-    {
-        return new TestTableOkBodyImpl(
-                                integerResult,
-                                stringResult
-                                );
-    }
-
-    public TestContentBody createTestContentBody(
-                                )
-    {
-        return new TestContentBodyImpl(
-                                );
-    }
-
-    public TestContentOkBody createTestContentOkBody(
-                                final long contentChecksum
-                                )
-    {
-        return new TestContentOkBodyImpl(
-                                contentChecksum
-                                );
-    }
-
-
 
     public ProtocolVersionMethodConverter getProtocolVersionMethodConverter()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
index 5c8ad68cd0..0a9fc2d893 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
@@ -35,58 +35,5 @@ public interface ServerMethodDispatcher_8_0 extends ServerMethodDispatcher
 {
 
     public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicReject(BasicRejectBody 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 dispatchChannelOpen(ChannelOpenBody 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 dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException;
-    public boolean dispatchDtxSelect(DtxSelectBody body, int channelId) throws AMQException;
-    public boolean dispatchDtxStart(DtxStartBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException;
-    public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException;
-    public boolean dispatchFileAck(FileAckBody body, int channelId) throws AMQException;
-    public boolean dispatchFileCancel(FileCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchFileConsume(FileConsumeBody 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 dispatchFilePublish(FilePublishBody body, int channelId) throws AMQException;
-    public boolean dispatchFileQos(FileQosBody body, int channelId) throws AMQException;
-    public boolean dispatchFileReject(FileRejectBody body, int channelId) throws AMQException;
-    public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException;
-    public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamCancel(StreamCancelBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamConsume(StreamConsumeBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamPublish(StreamPublishBody body, int channelId) throws AMQException;
-    public boolean dispatchStreamQos(StreamQosBody body, int channelId) throws AMQException;
-    public boolean dispatchTestContent(TestContentBody body, int channelId) throws AMQException;
-    public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException;
-    public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException;
-    public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException;
-    public boolean dispatchTestTableOk(TestTableOkBody body, int channelId) throws AMQException;
-    public boolean dispatchTunnelRequest(TunnelRequestBody body, int channelId) throws AMQException;
-    public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException;
-    public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException;
-    public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException;
 
-}
\ No newline at end of file
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java
deleted file mode 100644
index 80032c93da..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelBodyImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamCancelBodyImpl extends AMQMethodBody_8_0 implements StreamCancelBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamCancelBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [nowait]
-
-    // Constructor
-    public StreamCancelBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamCancelBodyImpl(
-                                AMQShortString consumerTag,
-                                boolean nowait
-                            )
-    {
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamCancel(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamCancelBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java
deleted file mode 100644
index f7d5f28269..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamCancelOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamCancelOkBodyImpl extends AMQMethodBody_8_0 implements StreamCancelOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamCancelOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public StreamCancelOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public StreamCancelOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamCancelOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamCancelOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java
deleted file mode 100644
index 2e55068f1d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeBodyImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamConsumeBodyImpl extends AMQMethodBody_8_0 implements StreamConsumeBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamConsumeBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _queue; // [queue]
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final byte _bitfield0; // [noLocal, exclusive, nowait]
-
-    // Constructor
-    public StreamConsumeBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _queue = readAMQShortString( buffer );
-        _consumerTag = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamConsumeBodyImpl(
-                                int ticket,
-                                AMQShortString queue,
-                                AMQShortString consumerTag,
-                                boolean noLocal,
-                                boolean exclusive,
-                                boolean nowait
-                            )
-    {
-        _ticket = ticket;
-        _queue = queue;
-        _consumerTag = consumerTag;
-        byte bitfield0 = (byte)0;
-        if( noLocal )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( exclusive )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-
-        if( nowait )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 2));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final boolean getNoLocal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getExclusive()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-    public final boolean getNowait()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 2)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _queue );
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _queue );
-        writeAMQShortString( buffer, _consumerTag );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamConsume(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamConsumeBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append( ", " );
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "noLocal=" );
-        buf.append(  getNoLocal() );
-        buf.append( ", " );
-        buf.append( "exclusive=" );
-        buf.append(  getExclusive() );
-        buf.append( ", " );
-        buf.append( "nowait=" );
-        buf.append(  getNowait() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java
deleted file mode 100644
index 052efc1fdd..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamConsumeOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamConsumeOkBodyImpl extends AMQMethodBody_8_0 implements StreamConsumeOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamConsumeOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-
-    // Constructor
-    public StreamConsumeOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-    }
-
-    public StreamConsumeOkBodyImpl(
-                                AMQShortString consumerTag
-                            )
-    {
-        _consumerTag = consumerTag;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _consumerTag );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamConsumeOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamConsumeOkBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java
deleted file mode 100644
index 8bbde690a0..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamDeliverBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamDeliverBodyImpl extends AMQMethodBody_8_0 implements StreamDeliverBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamDeliverBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 60;
-
-    // Fields declared in specification
-    private final AMQShortString _consumerTag; // [consumerTag]
-    private final long _deliveryTag; // [deliveryTag]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _queue; // [queue]
-
-    // Constructor
-    public StreamDeliverBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _consumerTag = readAMQShortString( buffer );
-        _deliveryTag = readLong( buffer );
-        _exchange = readAMQShortString( buffer );
-        _queue = readAMQShortString( buffer );
-    }
-
-    public StreamDeliverBodyImpl(
-                                AMQShortString consumerTag,
-                                long deliveryTag,
-                                AMQShortString exchange,
-                                AMQShortString queue
-                            )
-    {
-        _consumerTag = consumerTag;
-        _deliveryTag = deliveryTag;
-        _exchange = exchange;
-        _queue = queue;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getConsumerTag()
-    {
-        return _consumerTag;
-    }
-    public final long getDeliveryTag()
-    {
-        return _deliveryTag;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getQueue()
-    {
-        return _queue;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _consumerTag );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _queue );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _consumerTag );
-        writeLong( buffer, _deliveryTag );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _queue );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamDeliver(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamDeliverBodyImpl: ");
-        buf.append( "consumerTag=" );
-        buf.append(  getConsumerTag() );
-        buf.append( ", " );
-        buf.append( "deliveryTag=" );
-        buf.append(  getDeliveryTag() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "queue=" );
-        buf.append(  getQueue() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java
deleted file mode 100644
index 6977e839ff..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamPublishBodyImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamPublishBodyImpl extends AMQMethodBody_8_0 implements StreamPublishBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamPublishBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-    private final int _ticket; // [ticket]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-    private final byte _bitfield0; // [mandatory, immediate]
-
-    // Constructor
-    public StreamPublishBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _ticket = readUnsignedShort( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamPublishBodyImpl(
-                                int ticket,
-                                AMQShortString exchange,
-                                AMQShortString routingKey,
-                                boolean mandatory,
-                                boolean immediate
-                            )
-    {
-        _ticket = ticket;
-        _exchange = exchange;
-        _routingKey = routingKey;
-        byte bitfield0 = (byte)0;
-        if( mandatory )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-
-        if( immediate )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 1));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getTicket()
-    {
-        return _ticket;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-    public final boolean getMandatory()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-    public final boolean getImmediate()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 3;
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _ticket );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamPublish(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamPublishBodyImpl: ");
-        buf.append( "ticket=" );
-        buf.append(  getTicket() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append( ", " );
-        buf.append( "mandatory=" );
-        buf.append(  getMandatory() );
-        buf.append( ", " );
-        buf.append( "immediate=" );
-        buf.append(  getImmediate() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java
deleted file mode 100644
index 50fe23c170..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosBodyImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamQosBodyImpl extends AMQMethodBody_8_0 implements StreamQosBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamQosBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final long _prefetchSize; // [prefetchSize]
-    private final int _prefetchCount; // [prefetchCount]
-    private final long _consumeRate; // [consumeRate]
-    private final byte _bitfield0; // [global]
-
-    // Constructor
-    public StreamQosBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _prefetchSize = readUnsignedInteger( buffer );
-        _prefetchCount = readUnsignedShort( buffer );
-        _consumeRate = readUnsignedInteger( buffer );
-        _bitfield0 = readBitfield( buffer );
-    }
-
-    public StreamQosBodyImpl(
-                                long prefetchSize,
-                                int prefetchCount,
-                                long consumeRate,
-                                boolean global
-                            )
-    {
-        _prefetchSize = prefetchSize;
-        _prefetchCount = prefetchCount;
-        _consumeRate = consumeRate;
-        byte bitfield0 = (byte)0;
-        if( global )
-        {
-            bitfield0 = (byte) (((int) bitfield0) | (1 << 0));
-        }
-        _bitfield0 = bitfield0;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-    public final int getPrefetchCount()
-    {
-        return _prefetchCount;
-    }
-    public final long getConsumeRate()
-    {
-        return _consumeRate;
-    }
-    public final boolean getGlobal()
-    {
-        return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 11;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _prefetchSize );
-        writeUnsignedShort( buffer, _prefetchCount );
-        writeUnsignedInteger( buffer, _consumeRate );
-        writeBitfield( buffer, _bitfield0 );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamQos(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamQosBodyImpl: ");
-        buf.append( "prefetchSize=" );
-        buf.append(  getPrefetchSize() );
-        buf.append( ", " );
-        buf.append( "prefetchCount=" );
-        buf.append(  getPrefetchCount() );
-        buf.append( ", " );
-        buf.append( "consumeRate=" );
-        buf.append(  getConsumeRate() );
-        buf.append( ", " );
-        buf.append( "global=" );
-        buf.append(  getGlobal() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java
deleted file mode 100644
index 6f8977e4eb..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamQosOkBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamQosOkBodyImpl extends AMQMethodBody_8_0 implements StreamQosOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamQosOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-
-    // Constructor
-    public StreamQosOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public StreamQosOkBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamQosOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamQosOkBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java
deleted file mode 100644
index 7b79956958..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/StreamReturnBodyImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class StreamReturnBodyImpl extends AMQMethodBody_8_0 implements StreamReturnBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new StreamReturnBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  80;
-    public static final int METHOD_ID = 50;
-
-    // Fields declared in specification
-    private final int _replyCode; // [replyCode]
-    private final AMQShortString _replyText; // [replyText]
-    private final AMQShortString _exchange; // [exchange]
-    private final AMQShortString _routingKey; // [routingKey]
-
-    // Constructor
-    public StreamReturnBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _replyCode = readUnsignedShort( buffer );
-        _replyText = readAMQShortString( buffer );
-        _exchange = readAMQShortString( buffer );
-        _routingKey = readAMQShortString( buffer );
-    }
-
-    public StreamReturnBodyImpl(
-                                int replyCode,
-                                AMQShortString replyText,
-                                AMQShortString exchange,
-                                AMQShortString routingKey
-                            )
-    {
-        _replyCode = replyCode;
-        _replyText = replyText;
-        _exchange = exchange;
-        _routingKey = routingKey;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final int getReplyCode()
-    {
-        return _replyCode;
-    }
-    public final AMQShortString getReplyText()
-    {
-        return _replyText;
-    }
-    public final AMQShortString getExchange()
-    {
-        return _exchange;
-    }
-    public final AMQShortString getRoutingKey()
-    {
-        return _routingKey;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _replyText );
-        size += getSizeOf( _exchange );
-        size += getSizeOf( _routingKey );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedShort( buffer, _replyCode );
-        writeAMQShortString( buffer, _replyText );
-        writeAMQShortString( buffer, _exchange );
-        writeAMQShortString( buffer, _routingKey );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchStreamReturn(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[StreamReturnBodyImpl: ");
-        buf.append( "replyCode=" );
-        buf.append(  getReplyCode() );
-        buf.append( ", " );
-        buf.append( "replyText=" );
-        buf.append(  getReplyText() );
-        buf.append( ", " );
-        buf.append( "exchange=" );
-        buf.append(  getExchange() );
-        buf.append( ", " );
-        buf.append( "routingKey=" );
-        buf.append(  getRoutingKey() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java
deleted file mode 100644
index 832ee12e2c..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentBodyImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestContentBodyImpl extends AMQMethodBody_8_0 implements TestContentBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestContentBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 40;
-
-    // Fields declared in specification
-
-    // Constructor
-    public TestContentBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-    }
-
-    public TestContentBodyImpl(
-                            )
-    {
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestContent(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestContentBodyImpl: ");
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java
deleted file mode 100644
index 32c9e92c2f..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestContentOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestContentOkBodyImpl extends AMQMethodBody_8_0 implements TestContentOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestContentOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 41;
-
-    // Fields declared in specification
-    private final long _contentChecksum; // [contentChecksum]
-
-    // Constructor
-    public TestContentOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _contentChecksum = readUnsignedInteger( buffer );
-    }
-
-    public TestContentOkBodyImpl(
-                                long contentChecksum
-                            )
-    {
-        _contentChecksum = contentChecksum;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getContentChecksum()
-    {
-        return _contentChecksum;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 4;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedInteger( buffer, _contentChecksum );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestContentOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestContentOkBodyImpl: ");
-        buf.append( "contentChecksum=" );
-        buf.append(  getContentChecksum() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java
deleted file mode 100644
index 8d01d2d4d8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerBodyImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestIntegerBodyImpl extends AMQMethodBody_8_0 implements TestIntegerBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestIntegerBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final short _integer1; // [integer1]
-    private final int _integer2; // [integer2]
-    private final long _integer3; // [integer3]
-    private final long _integer4; // [integer4]
-    private final short _operation; // [operation]
-
-    // Constructor
-    public TestIntegerBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _integer1 = readUnsignedByte( buffer );
-        _integer2 = readUnsignedShort( buffer );
-        _integer3 = readUnsignedInteger( buffer );
-        _integer4 = readLong( buffer );
-        _operation = readUnsignedByte( buffer );
-    }
-
-    public TestIntegerBodyImpl(
-                                short integer1,
-                                int integer2,
-                                long integer3,
-                                long integer4,
-                                short operation
-                            )
-    {
-        _integer1 = integer1;
-        _integer2 = integer2;
-        _integer3 = integer3;
-        _integer4 = integer4;
-        _operation = operation;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final short getInteger1()
-    {
-        return _integer1;
-    }
-    public final int getInteger2()
-    {
-        return _integer2;
-    }
-    public final long getInteger3()
-    {
-        return _integer3;
-    }
-    public final long getInteger4()
-    {
-        return _integer4;
-    }
-    public final short getOperation()
-    {
-        return _operation;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 16;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeUnsignedByte( buffer, _integer1 );
-        writeUnsignedShort( buffer, _integer2 );
-        writeUnsignedInteger( buffer, _integer3 );
-        writeLong( buffer, _integer4 );
-        writeUnsignedByte( buffer, _operation );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestInteger(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestIntegerBodyImpl: ");
-        buf.append( "integer1=" );
-        buf.append(  getInteger1() );
-        buf.append( ", " );
-        buf.append( "integer2=" );
-        buf.append(  getInteger2() );
-        buf.append( ", " );
-        buf.append( "integer3=" );
-        buf.append(  getInteger3() );
-        buf.append( ", " );
-        buf.append( "integer4=" );
-        buf.append(  getInteger4() );
-        buf.append( ", " );
-        buf.append( "operation=" );
-        buf.append(  getOperation() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java
deleted file mode 100644
index b46b6c74d4..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestIntegerOkBodyImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestIntegerOkBodyImpl extends AMQMethodBody_8_0 implements TestIntegerOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestIntegerOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 11;
-
-    // Fields declared in specification
-    private final long _result; // [result]
-
-    // Constructor
-    public TestIntegerOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _result = readLong( buffer );
-    }
-
-    public TestIntegerOkBodyImpl(
-                                long result
-                            )
-    {
-        _result = result;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getResult()
-    {
-        return _result;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _result );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestIntegerOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestIntegerOkBodyImpl: ");
-        buf.append( "result=" );
-        buf.append(  getResult() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java
deleted file mode 100644
index 8bdb72d58a..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringBodyImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestStringBodyImpl extends AMQMethodBody_8_0 implements TestStringBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestStringBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 20;
-
-    // Fields declared in specification
-    private final AMQShortString _string1; // [string1]
-    private final byte[] _string2; // [string2]
-    private final short _operation; // [operation]
-
-    // Constructor
-    public TestStringBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _string1 = readAMQShortString( buffer );
-        _string2 = readBytes( buffer );
-        _operation = readUnsignedByte( buffer );
-    }
-
-    public TestStringBodyImpl(
-                                AMQShortString string1,
-                                byte[] string2,
-                                short operation
-                            )
-    {
-        _string1 = string1;
-        _string2 = string2;
-        _operation = operation;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final AMQShortString getString1()
-    {
-        return _string1;
-    }
-    public final byte[] getString2()
-    {
-        return _string2;
-    }
-    public final short getOperation()
-    {
-        return _operation;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 1;
-        size += getSizeOf( _string1 );
-        size += getSizeOf( _string2 );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeAMQShortString( buffer, _string1 );
-        writeBytes( buffer, _string2 );
-        writeUnsignedByte( buffer, _operation );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestString(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestStringBodyImpl: ");
-        buf.append( "string1=" );
-        buf.append(  getString1() );
-        buf.append( ", " );
-        buf.append( "string2=" );
-        buf.append(  getString2() == null  ? "null" : java.util.Arrays.toString( getString2() ) );
-        buf.append( ", " );
-        buf.append( "operation=" );
-        buf.append(  getOperation() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java
deleted file mode 100644
index be927e13ea..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestStringOkBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestStringOkBodyImpl extends AMQMethodBody_8_0 implements TestStringOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestStringOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 21;
-
-    // Fields declared in specification
-    private final byte[] _result; // [result]
-
-    // Constructor
-    public TestStringOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _result = readBytes( buffer );
-    }
-
-    public TestStringOkBodyImpl(
-                                byte[] result
-                            )
-    {
-        _result = result;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final byte[] getResult()
-    {
-        return _result;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _result );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeBytes( buffer, _result );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestStringOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestStringOkBodyImpl: ");
-        buf.append( "result=" );
-        buf.append(  getResult() == null  ? "null" : java.util.Arrays.toString( getResult() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java
deleted file mode 100644
index 5c4b9e8d33..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableBodyImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestTableBodyImpl extends AMQMethodBody_8_0 implements TestTableBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestTableBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 30;
-
-    // Fields declared in specification
-    private final FieldTable _table; // [table]
-    private final short _integerOp; // [integerOp]
-    private final short _stringOp; // [stringOp]
-
-    // Constructor
-    public TestTableBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _table = readFieldTable( buffer );
-        _integerOp = readUnsignedByte( buffer );
-        _stringOp = readUnsignedByte( buffer );
-    }
-
-    public TestTableBodyImpl(
-                                FieldTable table,
-                                short integerOp,
-                                short stringOp
-                            )
-    {
-        _table = table;
-        _integerOp = integerOp;
-        _stringOp = stringOp;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final FieldTable getTable()
-    {
-        return _table;
-    }
-    public final short getIntegerOp()
-    {
-        return _integerOp;
-    }
-    public final short getStringOp()
-    {
-        return _stringOp;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 2;
-        size += getSizeOf( _table );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeFieldTable( buffer, _table );
-        writeUnsignedByte( buffer, _integerOp );
-        writeUnsignedByte( buffer, _stringOp );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestTable(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestTableBodyImpl: ");
-        buf.append( "table=" );
-        buf.append(  getTable() );
-        buf.append( ", " );
-        buf.append( "integerOp=" );
-        buf.append(  getIntegerOp() );
-        buf.append( ", " );
-        buf.append( "stringOp=" );
-        buf.append(  getStringOp() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java
deleted file mode 100644
index ea16a3b157..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TestTableOkBodyImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TestTableOkBodyImpl extends AMQMethodBody_8_0 implements TestTableOkBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TestTableOkBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  120;
-    public static final int METHOD_ID = 31;
-
-    // Fields declared in specification
-    private final long _integerResult; // [integerResult]
-    private final byte[] _stringResult; // [stringResult]
-
-    // Constructor
-    public TestTableOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _integerResult = readLong( buffer );
-        _stringResult = readBytes( buffer );
-    }
-
-    public TestTableOkBodyImpl(
-                                long integerResult,
-                                byte[] stringResult
-                            )
-    {
-        _integerResult = integerResult;
-        _stringResult = stringResult;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final long getIntegerResult()
-    {
-        return _integerResult;
-    }
-    public final byte[] getStringResult()
-    {
-        return _stringResult;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 8;
-        size += getSizeOf( _stringResult );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeLong( buffer, _integerResult );
-        writeBytes( buffer, _stringResult );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTestTableOk(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TestTableOkBodyImpl: ");
-        buf.append( "integerResult=" );
-        buf.append(  getIntegerResult() );
-        buf.append( ", " );
-        buf.append( "stringResult=" );
-        buf.append(  getStringResult() == null  ? "null" : java.util.Arrays.toString( getStringResult() ) );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java
deleted file mode 100644
index 5bb0e64ec8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/TunnelRequestBodyImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.
- * Supported AMQP version:
- *   8-0
- */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.codec.MarkableDataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class TunnelRequestBodyImpl extends AMQMethodBody_8_0 implements TunnelRequestBody
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
-        {
-            return new TunnelRequestBodyImpl(in);
-        }
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  110;
-    public static final int METHOD_ID = 10;
-
-    // Fields declared in specification
-    private final FieldTable _metaData; // [metaData]
-
-    // Constructor
-    public TunnelRequestBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
-    {
-        _metaData = readFieldTable( buffer );
-    }
-
-    public TunnelRequestBodyImpl(
-                                FieldTable metaData
-                            )
-    {
-        _metaData = metaData;
-    }
-
-    public int getClazz()
-    {
-        return CLASS_ID;
-    }
-
-    public int getMethod()
-    {
-        return METHOD_ID;
-    }
-
-    public final FieldTable getMetaData()
-    {
-        return _metaData;
-    }
-
-    protected int getBodySize()
-    {
-        int size = 0;
-        size += getSizeOf( _metaData );
-        return size;
-    }
-
-    public void writeMethodPayload(DataOutput buffer) throws IOException
-    {
-        writeFieldTable( buffer, _metaData );
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchTunnelRequest(this, channelId);
-	}
-
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[TunnelRequestBodyImpl: ");
-        buf.append( "metaData=" );
-        buf.append(  getMetaData() );
-        buf.append("]");
-        return buf.toString();
-    }
-
-}
diff --git a/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
index dfc507d88a..ad3f2139b5 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
@@ -42,7 +42,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
+import org.apache.qpid.framing.BasicConsumeBodyImpl;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
 import org.apache.qpid.server.connection.SessionPrincipal;
diff --git a/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java b/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
index 322b971487..74beb7cd58 100644
--- a/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
@@ -54,8 +54,8 @@ import org.apache.qpid.framing.ConnectionCloseBody;
 import org.apache.qpid.framing.ConnectionStartOkBody;
 import org.apache.qpid.framing.ConnectionTuneOkBody;
 import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.amqp_0_91.ConnectionStartOkBodyImpl;
-import org.apache.qpid.framing.amqp_0_91.ConnectionTuneOkBodyImpl;
+import org.apache.qpid.framing.ConnectionStartOkBodyImpl;
+import org.apache.qpid.framing.ConnectionTuneOkBodyImpl;
 import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.server.model.AuthenticationProvider;