You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/10/13 17:49:30 UTC

svn commit: r463716 [4/6] - in /incubator/activemq/sandbox/qpid: ./ src/main/java/org/apache/activemq/qpid/ src/main/java/org/apache/activemq/qpid/command/ src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ src/main/java/org/apache/activemq/qpid/t...

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicReturnBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicReturnBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicReturnBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicReturnBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicReturnBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicReturnBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicReturnBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class BasicReturnBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicReturnBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 60; 	
     public static final int METHOD_ID = 50; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new BasicReturnBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         BasicReturnBody object = (BasicReturnBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         BasicReturnBody object = (BasicReturnBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.replyCode);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         BasicReturnBody object = (BasicReturnBody)o;
         object.replyCode = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelAlertBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelAlertBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelAlertBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelAlertBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelAlertBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelAlertBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelAlertBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelAlertBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelAlertBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 30; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelAlertBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelAlertBody object = (ChannelAlertBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelAlertBody object = (ChannelAlertBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.replyCode);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelAlertBody object = (ChannelAlertBody)o;
         object.replyCode = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelCloseBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelCloseBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelCloseBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelCloseBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelCloseBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 40; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelCloseBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelCloseBody object = (ChannelCloseBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelCloseBody object = (ChannelCloseBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.replyCode);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelCloseBody object = (ChannelCloseBody)o;
         object.replyCode = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelCloseOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelCloseOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelCloseOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelCloseOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelCloseOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelCloseOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 41; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelCloseOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelCloseOkBody object = (ChannelCloseOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelCloseOkBody object = (ChannelCloseOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelCloseOkBody object = (ChannelCloseOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelFlowBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelFlowBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelFlowBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelFlowBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelFlowBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelFlowBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelFlowBody object = (ChannelFlowBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelFlowBody object = (ChannelFlowBody)o;
         EncodingUtils.writeBooleans(buffer, new boolean[]{ object.active});
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelFlowBody object = (ChannelFlowBody)o;
         boolean[] bools = EncodingUtils.readBooleans(buffer);object.active = bools[0];

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelFlowOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelFlowOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelFlowOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelFlowOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelFlowOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelFlowOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 21; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelFlowOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelFlowOkBody object = (ChannelFlowOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelFlowOkBody object = (ChannelFlowOkBody)o;
         EncodingUtils.writeBooleans(buffer, new boolean[]{ object.active});
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelFlowOkBody object = (ChannelFlowOkBody)o;
         boolean[] bools = EncodingUtils.readBooleans(buffer);object.active = bools[0];

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelOpenBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelOpenBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelOpenBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelOpenBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelOpenBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelOpenBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelOpenBody object = (ChannelOpenBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelOpenBody object = (ChannelOpenBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.outOfBand);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelOpenBody object = (ChannelOpenBody)o;
         object.outOfBand = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelOpenOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelOpenOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ChannelOpenOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ChannelOpenOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ChannelOpenOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ChannelOpenOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 20; 	
     public static final int METHOD_ID = 11; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ChannelOpenOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ChannelOpenOkBody object = (ChannelOpenOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ChannelOpenOkBody object = (ChannelOpenOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ChannelOpenOkBody object = (ChannelOpenOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionCloseBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionCloseBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionCloseBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionCloseBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionCloseBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 60; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionCloseBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionCloseBody object = (ConnectionCloseBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionCloseBody object = (ConnectionCloseBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.replyCode);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionCloseBody object = (ConnectionCloseBody)o;
         object.replyCode = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionCloseOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionCloseOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionCloseOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionCloseOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionCloseOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionCloseOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 61; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionCloseOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionCloseOkBody object = (ConnectionCloseOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionCloseOkBody object = (ConnectionCloseOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionCloseOkBody object = (ConnectionCloseOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionOpenBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionOpenBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionOpenBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionOpenBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionOpenBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 40; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionOpenBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionOpenBody object = (ConnectionOpenBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionOpenBody object = (ConnectionOpenBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.virtualHost);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionOpenBody object = (ConnectionOpenBody)o;
         object.virtualHost = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionOpenOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionOpenOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionOpenOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionOpenOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionOpenOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionOpenOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 41; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionOpenOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionOpenOkBody object = (ConnectionOpenOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionOpenOkBody object = (ConnectionOpenOkBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.knownHosts);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionOpenOkBody object = (ConnectionOpenOkBody)o;
         object.knownHosts = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionRedirectBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionRedirectBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionRedirectBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionRedirectBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionRedirectBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionRedirectBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionRedirectBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionRedirectBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionRedirectBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 50; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionRedirectBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionRedirectBody object = (ConnectionRedirectBody)o;
         
@@ -55,7 +59,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionRedirectBody object = (ConnectionRedirectBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.host);
@@ -63,7 +67,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionRedirectBody object = (ConnectionRedirectBody)o;
         object.host = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionSecureBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionSecureBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionSecureBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionSecureBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionSecureBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionSecureBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionSecureBody object = (ConnectionSecureBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionSecureBody object = (ConnectionSecureBody)o;
         EncodingUtils.writeLongstr(buffer, object.challenge);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionSecureBody object = (ConnectionSecureBody)o;
         object.challenge = EncodingUtils.readLongstr(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionSecureOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionSecureOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionSecureOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionSecureOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionSecureOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionSecureOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 21; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionSecureOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionSecureOkBody object = (ConnectionSecureOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionSecureOkBody object = (ConnectionSecureOkBody)o;
         EncodingUtils.writeLongstr(buffer, object.response);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionSecureOkBody object = (ConnectionSecureOkBody)o;
         object.response = EncodingUtils.readLongstr(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionStartBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionStartBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionStartBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionStartBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionStartBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionStartBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionStartBody object = (ConnectionStartBody)o;
         
@@ -58,7 +62,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionStartBody object = (ConnectionStartBody)o;
         EncodingUtils.writeUnsignedByte(buffer, object.versionMajor);
@@ -69,7 +73,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionStartBody object = (ConnectionStartBody)o;
         object.versionMajor = EncodingUtils.readUnsignedByte(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionStartOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionStartOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionStartOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionStartOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionStartOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionStartOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 11; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionStartOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionStartOkBody object = (ConnectionStartOkBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionStartOkBody object = (ConnectionStartOkBody)o;
         EncodingUtils.writeFieldTableBytes(buffer, object.clientProperties);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionStartOkBody object = (ConnectionStartOkBody)o;
         object.clientProperties = EncodingUtils.readFieldTable(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionTuneBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionTuneBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionTuneBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionTuneBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionTuneBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 30; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionTuneBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionTuneBody object = (ConnectionTuneBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionTuneBody object = (ConnectionTuneBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.channelMax);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionTuneBody object = (ConnectionTuneBody)o;
         object.channelMax = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionTuneOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionTuneOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ConnectionTuneOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ConnectionTuneOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionTuneOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ConnectionTuneOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 10; 	
     public static final int METHOD_ID = 31; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ConnectionTuneOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ConnectionTuneOkBody object = (ConnectionTuneOkBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ConnectionTuneOkBody object = (ConnectionTuneOkBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.channelMax);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ConnectionTuneOkBody object = (ConnectionTuneOkBody)o;
         object.channelMax = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxSelectBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxSelectBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxSelectBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxSelectBodyMarshaller extends AMQMethodBodyMarshaller
+public class DtxSelectBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 100; 	
     public static final int METHOD_ID = 10; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new DtxSelectBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         DtxSelectBody object = (DtxSelectBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         DtxSelectBody object = (DtxSelectBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         DtxSelectBody object = (DtxSelectBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxSelectOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxSelectOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxSelectOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxSelectOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxSelectOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class DtxSelectOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 100; 	
     public static final int METHOD_ID = 11; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new DtxSelectOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         DtxSelectOkBody object = (DtxSelectOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         DtxSelectOkBody object = (DtxSelectOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         DtxSelectOkBody object = (DtxSelectOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxStartBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxStartBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxStartBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxStartBodyMarshaller extends AMQMethodBodyMarshaller
+public class DtxStartBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 100; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new DtxStartBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         DtxStartBody object = (DtxStartBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         DtxStartBody object = (DtxStartBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.dtxIdentifier);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         DtxStartBody object = (DtxStartBody)o;
         object.dtxIdentifier = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxStartOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxStartOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/DtxStartOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/DtxStartOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxStartOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class DtxStartOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 100; 	
     public static final int METHOD_ID = 21; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new DtxStartOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         DtxStartOkBody object = (DtxStartOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         DtxStartOkBody object = (DtxStartOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         DtxStartOkBody object = (DtxStartOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeclareBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeclareBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeclareBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeclareBodyMarshaller extends AMQMethodBodyMarshaller
+public class ExchangeDeclareBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 40; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ExchangeDeclareBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ExchangeDeclareBody object = (ExchangeDeclareBody)o;
         
@@ -62,7 +66,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ExchangeDeclareBody object = (ExchangeDeclareBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -73,7 +77,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ExchangeDeclareBody object = (ExchangeDeclareBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeclareOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeclareOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeclareOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeclareOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeclareOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ExchangeDeclareOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 40; 	
     public static final int METHOD_ID = 11; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ExchangeDeclareOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ExchangeDeclareOkBody object = (ExchangeDeclareOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ExchangeDeclareOkBody object = (ExchangeDeclareOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ExchangeDeclareOkBody object = (ExchangeDeclareOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeleteBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeleteBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeleteBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeleteBodyMarshaller extends AMQMethodBodyMarshaller
+public class ExchangeDeleteBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 40; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ExchangeDeleteBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ExchangeDeleteBody object = (ExchangeDeleteBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ExchangeDeleteBody object = (ExchangeDeleteBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -66,7 +70,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ExchangeDeleteBody object = (ExchangeDeleteBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeleteOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeleteOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ExchangeDeleteOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/ExchangeDeleteOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeleteOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class ExchangeDeleteOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 40; 	
     public static final int METHOD_ID = 21; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new ExchangeDeleteOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         ExchangeDeleteOkBody object = (ExchangeDeleteOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         ExchangeDeleteOkBody object = (ExchangeDeleteOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         ExchangeDeleteOkBody object = (ExchangeDeleteOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileAckBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileAckBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileAckBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileAckBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileAckBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileAckBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileAckBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileAckBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileAckBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 90; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileAckBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileAckBody object = (FileAckBody)o;
         
@@ -55,7 +59,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileAckBody object = (FileAckBody)o;
         buffer.writeLong(object.deliveryTag);
@@ -63,7 +67,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileAckBody object = (FileAckBody)o;
         object.deliveryTag = buffer.readLong();

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileCancelBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileCancelBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileCancelBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileCancelBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileCancelBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 30; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileCancelBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileCancelBody object = (FileCancelBody)o;
         
@@ -55,7 +59,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileCancelBody object = (FileCancelBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
@@ -63,7 +67,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileCancelBody object = (FileCancelBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileCancelOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileCancelOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileCancelOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileCancelOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileCancelOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileCancelOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 31; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileCancelOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileCancelOkBody object = (FileCancelOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileCancelOkBody object = (FileCancelOkBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileCancelOkBody object = (FileCancelOkBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileConsumeBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileConsumeBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileConsumeBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileConsumeBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileConsumeBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileConsumeBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileConsumeBody object = (FileConsumeBody)o;
         
@@ -60,7 +64,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileConsumeBody object = (FileConsumeBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -70,7 +74,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileConsumeBody object = (FileConsumeBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileConsumeOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileConsumeOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileConsumeOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileConsumeOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
 *
 */
     
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 
 import org.apache.activemq.qpid.*;
 import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileConsumeOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileConsumeOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 21; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileConsumeOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileConsumeOkBody object = (FileConsumeOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileConsumeOkBody object = (FileConsumeOkBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileConsumeOkBody object = (FileConsumeOkBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);