activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r463716 [2/6] - in /incubator/activemq/sandbox/qpid: ./ src/main/java/org/apache/activemq/qpid/ src/main/java/org/apache/activemq/qpid/command/ src/main/java/org/apache/activemq/qpid/marshaller/v8_0/ src/main/java/org/apache/activemq/qpid/t...
Date Fri, 13 Oct 2006 15:49:30 GMT
Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionSecureOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionSecureOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionSecureOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionSecureOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionSecureOkBody extends AMQMethodBody
+public class ConnectionSecureOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 10; 	
+    public static final int METHOD_ID = 21; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public byte[] response;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, byte[] response)
-    {
-        ConnectionSecureOkBody body = new ConnectionSecureOkBody();
-        body.response = response;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionStartBody extends AMQMethodBody
+public class ConnectionStartBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 10; 	
+    public static final int METHOD_ID = 10; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public short versionMajor;    
     public short versionMinor;    
     public FieldTable serverProperties;    
@@ -43,19 +57,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, short versionMajor, short versionMinor, FieldTable serverProperties, byte[] mechanisms, byte[] locales)
-    {
-        ConnectionStartBody body = new ConnectionStartBody();
-        body.versionMajor = versionMajor;
-        body.versionMinor = versionMinor;
-        body.serverProperties = serverProperties;
-        body.mechanisms = mechanisms;
-        body.locales = locales;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionStartOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionStartOkBody extends AMQMethodBody
+public class ConnectionStartOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 10; 	
+    public static final int METHOD_ID = 11; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public FieldTable clientProperties;    
     public String mechanism;    
     public byte[] response;    
@@ -41,18 +55,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, FieldTable clientProperties, String mechanism, byte[] response, String locale)
-    {
-        ConnectionStartOkBody body = new ConnectionStartOkBody();
-        body.clientProperties = clientProperties;
-        body.mechanism = mechanism;
-        body.response = response;
-        body.locale = locale;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionTuneBody extends AMQMethodBody
+public class ConnectionTuneBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 10; 	
+    public static final int METHOD_ID = 30; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int channelMax;    
     public long frameMax;    
     public int heartbeat;    
@@ -39,17 +53,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int channelMax, long frameMax, int heartbeat)
-    {
-        ConnectionTuneBody body = new ConnectionTuneBody();
-        body.channelMax = channelMax;
-        body.frameMax = frameMax;
-        body.heartbeat = heartbeat;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ConnectionTuneOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ConnectionTuneOkBody extends AMQMethodBody
+public class ConnectionTuneOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 10; 	
+    public static final int METHOD_ID = 31; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int channelMax;    
     public long frameMax;    
     public int heartbeat;    
@@ -39,17 +53,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int channelMax, long frameMax, int heartbeat)
-    {
-        ConnectionTuneOkBody body = new ConnectionTuneOkBody();
-        body.channelMax = channelMax;
-        body.frameMax = frameMax;
-        body.heartbeat = heartbeat;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentBody.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentBody.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentBody.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,32 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.command;
+
+import org.apache.activemq.util.ByteSequence;
+
+public class ContentBody extends Frame
+{
+    public static final byte TYPE = 3;
+    public ByteSequence payload;
+
+    public byte getType()
+    {
+        return TYPE;
+    }
+
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderBody.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderBody.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderBody.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,59 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.command;
+
+
+public class ContentHeaderBody extends Frame
+{
+    public static final byte TYPE = 2;
+    public int classId;
+    public int weight;
+    /** unsigned long but java can't handle that anyway when allocating byte array */
+    public long bodySize;
+    /** must never be null */
+    public ContentHeaderProperties properties;
+        
+    public byte getType()
+    {
+        return TYPE;
+    }
+
+    public ContentHeaderBody()
+    {
+    }
+
+    public ContentHeaderBody(ContentHeaderProperties props, int classId)
+    {
+        properties = props;
+        this.classId = classId;
+    }
+
+    public ContentHeaderBody(int classId, int weight, ContentHeaderProperties props, long bodySize)
+    {
+        this(props, classId);
+        this.weight = weight;
+        this.bodySize = bodySize;
+    }
+
+//
+//    public int getSize()
+//    {
+//        return 2 + 2 + 8 + 2 + properties.getPropertyListSize();
+//    }
+
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,187 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.command;
+
+
+public class ContentHeaderProperties 
+{	
+    public String contentType;
+    public String encoding;
+    public FieldTable headers;
+    public byte deliveryMode;
+    public byte priority;
+    public String correlationId;
+    public String replyTo;
+    public long expiration;
+    public String messageId;
+    public long timestamp;
+    public String type;
+    public String userId;
+    public String appId;
+    public String clusterId;
+
+    public ContentHeaderProperties()
+    {
+    }
+
+    public String getContentType()
+    {
+        return contentType;
+    }
+
+    public void setContentType(String contentType)
+    {
+    	this.contentType = contentType;
+    }
+
+    public String getEncoding()
+    {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding)
+    {
+    	this.encoding = encoding;
+    }
+
+    public FieldTable getHeaders()
+    {
+        return headers;
+    }
+
+    public void setHeaders(FieldTable headers)
+    {
+    	this.headers = headers;
+    }
+
+    public byte getDeliveryMode()
+    {
+        return deliveryMode;
+    }
+
+    public void setDeliveryMode(byte deliveryMode)
+    {
+    	this.deliveryMode = deliveryMode;
+    }
+
+    public byte getPriority()
+    {
+        return priority;
+    }
+
+    public void setPriority(byte priority)
+    {
+    	this.priority = priority;
+    }
+
+    public String getCorrelationId()
+    {
+        return correlationId;
+    }
+
+    public void setCorrelationId(String correlationId)
+    {
+    	this.correlationId = correlationId;
+    }
+
+    public String getReplyTo()
+    {
+        return replyTo;
+    }
+
+    public void setReplyTo(String replyTo)
+    {
+    	this.replyTo = replyTo;
+    }
+
+    public long getExpiration()
+    {
+        return expiration;
+    }
+
+    public void setExpiration(long expiration)
+    {
+    	this.expiration = expiration;
+    }
+
+
+    public String getMessageId()
+    {
+        return messageId;
+    }
+
+    public void setMessageId(String messageId)
+    {
+    	this.messageId = messageId;
+    }
+
+    public long getTimestamp()
+    {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp)
+    {
+    	this.timestamp = timestamp;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(String userId)
+    {
+    	this.userId = userId;
+    }
+
+    public String getAppId()
+    {
+        return appId;
+    }
+
+    public void setAppId(String appId)
+    {
+    	this.appId = appId;
+    }
+
+    public String getClusterId()
+    {
+        return clusterId;
+    }
+
+    public void setClusterId(String clusterId)
+    {
+    	this.clusterId = clusterId;
+    }
+
+    public String toString()
+    {
+        return "reply-to = " + replyTo;   
+    }
+}

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxSelectBody extends AMQMethodBody
+public class DtxSelectBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 100; 	
+    public static final int METHOD_ID = 10; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        DtxSelectBody body = new DtxSelectBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxSelectOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxSelectOkBody extends AMQMethodBody
+public class DtxSelectOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 100; 	
+    public static final int METHOD_ID = 11; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        DtxSelectOkBody body = new DtxSelectOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxStartBody extends AMQMethodBody
+public class DtxStartBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 100; 	
+    public static final int METHOD_ID = 20; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String dtxIdentifier;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String dtxIdentifier)
-    {
-        DtxStartBody body = new DtxStartBody();
-        body.dtxIdentifier = dtxIdentifier;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/DtxStartOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class DtxStartOkBody extends AMQMethodBody
+public class DtxStartOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 100; 	
+    public static final int METHOD_ID = 21; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        DtxStartOkBody body = new DtxStartOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeclareBody extends AMQMethodBody
+public class ExchangeDeclareBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 40; 	
+    public static final int METHOD_ID = 10; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String exchange;    
     public String type;    
@@ -51,23 +65,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String exchange, String type, boolean passive, boolean durable, boolean autoDelete, boolean internal, boolean nowait, FieldTable arguments)
-    {
-        ExchangeDeclareBody body = new ExchangeDeclareBody();
-        body.ticket = ticket;
-        body.exchange = exchange;
-        body.type = type;
-        body.passive = passive;
-        body.durable = durable;
-        body.autoDelete = autoDelete;
-        body.internal = internal;
-        body.nowait = nowait;
-        body.arguments = arguments;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeclareOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeclareOkBody extends AMQMethodBody
+public class ExchangeDeclareOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 40; 	
+    public static final int METHOD_ID = 11; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        ExchangeDeclareOkBody body = new ExchangeDeclareOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeleteBody extends AMQMethodBody
+public class ExchangeDeleteBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 40; 	
+    public static final int METHOD_ID = 20; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String exchange;    
     public boolean ifUnused;    
@@ -41,18 +55,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String exchange, boolean ifUnused, boolean nowait)
-    {
-        ExchangeDeleteBody body = new ExchangeDeleteBody();
-        body.ticket = ticket;
-        body.exchange = exchange;
-        body.ifUnused = ifUnused;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ExchangeDeleteOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class ExchangeDeleteOkBody extends AMQMethodBody
+public class ExchangeDeleteOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 40; 	
+    public static final int METHOD_ID = 21; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        ExchangeDeleteOkBody body = new ExchangeDeleteOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FieldTable.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/FieldTable.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FieldTable.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/FieldTable.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FieldTable.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/FieldTable.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FieldTable.java Fri Oct 13 08:49:22 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid;
+package org.apache.activemq.qpid.command;
 
 import java.util.LinkedHashMap;
 

Propchange: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FieldTable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileAckBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileAckBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileAckBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileAckBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileAckBody extends AMQMethodBody
+public class FileAckBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 90; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long deliveryTag;    
     public boolean multiple;    
      
@@ -37,16 +51,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long deliveryTag, boolean multiple)
-    {
-        FileAckBody body = new FileAckBody();
-        body.deliveryTag = deliveryTag;
-        body.multiple = multiple;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileCancelBody extends AMQMethodBody
+public class FileCancelBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 30; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
     public boolean nowait;    
      
@@ -37,16 +51,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag, boolean nowait)
-    {
-        FileCancelBody body = new FileCancelBody();
-        body.consumerTag = consumerTag;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileCancelOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileCancelOkBody extends AMQMethodBody
+public class FileCancelOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 31; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag)
-    {
-        FileCancelOkBody body = new FileCancelOkBody();
-        body.consumerTag = consumerTag;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileConsumeBody extends AMQMethodBody
+public class FileConsumeBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 20; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String queue;    
     public String consumerTag;    
@@ -47,21 +61,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String queue, String consumerTag, boolean noLocal, boolean noAck, boolean exclusive, boolean nowait)
-    {
-        FileConsumeBody body = new FileConsumeBody();
-        body.ticket = ticket;
-        body.queue = queue;
-        body.consumerTag = consumerTag;
-        body.noLocal = noLocal;
-        body.noAck = noAck;
-        body.exclusive = exclusive;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileConsumeOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileConsumeOkBody extends AMQMethodBody
+public class FileConsumeOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 21; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag)
-    {
-        FileConsumeOkBody body = new FileConsumeOkBody();
-        body.consumerTag = consumerTag;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileDeliverBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileDeliverBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileDeliverBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileDeliverBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileDeliverBody extends AMQMethodBody
+public class FileDeliverBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 80; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
     public long deliveryTag;    
     public boolean redelivered;    
@@ -45,20 +59,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag, long deliveryTag, boolean redelivered, String exchange, String routingKey, String identifier)
-    {
-        FileDeliverBody body = new FileDeliverBody();
-        body.consumerTag = consumerTag;
-        body.deliveryTag = deliveryTag;
-        body.redelivered = redelivered;
-        body.exchange = exchange;
-        body.routingKey = routingKey;
-        body.identifier = identifier;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileOpenBody extends AMQMethodBody
+public class FileOpenBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 40; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String identifier;    
     public long contentSize;    
      
@@ -37,16 +51,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String identifier, long contentSize)
-    {
-        FileOpenBody body = new FileOpenBody();
-        body.identifier = identifier;
-        body.contentSize = contentSize;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileOpenOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileOpenOkBody extends AMQMethodBody
+public class FileOpenOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 41; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long stagedSize;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long stagedSize)
-    {
-        FileOpenOkBody body = new FileOpenOkBody();
-        body.stagedSize = stagedSize;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FilePublishBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FilePublishBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FilePublishBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FilePublishBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FilePublishBody extends AMQMethodBody
+public class FilePublishBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 60; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String exchange;    
     public String routingKey;    
@@ -45,20 +59,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String exchange, String routingKey, boolean mandatory, boolean immediate, String identifier)
-    {
-        FilePublishBody body = new FilePublishBody();
-        body.ticket = ticket;
-        body.exchange = exchange;
-        body.routingKey = routingKey;
-        body.mandatory = mandatory;
-        body.immediate = immediate;
-        body.identifier = identifier;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileQosBody extends AMQMethodBody
+public class FileQosBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 10; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long prefetchSize;    
     public int prefetchCount;    
     public boolean global;    
@@ -39,17 +53,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long prefetchSize, int prefetchCount, boolean global)
-    {
-        FileQosBody body = new FileQosBody();
-        body.prefetchSize = prefetchSize;
-        body.prefetchCount = prefetchCount;
-        body.global = global;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileQosOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileQosOkBody extends AMQMethodBody
+public class FileQosOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 11; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        FileQosOkBody body = new FileQosOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileRejectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileRejectBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileRejectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileRejectBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileRejectBody extends AMQMethodBody
+public class FileRejectBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 100; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long deliveryTag;    
     public boolean requeue;    
      
@@ -37,16 +51,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long deliveryTag, boolean requeue)
-    {
-        FileRejectBody body = new FileRejectBody();
-        body.deliveryTag = deliveryTag;
-        body.requeue = requeue;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileReturnBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileReturnBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileReturnBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileReturnBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileReturnBody extends AMQMethodBody
+public class FileReturnBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 70; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int replyCode;    
     public String replyText;    
     public String exchange;    
@@ -41,18 +55,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int replyCode, String replyText, String exchange, String routingKey)
-    {
-        FileReturnBody body = new FileReturnBody();
-        body.replyCode = replyCode;
-        body.replyText = replyText;
-        body.exchange = exchange;
-        body.routingKey = routingKey;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileStageBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileStageBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileStageBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/FileStageBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class FileStageBody extends AMQMethodBody
+public class FileStageBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 70; 	
+    public static final int METHOD_ID = 50; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        FileStageBody body = new FileStageBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,25 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.command;
+
+
+public abstract class Frame
+{
+    public int channel;
+    public abstract byte getType();    
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/HeartbeatBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/HeartbeatBody.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/HeartbeatBody.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/HeartbeatBody.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,29 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.command;
+
+public class HeartbeatBody extends Frame
+{
+    public static final byte TYPE = 8;
+
+    public byte getType()
+    {
+        return TYPE;
+    }
+
+}

Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/MethodBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/MethodBody.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/MethodBody.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/MethodBody.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,38 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.activemq.qpid.command;
+
+public abstract class MethodBody extends Frame
+{
+    public static final byte TYPE = 1;    
+
+	public byte getType() {
+		return TYPE;
+	}
+	
+    /**
+     * @return unsigned short
+     */
+    public abstract int getClazz();
+
+    /**
+     * @return unsigned short
+     */
+    public abstract int getMethod();
+
+}

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueueBindBody extends AMQMethodBody
+public class QueueBindBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 20; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String queue;    
     public String exchange;    
@@ -45,20 +59,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String queue, String exchange, String routingKey, boolean nowait, FieldTable arguments)
-    {
-        QueueBindBody body = new QueueBindBody();
-        body.ticket = ticket;
-        body.queue = queue;
-        body.exchange = exchange;
-        body.routingKey = routingKey;
-        body.nowait = nowait;
-        body.arguments = arguments;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueBindOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueueBindOkBody extends AMQMethodBody
+public class QueueBindOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 21; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        QueueBindOkBody body = new QueueBindOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueueDeclareBody extends AMQMethodBody
+public class QueueDeclareBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 10; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String queue;    
     public boolean passive;    
@@ -49,22 +63,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String queue, boolean passive, boolean durable, boolean exclusive, boolean autoDelete, boolean nowait, FieldTable arguments)
-    {
-        QueueDeclareBody body = new QueueDeclareBody();
-        body.ticket = ticket;
-        body.queue = queue;
-        body.passive = passive;
-        body.durable = durable;
-        body.exclusive = exclusive;
-        body.autoDelete = autoDelete;
-        body.nowait = nowait;
-        body.arguments = arguments;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeclareOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueueDeclareOkBody extends AMQMethodBody
+public class QueueDeclareOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 11; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String queue;    
     public long messageCount;    
     public long consumerCount;    
@@ -39,17 +53,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String queue, long messageCount, long consumerCount)
-    {
-        QueueDeclareOkBody body = new QueueDeclareOkBody();
-        body.queue = queue;
-        body.messageCount = messageCount;
-        body.consumerCount = consumerCount;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueueDeleteBody extends AMQMethodBody
+public class QueueDeleteBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 40; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String queue;    
     public boolean ifUnused;    
@@ -43,19 +57,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String queue, boolean ifUnused, boolean ifEmpty, boolean nowait)
-    {
-        QueueDeleteBody body = new QueueDeleteBody();
-        body.ticket = ticket;
-        body.queue = queue;
-        body.ifUnused = ifUnused;
-        body.ifEmpty = ifEmpty;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueueDeleteOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueueDeleteOkBody extends AMQMethodBody
+public class QueueDeleteOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 41; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long messageCount;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long messageCount)
-    {
-        QueueDeleteOkBody body = new QueueDeleteOkBody();
-        body.messageCount = messageCount;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueuePurgeBody extends AMQMethodBody
+public class QueuePurgeBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 30; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String queue;    
     public boolean nowait;    
@@ -39,17 +53,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String queue, boolean nowait)
-    {
-        QueuePurgeBody body = new QueuePurgeBody();
-        body.ticket = ticket;
-        body.queue = queue;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/QueuePurgeOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class QueuePurgeOkBody extends AMQMethodBody
+public class QueuePurgeOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 50; 	
+    public static final int METHOD_ID = 31; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long messageCount;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long messageCount)
-    {
-        QueuePurgeOkBody body = new QueuePurgeOkBody();
-        body.messageCount = messageCount;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamCancelBody extends AMQMethodBody
+public class StreamCancelBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 30; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
     public boolean nowait;    
      
@@ -37,16 +51,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag, boolean nowait)
-    {
-        StreamCancelBody body = new StreamCancelBody();
-        body.consumerTag = consumerTag;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamCancelOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamCancelOkBody extends AMQMethodBody
+public class StreamCancelOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 31; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag)
-    {
-        StreamCancelOkBody body = new StreamCancelOkBody();
-        body.consumerTag = consumerTag;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamConsumeBody extends AMQMethodBody
+public class StreamConsumeBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 20; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String queue;    
     public String consumerTag;    
@@ -45,20 +59,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String queue, String consumerTag, boolean noLocal, boolean exclusive, boolean nowait)
-    {
-        StreamConsumeBody body = new StreamConsumeBody();
-        body.ticket = ticket;
-        body.queue = queue;
-        body.consumerTag = consumerTag;
-        body.noLocal = noLocal;
-        body.exclusive = exclusive;
-        body.nowait = nowait;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamConsumeOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamConsumeOkBody extends AMQMethodBody
+public class StreamConsumeOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 21; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag)
-    {
-        StreamConsumeOkBody body = new StreamConsumeOkBody();
-        body.consumerTag = consumerTag;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamDeliverBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamDeliverBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamDeliverBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamDeliverBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamDeliverBody extends AMQMethodBody
+public class StreamDeliverBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 60; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public String consumerTag;    
     public long deliveryTag;    
     public String exchange;    
@@ -41,18 +55,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, String consumerTag, long deliveryTag, String exchange, String queue)
-    {
-        StreamDeliverBody body = new StreamDeliverBody();
-        body.consumerTag = consumerTag;
-        body.deliveryTag = deliveryTag;
-        body.exchange = exchange;
-        body.queue = queue;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamPublishBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamPublishBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamPublishBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamPublishBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamPublishBody extends AMQMethodBody
+public class StreamPublishBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 40; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int ticket;    
     public String exchange;    
     public String routingKey;    
@@ -43,19 +57,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int ticket, String exchange, String routingKey, boolean mandatory, boolean immediate)
-    {
-        StreamPublishBody body = new StreamPublishBody();
-        body.ticket = ticket;
-        body.exchange = exchange;
-        body.routingKey = routingKey;
-        body.mandatory = mandatory;
-        body.immediate = immediate;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamQosBody extends AMQMethodBody
+public class StreamQosBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 10; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long prefetchSize;    
     public int prefetchCount;    
     public long consumeRate;    
@@ -41,18 +55,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long prefetchSize, int prefetchCount, long consumeRate, boolean global)
-    {
-        StreamQosBody body = new StreamQosBody();
-        body.prefetchSize = prefetchSize;
-        body.prefetchCount = prefetchCount;
-        body.consumeRate = consumeRate;
-        body.global = global;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamQosOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamQosOkBody extends AMQMethodBody
+public class StreamQosOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 11; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        StreamQosOkBody body = new StreamQosOkBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamReturnBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamReturnBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamReturnBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/StreamReturnBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class StreamReturnBody extends AMQMethodBody
+public class StreamReturnBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 80; 	
+    public static final int METHOD_ID = 50; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public int replyCode;    
     public String replyText;    
     public String exchange;    
@@ -41,18 +55,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, int replyCode, String replyText, String exchange, String routingKey)
-    {
-        StreamReturnBody body = new StreamReturnBody();
-        body.replyCode = replyCode;
-        body.replyText = replyText;
-        body.exchange = exchange;
-        body.routingKey = routingKey;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class TestContentBody extends AMQMethodBody
+public class TestContentBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 120; 	
+    public static final int METHOD_ID = 40; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
      
 
     public String toString()
@@ -33,14 +47,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId)
-    {
-        TestContentBody body = new TestContentBody();
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestContentOkBody.java Fri Oct 13 08:49:22 2006
@@ -23,8 +23,22 @@
 /**
  * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
  */
-public class TestContentOkBody extends AMQMethodBody
+public class TestContentOkBody extends MethodBody
 { 
+
+    public static final int CLASS_ID = 120; 	
+    public static final int METHOD_ID = 41; 	
+
+    public int getClazz()
+    {
+        return CLASS_ID;
+    }
+   
+    public int getMethod()
+    {
+        return METHOD_ID;
+    }
+
     public long contentChecksum;    
      
 
@@ -35,15 +49,5 @@
          
         return buf.toString();
     }
-
-    public static AMQFrame createAMQFrame(int channelId, long contentChecksum)
-    {
-        TestContentOkBody body = new TestContentOkBody();
-        body.contentChecksum = contentChecksum;
-        		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
+    
 } 



Mime
View raw message