3 files changed, 9 insertions, 25 deletions
diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml
index ed56e87703..711efc4481 100644
--- a/java/common/protocol-version.xml
+++ b/java/common/protocol-version.xml
@@ -27,8 +27,8 @@
   <property name="generated.dir" location="${generated.path}/${generated.package}" />
   <property name="generated.timestamp" location="${generated.dir}/timestamp" />
   <property name="xml.spec.dir" location="${topDirectoryLocation}/../specs" />
-  <property name="xml.spec.deps" value="amqp.0-9.xml cluster.0-9.xml amqp-nogen.0-9.xml" />
-  <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/cluster.0-9.xml ${xml.spec.dir}/amqp-nogen.0-9.xml" />
+  <property name="xml.spec.deps" value="amqp.0-9.xml cluster.0-9.xml exchange-bound.0-9.xml amqp-nogen.0-9.xml" />
+  <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/cluster.0-9.xml ${xml.spec.dir}/exchange-bound.0-9.xml ${xml.spec.dir}/amqp-nogen.0-9.xml" />
   	
   <target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired">
     <mkdir dir="${generated.dir}"/>
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQRequest.java b/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
index 821b5d177d..a60db0fa3f 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQRequest.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
@@ -22,7 +22,7 @@ package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
 
-public class AMQRequest extends AMQBody
+public class AMQRequestBody extends AMQBody
 {
     public static final byte TYPE = (byte)AmqpConstants.frameRequestAsInt();
        
@@ -33,7 +33,7 @@ public class AMQRequest extends AMQBody
 
 
     // Constructor
-    public AMQRequest() {}
+    public AMQRequestBody() {}
 
     // Field methods
     
@@ -72,7 +72,7 @@ public class AMQRequest extends AMQBody
     public static AMQFrame createAMQFrame(int channelId, long requestId,
             long responseMark, AMQMethodBody methodPayload)
     {
-        AMQResponse responseFrame = new AMQResponse();
+        AMQResponseBody responseFrame = new AMQResponseBody();
         responseFrame.requestId = requestId;
         responseFrame.responseMark = responseMark;
         responseFrame.methodPayload = methodPayload;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQResponse.java b/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
index bf4bec8cda..c86bcbe2ad 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQResponse.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
@@ -22,36 +22,20 @@ package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
 
-public class AMQResponse extends AMQBody
+public class AMQResponseBody extends AMQRequestBody
 {
     public static final byte TYPE = (byte)AmqpConstants.frameResponseAsInt();
        
     // Fields declared in specification
-    public long requestId;
-    public long responseMark;
     public int batchOffset;
-    public AMQMethodBody methodPayload;
 
     // Constructor
-    public AMQResponse() {}
+    public AMQResponseBody() {}
 
     // Field methods
     
-    public long getRequestId() { return requestId; }
-    public long getResponseMark() { return responseMark; }
     public int  getBatchOffset() { return batchOffset; }
-    public AMQMethodBody getMethodPayload() { return methodPayload; }
-    
-    protected byte getFrameType()
-    {
-        return TYPE;
-    }
-    
-    protected int getSize()
-    {
-        return 8 + 8 + 4 + methodPayload.getBodySize();
-    }
-    
+        
     protected void writePayload(ByteBuffer buffer)
     {
         EncodingUtils.writeLong(buffer, requestId);
@@ -72,7 +56,7 @@ public class AMQResponse extends AMQBody
     public static AMQFrame createAMQFrame(int channelId, long requestId,
             long responseMark, int batchOffset, AMQMethodBody methodPayload)
     {
-        AMQResponse responseFrame = new AMQResponse();
+        AMQResponseBody responseFrame = new AMQResponseBody();
         responseFrame.requestId = requestId;
         responseFrame.responseMark = responseMark;
         responseFrame.batchOffset = batchOffset;