Remove remaining protocol specific classes/interfaces

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

42 files changed, 123 insertions, 450 deletions

diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
index 3588b96e88..262931f054 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
@@ -38,7 +38,7 @@ import org.apache.qpid.framing.AMQProtocolVersionException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.store.StoreException;
diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index 558fe86b91..1c1c13ce07 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -32,7 +32,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.MethodRegistry;
 import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaDataType_0_10;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;
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 4e1af5ddd6..6b36e846c0 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
@@ -54,7 +54,7 @@ import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.TransactionTimeoutHelper;
 import org.apache.qpid.server.TransactionTimeoutHelper.CloseAction;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
index 869de2f3a5..716a84eeb0 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.AbstractServerMessageImpl;
 import org.apache.qpid.server.store.StoredMessage;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
index 80c4c77b65..821d6101db 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
@@ -24,7 +24,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.message.MessageDestination;
 
 import java.util.ArrayList;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
index 0f383c5ff0..7fca10b388 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
@@ -33,7 +33,7 @@ import org.apache.qpid.framing.AMQShortString;
 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.MessagePublishInfo;
 import org.apache.qpid.server.message.internal.InternalMessage;
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.plugin.PluggableService;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
index fd7fb9ca80..7cc00e713e 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.server.protocol.v0_8;
 
 import java.util.Collection;
-import org.apache.qpid.AMQException;
+
 import org.apache.qpid.framing.AMQFrameDecodingException;
 import org.apache.qpid.framing.AMQProtocolVersionException;
 import org.apache.qpid.framing.AMQShortString;
@@ -29,7 +29,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.EncodingUtils;
 import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.plugin.MessageMetaDataType;
 import org.apache.qpid.server.store.StorableMessageMetaData;
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 b352a2772c..41f727c7d4 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
@@ -27,8 +27,7 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
@@ -95,10 +94,10 @@ public class BasicPublishMethodHandler implements StateAwareMethodListener<Basic
                 throw body.getChannelNotFoundException(channelId, connection.getMethodRegistry());
             }
 
-            MessagePublishInfo info = new MessagePublishInfoImpl(body.getExchange(),
-                                                                 body.getImmediate(),
-                                                                 body.getMandatory(),
-                                                                 body.getRoutingKey());
+            MessagePublishInfo info = new MessagePublishInfo(body.getExchange(),
+                                                             body.getImmediate(),
+                                                             body.getMandatory(),
+                                                             body.getRoutingKey());
             info.setExchange(exchangeName);
             try
             {
@@ -106,7 +105,9 @@ public class BasicPublishMethodHandler implements StateAwareMethodListener<Basic
             }
             catch (AccessControlException e)
             {
-                throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage(), connection.getMethodRegistry());
+                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/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 4d66d0f999..d15d27fcd5 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
@@ -22,15 +22,19 @@ 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.framing.BasicRecoverSyncBody;

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

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

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

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

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

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

 

 

 

 public class ServerMethodDispatcherImpl_0_9

         extends ServerMethodDispatcherImpl

-        implements MethodDispatcher_0_9

+        implements MethodDispatcher

 

 {

 

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

     }

 

+    @Override

+    public boolean dispatchChannelAlert(final ChannelAlertBody body, final int channelId)

+            throws AMQException

+    {

+        throw new UnexpectedMethodException(body);

+    }

+

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

     {

         throw new UnexpectedMethodException(body);

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 711dfe12ff..f0f387685a 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
@@ -22,14 +22,18 @@ 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.framing.BasicRecoverSyncBody;

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

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

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

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

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

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

 

 

 public class ServerMethodDispatcherImpl_0_91

         extends ServerMethodDispatcherImpl

-        implements MethodDispatcher_0_91

+        implements MethodDispatcher

 

 {

 

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

     }

 

+    @Override

+    public boolean dispatchChannelAlert(final ChannelAlertBody body, final int channelId)

+            throws AMQException

+    {

+        throw new UnexpectedMethodException(body);

+    }

+

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

     {

         throw new UnexpectedMethodException(body);

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 b8c253d601..4b8531832b 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
@@ -21,16 +21,17 @@
 package org.apache.qpid.server.protocol.v0_8.handler;

 

 import org.apache.qpid.AMQException;

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

 import org.apache.qpid.framing.BasicRecoverSyncOkBody;

 import org.apache.qpid.framing.ChannelAlertBody;

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

 import org.apache.qpid.framing.QueueUnbindBody;

 import org.apache.qpid.framing.QueueUnbindOkBody;

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

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

 

 public class ServerMethodDispatcherImpl_8_0

         extends ServerMethodDispatcherImpl

-        implements MethodDispatcher_8_0

+        implements MethodDispatcher

 {

     public ServerMethodDispatcherImpl_8_0(AMQProtocolSession<?> connection)

     {

@@ -60,4 +61,11 @@ public class ServerMethodDispatcherImpl_8_0
     {

         return false;

     }

+

+    @Override

+    public boolean dispatchBasicRecoverSync(final BasicRecoverSyncBody body, final int channelId)

+            throws AMQException

+    {

+        throw new UnexpectedMethodException(body);

+    }

 }

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
index 4ee5cbc17d..1e473a0a14 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
@@ -29,7 +29,7 @@ package org.apache.qpid.server.protocol.v0_8.output;
 import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageContentSource;
 import org.apache.qpid.server.message.ServerMessage;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
index 5de9c928e1..fe475c1914 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
@@ -36,7 +36,7 @@ import org.apache.qpid.framing.BasicGetOkBody;
 import org.apache.qpid.framing.BasicReturnBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageContentSource;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
index 21680ff4e4..6c35077f8a 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
@@ -29,7 +29,7 @@ import java.util.Map;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.message.MessageContentSource;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
index 47456f2675..c9f643eac6 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
@@ -29,7 +29,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.consumer.ConsumerImpl;
 import org.apache.qpid.server.flow.LimitlessCreditManager;
 import org.apache.qpid.server.flow.Pre0_10CreditManager;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
index 8b80504d6e..ad9035259c 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
@@ -24,7 +24,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
index 05ae5285ad..d88e466443 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
@@ -39,7 +39,7 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.consumer.ConsumerImpl;
 import org.apache.qpid.server.message.InstanceProperties;
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
index ab29e58a6c..ffcd01ba20 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.server.protocol.v0_8;
 
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 
 public class MockMessagePublishInfo implements MessagePublishInfo
 {
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
index 9689976e6f..8410e2cf5b 100755
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 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.MessagePublishInfo;
 import org.apache.qpid.server.store.StoredMessage;
 
 public class MockStoredMessage implements StoredMessage<MessageMetaData>
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
index e0f0fc98a5..669028e6f4 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
@@ -26,7 +26,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.store.MessageCounter;
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java b/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
index d3c1dae29b..7c7284ff96 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
+++ b/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
@@ -30,7 +30,7 @@ import org.apache.qpid.framing.AMQShortString;
 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.MessagePublishInfo;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.plugin.PluggableService;
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java b/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
index 783c6ca772..ea33a9e763 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
+++ b/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
@@ -28,7 +28,7 @@ import org.apache.qpid.framing.AMQShortString;
 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.MessagePublishInfo;
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.plugin.PluggableService;
 import org.apache.qpid.server.protocol.v0_8.AMQMessage;
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 7be75414ca..4232f59292 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
@@ -23,10 +23,14 @@ package org.apache.qpid.client.handler;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.protocol.AMQProtocolSession;
 import org.apache.qpid.client.state.AMQMethodNotImplementedException;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.framing.amqp_0_9.MethodDispatcher_0_9;
+import org.apache.qpid.framing.BasicRecoverSyncBody;
+import org.apache.qpid.framing.BasicRecoverSyncOkBody;
+import org.apache.qpid.framing.ChannelAlertBody;
+import org.apache.qpid.framing.MethodDispatcher;
+import org.apache.qpid.framing.QueueUnbindBody;
+import org.apache.qpid.framing.QueueUnbindOkBody;
 
-public class ClientMethodDispatcherImpl_0_9 extends ClientMethodDispatcherImpl implements MethodDispatcher_0_9
+public class ClientMethodDispatcherImpl_0_9 extends ClientMethodDispatcherImpl implements MethodDispatcher
 {
     public ClientMethodDispatcherImpl_0_9(AMQProtocolSession session)
     {
@@ -38,6 +42,13 @@ public class ClientMethodDispatcherImpl_0_9 extends ClientMethodDispatcherImpl i
         return false;
     }
 
+    @Override
+    public boolean dispatchChannelAlert(final ChannelAlertBody body, final int channelId)
+            throws AMQException
+    {
+        throw new AMQMethodNotImplementedException(body);
+    }
+
     public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody 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 284bd675a8..573ab52cc3 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
@@ -23,10 +23,14 @@ package org.apache.qpid.client.handler;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.protocol.AMQProtocolSession;
 import org.apache.qpid.client.state.AMQMethodNotImplementedException;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.framing.amqp_0_91.MethodDispatcher_0_91;
+import org.apache.qpid.framing.BasicRecoverSyncBody;
+import org.apache.qpid.framing.BasicRecoverSyncOkBody;
+import org.apache.qpid.framing.ChannelAlertBody;
+import org.apache.qpid.framing.MethodDispatcher;
+import org.apache.qpid.framing.QueueUnbindBody;
+import org.apache.qpid.framing.QueueUnbindOkBody;
 
-public class ClientMethodDispatcherImpl_0_91 extends ClientMethodDispatcherImpl implements MethodDispatcher_0_91
+public class ClientMethodDispatcherImpl_0_91 extends ClientMethodDispatcherImpl implements MethodDispatcher
 {
     public ClientMethodDispatcherImpl_0_91(AMQProtocolSession session)
     {
@@ -38,6 +42,13 @@ public class ClientMethodDispatcherImpl_0_91 extends ClientMethodDispatcherImpl
         return false;
     }
 
+    @Override
+    public boolean dispatchChannelAlert(final ChannelAlertBody body, final int channelId)
+            throws AMQException
+    {
+        throw new AMQMethodNotImplementedException(body);
+    }
+
     public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException
     {
         throw new AMQMethodNotImplementedException(body);
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 fc2037097f..7d421622e7 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
@@ -23,13 +23,14 @@
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.protocol.AMQProtocolSession;
 import org.apache.qpid.client.state.AMQMethodNotImplementedException;
+import org.apache.qpid.framing.BasicRecoverSyncBody;
 import org.apache.qpid.framing.BasicRecoverSyncOkBody;
 import org.apache.qpid.framing.ChannelAlertBody;
+import org.apache.qpid.framing.MethodDispatcher;
 import org.apache.qpid.framing.QueueUnbindBody;
 import org.apache.qpid.framing.QueueUnbindOkBody;
-import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;
 
-public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl implements MethodDispatcher_8_0
+public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl implements MethodDispatcher
 {
     public ClientMethodDispatcherImpl_8_0(AMQProtocolSession session)
     {
@@ -59,4 +60,11 @@ public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl i
     {
         throw new AMQMethodNotImplementedException(body);
     }
+
+    @Override
+    public boolean dispatchBasicRecoverSync(final BasicRecoverSyncBody body, final int channelId)
+            throws AMQException
+    {
+        throw new AMQMethodNotImplementedException(body);
+    }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java b/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
index f4d1b795bd..4fa98ac2dc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
@@ -32,7 +32,6 @@ import java.io.IOException;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.MarkableDataInput;
-import org.apache.qpid.framing.amqp_0_91.MethodDispatcher_0_91;
 
 public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {
@@ -92,7 +91,7 @@ public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements Encodable
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_0_91)dispatcher).dispatchBasicRecoverSync(this, channelId);
+        return dispatcher.dispatchBasicRecoverSync(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java b/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
index e0a1e05e58..9f0e5ecdf5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
@@ -27,12 +27,11 @@
 
 package org.apache.qpid.framing;
 
-import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;
+import org.apache.qpid.codec.MarkableDataInput;
 
 public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
 {
@@ -104,7 +103,7 @@ public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQD
 
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
 	{
-    return ((MethodDispatcher_8_0)dispatcher).dispatchChannelAlert(this, channelId);
+    return dispatcher.dispatchChannelAlert(this, channelId);
 	}
 
     public String toString()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java b/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
index 038963f4e1..97de0ac487 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
@@ -70,4 +70,6 @@ public interface ClientMethodDispatcher
 
     boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody basicRecoverSyncOkBody, int channelId)
             throws AMQException;
+
+    boolean dispatchChannelAlert(ChannelAlertBody channelAlertBody, int channelId) throws AMQException;
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java b/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java
index 53c70c8d71..1381fadbdc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java
@@ -18,23 +18,23 @@
  * under the License.
  *
  */
-package org.apache.qpid.framing.abstraction;
+package org.apache.qpid.framing;
 
 import org.apache.qpid.framing.AMQShortString;
 
-public class MessagePublishInfoImpl implements MessagePublishInfo
+public final class MessagePublishInfo
 {
     private AMQShortString _exchange;
     private boolean _immediate;
     private boolean _mandatory;
     private AMQShortString _routingKey;
 
-    public MessagePublishInfoImpl()
+    public MessagePublishInfo()
     {
     }
 
-    public MessagePublishInfoImpl(AMQShortString exchange, boolean immediate, boolean mandatory,
-                                  AMQShortString routingKey)
+    public MessagePublishInfo(AMQShortString exchange, boolean immediate, boolean mandatory,
+                              AMQShortString routingKey)
     {
         _exchange = exchange;
         _immediate = immediate;
@@ -69,7 +69,7 @@ public class MessagePublishInfoImpl implements MessagePublishInfo
 
     public void setMandatory(boolean mandatory)
     {
-        _mandatory = mandatory;        
+        _mandatory = mandatory;
     }
 
     public AMQShortString getRoutingKey()
@@ -81,4 +81,5 @@ public class MessagePublishInfoImpl implements MessagePublishInfo
     {
         _routingKey = routingKey;
     }
+
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java b/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
index fd87911b26..f4ab67dad4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
@@ -66,4 +66,6 @@ public interface ServerMethodDispatcher
     public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException;
 
     boolean dispatchQueueUnbind(QueueUnbindBody queueUnbindBody, int channelId) throws AMQException;
+
+    boolean dispatchBasicRecoverSync(BasicRecoverSyncBody basicRecoverSyncBody, int channelId) throws AMQException;
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java b/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
deleted file mode 100644
index a96bdcc171..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.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.
- *
- */
-package org.apache.qpid.framing.abstraction;
-
-import org.apache.qpid.framing.AMQShortString;
-
-public interface MessagePublishInfo
-{
-
-    public AMQShortString getExchange();
-
-    public void setExchange(AMQShortString exchange);
-
-    public boolean isImmediate();
-
-    public boolean isMandatory();
-
-    public AMQShortString getRoutingKey();
-
-}
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
deleted file mode 100644
index 7c636140e9..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ClientMethodDispatcher_0_9.java
+++ /dev/null
@@ -1,41 +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.AMQException;
-import org.apache.qpid.framing.*;
-
-public interface ClientMethodDispatcher_0_9 extends ClientMethodDispatcher
-{
-
-    public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException;
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.java
deleted file mode 100644
index 00c81e1180..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodDispatcher_0_9.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
-  */
-
-package org.apache.qpid.framing.amqp_0_9;
-
-import org.apache.qpid.framing.*;
-
-public interface MethodDispatcher_0_9
-    extends MethodDispatcher,
-            ServerMethodDispatcher_0_9,
-            ClientMethodDispatcher_0_9
-{
-
-}
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
deleted file mode 100644
index 128af0e2a7..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java
+++ /dev/null
@@ -1,41 +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.AMQException;
-import org.apache.qpid.framing.*;
-
-
-public interface ServerMethodDispatcher_0_9 extends ServerMethodDispatcher
-{
-
-    public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException;
-    public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException;
-
-}
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
deleted file mode 100644
index 11fd973ec8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java
+++ /dev/null
@@ -1,39 +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.AMQException;
-import org.apache.qpid.framing.*;
-
-public interface ClientMethodDispatcher_0_91 extends ClientMethodDispatcher
-{
-
-    public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException;
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.java
deleted file mode 100644
index 9846ce4b48..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodDispatcher_0_91.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-91
-  */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.framing.*;
-
-public interface MethodDispatcher_0_91
-    extends MethodDispatcher,
-            ServerMethodDispatcher_0_91,
-            ClientMethodDispatcher_0_91
-{
-
-}
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
deleted file mode 100644
index 7f85c2beb7..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.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-91
-  */
-
-package org.apache.qpid.framing.amqp_0_91;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.*;
-
-
-public interface ServerMethodDispatcher_0_91 extends ServerMethodDispatcher
-{
-
-    public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException;
-    public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException;
-
-}
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
deleted file mode 100644
index 7274e4c3bd..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_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.
- *
- */
-
-/*
- * 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.AMQException;
-import org.apache.qpid.framing.*;
-
-public interface ClientMethodDispatcher_8_0 extends ClientMethodDispatcher
-{
-
-    public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException;
-    public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws AMQException;
-    public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException;
-
-}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.java
deleted file mode 100644
index dc4f33ab6d..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodDispatcher_8_0.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:
-  *   8-0
-  */
-
-package org.apache.qpid.framing.amqp_8_0;
-
-import org.apache.qpid.framing.*;
-
-public interface MethodDispatcher_8_0
-    extends MethodDispatcher,
-            ServerMethodDispatcher_8_0,
-            ClientMethodDispatcher_8_0
-{
-
-}
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
deleted file mode 100644
index 0a9fc2d893..0000000000
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java
+++ /dev/null
@@ -1,39 +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.AMQException;
-import org.apache.qpid.framing.*;
-
-
-public interface ServerMethodDispatcher_8_0 extends ServerMethodDispatcher
-{
-
-    public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException;
-
-}
diff --git a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
index 5a57db1650..aece8ed4e2 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
+++ b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
@@ -23,16 +23,17 @@ package org.apache.qpid.framing.abstraction;
 import junit.framework.TestCase;
 
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.MessagePublishInfo;
 
 public class MessagePublishInfoImplTest extends TestCase
 {
-    private MessagePublishInfoImpl _mpi;
+    private MessagePublishInfo _mpi;
     private final AMQShortString _exchange = new AMQShortString("exchange");
     private final AMQShortString _routingKey = new AMQShortString("routingKey");
 
     public void setUp()
     {
-        _mpi = new MessagePublishInfoImpl(_exchange, true, true, _routingKey);
+        _mpi = new MessagePublishInfo(_exchange, true, true, _routingKey);
     }
 
     /** Test that we can update the exchange value. */
@@ -55,7 +56,7 @@ public class MessagePublishInfoImplTest extends TestCase
         //Check that the set value is correct
         assertTrue("Set value for immediate not as expected", _mpi.isImmediate());
 
-        MessagePublishInfoImpl mpi = new MessagePublishInfoImpl();
+        MessagePublishInfo mpi = new MessagePublishInfo();
 
         assertFalse("Default value for immediate should be false", mpi.isImmediate());
 
@@ -72,7 +73,7 @@ public class MessagePublishInfoImplTest extends TestCase
     {
         assertTrue("Set value for mandatory not as expected", _mpi.isMandatory());
 
-        MessagePublishInfoImpl mpi = new MessagePublishInfoImpl();
+        MessagePublishInfo mpi = new MessagePublishInfo();
 
         assertFalse("Default value for mandatory should be false", mpi.isMandatory());
 
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 73ce5b9f05..9626bb017f 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.BasicConsumeBody;
 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.MessagePublishInfo;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
 import org.apache.qpid.server.connection.SessionPrincipal;