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

svn commit: r468441 [2/6] - in /incubator/activemq/sandbox/qpid: ./ specs/ src/main/java/org/apache/activemq/amqp/broker/ src/main/java/org/apache/activemq/amqp/command/ src/main/java/org/apache/activemq/amqp/transport/ src/main/java/org/apache/activem...

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class DtxSelectBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class DtxSelectOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class DtxStartBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class DtxStartOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class ExchangeDeclareBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class ExchangeDeclareOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class ExchangeDeleteBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class ExchangeDeleteOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileAckBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileAckBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileAckBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileAckBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileAckBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileCancelBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileCancelOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileConsumeBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileConsumeOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileDeliverBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileDeliverBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileDeliverBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileDeliverBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileDeliverBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileOpenBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileOpenOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FilePublishBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FilePublishBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FilePublishBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FilePublishBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FilePublishBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileQosBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileQosOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileRejectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileRejectBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileRejectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileRejectBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileRejectBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileReturnBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileReturnBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileReturnBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileReturnBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileReturnBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileStageBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileStageBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileStageBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileStageBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class FileStageBody extends MethodBody
 { 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ProtocolInitiation.java (from r468417, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ProtocolInitiation.java?view=diff&rev=468441&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java&r1=468417&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ProtocolInitiation.java&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ProtocolInitiation.java Fri Oct 27 09:18:49 2006
@@ -15,14 +15,12 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.amqp.wireformat;
+package org.apache.activemq.amqp.command;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.amqp.command.AMQDataBlock;
-import org.apache.activemq.amqp.command.Visitor;
 
 import edu.emory.mathcs.backport.java.util.Arrays;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueueBindBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueueBindOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueueDeclareBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueueDeclareOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueueDeleteBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueueDeleteOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueuePurgeBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class QueuePurgeOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamCancelBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamCancelOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamConsumeBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamConsumeOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamDeliverBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamDeliverBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamDeliverBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamDeliverBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamDeliverBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamPublishBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamPublishBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamPublishBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamPublishBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamPublishBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamQosBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamQosOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamReturnBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamReturnBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamReturnBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamReturnBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class StreamReturnBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestContentBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestContentOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestIntegerBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestIntegerOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestStringBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestStringOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestTableBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TestTableOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TunnelRequestBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TunnelRequestBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TunnelRequestBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TunnelRequestBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TunnelRequestBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TxCommitBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TxCommitOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TxRollbackBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TxRollbackOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TxSelectBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectOkBody.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectOkBody.java Fri Oct 27 09:18:49 2006
@@ -18,10 +18,8 @@
     
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.*;
-
 /**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
  */
 public class TxSelectOkBody extends MethodBody
 { 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/Visitor.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/Visitor.java?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/Visitor.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/Visitor.java Fri Oct 27 09:18:49 2006
@@ -1,6 +1,5 @@
 package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.amqp.wireformat.ProtocolInitiation;
 
 public class Visitor {
 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpProxy.java (from r468417, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/Proxy.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpProxy.java?view=diff&rev=468441&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/Proxy.java&r1=468417&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpProxy.java&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/Proxy.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpProxy.java Fri Oct 27 09:18:49 2006
@@ -37,7 +37,7 @@
  * 
  * @author chirino
  */
-public class Proxy {
+public class AmqpProxy {
 	public static void main(String[] args) throws Exception {
 				
 		String bind = "qpid://localhost:5673";
@@ -56,8 +56,8 @@
 		connector.setRemote(new URI(proxy));
 		connector.start();
 		
-		synchronized(Proxy.class) {
-			Proxy.class.wait();
+		synchronized(AmqpProxy.class) {
+			AmqpProxy.class.wait();
 		}
 		
 	}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpServerTransportFilter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpServerTransportFilter.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpServerTransportFilter.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpServerTransportFilter.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,51 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.amqp.transport;
+
+import org.apache.activemq.amqp.command.AMQDataBlock;
+import org.apache.activemq.amqp.command.AccessRequestBody;
+import org.apache.activemq.amqp.command.Visitor;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportFilter;
+
+/**
+ * This filter should eventually translate the qpid command set to the ActiveMQ command set.
+ *  
+ * @author chirino
+ */
+public class AmqpServerTransportFilter extends TransportFilter {
+
+	public AmqpServerTransportFilter(Transport next) {
+		super(next);
+	}
+
+	public void onCommand(Object command) {
+		AMQDataBlock frame = (AMQDataBlock) command;
+		try {
+			frame.process(new Visitor() {
+				public Object processAccessRequestBody(AccessRequestBody body) throws Exception {
+					// TODO Auto-generated method stub
+					return super.processAccessRequestBody(body);
+				}
+			});
+		} catch (Exception e) {
+		}
+		super.onCommand(command);
+	}
+	
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpTransportFactory.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpTransportFactory.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpTransportFactory.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,69 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.amqp.transport;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.net.SocketFactory;
+
+import org.apache.activemq.amqp.wireformat.AmqpWireFormat;
+import org.apache.activemq.transport.MutexTransport;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.tcp.TcpTransport;
+import org.apache.activemq.transport.tcp.TcpTransportFactory;
+import org.apache.activemq.wireformat.WireFormat;
+
+/**
+ * A <a href="http://stomp.codehaus.org/">STOMP</a> transport factory
+ *
+ * @version $Revision: 1.1.1.1 $
+ */
+public class AmqpTransportFactory extends TcpTransportFactory {
+
+    protected String getDefaultWireFormatType() {
+        return "amqp";
+    }
+
+    
+    public Transport configure(Transport transport, WireFormat wf, Map options) throws Exception {
+    	((AmqpWireFormat)wf).setSendProtocolInitiation(true);
+    	((AmqpWireFormat)wf).setWaitForProtocolInitiation(false);    	
+    	transport = compositeConfigure(transport, wf, options);
+        transport = new MutexTransport(transport);
+        // transport = new ResponseCorrelator(transport);
+        return transport;
+    }
+    
+    public Transport serverConfigure(Transport transport, WireFormat wf, HashMap options) throws Exception {
+    	((AmqpWireFormat)wf).setSendProtocolInitiation(false);
+    	((AmqpWireFormat)wf).setWaitForProtocolInitiation(true);    	
+    	transport = compositeConfigure(transport, wf, options);    	
+    	transport = new AmqpServerTransportFilter(transport);
+        transport = new MutexTransport(transport);
+        return transport;
+    }
+
+    protected TcpTransport createTcpTransport(WireFormat wf, SocketFactory socketFactory, URI location, URI localLocation) throws UnknownHostException, IOException {
+    	return super.createTcpTransport(wf, socketFactory, location, localLocation);
+    }
+
+}
\ No newline at end of file

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,246 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.amqp.wireformat;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.activemq.amqp.command.AMQDataBlock;
+import org.apache.activemq.amqp.command.BasicConsumeBody;
+import org.apache.activemq.amqp.command.BasicContentHeaderProperties;
+import org.apache.activemq.amqp.command.CompositeAMQDataBlock;
+import org.apache.activemq.amqp.command.ContentBody;
+import org.apache.activemq.amqp.command.ContentHeaderBody;
+import org.apache.activemq.amqp.command.HeartbeatBody;
+import org.apache.activemq.amqp.command.MethodBody;
+import org.apache.activemq.amqp.command.ProtocolInitiation;
+import org.apache.activemq.amqp.wireformat.v0_80.EncodingUtils;
+import org.apache.activemq.amqp.wireformat.v0_80.MainRegistry;
+import org.apache.activemq.amqp.wireformat.v0_80.MethodBodyMarshaller;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.wireformat.WireFormat;
+
+/**
+ * Implements marshalling and unmarsalling to talk to Qpid clients.
+ */
+public class AmqpWireFormat implements WireFormat {
+	
+	private int version=8;
+	private int minorVersion=0;
+	
+	private final HashMap methodBodyMarshallers = new HashMap();
+	
+	private boolean sendProtocolInitiation = false;
+	private boolean waitForProtocolInitiation = true;
+
+	public int getVersion() {
+		return version;
+	}
+	public void setVersion(int version) {
+		this.version=version;
+	}
+	
+	public ByteSequence marshal(Object arg0) throws IOException {
+		throw new RuntimeException("Not implemented");
+	}
+	public Object unmarshal(ByteSequence arg0) throws IOException {
+		throw new RuntimeException("Not implemented");
+	}
+
+	public AmqpWireFormat () {
+		MainRegistry.register(methodBodyMarshallers);
+	}
+
+	private MethodBodyMarshaller getAMQMethodBodyMarshaller(int clazz, int method) {
+		return (MethodBodyMarshaller) methodBodyMarshallers.get(new Integer(clazz * 1000 + method));
+	}
+	
+	/////////////////////////////////////////////////////////////////////////
+	//
+	// HANDLE Marhsalling the Frame objects
+	//
+	/////////////////////////////////////////////////////////////////////////
+	public Object unmarshal(DataInputStream buffer) throws IOException {
+		
+		if( waitForProtocolInitiation ) {
+			ProtocolInitiation initiation = new ProtocolInitiation();
+			initiation.unmarshall(buffer);
+			waitForProtocolInitiation=false;
+			return initiation;
+		}
+
+		AMQDataBlock rc=null;
+        final byte type = buffer.readByte();
+        int channel = EncodingUtils.readUnsignedShort(buffer); 
+        final long length = EncodingUtils.readUnsignedInteger(buffer);
+        
+        switch( type ) {
+        case MethodBody.TYPE:        	
+            int clazz = EncodingUtils.readUnsignedShort(buffer);
+            int method = EncodingUtils.readUnsignedShort(buffer);
+            
+        	MethodBodyMarshaller marshaller = getAMQMethodBodyMarshaller(clazz, method);        	
+        	MethodBody methodBody = marshaller.createBody();
+            marshaller.populateFromBuffer(buffer, length, methodBody);
+            methodBody.channel=channel;
+            rc = methodBody;
+            break;
+            
+        case ContentHeaderBody.TYPE:
+        	ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
+        	
+        	contentHeaderBody.channel = channel;
+        	contentHeaderBody.classId = EncodingUtils.readUnsignedShort(buffer);
+        	contentHeaderBody.weight = EncodingUtils.readUnsignedShort(buffer);
+        	contentHeaderBody.bodySize = buffer.readLong();        	
+            
+            if(contentHeaderBody.classId != BasicConsumeBody.CLASS_ID) {
+    			throw new IOException("Unsupport content header class id: " + contentHeaderBody.classId);
+            }
+            
+            contentHeaderBody.properties = new BasicContentHeaderProperties();
+            EncodingUtils.unmarshalContentHeaderProperties(buffer, contentHeaderBody.properties);
+            
+            rc = contentHeaderBody;
+            break;
+        	        	
+        case ContentBody.TYPE:
+        	
+        	ContentBody contentBody = new ContentBody();        	
+            byte[] data = new byte [(int) length];            
+            buffer.readFully(data);
+            
+            contentBody.channel = channel;
+            contentBody.payload = new ByteSequence(data, 0, data.length);
+            rc = contentBody;
+            break;
+            
+        case HeartbeatBody.TYPE:
+        	HeartbeatBody heartbeatBody = new HeartbeatBody();
+            long size = EncodingUtils.readUnsignedInteger(buffer); // No payload
+            
+            if(size > 0)
+            {
+                //allow other implementations to have a payload, but ignore it:
+                buffer.skip((int) size);
+            }
+            heartbeatBody.channel = channel;
+            rc = heartbeatBody;
+            break;
+            
+        default:
+            throw new IOException("Unsupported frame type: " + type);
+        }
+                        
+        byte marker = buffer.readByte();
+        if ((marker & 0xFF) != 0xCE)
+        {
+            throw new IOException("End of frame marker not found. Read " + marker + " size=" + length + " type=" + type);
+        }
+        return rc;
+	}
+
+	
+	public void marshal(Object object, DataOutputStream buffer) throws IOException {
+		
+		if( sendProtocolInitiation ) {
+			
+			ProtocolInitiation initiation = new ProtocolInitiation(getVersion(), getMinorVersion());
+			initiation.marshall(buffer);
+			sendProtocolInitiation=false;
+			
+			if( object instanceof ProtocolInitiation ) {
+				return;
+			}
+		}
+		
+		// The CompositeAMQDataBlock is a bit special... 
+		if( object.getClass() == CompositeAMQDataBlock.class ) {
+			CompositeAMQDataBlock cdb = (CompositeAMQDataBlock)object;
+			AMQDataBlock[] blocks = cdb.getBlocks();
+			for (AMQDataBlock frame : blocks) {
+				marshal(frame, buffer);
+			}
+			return;
+		}
+			
+		AMQDataBlock frame = (AMQDataBlock) object;
+    	byte type = frame.getFrameType();    	
+        buffer.writeByte(type);
+        EncodingUtils.writeUnsignedShort(buffer, frame.channel);
+        
+        switch( type ) {
+        case MethodBody.TYPE:        	
+            MethodBody methodBody = (MethodBody) frame;
+        	MethodBodyMarshaller marshaller = getAMQMethodBodyMarshaller(methodBody.getClazz(), methodBody.getMethod());        	
+            EncodingUtils.writeUnsignedInteger(buffer, marshaller.getSize(methodBody));
+            EncodingUtils.writeUnsignedShort(buffer, methodBody.getClazz());
+            EncodingUtils.writeUnsignedShort(buffer, methodBody.getMethod());
+            marshaller.writeMethodPayload(buffer, methodBody);
+            break;
+        case ContentHeaderBody.TYPE:
+        	ContentHeaderBody contentHeaderBody = (ContentHeaderBody) frame;
+        	
+            EncodingUtils.writeUnsignedInteger(buffer, 2 + 2 + 8 + EncodingUtils.getContentHeaderPropertiesSize(contentHeaderBody.properties) );
+            EncodingUtils.writeUnsignedShort(buffer, contentHeaderBody.classId);
+            EncodingUtils.writeUnsignedShort(buffer, contentHeaderBody.weight);
+            buffer.writeLong(contentHeaderBody.bodySize);
+            EncodingUtils.marshalContentHeaderProperties(buffer, contentHeaderBody.properties);
+        	break;
+        	
+        case ContentBody.TYPE:
+        	ContentBody contentBody = (ContentBody) frame;
+            ByteSequence payload = contentBody.payload;
+            EncodingUtils.writeUnsignedInteger(buffer, payload.length );
+            buffer.write(payload.getData(), payload.getOffset(), payload.getLength());
+            break;
+            
+        case HeartbeatBody.TYPE:
+            EncodingUtils.writeUnsignedInteger(buffer, 0); // No payload
+            break;
+            
+        default:
+            throw new IOException("Unsupported frame type: " + type);
+        	
+        }
+        
+        buffer.writeByte((byte) 0xCE);
+    }
+	public boolean isSendProtocolInitiation() {
+		return sendProtocolInitiation;
+	}
+	public void setSendProtocolInitiation(boolean sendProtocolInitiation) {
+		this.sendProtocolInitiation = sendProtocolInitiation;
+	}
+	public boolean isWaitForProtocolInitiation() {
+		return waitForProtocolInitiation;
+	}
+	public void setWaitForProtocolInitiation(boolean waitForProtocolInitiation) {
+		this.waitForProtocolInitiation = waitForProtocolInitiation;
+	}
+	public int getMinorVersion() {
+		return minorVersion;
+	}
+	public void setMinorVersion(int minorVersion) {
+		this.minorVersion = minorVersion;
+	}
+	
+	
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,30 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.amqp.wireformat;
+
+import org.apache.activemq.wireformat.WireFormat;
+import org.apache.activemq.wireformat.WireFormatFactory;
+
+/**
+ * Creates WireFormat objects that marshalls the <a href="http://stomp.codehaus.org/">Stomp</a> protocol.
+ */
+public class AmqpWireFormatFactory implements WireFormatFactory {
+    public WireFormat createWireFormat() {
+        return new AmqpWireFormat();
+    }
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestBodyMarshaller.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestBodyMarshaller.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestBodyMarshaller.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,84 @@
+/**
+ *
+ * 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.amqp.wireformat.v0_80;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
+
+/**
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
+ */
+public class AccessRequestBodyMarshaller extends MethodBodyMarshaller
+{ 
+    public static final int CLASS_ID = 30; 	
+    public static final int METHOD_ID = 10; 	
+
+    protected int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    protected int getMethod()
+    {
+        return METHOD_ID;
+    }
+
+	public MethodBody createBody() {
+		return new AccessRequestBody();
+	}
+
+    protected int getBodySize(MethodBody o)
+    {
+        AccessRequestBody object = (AccessRequestBody)o;
+        
+        return
+        EncodingUtils.encodedShortStringLength(object.realm)+
+            1 /*exclusive*/+
+            0 /*passive*/+
+            0 /*active*/+
+            0 /*write*/+
+            0 /*read*/		 
+        ;
+         
+    }
+
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
+    {
+        AccessRequestBody object = (AccessRequestBody)o;
+        EncodingUtils.writeShortStringBytes(buffer, object.realm);
+            EncodingUtils.writeBooleans(buffer, new boolean[]{ object.exclusive, object.passive, object.active, object.write, object.read});
+            		 
+    }
+
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
+    {
+        AccessRequestBody object = (AccessRequestBody)o;
+        object.realm = EncodingUtils.readShortString(buffer);
+        boolean[] bools = EncodingUtils.readBooleans(buffer);object.exclusive = bools[0];
+        object.passive = bools[1];
+        object.active = bools[2];
+        object.write = bools[3];
+        object.read = bools[4];
+        		 
+    }
+} 

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestOkBodyMarshaller.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestOkBodyMarshaller.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestOkBodyMarshaller.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,73 @@
+/**
+ *
+ * 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.amqp.wireformat.v0_80;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
+
+/**
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
+ */
+public class AccessRequestOkBodyMarshaller extends MethodBodyMarshaller
+{ 
+    public static final int CLASS_ID = 30; 	
+    public static final int METHOD_ID = 11; 	
+
+    protected int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    protected int getMethod()
+    {
+        return METHOD_ID;
+    }
+
+	public MethodBody createBody() {
+		return new AccessRequestOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
+    {
+        AccessRequestOkBody object = (AccessRequestOkBody)o;
+        
+        return
+        2 /*ticket*/		 
+        ;
+         
+    }
+
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
+    {
+        AccessRequestOkBody object = (AccessRequestOkBody)o;
+        EncodingUtils.writeUnsignedShort(buffer, object.ticket);
+            		 
+    }
+
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
+    {
+        AccessRequestOkBody object = (AccessRequestOkBody)o;
+        object.ticket = EncodingUtils.readUnsignedShort(buffer);
+        		 
+    }
+} 

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicAckBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicAckBodyMarshaller.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicAckBodyMarshaller.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicAckBodyMarshaller.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,76 @@
+/**
+ *
+ * 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.amqp.wireformat.v0_80;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
+
+/**
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
+ */
+public class BasicAckBodyMarshaller extends MethodBodyMarshaller
+{ 
+    public static final int CLASS_ID = 60; 	
+    public static final int METHOD_ID = 80; 	
+
+    protected int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    protected int getMethod()
+    {
+        return METHOD_ID;
+    }
+
+	public MethodBody createBody() {
+		return new BasicAckBody();
+	}
+
+    protected int getBodySize(MethodBody o)
+    {
+        BasicAckBody object = (BasicAckBody)o;
+        
+        return
+        8 /*deliveryTag*/+
+            1 /*multiple*/		 
+        ;
+         
+    }
+
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
+    {
+        BasicAckBody object = (BasicAckBody)o;
+        buffer.writeLong(object.deliveryTag);
+            EncodingUtils.writeBooleans(buffer, new boolean[]{ object.multiple});
+            		 
+    }
+
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
+    {
+        BasicAckBody object = (BasicAckBody)o;
+        object.deliveryTag = buffer.readLong();
+        boolean[] bools = EncodingUtils.readBooleans(buffer);object.multiple = bools[0];
+        		 
+    }
+} 

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelBodyMarshaller.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelBodyMarshaller.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelBodyMarshaller.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,76 @@
+/**
+ *
+ * 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.amqp.wireformat.v0_80;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
+
+/**
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
+ */
+public class BasicCancelBodyMarshaller extends MethodBodyMarshaller
+{ 
+    public static final int CLASS_ID = 60; 	
+    public static final int METHOD_ID = 30; 	
+
+    protected int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    protected int getMethod()
+    {
+        return METHOD_ID;
+    }
+
+	public MethodBody createBody() {
+		return new BasicCancelBody();
+	}
+
+    protected int getBodySize(MethodBody o)
+    {
+        BasicCancelBody object = (BasicCancelBody)o;
+        
+        return
+        EncodingUtils.encodedShortStringLength(object.consumerTag)+
+            1 /*nowait*/		 
+        ;
+         
+    }
+
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
+    {
+        BasicCancelBody object = (BasicCancelBody)o;
+        EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
+            EncodingUtils.writeBooleans(buffer, new boolean[]{ object.nowait});
+            		 
+    }
+
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
+    {
+        BasicCancelBody object = (BasicCancelBody)o;
+        object.consumerTag = EncodingUtils.readShortString(buffer);
+        boolean[] bools = EncodingUtils.readBooleans(buffer);object.nowait = bools[0];
+        		 
+    }
+} 

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelOkBodyMarshaller.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelOkBodyMarshaller.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelOkBodyMarshaller.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,73 @@
+/**
+ *
+ * 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.amqp.wireformat.v0_80;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
+
+/**
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
+ */
+public class BasicCancelOkBodyMarshaller extends MethodBodyMarshaller
+{ 
+    public static final int CLASS_ID = 60; 	
+    public static final int METHOD_ID = 31; 	
+
+    protected int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    protected int getMethod()
+    {
+        return METHOD_ID;
+    }
+
+	public MethodBody createBody() {
+		return new BasicCancelOkBody();
+	}
+
+    protected int getBodySize(MethodBody o)
+    {
+        BasicCancelOkBody object = (BasicCancelOkBody)o;
+        
+        return
+        EncodingUtils.encodedShortStringLength(object.consumerTag)		 
+        ;
+         
+    }
+
+    public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
+    {
+        BasicCancelOkBody object = (BasicCancelOkBody)o;
+        EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
+            		 
+    }
+
+    public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
+    {
+        BasicCancelOkBody object = (BasicCancelOkBody)o;
+        object.consumerTag = EncodingUtils.readShortString(buffer);
+        		 
+    }
+}