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/13 17:49:30 UTC
svn commit: r463716 [3/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...
Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerBody.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 TestIntegerBody extends AMQMethodBody
+public class TestIntegerBody extends MethodBody
{
+
+ public static final int CLASS_ID = 120;
+ public static final int METHOD_ID = 10;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public short integer1;
public int integer2;
public long integer3;
@@ -43,19 +57,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, short integer1, int integer2, long integer3, long integer4, short operation)
- {
- TestIntegerBody body = new TestIntegerBody();
- body.integer1 = integer1;
- body.integer2 = integer2;
- body.integer3 = integer3;
- body.integer4 = integer4;
- body.operation = operation;
-
- 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/TestIntegerOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestIntegerOkBody.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 TestIntegerOkBody extends AMQMethodBody
+public class TestIntegerOkBody extends MethodBody
{
+
+ public static final int CLASS_ID = 120;
+ public static final int METHOD_ID = 11;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public long result;
@@ -35,15 +49,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, long result)
- {
- TestIntegerOkBody body = new TestIntegerOkBody();
- body.result = result;
-
- 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/TestStringBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestStringBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestStringBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestStringBody.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 TestStringBody extends AMQMethodBody
+public class TestStringBody extends MethodBody
{
+
+ public static final int CLASS_ID = 120;
+ public static final int METHOD_ID = 20;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public String string1;
public byte[] string2;
public short operation;
@@ -39,17 +53,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, String string1, byte[] string2, short operation)
- {
- TestStringBody body = new TestStringBody();
- body.string1 = string1;
- body.string2 = string2;
- body.operation = operation;
-
- 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/TestStringOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestStringOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestStringOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestStringOkBody.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 TestStringOkBody extends AMQMethodBody
+public class TestStringOkBody extends MethodBody
{
+
+ public static final int CLASS_ID = 120;
+ public static final int METHOD_ID = 21;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public byte[] result;
@@ -35,15 +49,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, byte[] result)
- {
- TestStringOkBody body = new TestStringOkBody();
- body.result = result;
-
- 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/TestTableBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestTableBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestTableBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestTableBody.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 TestTableBody extends AMQMethodBody
+public class TestTableBody extends MethodBody
{
+
+ public static final int CLASS_ID = 120;
+ public static final int METHOD_ID = 30;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public FieldTable table;
public short integerOp;
public short stringOp;
@@ -39,17 +53,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, FieldTable table, short integerOp, short stringOp)
- {
- TestTableBody body = new TestTableBody();
- body.table = table;
- body.integerOp = integerOp;
- body.stringOp = stringOp;
-
- 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/TestTableOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestTableOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestTableOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TestTableOkBody.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 TestTableOkBody extends AMQMethodBody
+public class TestTableOkBody extends MethodBody
{
+
+ public static final int CLASS_ID = 120;
+ public static final int METHOD_ID = 31;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public long integerResult;
public byte[] stringResult;
@@ -37,16 +51,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, long integerResult, byte[] stringResult)
- {
- TestTableOkBody body = new TestTableOkBody();
- body.integerResult = integerResult;
- body.stringResult = stringResult;
-
- 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/TunnelRequestBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TunnelRequestBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TunnelRequestBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TunnelRequestBody.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 TunnelRequestBody extends AMQMethodBody
+public class TunnelRequestBody extends MethodBody
{
+
+ public static final int CLASS_ID = 110;
+ public static final int METHOD_ID = 10;
+
+ public int getClazz()
+ {
+ return CLASS_ID;
+ }
+
+ public int getMethod()
+ {
+ return METHOD_ID;
+ }
+
public FieldTable metaData;
@@ -35,15 +49,5 @@
return buf.toString();
}
-
- public static AMQFrame createAMQFrame(int channelId, FieldTable metaData)
- {
- TunnelRequestBody body = new TunnelRequestBody();
- body.metaData = metaData;
-
- 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/TxCommitBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxCommitBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxCommitBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxCommitBody.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 TxCommitBody extends AMQMethodBody
+public class TxCommitBody extends MethodBody
{
+
+ public static final int CLASS_ID = 90;
+ public static final int METHOD_ID = 20;
+
+ 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)
- {
- TxCommitBody body = new TxCommitBody();
-
- 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/TxCommitOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxCommitOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxCommitOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxCommitOkBody.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 TxCommitOkBody extends AMQMethodBody
+public class TxCommitOkBody extends MethodBody
{
+
+ public static final int CLASS_ID = 90;
+ 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)
- {
- TxCommitOkBody body = new TxCommitOkBody();
-
- 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/TxRollbackBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxRollbackBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxRollbackBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxRollbackBody.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 TxRollbackBody extends AMQMethodBody
+public class TxRollbackBody extends MethodBody
{
+
+ public static final int CLASS_ID = 90;
+ public static final int METHOD_ID = 30;
+
+ 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)
- {
- TxRollbackBody body = new TxRollbackBody();
-
- 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/TxRollbackOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxRollbackOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxRollbackOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxRollbackOkBody.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 TxRollbackOkBody extends AMQMethodBody
+public class TxRollbackOkBody extends MethodBody
{
+
+ public static final int CLASS_ID = 90;
+ public static final int METHOD_ID = 31;
+
+ 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)
- {
- TxRollbackOkBody body = new TxRollbackOkBody();
-
- 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/TxSelectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxSelectBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxSelectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxSelectBody.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 TxSelectBody extends AMQMethodBody
+public class TxSelectBody extends MethodBody
{
+
+ public static final int CLASS_ID = 90;
+ 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)
- {
- TxSelectBody body = new TxSelectBody();
-
- 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/TxSelectOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxSelectOkBody.java?view=diff&rev=463716&r1=463715&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxSelectOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/TxSelectOkBody.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 TxSelectOkBody extends AMQMethodBody
+public class TxSelectOkBody extends MethodBody
{
+
+ public static final int CLASS_ID = 90;
+ 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)
- {
- TxSelectOkBody body = new TxSelectOkBody();
-
- AMQFrame frame = new AMQFrame();
- frame.channel = channelId;
- frame.bodyFrame = body;
- return frame;
- }
+
}
Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/transport/QpidTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/transport/QpidTransportFactory.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/transport/QpidTransportFactory.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/transport/QpidTransportFactory.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,41 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.qpid.transport;
+
+import java.util.Map;
+
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.tcp.TcpTransportFactory;
+import org.apache.activemq.wireformat.WireFormat;
+
+/**
+ * A <a href="http://stomp.codehaus.org/">STOMP</a> transport factory
+ *
+ * @version $Revision: 1.1.1.1 $
+ */
+public class QpidTransportFactory extends TcpTransportFactory {
+
+ protected String getDefaultWireFormatType() {
+ return "qpid";
+ }
+
+ public Transport compositeConfigure(Transport transport, WireFormat format, Map options) {
+// transport = new StompTransportFilter(transport, new LegacyFrameTranslator());
+ return super.compositeConfigure(transport, format, options);
+ }
+}
\ No newline at end of file
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/EncodingUtils.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/EncodingUtils.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/EncodingUtils.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.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.wireformat;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,6 +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.log4j.Logger;
public class EncodingUtils
@@ -681,4 +683,199 @@
return rc;
}
+
+ /////////////////////////////////////////////////////////////////////////
+ //
+ // HANDLE Marhsalling ContentHeaderProperties objects
+ //
+ /////////////////////////////////////////////////////////////////////////
+ static final int CONTENT_TYPE_FLAG = 1 << 15;
+ static final int ENCODING_FLAG = 1 << 14;
+ static final int HEADERS_FLAG = 1 << 13;
+ static final int DELIVERY_MODE_FLAG = 1 << 12;
+ static final int PRIORITY_FLAG = 1 << 11;
+ static final int CORRELATION_ID_FLAG = 1 << 10;
+ static final int REPLY_TO_FLAG = 1 << 9;
+ static final int EXPIRATION_FLAG = 1 << 8;
+ static final int MESSAGE_ID_FLAG = 1 << 7;
+ static final int TIMESTAMP_FLAG = 1 << 6;
+ static final int TYPE_FLAG = 1 << 5;
+ static final int USER_ID_FLAG = 1 << 4;
+ static final int APP_ID_FLAG = 1 << 3;
+ static final int CLUSTER_ID_FLAG = 1 << 2;
+
+ static int getContentHeaderPropertiesSize(ContentHeaderProperties properties) {
+ int size = 2;
+ if( properties.contentType != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.contentType);
+ }
+ if( properties.encoding != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.encoding);
+ }
+ if( properties.headers != null ) {
+ size += EncodingUtils.encodedFieldTableLength(properties.headers);
+ }
+ if( properties.deliveryMode != 0 ) {
+ size += 1;
+ }
+ if( properties.priority != 0 ) {
+ size += 1;
+ }
+ if( properties.correlationId != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.correlationId);
+ }
+ if( properties.replyTo != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.replyTo);
+ }
+ if( properties.expiration != 0 ) {
+ size += EncodingUtils.encodedShortStringLength(String.valueOf(properties.expiration));
+ }
+ if( properties.messageId != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.messageId);
+ }
+ if( properties.timestamp != 0 ) {
+ size += 8;
+ }
+ if( properties.type != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.type);
+ }
+ if( properties.userId != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.userId);
+ }
+ if( properties.appId != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.appId);
+ }
+ if( properties.clusterId != null ) {
+ size += EncodingUtils.encodedShortStringLength(properties.clusterId);
+ }
+
+ return size;
+ }
+
+ static public void marshalContentHeaderProperties(DataOutput buffer, ContentHeaderProperties properties) throws IOException
+ {
+ int propertyFlags=0;
+ if( properties.contentType != null ) {
+ propertyFlags |= CONTENT_TYPE_FLAG;
+ }
+ if( properties.encoding != null ) {
+ propertyFlags |= ENCODING_FLAG;
+ }
+ if( properties.headers != null ) {
+ propertyFlags |= HEADERS_FLAG;
+ }
+ if( properties.deliveryMode != 0 ) {
+ propertyFlags |= DELIVERY_MODE_FLAG;
+ }
+ if( properties.priority != 0 ) {
+ propertyFlags |= PRIORITY_FLAG;
+ }
+ if( properties.correlationId != null ) {
+ propertyFlags |= CORRELATION_ID_FLAG;
+ }
+ if( properties.replyTo != null ) {
+ propertyFlags |= REPLY_TO_FLAG;
+ }
+ if( properties.expiration != 0 ) {
+ propertyFlags |= EXPIRATION_FLAG;
+ }
+ if( properties.messageId != null ) {
+ propertyFlags |= MESSAGE_ID_FLAG;
+ }
+ if( properties.timestamp != 0 ) {
+ propertyFlags |= TIMESTAMP_FLAG;
+ }
+ if( properties.type != null ) {
+ propertyFlags |= TYPE_FLAG;
+ }
+ if( properties.userId != null ) {
+ propertyFlags |= USER_ID_FLAG;
+ }
+ if( properties.appId != null ) {
+ propertyFlags |= APP_ID_FLAG;
+ }
+ if( properties.clusterId != null ) {
+ propertyFlags |= CLUSTER_ID_FLAG;
+ }
+
+ EncodingUtils.writeUnsignedShort(buffer, propertyFlags);
+
+ if( properties.contentType != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.contentType);
+ }
+ if( properties.encoding != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.encoding);
+ }
+ if( properties.headers != null ) {
+ EncodingUtils.writeFieldTableBytes(buffer, properties.headers);
+ }
+ if( properties.deliveryMode != 0 ) {
+ buffer.writeByte(properties.deliveryMode);
+ }
+ if( properties.priority != 0 ) {
+ buffer.writeByte(properties.priority);
+ }
+ if( properties.correlationId != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.correlationId);
+ }
+ if( properties.replyTo != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.replyTo);
+ }
+ if( properties.expiration != 0 ) {
+ EncodingUtils.writeShortStringBytes(buffer, String.valueOf(properties.expiration));
+ }
+ if( properties.messageId != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.messageId);
+ }
+ if( properties.timestamp != 0 ) {
+ EncodingUtils.writeTimestamp(buffer, properties.timestamp);
+ }
+ if( properties.type != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.type);
+ }
+ if( properties.userId != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.userId);
+ }
+ if( properties.appId != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.appId);
+ }
+ if( properties.clusterId != null ) {
+ EncodingUtils.writeShortStringBytes(buffer, properties.clusterId);
+ }
+ }
+
+ static public void unmarshalContentHeaderProperties(DataInput buffer, ContentHeaderProperties properties) throws IOException
+ {
+ int propertyFlags = EncodingUtils.readUnsignedShort(buffer);
+
+ properties.contentType = ((propertyFlags & CONTENT_TYPE_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.encoding = ((propertyFlags & ENCODING_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.headers = ((propertyFlags & HEADERS_FLAG) > 0) ?
+ EncodingUtils.readFieldTable(buffer) : null;
+ properties.deliveryMode = ((propertyFlags & DELIVERY_MODE_FLAG) > 0) ?
+ buffer.readByte() : 0;
+ properties.priority = ((propertyFlags & PRIORITY_FLAG) > 0) ?
+ buffer.readByte() : 0;
+ properties.correlationId = ((propertyFlags & CORRELATION_ID_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.replyTo = ((propertyFlags & REPLY_TO_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.expiration = ((propertyFlags & EXPIRATION_FLAG) > 0) ?
+ Long.parseLong(EncodingUtils.readShortString(buffer)) : 0;
+ properties.messageId = ((propertyFlags & MESSAGE_ID_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.timestamp = ((propertyFlags & TIMESTAMP_FLAG) > 0) ?
+ EncodingUtils.readTimestamp(buffer) : 0;
+ properties.type = ((propertyFlags & TYPE_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.userId = ((propertyFlags & USER_ID_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.appId = ((propertyFlags & APP_ID_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ properties.clusterId = ((propertyFlags & CLUSTER_ID_FLAG) > 0) ?
+ EncodingUtils.readShortString(buffer) : null;
+ }
+
}
Propchange: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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/qpid/wireformat/QpidWireFormat.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,195 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.qpid.wireformat;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+
+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.util.ByteSequence;
+import org.apache.activemq.wireformat.WireFormat;
+
+/**
+ * Implements marshalling and unmarsalling to talk to Qpid clients.
+ */
+public class QpidWireFormat implements WireFormat {
+
+ private int version=8;
+ private final HashMap methodBodyMarshallers = new HashMap();
+
+ public int getVersion() {
+ return version;
+ }
+ public void setVersion(int version) {
+ this.version=version;
+ }
+
+ public ByteSequence marshal(Object arg0) throws IOException {
+ throw new RuntimeException("Not implemented");
+ }
+ public Object unmarshal(ByteSequence arg0) throws IOException {
+ throw new RuntimeException("Not implemented");
+ }
+
+ public QpidWireFormat () {
+ MainRegistry.register(methodBodyMarshallers);
+ }
+
+ private MethodBodyMarshaller getAMQMethodBodyMarshaller(int clazz, int method) {
+ return (MethodBodyMarshaller) methodBodyMarshallers.get(new Integer(clazz * 1000 + method));
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+ //
+ // HANDLE Marhsalling the Frame objects
+ //
+ /////////////////////////////////////////////////////////////////////////
+ public Object unmarshal(DataInputStream buffer) throws IOException {
+
+ Frame rc=null;
+ final byte type = buffer.readByte();
+ int channel = EncodingUtils.readUnsignedShort(buffer);
+ final long bodySize = EncodingUtils.readUnsignedInteger(buffer);
+
+ switch( type ) {
+ case MethodBody.TYPE:
+ int clazz = EncodingUtils.readUnsignedShort(buffer);
+ int method = EncodingUtils.readUnsignedShort(buffer);
+
+ MethodBodyMarshaller marshaller = getAMQMethodBodyMarshaller(clazz, method);
+ MethodBody methodBody = marshaller.createBody();
+ marshaller.populateFromBuffer(buffer, bodySize, methodBody);
+ methodBody.channel=channel;
+ rc = methodBody;
+ break;
+
+ case ContentHeaderBody.TYPE:
+ ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
+
+ contentHeaderBody.channel = channel;
+ contentHeaderBody.classId = EncodingUtils.readUnsignedShort(buffer);
+ contentHeaderBody.weight = EncodingUtils.readUnsignedShort(buffer);
+ contentHeaderBody.bodySize = buffer.readLong();
+
+ if(contentHeaderBody.classId != BasicConsumeBody.CLASS_ID) {
+ throw new IOException("Unsupport content header class id: " + contentHeaderBody.classId);
+ }
+
+ contentHeaderBody.properties = new ContentHeaderProperties();
+ EncodingUtils.unmarshalContentHeaderProperties(buffer, contentHeaderBody.properties);
+
+ rc = contentHeaderBody;
+ break;
+
+ case ContentBody.TYPE:
+
+ ContentBody contentBody = new ContentBody();
+
+ long length = EncodingUtils.readUnsignedInteger(buffer);
+ byte[] data = new byte [(int) length];
+ buffer.readFully(data);
+
+ contentBody.channel = channel;
+ contentBody.payload = new ByteSequence(data, 0, data.length);
+ rc = contentBody;
+ break;
+
+ case HeartbeatBody.TYPE:
+ HeartbeatBody heartbeatBody = new HeartbeatBody();
+ long size = EncodingUtils.readUnsignedInteger(buffer); // No payload
+
+ if(size > 0)
+ {
+ //allow other implementations to have a payload, but ignore it:
+ buffer.skip((int) size);
+ }
+ heartbeatBody.channel = channel;
+ rc = heartbeatBody;
+ break;
+
+ default:
+ throw new IOException("Unsupported frame type: " + type);
+ }
+
+ byte marker = buffer.readByte();
+ if ((marker & 0xFF) != 0xCE)
+ {
+ throw new IOException("End of frame marker not found. Read " + marker + " size=" + bodySize + " type=" + type);
+ }
+ return rc;
+ }
+
+
+ public void marshal(Object object, DataOutputStream buffer) throws IOException {
+
+ Frame frame = (Frame) object;
+ byte type = frame.getType();
+ buffer.writeByte(type);
+ EncodingUtils.writeUnsignedShort(buffer, frame.channel);
+
+ switch( type ) {
+ case MethodBody.TYPE:
+ MethodBody methodBody = (MethodBody) frame;
+ MethodBodyMarshaller marshaller = getAMQMethodBodyMarshaller(methodBody.getClazz(), methodBody.getMethod());
+ EncodingUtils.writeUnsignedInteger(buffer, marshaller.getSize(methodBody));
+ EncodingUtils.writeUnsignedShort(buffer, methodBody.getClazz());
+ EncodingUtils.writeUnsignedShort(buffer, methodBody.getMethod());
+ marshaller.writeMethodPayload(buffer, methodBody);
+ break;
+ case ContentHeaderBody.TYPE:
+ ContentHeaderBody contentHeaderBody = (ContentHeaderBody) frame;
+
+ EncodingUtils.writeUnsignedInteger(buffer, 2 + 2 + 8 + EncodingUtils.getContentHeaderPropertiesSize(contentHeaderBody.properties) );
+ EncodingUtils.writeUnsignedShort(buffer, contentHeaderBody.classId);
+ EncodingUtils.writeUnsignedShort(buffer, contentHeaderBody.weight);
+ buffer.writeLong(contentHeaderBody.bodySize);
+ EncodingUtils.marshalContentHeaderProperties(buffer, contentHeaderBody.properties);
+ break;
+
+ case ContentBody.TYPE:
+ ContentBody contentBody = (ContentBody) frame;
+ ByteSequence payload = contentBody.payload;
+ EncodingUtils.writeUnsignedInteger(buffer, payload.length );
+ buffer.write(payload.getData(), payload.getOffset(), payload.getLength());
+ break;
+
+ case HeartbeatBody.TYPE:
+ HeartbeatBody heartbeatBody = (HeartbeatBody) frame;
+ EncodingUtils.writeUnsignedInteger(buffer, 0); // No payload
+ break;
+
+ default:
+ throw new IOException("Unsupported frame type: " + type);
+
+ }
+
+ buffer.writeByte((byte) 0xCE);
+ }
+
+
+}
Added: 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/qpid/wireformat/QpidWireFormatFactory.java?view=auto&rev=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java Fri Oct 13 08:49:22 2006
@@ -0,0 +1,30 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.qpid.wireformat;
+
+import org.apache.activemq.wireformat.WireFormat;
+import org.apache.activemq.wireformat.WireFormatFactory;
+
+/**
+ * Creates WireFormat objects that marshalls the <a href="http://stomp.codehaus.org/">Stomp</a> protocol.
+ */
+public class QpidWireFormatFactory implements WireFormatFactory {
+ public WireFormat createWireFormat() {
+ return new QpidWireFormat();
+ }
+}
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/AccessRequestBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/AccessRequestBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/AccessRequestBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class AccessRequestBodyMarshaller extends AMQMethodBodyMarshaller
+public class AccessRequestBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 30;
public static final int METHOD_ID = 10;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new AccessRequestBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
AccessRequestBody object = (AccessRequestBody)o;
@@ -59,7 +63,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
AccessRequestBody object = (AccessRequestBody)o;
EncodingUtils.writeShortStringBytes(buffer, object.realm);
@@ -67,7 +71,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
AccessRequestBody object = (AccessRequestBody)o;
object.realm = EncodingUtils.readShortString(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/AccessRequestOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/AccessRequestOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/AccessRequestOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/AccessRequestOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class AccessRequestOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class AccessRequestOkBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 30;
public static final int METHOD_ID = 11;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new AccessRequestOkBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
AccessRequestOkBody object = (AccessRequestOkBody)o;
@@ -54,14 +58,14 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
AccessRequestOkBody object = (AccessRequestOkBody)o;
EncodingUtils.writeUnsignedShort(buffer, object.ticket);
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
AccessRequestOkBody object = (AccessRequestOkBody)o;
object.ticket = EncodingUtils.readUnsignedShort(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicAckBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicAckBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicAckBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicAckBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicAckBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicAckBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicAckBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicAckBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicAckBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 80;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicAckBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicAckBody object = (BasicAckBody)o;
@@ -55,7 +59,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicAckBody object = (BasicAckBody)o;
buffer.writeLong(object.deliveryTag);
@@ -63,7 +67,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicAckBody object = (BasicAckBody)o;
object.deliveryTag = buffer.readLong();
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicCancelBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicCancelBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicCancelBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicCancelBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicCancelBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 30;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicCancelBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicCancelBody object = (BasicCancelBody)o;
@@ -55,7 +59,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicCancelBody object = (BasicCancelBody)o;
EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
@@ -63,7 +67,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicCancelBody object = (BasicCancelBody)o;
object.consumerTag = EncodingUtils.readShortString(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicCancelOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicCancelOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicCancelOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicCancelOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicCancelOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicCancelOkBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 31;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicCancelOkBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicCancelOkBody object = (BasicCancelOkBody)o;
@@ -54,14 +58,14 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicCancelOkBody object = (BasicCancelOkBody)o;
EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicCancelOkBody object = (BasicCancelOkBody)o;
object.consumerTag = EncodingUtils.readShortString(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicConsumeBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicConsumeBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicConsumeBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicConsumeBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicConsumeBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 20;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicConsumeBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicConsumeBody object = (BasicConsumeBody)o;
@@ -60,7 +64,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicConsumeBody object = (BasicConsumeBody)o;
EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -70,7 +74,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicConsumeBody object = (BasicConsumeBody)o;
object.ticket = EncodingUtils.readUnsignedShort(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicConsumeOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicConsumeOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicConsumeOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicConsumeOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicConsumeOkBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 21;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicConsumeOkBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicConsumeOkBody object = (BasicConsumeOkBody)o;
@@ -54,14 +58,14 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicConsumeOkBody object = (BasicConsumeOkBody)o;
EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicConsumeOkBody object = (BasicConsumeOkBody)o;
object.consumerTag = EncodingUtils.readShortString(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicDeliverBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicDeliverBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicDeliverBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicDeliverBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicDeliverBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicDeliverBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicDeliverBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicDeliverBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicDeliverBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 60;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicDeliverBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicDeliverBody object = (BasicDeliverBody)o;
@@ -58,7 +62,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicDeliverBody object = (BasicDeliverBody)o;
EncodingUtils.writeShortStringBytes(buffer, object.consumerTag);
@@ -69,7 +73,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicDeliverBody object = (BasicDeliverBody)o;
object.consumerTag = EncodingUtils.readShortString(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicGetBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicGetBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 70;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicGetBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicGetBody object = (BasicGetBody)o;
@@ -56,7 +60,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicGetBody object = (BasicGetBody)o;
EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -65,7 +69,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicGetBody object = (BasicGetBody)o;
object.ticket = EncodingUtils.readUnsignedShort(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetEmptyBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetEmptyBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetEmptyBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicGetEmptyBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicGetEmptyBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 72;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicGetEmptyBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicGetEmptyBody object = (BasicGetEmptyBody)o;
@@ -54,14 +58,14 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicGetEmptyBody object = (BasicGetEmptyBody)o;
EncodingUtils.writeShortStringBytes(buffer, object.clusterId);
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicGetEmptyBody object = (BasicGetEmptyBody)o;
object.clusterId = EncodingUtils.readShortString(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicGetOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicGetOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicGetOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicGetOkBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 71;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicGetOkBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicGetOkBody object = (BasicGetOkBody)o;
@@ -58,7 +62,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicGetOkBody object = (BasicGetOkBody)o;
buffer.writeLong(object.deliveryTag);
@@ -69,7 +73,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicGetOkBody object = (BasicGetOkBody)o;
object.deliveryTag = buffer.readLong();
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicPublishBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicPublishBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicPublishBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicPublishBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicPublishBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicPublishBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicPublishBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicPublishBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicPublishBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 40;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicPublishBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicPublishBody object = (BasicPublishBody)o;
@@ -58,7 +62,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicPublishBody object = (BasicPublishBody)o;
EncodingUtils.writeUnsignedShort(buffer, object.ticket);
@@ -68,7 +72,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicPublishBody object = (BasicPublishBody)o;
object.ticket = EncodingUtils.readUnsignedShort(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicQosBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicQosBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicQosBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicQosBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicQosBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 10;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicQosBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicQosBody object = (BasicQosBody)o;
@@ -56,7 +60,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicQosBody object = (BasicQosBody)o;
EncodingUtils.writeUnsignedInteger(buffer, object.prefetchSize);
@@ -65,7 +69,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicQosBody object = (BasicQosBody)o;
object.prefetchSize = EncodingUtils.readUnsignedInteger(buffer);
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosOkBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicQosOkBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosOkBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicQosOkBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosOkBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicQosOkBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicQosOkBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicQosOkBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicQosOkBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 11;
@@ -44,19 +44,23 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicQosOkBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicQosOkBody object = (BasicQosOkBody)o;
return 0;
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicQosOkBody object = (BasicQosOkBody)o;
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicQosOkBody object = (BasicQosOkBody)o;
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRecoverBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicRecoverBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRecoverBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicRecoverBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRecoverBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicRecoverBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRecoverBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicRecoverBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicRecoverBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 100;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicRecoverBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicRecoverBody object = (BasicRecoverBody)o;
@@ -54,14 +58,14 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicRecoverBody object = (BasicRecoverBody)o;
EncodingUtils.writeBooleans(buffer, new boolean[]{ object.requeue});
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicRecoverBody object = (BasicRecoverBody)o;
boolean[] bools = EncodingUtils.readBooleans(buffer);object.requeue = bools[0];
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRejectBodyMarshaller.java (from r462625, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicRejectBodyMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRejectBodyMarshaller.java?view=diff&rev=463716&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicRejectBodyMarshaller.java&r1=462625&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRejectBodyMarshaller.java&r2=463716
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/marshaller/v8_0/BasicRejectBodyMarshaller.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/BasicRejectBodyMarshaller.java Fri Oct 13 08:49:22 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.activemq.qpid.marshaller.v8_0;
+package org.apache.activemq.qpid.wireformat.v8_0;
import java.io.DataInput;
import java.io.DataOutput;
@@ -24,12 +24,12 @@
import org.apache.activemq.qpid.*;
import org.apache.activemq.qpid.command.*;
-import org.apache.activemq.qpid.marshaller.*;
+import org.apache.activemq.qpid.wireformat.*;
/**
* This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
*/
-public class BasicRejectBodyMarshaller extends AMQMethodBodyMarshaller
+public class BasicRejectBodyMarshaller extends MethodBodyMarshaller
{
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 90;
@@ -44,7 +44,11 @@
return METHOD_ID;
}
- protected int getBodySize(AMQMethodBody o)
+ public MethodBody createBody() {
+ return new BasicRejectBody();
+ }
+
+ protected int getBodySize(MethodBody o)
{
BasicRejectBody object = (BasicRejectBody)o;
@@ -55,7 +59,7 @@
}
- protected void writeMethodPayload(DataOutput buffer, AMQMethodBody o) throws IOException
+ public void writeMethodPayload(DataOutput buffer, MethodBody o) throws IOException
{
BasicRejectBody object = (BasicRejectBody)o;
buffer.writeLong(object.deliveryTag);
@@ -63,7 +67,7 @@
}
- public void populateMethodBodyFromBuffer(DataInput buffer, AMQMethodBody o) throws IOException
+ public void populateMethodBodyFromBuffer(DataInput buffer, MethodBody o) throws IOException
{
BasicRejectBody object = (BasicRejectBody)o;
object.deliveryTag = buffer.readLong();