activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r463716 [6/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/TestStringOkBodyMarshaller.java
(from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestStringOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestStringOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/TestStringOkBodyMarshaller.java
(original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/TestStringOkBodyMarshaller.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 TestStringOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class TestStringOkBodyMarshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = 120; 	
     public static final int METHOD_ID = 21; 	
@@ -44,7 +44,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new TestStringOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         TestStringOkBody object = (TestStringOkBody)o;
         
@@ -54,14 +58,14 @@
          
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         TestStringOkBody object = (TestStringOkBody)o;
         EncodingUtils.writeLongstr(buffer, object.result);
             		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         TestStringOkBody object = (TestStringOkBody)o;
         object.result = EncodingUtils.readLongstr(buffer);

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

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

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

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

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

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

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

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

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

Added: incubator/activemq/sandbox/qpid/src/main/resources/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/resources/META-INF/DISCLAIMER.txt?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/resources/META-INF/DISCLAIMER.txt (added)
+++ incubator/activemq/sandbox/qpid/src/main/resources/META-INF/DISCLAIMER.txt Fri Oct 13
08:49:22 2006
@@ -0,0 +1,7 @@
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Added: incubator/activemq/sandbox/qpid/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/resources/META-INF/LICENSE.txt?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/resources/META-INF/LICENSE.txt (added)
+++ incubator/activemq/sandbox/qpid/src/main/resources/META-INF/LICENSE.txt Fri Oct 13 08:49:22
2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Propchange: incubator/activemq/sandbox/qpid/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/qpid
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/qpid?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/qpid
(added)
+++ incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/qpid
Fri Oct 13 08:49:22 2006
@@ -0,0 +1 @@
+class=org.apache.activemq.qpid.transport.QpidTransportFactory

Added: incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/qpid
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/qpid?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/qpid
(added)
+++ incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/qpid
Fri Oct 13 08:49:22 2006
@@ -0,0 +1 @@
+class=org.apache.activemq.qpid.wireformat.QpidWireFormatFactory
\ No newline at end of file

Modified: incubator/activemq/sandbox/qpid/stylesheets/command-java.xsl
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/stylesheets/command-java.xsl?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/stylesheets/command-java.xsl (original)
+++ incubator/activemq/sandbox/qpid/stylesheets/command-java.xsl Fri Oct 13 08:49:22 2006
@@ -51,8 +51,22 @@
 /**
  * This class is autogenerated, do not modify. [From <xsl:value-of select="$f/parent::frames/@protocol"/>]
  */
-public class <xsl:value-of select="$f/@name"/> extends AMQMethodBody
+public class <xsl:value-of select="$f/@name"/> extends MethodBody
 { 
+
+    public static final int CLASS_ID = <xsl:value-of select="$f/@class-id"/>; 	
+    public static final int METHOD_ID = <xsl:value-of select="$f/@method-id"/>; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     <xsl:for-each select="$f/field"> 
         <xsl:text>public </xsl:text><xsl:value-of select="@java-type"/>
         <xsl:text> </xsl:text>
@@ -67,18 +81,7 @@
         </xsl:for-each> 
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId<xsl:if test="$f/field">, </xsl:if><xsl:value-of
select="$f/field/concat(@java-type, ' ', @name)" separator=", "/>)
-    {
-        <xsl:value-of select="@name"/> body = new <xsl:value-of select="@name"/>();
-        <xsl:for-each select="$f/field">
-            <xsl:value-of select="concat('body.', @name, ' = ', @name)"/>;
-        </xsl:for-each>		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 
 </xsl:template> 
 

Modified: incubator/activemq/sandbox/qpid/stylesheets/marshaller-java.xsl
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/stylesheets/marshaller-java.xsl?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/stylesheets/marshaller-java.xsl (original)
+++ incubator/activemq/sandbox/qpid/stylesheets/marshaller-java.xsl Fri Oct 13 08:49:22 2006
@@ -47,7 +47,7 @@
 <xsl:template name="generate-class"> 
 <xsl:param name="f"/>
 <xsl:value-of select="amq:copyright()"/>    
-package org.apache.activemq.qpid.marshaller.v<xsl:value-of select="$major"/>_<xsl:value-of
select="$minor"/>;
+package org.apache.activemq.qpid.wireformat.v<xsl:value-of select="$major"/>_<xsl:value-of
select="$minor"/>;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -55,12 +55,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 <xsl:value-of select="$f/parent::frames/@protocol"/>]
  */
-public class <xsl:value-of select="$f/@name"/>Marshaller extends AMQMethodBodyMarshaller
+public class <xsl:value-of select="$f/@name"/>Marshaller extends MethodBodyMarshaller
 { 
     public static final int CLASS_ID = <xsl:value-of select="$f/@class-id"/>; 	
     public static final int METHOD_ID = <xsl:value-of select="$f/@method-id"/>; 	
@@ -75,7 +75,11 @@
         return METHOD_ID;
     }
 
-    protected int getBodySize(AMQMethodBody o)
+	public MethodBody createBody() {
+		return new <xsl:value-of select="$f/@name"/>();
+	}
+
+    protected int getBodySize(MethodBody o)
     {
         <xsl:value-of select="$f/@name"/> object = (<xsl:value-of select="$f/@name"/>)o;
         <xsl:choose> 
@@ -92,7 +96,7 @@
         </xsl:choose> 
     }
 
-    protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
     {
         <xsl:value-of select="$f/@name"/> object = (<xsl:value-of select="$f/@name"/>)o;
         <xsl:for-each select="$f/field">
@@ -106,7 +110,7 @@
         </xsl:for-each>		 
     }
 
-    public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
     {
         <xsl:value-of select="$f/@name"/> object = (<xsl:value-of select="$f/@name"/>)o;
         <xsl:for-each select="$f/field">
@@ -134,7 +138,7 @@
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQMethodBody;
+import org.apache.qpid.framing.MethodBody;
 
 /**
  * This class is autogenerated, do not modify.
@@ -152,14 +156,14 @@
         </xsl:for-each>
     }
 
-    public static AMQMethodBody get(int clazz, int method) throws AMQFrameDecodingException
+    public static MethodBody get(int clazz, int method) throws AMQFrameDecodingException
     {
 	Class bodyClass = (Class) _classMethodProductToMethodBodyMap.get(new Integer(clazz * 1000
+ method));
 	if (bodyClass != null)
 	{
 	    try
 	    {
-	        return (AMQMethodBody) bodyClass.newInstance();
+	        return (MethodBody) bodyClass.newInstance();
 	    }
 	    catch (Exception e)
 	    {
@@ -185,16 +189,16 @@
     <xsl:result-document href="{$file}" format="textFormat">
     <xsl:value-of select="amq:copyright()"/>
 <!-- package org.apache.qpid.framing_<xsl:value-of select="$major"/>_<xsl:value-of
select="$minor"/>; -->
-package org.apache.activemq.qpid.marshaller.v<xsl:value-of select="$major"/>_<xsl:value-of
select="$minor"/>;
+package org.apache.activemq.qpid.wireformat.v<xsl:value-of select="$major"/>_<xsl:value-of
select="$minor"/>;
 
 import java.util.Map;
 
 /**
  * This class is autogenerated, do not modify. [From <xsl:value-of select="@protocol"/>]
  */
-class <xsl:value-of select="$registry_name"/>
+public class <xsl:value-of select="$registry_name"/>
 {
-    static void register(Map map)
+    public static void register(Map map)
     {
         <xsl:for-each select="frame">
             <xsl:text>map.put(new Integer(</xsl:text>



Mime
View raw message