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 17:27:30 UTC

svn commit: r468414 [2/7] - in /incubator/activemq/sandbox/qpid/src/main/java/org/apache: activemq/amqp/ activemq/amqp/broker/ activemq/amqp/command/ activemq/amqp/transport/ activemq/amqp/wireformat/ activemq/amqp/wireformat/v8_0/ activemq/qpid/broker...

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FieldTable.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FieldTable.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FieldTable.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FieldTable.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import java.util.LinkedHashMap;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/HeartbeatBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/HeartbeatBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/HeartbeatBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/HeartbeatBody.java Fri Oct 27 08:27:20 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
-public class HeartbeatBody extends Frame
+public class HeartbeatBody extends AMQDataBlock
 {
     public static final byte TYPE = 8;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/MethodBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/MethodBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/MethodBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/MethodBody.java Fri Oct 27 08:27:20 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
-public abstract class MethodBody extends Frame
+public abstract class MethodBody extends AMQDataBlock
 {
     public static final byte TYPE = 1;    
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

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=468414&r1=468132&r2=468414
==============================================================================
--- 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 08:27:20 2006
@@ -1,287 +1,287 @@
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.wireformat.ProtocolInitiation;
+import org.apache.activemq.amqp.wireformat.ProtocolInitiation;
 
 public class Visitor {
 
 	public Object processAccessRequestBody(AccessRequestBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processAccessRequestOkBody(AccessRequestOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueueBindOkBody(QueueBindOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueuePurgeBody(QueuePurgeBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamConsumeOkBody(StreamConsumeOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamQosBody(StreamQosBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestContentOkBody(TestContentOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestTableBody(TestTableBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestTableOkBody(TestTableOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTxRollbackOkBody(TxRollbackOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamCancelBody(StreamCancelBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueuePurgeOkBody(QueuePurgeOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueueDeleteBody(QueueDeleteBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueueDeclareBody(QueueDeclareBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueueBindBody(QueueBindBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTxCommitBody(TxCommitBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTxCommitOkBody(TxCommitOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTxRollbackBody(TxRollbackBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTxSelectBody(TxSelectBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTxSelectOkBody(TxSelectOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicAckBody(BasicAckBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicCancelBody(BasicCancelBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileStageBody(FileStageBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileReturnBody(FileReturnBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileQosOkBody(FileQosOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestIntegerOkBody(TestIntegerOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamPublishBody(StreamPublishBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamDeliverBody(StreamDeliverBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueueDeleteOkBody(QueueDeleteOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamQosOkBody(StreamQosOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamCancelOkBody(StreamCancelOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamConsumeBody(StreamConsumeBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processQueueDeclareOkBody(QueueDeclareOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileRejectBody(FileRejectBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileQosBody(FileQosBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFilePublishBody(FilePublishBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTunnelRequestBody(TunnelRequestBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestStringOkBody(TestStringOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestStringBody(TestStringBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestIntegerBody(TestIntegerBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processTestContentBody(TestContentBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processStreamReturnBody(StreamReturnBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicCancelOkBody(BasicCancelOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicDeliverBody(BasicDeliverBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicConsumeOkBody(BasicConsumeOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicConsumeBody(BasicConsumeBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicGetBody(BasicGetBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelOpenBody(ChannelOpenBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicGetEmptyBody(BasicGetEmptyBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicGetOkBody(BasicGetOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicPublishBody(BasicPublishBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicQosBody(BasicQosBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicQosOkBody(BasicQosOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicRecoverBody(BasicRecoverBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicRejectBody(BasicRejectBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processBasicReturnBody(BasicReturnBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelAlertBody(ChannelAlertBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelCloseBody(ChannelCloseBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelCloseOkBody(ChannelCloseOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelFlowBody(ChannelFlowBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelFlowOkBody(ChannelFlowOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processChannelOpenOkBody(ChannelOpenOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionCloseBody(ConnectionCloseBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionCloseOkBody(ConnectionCloseOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionOpenBody(ConnectionOpenBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionOpenOkBody(ConnectionOpenOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileAckBody(FileAckBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileCancelBody(FileCancelBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileCancelOkBody(FileCancelOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileConsumeBody(FileConsumeBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileConsumeOkBody(FileConsumeOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileDeliverBody(FileDeliverBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileOpenOkBody(FileOpenOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processFileOpenBody(FileOpenBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processDtxSelectBody(DtxSelectBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processDtxSelectOkBody(DtxSelectOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processDtxStartBody(DtxStartBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processDtxStartOkBody(DtxStartOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processExchangeDeclareBody(ExchangeDeclareBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processExchangeDeclareOkBody(ExchangeDeclareOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processExchangeDeleteBody(ExchangeDeleteBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processExchangeDeleteOkBody(ExchangeDeleteOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionRedirectBody(ConnectionRedirectBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionSecureBody(ConnectionSecureBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionSecureOkBody(ConnectionSecureOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionStartBody(ConnectionStartBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionStartOkBody(ConnectionStartOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionTuneBody(ConnectionTuneBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processConnectionTuneOkBody(ConnectionTuneOkBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processHeartbeatBody(HeartbeatBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processContentHeaderBody(ContentHeaderBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processContentBody(ContentBody body) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	public Object processProtocolInitiation(ProtocolInitiation initiation) throws Exception {
-		return null;
+		throw new Exception("Invalid opperation");
 	}
 	
 }

Modified: 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/Proxy.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- 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/Proxy.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.transport;
+package org.apache.activemq.amqp.transport;
 
 import java.net.URI;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidServerTransportFilter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidServerTransportFilter.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidServerTransportFilter.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidServerTransportFilter.java Fri Oct 27 08:27:20 2006
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.qpid.transport;
+package org.apache.activemq.amqp.transport;
 
-import org.apache.activemq.qpid.command.AccessRequestBody;
-import org.apache.activemq.qpid.command.Frame;
-import org.apache.activemq.qpid.command.Visitor;
+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;
 
@@ -35,7 +35,7 @@
 	}
 
 	public void onCommand(Object command) {
-		Frame frame = (Frame) command;
+		AMQDataBlock frame = (AMQDataBlock) command;
 		try {
 			frame.process(new Visitor() {
 				public Object processAccessRequestBody(AccessRequestBody body) throws Exception {

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidTransportFactory.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidTransportFactory.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidTransportFactory.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.qpid.transport;
+package org.apache.activemq.amqp.transport;
 
 import java.io.IOException;
 import java.net.URI;
@@ -25,7 +25,7 @@
 
 import javax.net.SocketFactory;
 
-import org.apache.activemq.qpid.wireformat.QpidWireFormat;
+import org.apache.activemq.amqp.wireformat.QpidWireFormat;
 import org.apache.activemq.transport.MutexTransport;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.tcp.TcpTransport;

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/EncodingUtils.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/EncodingUtils.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/EncodingUtils.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/EncodingUtils.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.wireformat;
+package org.apache.activemq.amqp.wireformat;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,8 +24,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.activemq.qpid.command.ContentHeaderProperties;
-import org.apache.activemq.qpid.command.FieldTable;
+import org.apache.activemq.amqp.command.BasicContentHeaderProperties;
+import org.apache.activemq.amqp.command.FieldTable;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -705,7 +705,7 @@
     static final int APP_ID_FLAG = 1 << 3;
     static final int CLUSTER_ID_FLAG = 1 << 2;
 
-    static int getContentHeaderPropertiesSize(ContentHeaderProperties properties) {
+    static int getContentHeaderPropertiesSize(BasicContentHeaderProperties properties) {
         int size = 2;        
         if( properties.contentType != null ) {        	
         	size += EncodingUtils.encodedShortStringLength(properties.contentType);
@@ -753,7 +753,7 @@
         return size;
 	}
 		
-    static public void marshalContentHeaderProperties(DataOutput buffer, ContentHeaderProperties properties) throws IOException
+    static public void marshalContentHeaderProperties(DataOutput buffer, BasicContentHeaderProperties properties) throws IOException
     {
     	int propertyFlags=0;
         if( properties.contentType != null ) {        	
@@ -845,7 +845,7 @@
         }
     }
     
-    static public void unmarshalContentHeaderProperties(DataInput buffer, ContentHeaderProperties properties) throws IOException
+    static public void unmarshalContentHeaderProperties(DataInput buffer, BasicContentHeaderProperties properties) throws IOException
     {
     	int propertyFlags = EncodingUtils.readUnsignedShort(buffer);
 

Propchange: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/EncodingUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/ProtocolInitiation.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/ProtocolInitiation.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/ProtocolInitiation.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java Fri Oct 27 08:27:20 2006
@@ -15,18 +15,18 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.wireformat;
+package org.apache.activemq.amqp.wireformat;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.qpid.command.Frame;
-import org.apache.activemq.qpid.command.Visitor;
+import org.apache.activemq.amqp.command.AMQDataBlock;
+import org.apache.activemq.amqp.command.Visitor;
 
 import edu.emory.mathcs.backport.java.util.Arrays;
 
-public class ProtocolInitiation extends Frame
+public class ProtocolInitiation extends AMQDataBlock
 {
     static public byte[] MAGIC = new byte[]{'A','M','Q','P'};
 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormat.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormat.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormat.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormat.java Fri Oct 27 08:27:20 2006
@@ -15,23 +15,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.qpid.wireformat;
+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.qpid.broker.queue.CompositeAMQDataBlock;
-import org.apache.activemq.qpid.command.BasicConsumeBody;
-import org.apache.activemq.qpid.command.ContentBody;
-import org.apache.activemq.qpid.command.ContentHeaderBody;
-import org.apache.activemq.qpid.command.ContentHeaderProperties;
-import org.apache.activemq.qpid.command.Frame;
-import org.apache.activemq.qpid.command.HeartbeatBody;
-import org.apache.activemq.qpid.command.MethodBody;
-import org.apache.activemq.qpid.wireformat.v8_0.MainRegistry;
-import org.apache.activemq.qpid.wireformat.v8_0.MethodBodyMarshaller;
+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.wireformat.v8_0.MainRegistry;
+import org.apache.activemq.amqp.wireformat.v8_0.MethodBodyMarshaller;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
 
@@ -84,7 +84,7 @@
 			return initiation;
 		}
 
-		Frame rc=null;
+		AMQDataBlock rc=null;
         final byte type = buffer.readByte();
         int channel = EncodingUtils.readUnsignedShort(buffer); 
         final long length = EncodingUtils.readUnsignedInteger(buffer);
@@ -113,7 +113,7 @@
     			throw new IOException("Unsupport content header class id: " + contentHeaderBody.classId);
             }
             
-            contentHeaderBody.properties = new ContentHeaderProperties();
+            contentHeaderBody.properties = new BasicContentHeaderProperties();
             EncodingUtils.unmarshalContentHeaderProperties(buffer, contentHeaderBody.properties);
             
             rc = contentHeaderBody;
@@ -172,14 +172,14 @@
 		// The CompositeAMQDataBlock is a bit special... 
 		if( object.getClass() == CompositeAMQDataBlock.class ) {
 			CompositeAMQDataBlock cdb = (CompositeAMQDataBlock)object;
-			Frame[] blocks = cdb.getBlocks();
-			for (Frame frame : blocks) {
+			AMQDataBlock[] blocks = cdb.getBlocks();
+			for (AMQDataBlock frame : blocks) {
 				marshal(frame, buffer);
 			}
 			return;
 		}
 			
-		Frame frame = (Frame) object;
+		AMQDataBlock frame = (AMQDataBlock) object;
     	byte type = frame.getFrameType();    	
         buffer.writeByte(type);
         EncodingUtils.writeUnsignedShort(buffer, frame.channel);

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormatFactory.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormatFactory.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormatFactory.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormatFactory.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.qpid.wireformat;
+package org.apache.activemq.amqp.wireformat;
 
 import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestOkBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestOkBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicAckBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicAckBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicAckBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicAckBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelOkBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelOkBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicDeliverBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicDeliverBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicDeliverBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicDeliverBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetOkBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetOkBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicPublishBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicPublishBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicPublishBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicPublishBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosOkBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosOkBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosOkBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicRecoverBodyMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicRecoverBodyMarshaller.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicRecoverBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicRecoverBodyMarshaller.java Fri Oct 27 08:27:20 2006
@@ -16,15 +16,15 @@
  *
  */
     
-package org.apache.activemq.qpid.wireformat.v8_0;
+package org.apache.activemq.amqp.wireformat.v8_0;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import org.apache.activemq.amqp.command.*;
+import org.apache.activemq.amqp.wireformat.*;
 import org.apache.activemq.qpid.*;
-import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.wireformat.*;
 
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]