activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r463716 [5/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...
Date Fri, 13 Oct 2006 15:49:30 GMT
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileDeliverBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileDeliverBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileDeliverBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileDeliverBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileDeliverBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileDeliverBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileDeliverBodyMarshaller.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 FileDeliverBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileDeliverBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 80; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileDeliverBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileDeliverBody object = (FileDeliverBody)o;
         
@@ -59,7 +63,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileDeliverBody object = (FileDeliverBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
@@ -71,7 +75,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileDeliverBody object = (FileDeliverBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileOpenBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileOpenBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileOpenBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenBodyMarshaller.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 FileOpenBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileOpenBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 40; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileOpenBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileOpenBody object = (FileOpenBody)o;
         
@@ -55,7 +59,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileOpenBody object = (FileOpenBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.identifier);
@@ -63,7 +67,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileOpenBody object = (FileOpenBody)o;
         object.identifier = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileOpenOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileOpenOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileOpenOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileOpenOkBodyMarshaller.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 FileOpenOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileOpenOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 41; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileOpenOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileOpenOkBody object = (FileOpenOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileOpenOkBody object = (FileOpenOkBody)o;
         buffer.writeLong(object.stagedSize);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileOpenOkBody object = (FileOpenOkBody)o;
         object.stagedSize = buffer.readLong();

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FilePublishBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FilePublishBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FilePublishBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FilePublishBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FilePublishBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FilePublishBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FilePublishBodyMarshaller.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 FilePublishBodyMarshaller extends AMQMethodBodyMarshaller
+public class FilePublishBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 60; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FilePublishBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FilePublishBody object = (FilePublishBody)o;
         
@@ -59,7 +63,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FilePublishBody object = (FilePublishBody)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
     {
         FilePublishBody object = (FilePublishBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileQosBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileQosBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileQosBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosBodyMarshaller.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 FileQosBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileQosBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileQosBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileQosBody object = (FileQosBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileQosBody object = (FileQosBody)o;
         EncodingUtils.writeUnsignedInteger(buffer, object.prefetchSize);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileQosBody object = (FileQosBody)o;
         object.prefetchSize = EncodingUtils.readUnsignedInteger(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileQosOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileQosOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileQosOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileQosOkBodyMarshaller.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 FileQosOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileQosOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 11; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileQosOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileQosOkBody object = (FileQosOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileQosOkBody object = (FileQosOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileQosOkBody object = (FileQosOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileRejectBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileRejectBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileRejectBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileRejectBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileRejectBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileRejectBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileRejectBodyMarshaller.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 FileRejectBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileRejectBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 100; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileRejectBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileRejectBody object = (FileRejectBody)o;
         
@@ -55,7 +59,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileRejectBody object = (FileRejectBody)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
     {
         FileRejectBody object = (FileRejectBody)o;
         object.deliveryTag = buffer.readLong();

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileReturnBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileReturnBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileReturnBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileReturnBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileReturnBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileReturnBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileReturnBodyMarshaller.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 FileReturnBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileReturnBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 70; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileReturnBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileReturnBody object = (FileReturnBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileReturnBody object = (FileReturnBody)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
     {
         FileReturnBody object = (FileReturnBody)o;
         object.replyCode = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileStageBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileStageBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileStageBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileStageBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileStageBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/FileStageBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/FileStageBodyMarshaller.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 FileStageBodyMarshaller extends AMQMethodBodyMarshaller
+public class FileStageBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 70; 	
     public static final int METHOD_ID = 50; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new FileStageBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         FileStageBody object = (FileStageBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         FileStageBody object = (FileStageBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         FileStageBody object = (FileStageBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MainRegistry.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/MainRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MainRegistry.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/MainRegistry.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MainRegistry.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/MainRegistry.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MainRegistry.java Fri Oct 13 08:49:22 2006
@@ -17,16 +17,16 @@
 */
 
 
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
 
 import java.util.Map;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-class MainRegistry
+public class MainRegistry
 {
-    static void register(Map map)
+    public static void register(Map map)
     {
         map.put(new Integer(10 * 1000 + 10), new ConnectionStartBodyMarshaller());         
         map.put(new Integer(10 * 1000 + 11), new ConnectionStartOkBodyMarshaller());         

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MethodBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MethodBodyMarshaller.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MethodBodyMarshaller.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/MethodBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,54 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.wireformat.v8_0;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.qpid.command.MethodBody;
+import org.apache.activemq.qpid.wireformat.EncodingUtils;
+
+public abstract class MethodBodyMarshaller
+{
+
+    public int getSize(MethodBody o)
+    {
+        return 2 + 2 + getBodySize(o);
+    }
+
+    protected void writePayload(DataOutput buffer, MethodBody object)  throws IOException
+    {
+        EncodingUtils.writeUnsignedShort(buffer, getClazz());
+        EncodingUtils.writeUnsignedShort(buffer, getMethod());
+        writeMethodPayload(buffer, object);
+    }
+
+    public void populateFromBuffer(DataInput buffer, long size, MethodBody object) throws IOException
+    {
+        populateMethodBodyFromBuffer(buffer, object);
+    }
+    
+    protected abstract int getBodySize(MethodBody o);
+    protected abstract int getClazz();
+    protected abstract int getMethod();
+    public abstract void writeMethodPayload(DataOutput buffer, MethodBody object) throws IOException;
+    protected abstract void populateMethodBodyFromBuffer(DataInput buffer, MethodBody object) throws IOException;
+
+	public abstract MethodBody createBody();
+}

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueBindBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueBindBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueBindBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindBodyMarshaller.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 QueueBindBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueueBindBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueueBindBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueueBindBody object = (QueueBindBody)o;
         
@@ -59,7 +63,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueueBindBody object = (QueueBindBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -71,7 +75,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueueBindBody object = (QueueBindBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueBindOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueBindOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueBindOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueBindOkBodyMarshaller.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 QueueBindOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueueBindOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 21; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueueBindOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueueBindOkBody object = (QueueBindOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueueBindOkBody object = (QueueBindOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueueBindOkBody object = (QueueBindOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeclareBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeclareBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeclareBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareBodyMarshaller.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 QueueDeclareBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueueDeclareBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueueDeclareBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueueDeclareBody object = (QueueDeclareBody)o;
         
@@ -61,7 +65,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueueDeclareBody object = (QueueDeclareBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -71,7 +75,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueueDeclareBody object = (QueueDeclareBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeclareOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeclareOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeclareOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeclareOkBodyMarshaller.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 QueueDeclareOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueueDeclareOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 11; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueueDeclareOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueueDeclareOkBody object = (QueueDeclareOkBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueueDeclareOkBody object = (QueueDeclareOkBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.queue);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueueDeclareOkBody object = (QueueDeclareOkBody)o;
         object.queue = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeleteBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeleteBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeleteBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteBodyMarshaller.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 QueueDeleteBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueueDeleteBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 40; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueueDeleteBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueueDeleteBody object = (QueueDeleteBody)o;
         
@@ -58,7 +62,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueueDeleteBody object = (QueueDeleteBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueueDeleteBody object = (QueueDeleteBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeleteOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeleteOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueueDeleteOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueueDeleteOkBodyMarshaller.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 QueueDeleteOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueueDeleteOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 41; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueueDeleteOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueueDeleteOkBody object = (QueueDeleteOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueueDeleteOkBody object = (QueueDeleteOkBody)o;
         EncodingUtils.writeUnsignedInteger(buffer, object.messageCount);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueueDeleteOkBody object = (QueueDeleteOkBody)o;
         object.messageCount = EncodingUtils.readUnsignedInteger(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueuePurgeBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueuePurgeBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueuePurgeBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeBodyMarshaller.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 QueuePurgeBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueuePurgeBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 30; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueuePurgeBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueuePurgeBody object = (QueuePurgeBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueuePurgeBody object = (QueuePurgeBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueuePurgeBody object = (QueuePurgeBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueuePurgeOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueuePurgeOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/QueuePurgeOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/QueuePurgeOkBodyMarshaller.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 QueuePurgeOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class QueuePurgeOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 50; 	
     public static final int METHOD_ID = 31; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new QueuePurgeOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         QueuePurgeOkBody object = (QueuePurgeOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         QueuePurgeOkBody object = (QueuePurgeOkBody)o;
         EncodingUtils.writeUnsignedInteger(buffer, object.messageCount);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         QueuePurgeOkBody object = (QueuePurgeOkBody)o;
         object.messageCount = EncodingUtils.readUnsignedInteger(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamCancelBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamCancelBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamCancelBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelBodyMarshaller.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 StreamCancelBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamCancelBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 30; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamCancelBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamCancelBody object = (StreamCancelBody)o;
         
@@ -55,7 +59,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamCancelBody object = (StreamCancelBody)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
     {
         StreamCancelBody object = (StreamCancelBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamCancelOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamCancelOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamCancelOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamCancelOkBodyMarshaller.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 StreamCancelOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamCancelOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 31; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamCancelOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamCancelOkBody object = (StreamCancelOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamCancelOkBody object = (StreamCancelOkBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamCancelOkBody object = (StreamCancelOkBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamConsumeBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamConsumeBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamConsumeBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeBodyMarshaller.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 StreamConsumeBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamConsumeBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamConsumeBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamConsumeBody object = (StreamConsumeBody)o;
         
@@ -59,7 +63,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamConsumeBody object = (StreamConsumeBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -69,7 +73,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamConsumeBody object = (StreamConsumeBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamConsumeOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamConsumeOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamConsumeOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamConsumeOkBodyMarshaller.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 StreamConsumeOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamConsumeOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 21; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamConsumeOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamConsumeOkBody object = (StreamConsumeOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamConsumeOkBody object = (StreamConsumeOkBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamConsumeOkBody object = (StreamConsumeOkBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamDeliverBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamDeliverBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamDeliverBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamDeliverBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamDeliverBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamDeliverBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamDeliverBodyMarshaller.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 StreamDeliverBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamDeliverBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 60; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamDeliverBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamDeliverBody object = (StreamDeliverBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamDeliverBody object = (StreamDeliverBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamDeliverBody object = (StreamDeliverBody)o;
         object.consumerTag = EncodingUtils.readShortString(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamPublishBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamPublishBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamPublishBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamPublishBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamPublishBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamPublishBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamPublishBodyMarshaller.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 StreamPublishBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamPublishBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 40; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamPublishBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamPublishBody object = (StreamPublishBody)o;
         
@@ -58,7 +62,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamPublishBody object = (StreamPublishBody)o;
         EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -68,7 +72,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamPublishBody object = (StreamPublishBody)o;
         object.ticket = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamQosBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamQosBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamQosBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosBodyMarshaller.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 StreamQosBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamQosBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamQosBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamQosBody object = (StreamQosBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamQosBody object = (StreamQosBody)o;
         EncodingUtils.writeUnsignedInteger(buffer, object.prefetchSize);
@@ -67,7 +71,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamQosBody object = (StreamQosBody)o;
         object.prefetchSize = EncodingUtils.readUnsignedInteger(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamQosOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamQosOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamQosOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamQosOkBodyMarshaller.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 StreamQosOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamQosOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 11; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamQosOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamQosOkBody object = (StreamQosOkBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamQosOkBody object = (StreamQosOkBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         StreamQosOkBody object = (StreamQosOkBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamReturnBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamReturnBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamReturnBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamReturnBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamReturnBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/StreamReturnBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/StreamReturnBodyMarshaller.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 StreamReturnBodyMarshaller extends AMQMethodBodyMarshaller
+public class StreamReturnBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 80; 	
     public static final int METHOD_ID = 50; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new StreamReturnBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         StreamReturnBody object = (StreamReturnBody)o;
         
@@ -57,7 +61,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         StreamReturnBody object = (StreamReturnBody)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
     {
         StreamReturnBody object = (StreamReturnBody)o;
         object.replyCode = EncodingUtils.readUnsignedShort(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestContentBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestContentBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestContentBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentBodyMarshaller.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 TestContentBodyMarshaller extends AMQMethodBodyMarshaller
+public class TestContentBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 120; 	
     public static final int METHOD_ID = 40; 	
@@ -44,19 +44,23 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new TestContentBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         TestContentBody object = (TestContentBody)o;
         return 0; 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         TestContentBody object = (TestContentBody)o;
         		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         TestContentBody object = (TestContentBody)o;
         		 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestContentOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestContentOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestContentOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestContentOkBodyMarshaller.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 TestContentOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class TestContentOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 120; 	
     public static final int METHOD_ID = 41; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new TestContentOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         TestContentOkBody object = (TestContentOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         TestContentOkBody object = (TestContentOkBody)o;
         EncodingUtils.writeUnsignedInteger(buffer, object.contentChecksum);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         TestContentOkBody object = (TestContentOkBody)o;
         object.contentChecksum = EncodingUtils.readUnsignedInteger(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestIntegerBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestIntegerBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestIntegerBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerBodyMarshaller.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 TestIntegerBodyMarshaller extends AMQMethodBodyMarshaller
+public class TestIntegerBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 120; 	
     public static final int METHOD_ID = 10; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new TestIntegerBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         TestIntegerBody object = (TestIntegerBody)o;
         
@@ -58,7 +62,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         TestIntegerBody object = (TestIntegerBody)o;
         EncodingUtils.writeUnsignedByte(buffer, object.integer1);
@@ -69,7 +73,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         TestIntegerBody object = (TestIntegerBody)o;
         object.integer1 = EncodingUtils.readUnsignedByte(buffer);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestIntegerOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestIntegerOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestIntegerOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestIntegerOkBodyMarshaller.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 TestIntegerOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class TestIntegerOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 120; 	
     public static final int METHOD_ID = 11; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new TestIntegerOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         TestIntegerOkBody object = (TestIntegerOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         TestIntegerOkBody object = (TestIntegerOkBody)o;
         buffer.writeLong(object.result);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         TestIntegerOkBody object = (TestIntegerOkBody)o;
         object.result = buffer.readLong();

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestStringBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestStringBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestStringBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringBodyMarshaller.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 TestStringBodyMarshaller extends AMQMethodBodyMarshaller
+public class TestStringBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 120; 	
     public static final int METHOD_ID = 20; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new TestStringBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         TestStringBody object = (TestStringBody)o;
         
@@ -56,7 +60,7 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         TestStringBody object = (TestStringBody)o;
         EncodingUtils.writeShortStringBytes(buffer, object.string1);
@@ -65,7 +69,7 @@
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         TestStringBody object = (TestStringBody)o;
         object.string1 = EncodingUtils.readShortString(buffer);



Mime
View raw message