diff --git a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java
index bfe0b91717..ff5f3b0d46 100644
--- a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java
+++ b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java
@@ -39,6 +39,9 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
return super.run();
}
+ //////////////////////////////////////////////////////////////////////////////////////
+ // This section is for the tight wire format encoding generator
+ //////////////////////////////////////////////////////////////////////////////////////
protected void generateTightUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
@@ -242,4 +245,149 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
}
}
}
+
+ //////////////////////////////////////////////////////////////////////////////////////
+ // This section is for the loose wire format encoding generator
+ //////////////////////////////////////////////////////////////////////////////////////
+
+ protected void generateLooseUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
+
+ String propertyName = property.getSimpleName();
+ String type = property.getType().getSimpleName();
+
+ if (type.equals("boolean")) {
+ out.println(" info." + propertyName + " = dataIn.ReadBoolean();");
+ }
+ else if (type.equals("byte")) {
+ out.println(" info." + propertyName + " = dataIn.ReadByte();");
+ }
+ else if (type.equals("char")) {
+ out.println(" info." + propertyName + " = dataIn.ReadChar();");
+ }
+ else if (type.equals("short")) {
+ out.println(" info." + propertyName + " = dataIn.ReadInt16();");
+ }
+ else if (type.equals("int")) {
+ out.println(" info." + propertyName + " = dataIn.ReadInt32();");
+ }
+ else if (type.equals("long")) {
+ out.println(" info." + propertyName + " = LooseUnmarshalLong(wireFormat, dataIn);");
+ }
+ else if (type.equals("String")) {
+ out.println(" info." + propertyName + " = LooseUnmarshalString(dataIn);");
+ }
+ else if (type.equals("byte[]") || type.equals("ByteSequence")) {
+ if (size != null) {
+ out.println(" info." + propertyName + " = ReadBytes(dataIn, " + size.asInt() + ");");
+ }
+ else {
+ out.println(" info." + propertyName + " = ReadBytes(dataIn, dataIn.ReadBoolean());");
+ }
+ }
+ else if (isThrowable(property.getType())) {
+ out.println(" info." + propertyName + " = LooseUnmarshalBrokerError(wireFormat, dataIn);");
+ }
+ else if (isCachedProperty(property)) {
+ out.println(" info." + propertyName + " = (" + type + ") LooseUnmarshalCachedObject(wireFormat, dataIn);");
+ }
+ else {
+ out.println(" info." + propertyName + " = (" + type + ") LooseUnmarshalNestedObject(wireFormat, dataIn);");
+ }
+ }
+
+ protected void generateLooseUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
+ JClass propertyType = property.getType();
+ String arrayType = propertyType.getArrayComponentType().getSimpleName();
+ String propertyName = property.getSimpleName();
+ out.println();
+ if (size != null) {
+ out.println(" {");
+ out.println(" " + arrayType + "[] value = new " + arrayType + "[" + size.asInt() + "];");
+ out.println(" " + "for( int i=0; i < " + size.asInt() + "; i++ ) {");
+ out.println(" value[i] = (" + arrayType + ") LooseUnmarshalNestedObject(wireFormat,dataIn);");
+ out.println(" }");
+ out.println(" info." + propertyName + " = value;");
+ out.println(" }");
+ }
+ else {
+ out.println(" if (dataIn.ReadBoolean()) {");
+ out.println(" short size = dataIn.ReadInt16();");
+ out.println(" " + arrayType + "[] value = new " + arrayType + "[size];");
+ out.println(" for( int i=0; i < size; i++ ) {");
+ out.println(" value[i] = (" + arrayType + ") LooseUnmarshalNestedObject(wireFormat,dataIn);");
+ out.println(" }");
+ out.println(" info." + propertyName + " = value;");
+ out.println(" }");
+ out.println(" else {");
+ out.println(" info." + propertyName + " = null;");
+ out.println(" }");
+ }
+ }
+
+
+ protected void generateLooseMarshalBody(PrintWriter out) {
+ List properties = getProperties();
+ for (Iterator iter = properties.iterator(); iter.hasNext();) {
+ JProperty property = (JProperty) iter.next();
+ JAnnotation annotation = property.getAnnotation("openwire:property");
+ JAnnotationValue size = annotation.getValue("size");
+ JClass propertyType = property.getType();
+ String type = propertyType.getSimpleName();
+ String getter = "info." + property.getSimpleName();
+
+ if (type.equals("boolean")) {
+ out.println(" dataOut.Write(" + getter + ");");
+ }
+ else if (type.equals("byte")) {
+ out.println(" dataOut.Write(" + getter + ");");
+ }
+ else if (type.equals("char")) {
+ out.println(" dataOut.Write(" + getter + ");");
+ }
+ else if (type.equals("short")) {
+ out.println(" dataOut.Write(" + getter + ");");
+ }
+ else if (type.equals("int")) {
+ out.println(" dataOut.Write(" + getter + ");");
+ }
+ else if (type.equals("long")) {
+ out.println(" LooseMarshalLong(wireFormat, " + getter + ", dataOut);");
+ }
+ else if (type.equals("String")) {
+ out.println(" LooseMarshalString(" + getter + ", dataOut);");
+ }
+ else if (type.equals("byte[]") || type.equals("ByteSequence")) {
+ if (size != null) {
+ out.println(" dataOut.Write(" + getter + ", 0, " + size.asInt() + ");");
+ }
+ else {
+ out.println(" dataOut.Write(" + getter + "!=null);");
+ out.println(" if(" + getter + "!=null) {");
+ out.println(" dataOut.Write(" + getter + ".Length);");
+ out.println(" dataOut.Write(" + getter + ");");
+ out.println(" }");
+ }
+ }
+ else if (propertyType.isArrayType()) {
+ if (size != null) {
+ out.println(" LooseMarshalObjectArrayConstSize(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
+ }
+ else {
+ out.println(" LooseMarshalObjectArray(wireFormat, " + getter + ", dataOut);");
+ }
+ }
+ else if (isThrowable(propertyType)) {
+ out.println(" LooseMarshalBrokerError(wireFormat, " + getter + ", dataOut);");
+ }
+ else {
+ if (isCachedProperty(property)) {
+ out.println(" LooseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
+ }
+ else {
+ out.println(" LooseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
+ }
+ }
+ }
+ }
+
}
diff --git a/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy b/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
index bbda2eed57..828068aa05 100755
--- a/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
+++ b/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
@@ -76,6 +76,9 @@ if( !abstractClass ) out << """
}
"""
+/*
+ * Generate the tight encoding marshallers
+ */
out << """
//
// Un-marshal an object instance from the data input stream
@@ -102,8 +105,9 @@ if( marshallerAware ) out << """
out << """
}
+"""
-
+out << """
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -144,6 +148,69 @@ if( marshallerAware ) out << """
out << """
}
+"""
+
+/*
+ * Generate the loose encoding marshallers
+ */
+out << """
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+"""
+
+if( !properties.isEmpty() || marshallerAware ) out << """
+ ${jclass.simpleName} info = (${jclass.simpleName})o;
+"""
+
+if( marshallerAware ) out << """
+ info.BeforeUnmarshall(wireFormat);
+
+"""
+
+generateLooseUnmarshalBody(out)
+
+if( marshallerAware ) out << """
+ info.AfterUnmarshall(wireFormat);
+"""
+
+out << """
+ }
+"""
+
+out << """
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+"""
+
+if( !properties.isEmpty() || marshallerAware ) out << """
+ ${jclass.simpleName} info = (${jclass.simpleName})o;
+"""
+
+if( marshallerAware ) out << """
+ info.BeforeMarshall(wireFormat);
+"""
+
+out << """
+ base.LooseMarshal(wireFormat, o, dataOut);
+"""
+
+generateLooseMarshalBody(out)
+
+if( marshallerAware ) out << """
+ info.AfterMarshall(wireFormat);
+"""
+out << """
+ }
+"""
+
+
+out << """
}
}
"""
diff --git a/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
index 312f2ee8f4..c6a47e0093 100755
--- a/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
+++ b/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
@@ -29,7 +29,6 @@ import org.activeio.ByteArrayOutputStream;
import org.activeio.ByteSequence;
import org.activeio.command.WireFormat;
import org.apache.activemq.state.CommandVisitor;
-import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.MarshallingSupport;
/**
@@ -39,7 +38,8 @@ import org.apache.activemq.util.MarshallingSupport;
*/
public class WireFormatInfo implements Command, MarshallAware {
- public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO;
+ private static final int MAX_PROPERTY_SIZE = 1024*4;
+ public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO;
static final private byte MAGIC[] = new byte[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
protected byte magic[] = MAGIC;
@@ -136,7 +136,7 @@ public class WireFormatInfo implements Command, MarshallAware {
}
private HashMap unmarsallProperties(ByteSequence marshalledProperties) throws IOException {
- return MarshallingSupport.unmarshalPrimitiveMap(new DataInputStream(new ByteArrayInputStream(marshalledProperties)));
+ return MarshallingSupport.unmarshalPrimitiveMap(new DataInputStream(new ByteArrayInputStream(marshalledProperties)), MAX_PROPERTY_SIZE);
}
public void beforeMarshall(WireFormat wireFormat) throws IOException {
@@ -171,50 +171,50 @@ public class WireFormatInfo implements Command, MarshallAware {
* @throws IOException
*/
public boolean isCacheEnabled() throws IOException {
- return Boolean.TRUE == getProperty("cache");
+ return Boolean.TRUE == getProperty("CacheEnabled");
}
public void setCacheEnabled(boolean cacheEnabled) throws IOException {
- setProperty("cache", cacheEnabled ? Boolean.TRUE : Boolean.FALSE);
+ setProperty("CacheEnabled", cacheEnabled ? Boolean.TRUE : Boolean.FALSE);
}
/**
* @throws IOException
*/
public boolean isStackTraceEnabled() throws IOException {
- return Boolean.TRUE == getProperty("stackTrace");
+ return Boolean.TRUE == getProperty("StackTraceEnabled");
}
public void setStackTraceEnabled(boolean stackTraceEnabled) throws IOException {
- setProperty("stackTrace", stackTraceEnabled ? Boolean.TRUE : Boolean.FALSE);
+ setProperty("StackTraceEnabled", stackTraceEnabled ? Boolean.TRUE : Boolean.FALSE);
}
/**
* @throws IOException
*/
public boolean isTcpNoDelayEnabled() throws IOException {
- return Boolean.TRUE == getProperty("tcpNoDelay");
+ return Boolean.TRUE == getProperty("TcpNoDelayEnabled");
}
public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) throws IOException {
- setProperty("tcpNoDelay", tcpNoDelayEnabled ? Boolean.TRUE : Boolean.FALSE);
+ setProperty("TcpNoDelayEnabled", tcpNoDelayEnabled ? Boolean.TRUE : Boolean.FALSE);
}
/**
* @throws IOException
*/
- public boolean isPrefixPacketSize() throws IOException {
- return Boolean.TRUE == getProperty("prefixPacketSize");
+ public boolean isSizePrefixDisabled() throws IOException {
+ return Boolean.TRUE == getProperty("SizePrefixDisabled");
}
- public void setPrefixPacketSize(boolean prefixPacketSize) throws IOException {
- setProperty("prefixPacketSize", prefixPacketSize ? Boolean.TRUE : Boolean.FALSE);
+ public void setSizePrefixDisabled(boolean prefixPacketSize) throws IOException {
+ setProperty("SizePrefixDisabled", prefixPacketSize ? Boolean.TRUE : Boolean.FALSE);
}
/**
* @throws IOException
*/
public boolean isTightEncodingEnabled() throws IOException {
- return Boolean.TRUE == getProperty("tightEncoding");
+ return Boolean.TRUE == getProperty("TightEncodingEnabled");
}
public void setTightEncodingEnabled(boolean tightEncodingEnabled) throws IOException {
- setProperty("tightEncoding", tightEncodingEnabled ? Boolean.TRUE : Boolean.FALSE);
+ setProperty("TightEncodingEnabled", tightEncodingEnabled ? Boolean.TRUE : Boolean.FALSE);
}
public Response visit(CommandVisitor visitor) throws Exception {
@@ -222,7 +222,12 @@ public class WireFormatInfo implements Command, MarshallAware {
}
public String toString() {
- return IntrospectionSupport.toString(this, WireFormatInfo.class);
+ Map p=null;
+ try {
+ p = getProperties();
+ } catch (IOException e) {
+ }
+ return "WireFormatInfo { version="+version+", properties="+p+", magic="+Arrays.toString(magic)+"}";
}
///////////////////////////////////////////////////////////////
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
index 74899cddaa..412c2f1f7d 100755
--- a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
+++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
@@ -33,6 +33,8 @@ import org.activeio.packet.ByteArrayPacket;
import org.apache.activemq.command.CommandTypes;
import org.apache.activemq.command.DataStructure;
import org.apache.activemq.command.MarshallAware;
+import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.util.IdGenerator;
/**
*
@@ -46,11 +48,11 @@ final public class OpenWireFormat implements WireFormat {
private DataStreamMarshaller dataMarshallers[];
private int version;
- private boolean stackTraceEnabled=true;
+ private boolean stackTraceEnabled=false;
private boolean tcpNoDelayEnabled=false;
- private boolean cacheEnabled=true;
- private boolean tightEncodingEnabled=true;
- private boolean prefixPacketSize=true;
+ private boolean cacheEnabled=false;
+ private boolean tightEncodingEnabled=false;
+ private boolean sizePrefixDisabled=false;
private HashMap marshallCacheMap = new HashMap();
private short nextMarshallCacheIndex=0;
@@ -58,22 +60,22 @@ final public class OpenWireFormat implements WireFormat {
private DataStructure marshallCache[] = new DataStructure[MARSHAL_CACHE_SIZE];
private DataStructure unmarshallCache[] = new DataStructure[MARSHAL_CACHE_SIZE];
-
- public OpenWireFormat() {
- this(true);
- }
-
- public OpenWireFormat(boolean cacheEnabled) {
- setVersion(1);
- setCacheEnabled(cacheEnabled);
- }
-
- public int hashCode() {
+ private WireFormatInfo preferedWireFormatInfo;
+
+ public OpenWireFormat() {
+ this(1);
+ }
+
+ public OpenWireFormat(int i) {
+ setVersion(i);
+ }
+
+ public int hashCode() {
return version
^ (cacheEnabled ? 0x10000000:0x20000000)
^ (stackTraceEnabled ? 0x01000000:0x02000000)
^ (tightEncodingEnabled ? 0x00100000:0x00200000)
- ^ (prefixPacketSize ? 0x00010000:0x00020000)
+ ^ (sizePrefixDisabled ? 0x00010000:0x00020000)
;
}
@@ -85,12 +87,15 @@ final public class OpenWireFormat implements WireFormat {
o.cacheEnabled == cacheEnabled &&
o.version == version &&
o.tightEncodingEnabled == tightEncodingEnabled &&
- o.prefixPacketSize == prefixPacketSize
+ o.sizePrefixDisabled == sizePrefixDisabled
;
}
+ static IdGenerator g = new IdGenerator();
+ String id = g.generateId();
public String toString() {
- return "OpenWireFormat{version="+version+", cacheEnabled="+cacheEnabled+", stackTraceEnabled="+stackTraceEnabled+", tightEncodingEnabled="+tightEncodingEnabled+", prefixPacketSize="+prefixPacketSize+"}";
+ //return "OpenWireFormat{version="+version+", cacheEnabled="+cacheEnabled+", stackTraceEnabled="+stackTraceEnabled+", tightEncodingEnabled="+tightEncodingEnabled+", sizePrefixDisabled="+sizePrefixDisabled+"}";
+ return "OpenWireFormat{id="+id+", tightEncodingEnabled="+tightEncodingEnabled+"}";
}
public int getVersion() {
@@ -133,7 +138,7 @@ final public class OpenWireFormat implements WireFormat {
ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
DataOutputStream ds = new DataOutputStream(baos);
- if( prefixPacketSize ) {
+ if( !sizePrefixDisabled ) {
ds.writeInt(size);
}
ds.writeByte(type);
@@ -144,9 +149,9 @@ final public class OpenWireFormat implements WireFormat {
} else {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream ds = new DataOutputStream(baos);
- if( prefixPacketSize ) {
+ if( !sizePrefixDisabled ) {
ds.writeInt(0); // we don't know the final size yet but write this here for now.
}
ds.writeByte(type);
@@ -154,7 +159,7 @@ final public class OpenWireFormat implements WireFormat {
ds.close();
sequence = baos.toByteSequence();
- if( prefixPacketSize ) {
+ if( !sizePrefixDisabled ) {
size = sequence.getLength()-4;
ByteArrayPacket packet = new ByteArrayPacket(sequence);
PacketData.writeIntBig(packet, size);
@@ -183,11 +188,11 @@ final public class OpenWireFormat implements WireFormat {
ByteSequence sequence = packet.asByteSequence();
DataInputStream dis = new DataInputStream(new PacketToInputStream(packet));
- if( prefixPacketSize ) {
+ if( !sizePrefixDisabled ) {
int size = dis.readInt();
- if( sequence.getLength()-4 != size )
- System.out.println("Packet size does not match marshaled size: "+size+", "+(sequence.getLength()-4));
+ if( sequence.getLength()-4 != size ) {
// throw new IOException("Packet size does not match marshaled size");
+ }
}
Object command = doUnmarshal(dis);
@@ -197,7 +202,7 @@ final public class OpenWireFormat implements WireFormat {
return command;
}
- public void marshal(Object o, DataOutputStream ds) throws IOException {
+ public void marshal(Object o, DataOutputStream dataOut) throws IOException {
if( cacheEnabled ) {
runMarshallCacheEvictionSweep();
@@ -205,28 +210,53 @@ final public class OpenWireFormat implements WireFormat {
int size=1;
if( o != null) {
+
DataStructure c = (DataStructure) o;
byte type = c.getDataStructureType();
DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[type & 0xFF];
if( dsm == null )
throw new IOException("Unknown data type: "+type);
- BooleanStream bs = new BooleanStream();
- size += dsm.tightMarshal1(this, c, bs);
- size += bs.marshalledSize();
+ if( tightEncodingEnabled ) {
+ BooleanStream bs = new BooleanStream();
+ size += dsm.tightMarshal1(this, c, bs);
+ size += bs.marshalledSize();
+
+ dataOut.writeInt(size);
+ dataOut.writeByte(type);
+ bs.marshal(dataOut);
+ dsm.tightMarshal2(this, c, dataOut, bs);
+ } else {
+ DataOutputStream looseOut = dataOut;
+ ByteArrayOutputStream baos=null;
+
+ if( !sizePrefixDisabled ) {
+ baos = new ByteArrayOutputStream();
+ looseOut = new DataOutputStream(baos);
+ }
+
+ looseOut.writeByte(type);
+ dsm.looseMarshal(this, c, looseOut);
+
+ if( !sizePrefixDisabled ) {
+ looseOut.close();
+ ByteSequence sequence = baos.toByteSequence();
+ dataOut.writeInt(sequence.getLength()-4);
+ dataOut.write(sequence.getData(), sequence.getOffset(), sequence.getLength());
+ }
- ds.writeInt(size);
- ds.writeByte(type);
- bs.marshal(ds);
- dsm.tightMarshal2(this, c, ds, bs);
+ }
+
} else {
- ds.writeInt(size);
- ds.writeByte(NULL_TYPE);
+ dataOut.writeInt(size);
+ dataOut.writeByte(NULL_TYPE);
}
}
public Object unmarshal(DataInputStream dis) throws IOException {
- dis.readInt();
+ if( !sizePrefixDisabled ) {
+ dis.readInt();
+ }
return doUnmarshal(dis);
}
@@ -310,7 +340,10 @@ final public class OpenWireFormat implements WireFormat {
return null;
}
}
-
+// public void debug(String msg) {
+// String t = (Thread.currentThread().getName()+" ").substring(0, 40);
+// System.out.println(t+": "+msg);
+// }
public int tightMarshalNestedObject1(DataStructure o, BooleanStream bs) throws IOException {
bs.writeBoolean(o != null);
if( o == null )
@@ -496,12 +529,33 @@ final public class OpenWireFormat implements WireFormat {
this.tightEncodingEnabled = tightEncodingEnabled;
}
- public boolean isPrefixPacketSize() {
- return prefixPacketSize;
+ public boolean isSizePrefixDisabled() {
+ return sizePrefixDisabled;
}
- public void setPrefixPacketSize(boolean prefixPacketSize) {
- this.prefixPacketSize = prefixPacketSize;
+ public void setSizePrefixDisabled(boolean prefixPacketSize) {
+ this.sizePrefixDisabled = prefixPacketSize;
}
-
+
+ public void setPreferedWireFormatInfo(WireFormatInfo info) {
+ this.preferedWireFormatInfo = info;
+ }
+ public WireFormatInfo getPreferedWireFormatInfo() {
+ return preferedWireFormatInfo;
+ }
+
+ public void renegociatWireFormat(WireFormatInfo info) throws IOException {
+
+ if( preferedWireFormatInfo==null )
+ throw new IllegalStateException("Wireformat cannot not be renegociated.");
+
+ this.setVersion(Math.max(preferedWireFormatInfo.getVersion(), info.getVersion()) );
+ this.stackTraceEnabled = info.isStackTraceEnabled() && preferedWireFormatInfo.isStackTraceEnabled();
+ this.tcpNoDelayEnabled = info.isTcpNoDelayEnabled() && preferedWireFormatInfo.isTcpNoDelayEnabled();
+ this.cacheEnabled = info.isCacheEnabled() && preferedWireFormatInfo.isCacheEnabled();
+ this.tightEncodingEnabled = info.isTightEncodingEnabled() && preferedWireFormatInfo.isTightEncodingEnabled();
+ this.sizePrefixDisabled = info.isSizePrefixDisabled() && preferedWireFormatInfo.isSizePrefixDisabled();
+
+ }
+
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
index aac184a4d2..e0bd520715 100755
--- a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
+++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
@@ -18,28 +18,41 @@ package org.apache.activemq.openwire;
import org.activeio.command.WireFormat;
import org.activeio.command.WireFormatFactory;
+import org.apache.activemq.command.WireFormatInfo;
/**
* @version $Revision$
*/
public class OpenWireFormatFactory implements WireFormatFactory {
+ //
+ // The default values here are what the wireformat chanages to after a default negociation.
+ //
+
private int version=1;
private boolean stackTraceEnabled=true;
- private boolean tcpNoDelayEnabled=false;
+ private boolean tcpNoDelayEnabled=true;
private boolean cacheEnabled=true;
private boolean tightEncodingEnabled=true;
- private boolean prefixPacketSize=true;
+ private boolean sizePrefixDisabled=false;
public WireFormat createWireFormat() {
- OpenWireFormat format = new OpenWireFormat();
- format.setVersion(version);
- format.setStackTraceEnabled(stackTraceEnabled);
- format.setCacheEnabled(cacheEnabled);
- format.setTcpNoDelayEnabled(tcpNoDelayEnabled);
- format.setTightEncodingEnabled(tightEncodingEnabled);
- format.setPrefixPacketSize(prefixPacketSize);
- return format;
+ WireFormatInfo info = new WireFormatInfo();
+ info.setVersion(version);
+
+ try {
+ info.setStackTraceEnabled(stackTraceEnabled);
+ info.setCacheEnabled(cacheEnabled);
+ info.setTcpNoDelayEnabled(tcpNoDelayEnabled);
+ info.setTightEncodingEnabled(tightEncodingEnabled);
+ info.setSizePrefixDisabled(sizePrefixDisabled);
+ } catch (Exception e) {
+ throw new IllegalStateException("Could not configure WireFormatInfo", e);
+ }
+
+ OpenWireFormat f = new OpenWireFormat();
+ f.setPreferedWireFormatInfo(info);
+ return f;
}
public boolean isStackTraceEnabled() {
@@ -82,11 +95,11 @@ public class OpenWireFormatFactory implements WireFormatFactory {
this.tightEncodingEnabled = tightEncodingEnabled;
}
- public boolean isPrefixPacketSize() {
- return prefixPacketSize;
- }
+ public boolean isSizePrefixDisabled() {
+ return sizePrefixDisabled;
+ }
- public void setPrefixPacketSize(boolean prefixPacketSize) {
- this.prefixPacketSize = prefixPacketSize;
- }
+ public void setSizePrefixDisabled(boolean sizePrefixDisabled) {
+ this.sizePrefixDisabled = sizePrefixDisabled;
+ }
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
index 530086818e..59baaefc6c 100644
--- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
+++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
@@ -1 +1,132 @@
-/**
*
* Copyright 2005-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.openwire.v1;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;
/**
* Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller
*
*
* NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the modify the groovy scripts in the
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
* @version $Revision$
*/
public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller {
/**
* Return the type of Data Structure we marshal
* @return short representation of the type data structure
*/
public byte getDataStructureType() {
return NetworkBridgeFilter.DATA_STRUCTURE_TYPE;
}
/**
* @return a new object instance
*/
public DataStructure createObject() {
return new NetworkBridgeFilter();
}
/**
* Un-marshal an object instance from the data input stream
*
* @param o the object to un-marshal
* @param dataIn the data input stream to build the object from
* @throws IOException
*/
public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException {
super.tightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
info.setNetworkTTL(dataIn.readInt());
info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
}
/**
* Write the booleans that this object uses to a BooleanStream
*/
public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getNetworkBrokerId(), bs);
return rc + 4;
}
/**
* Write a object instance to data output stream
*
* @param o the instance to be marshaled
* @param dataOut the output stream
* @throws IOException thrown if an error occurs
*/
public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException {
super.tightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
dataOut.writeInt(info.getNetworkTTL());
tightMarshalCachedObject2(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut, bs);
}
/**
* Un-marshal an object instance from the data input stream
*
* @param o the object to un-marshal
* @param dataIn the data input stream to build the object from
* @throws IOException
*/
public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException {
super.looseUnmarshal(wireFormat, o, dataIn);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
info.setNetworkTTL(dataIn.readInt());
info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
}
/**
* Write the booleans that this object uses to a BooleanStream
*/
public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException {
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
super.looseMarshal(wireFormat, o, dataOut);
dataOut.writeInt(info.getNetworkTTL());
looseMarshalCachedObject(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut);
}
}
\ No newline at end of file
+/**
+ *
+ * Copyright 2005-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.openwire.v1;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller
+ *
+ *
+ * NOTE!: This file is auto generated - do not modify!
+ * if you need to make a change, please see the modify the groovy scripts in the
+ * under src/gram/script and then use maven openwire:generate to regenerate
+ * this file.
+ *
+ * @version $Revision$
+ */
+public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller {
+
+ /**
+ * Return the type of Data Structure we marshal
+ * @return short representation of the type data structure
+ */
+ public byte getDataStructureType() {
+ return NetworkBridgeFilter.DATA_STRUCTURE_TYPE;
+ }
+
+ /**
+ * @return a new object instance
+ */
+ public DataStructure createObject() {
+ return new NetworkBridgeFilter();
+ }
+
+ /**
+ * Un-marshal an object instance from the data input stream
+ *
+ * @param o the object to un-marshal
+ * @param dataIn the data input stream to build the object from
+ * @throws IOException
+ */
+ public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException {
+ super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+ info.setNetworkTTL(dataIn.readInt());
+ info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+
+ }
+
+
+ /**
+ * Write the booleans that this object uses to a BooleanStream
+ */
+ public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+
+ int rc = super.tightMarshal1(wireFormat, o, bs);
+ rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getNetworkBrokerId(), bs);
+
+ return rc + 4;
+ }
+
+ /**
+ * Write a object instance to data output stream
+ *
+ * @param o the instance to be marshaled
+ * @param dataOut the output stream
+ * @throws IOException thrown if an error occurs
+ */
+ public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException {
+ super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+ dataOut.writeInt(info.getNetworkTTL());
+ tightMarshalCachedObject2(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut, bs);
+
+ }
+
+ /**
+ * Un-marshal an object instance from the data input stream
+ *
+ * @param o the object to un-marshal
+ * @param dataIn the data input stream to build the object from
+ * @throws IOException
+ */
+ public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException {
+ super.looseUnmarshal(wireFormat, o, dataIn);
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+ info.setNetworkTTL(dataIn.readInt());
+ info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+
+ }
+
+
+ /**
+ * Write the booleans that this object uses to a BooleanStream
+ */
+ public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException {
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+
+ super.looseMarshal(wireFormat, o, dataOut);
+ dataOut.writeInt(info.getNetworkTTL());
+ looseMarshalCachedObject(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut);
+
+ }
+}
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
index 7d0b16bb54..35716c11ca 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
@@ -61,7 +61,7 @@ public class JDBCPersistenceAdapter implements PersistenceAdapter {
private static final Log log = LogFactory.getLog(JDBCPersistenceAdapter.class);
private static FactoryFinder factoryFinder = new FactoryFinder("META-INF/services/org/apache/activemq/store/jdbc/");
- private WireFormat wireFormat = new OpenWireFormat(false);
+ private WireFormat wireFormat = new OpenWireFormat();
private DataSource dataSource;
private Statements statements;
private JDBCAdapter adapter;
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
index c34ca6b2c0..f0b2d0479e 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
@@ -82,7 +82,7 @@ public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEve
private final PersistenceAdapter longTermPersistence;
final UsageManager usageManager;
- private final WireFormat wireFormat = new OpenWireFormat(false);
+ private final WireFormat wireFormat = new OpenWireFormat();
private final ConcurrentHashMap queues = new ConcurrentHashMap();
private final ConcurrentHashMap topics = new ConcurrentHashMap();
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
index f94a037364..8c9d69a3a6 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
@@ -82,7 +82,7 @@ public class QuickJournalPersistenceAdapter implements PersistenceAdapter, Journ
private final PersistenceAdapter longTermPersistence;
final UsageManager usageManager;
- private final WireFormat wireFormat = new OpenWireFormat(false);
+ private final WireFormat wireFormat = new OpenWireFormat();
private final ConcurrentHashMap queues = new ConcurrentHashMap();
private final ConcurrentHashMap topics = new ConcurrentHashMap();
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java b/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
index e56c30cc2a..965980206b 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
@@ -64,6 +64,7 @@ public class InactivityMonitor extends TransportFilter implements Runnable {
case 0:
writeCheck();
readCheckIteration++;
+ break;
case 1:
readCheck();
writeCheck();
@@ -100,10 +101,10 @@ public class InactivityMonitor extends TransportFilter implements Runnable {
}
if( !commandReceived.get() ) {
- log.debug("No message received since last read check!");
+ log.debug("No message received since last read check! ");
onException(new InactivityIOException("Channel was inactive for too long."));
} else {
- log.debug("Message received since last read check, resetting flag");
+ log.debug("Message received since last read check, resetting flag: ");
}
commandReceived.set(false);
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java b/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
index 6204ca9fbe..cb65988d1a 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
@@ -19,7 +19,6 @@ package org.apache.activemq.transport;
import java.io.IOException;
import java.io.InterruptedIOException;
-import org.activeio.command.WireFormat;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.WireFormatInfo;
import org.apache.activemq.openwire.OpenWireFormat;
@@ -27,17 +26,19 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
public class WireFormatNegotiator extends TransportFilter {
private static final Log log = LogFactory.getLog(WireFormatNegotiator.class);
- private final WireFormat wireFormat;
+ private OpenWireFormat wireFormat;
private final int minimumVersion;
- private boolean firstStart=true;
- private CountDownLatch readyCountDownLatch = new CountDownLatch(1);
+ private final AtomicBoolean firstStart=new AtomicBoolean(true);
+ private final CountDownLatch readyCountDownLatch = new CountDownLatch(1);
+ private final CountDownLatch wireInfoSentDownLatch = new CountDownLatch(1);
/**
* Negotiator
@@ -45,7 +46,7 @@ public class WireFormatNegotiator extends TransportFilter {
* @param next
* @param preferedFormat
*/
- public WireFormatNegotiator(Transport next, WireFormat wireFormat, int minimumVersion) {
+ public WireFormatNegotiator(Transport next, OpenWireFormat wireFormat, int minimumVersion) {
super(next);
this.wireFormat = wireFormat;
this.minimumVersion = minimumVersion;
@@ -54,9 +55,13 @@ public class WireFormatNegotiator extends TransportFilter {
public void start() throws Exception {
super.start();
- if( firstStart ) {
- WireFormatInfo info = createWireFormatInfo();
- next.oneway(info);
+ if( firstStart.compareAndSet(true, false) ) {
+ try {
+ WireFormatInfo info = wireFormat.getPreferedWireFormatInfo();
+ next.oneway(info);
+ } finally {
+ wireInfoSentDownLatch.countDown();
+ }
}
}
@@ -69,18 +74,6 @@ public class WireFormatNegotiator extends TransportFilter {
super.oneway(command);
}
- protected WireFormatInfo createWireFormatInfo() throws IOException {
- WireFormatInfo info = new WireFormatInfo();
- info.setVersion(wireFormat.getVersion());
- if ( wireFormat instanceof OpenWireFormat ) {
- info.setStackTraceEnabled(((OpenWireFormat)wireFormat).isStackTraceEnabled());
- info.setTcpNoDelayEnabled(((OpenWireFormat)wireFormat).isTcpNoDelayEnabled());
- info.setCacheEnabled(((OpenWireFormat)wireFormat).isCacheEnabled());
- info.setPrefixPacketSize(((OpenWireFormat)wireFormat).isPrefixPacketSize());
- info.setTightEncodingEnabled(((OpenWireFormat)wireFormat).isTightEncodingEnabled());
- }
- return info;
- }
public void onCommand(Command command) {
if( command.isWireFormatInfo() ) {
@@ -89,42 +82,33 @@ public class WireFormatNegotiator extends TransportFilter {
log.debug("Received WireFormat: " + info);
}
- if( !info.isValid() ) {
- getTransportListener().onException(new IOException("Remote wire format magic is invalid"));
- } else if( info.getVersion() < minimumVersion ) {
- getTransportListener().onException(new IOException("Remote wire format ("+info.getVersion()+") is lower the minimum version required ("+minimumVersion+")"));
- } else if ( info.getVersion()!=wireFormat.getVersion() ) {
- // Match the remote side.
- wireFormat.setVersion(info.getVersion());
- }
- if ( wireFormat instanceof OpenWireFormat ) {
- try {
- if( !info.isStackTraceEnabled() ) {
- ((OpenWireFormat)wireFormat).setStackTraceEnabled(false);
- }
- if( info.isTcpNoDelayEnabled() ) {
- ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true);
- }
- if( !info.isCacheEnabled() ) {
- ((OpenWireFormat)wireFormat).setCacheEnabled(false);
- }
- if( !info.isPrefixPacketSize() ) {
- ((OpenWireFormat)wireFormat).setPrefixPacketSize(false);
- }
- if( !info.isTightEncodingEnabled() ) {
- ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false);
- }
- } catch (IOException e) {
- getTransportListener().onException(e);
- }
- }
+ try {
+ wireInfoSentDownLatch.await();
+ if( !info.isValid() ) {
+ onException(new IOException("Remote wire format magic is invalid"));
+ } else if( info.getVersion() < minimumVersion ) {
+ onException(new IOException("Remote wire format ("+info.getVersion()+") is lower the minimum version required ("+minimumVersion+")"));
+ }
+
+ wireFormat.renegociatWireFormat(info);
+
+ } catch (IOException e) {
+ onException(e);
+ } catch (InterruptedException e) {
+ onException((IOException) new InterruptedIOException().initCause(e));
+ }
readyCountDownLatch.countDown();
}
getTransportListener().onCommand(command);
}
+ public void onException(IOException error) {
+ readyCountDownLatch.countDown();
+ super.onException(error);
+ }
+
public String toString() {
return next.toString();
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java
index f0f4da2480..7848f3a553 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransportFactory.java
@@ -29,6 +29,7 @@ import org.activeio.adapter.SyncToAsyncChannel;
import org.activeio.command.AsyncChannelToAsyncCommandChannel;
import org.activeio.command.WireFormat;
import org.activeio.net.SocketMetadata;
+import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.transport.InactivityMonitor;
import org.apache.activemq.transport.MutexTransport;
import org.apache.activemq.transport.ResponseCorrelator;
@@ -229,7 +230,10 @@ public class ActiveIOTransportFactory extends TransportFactory {
if( activeIOTransport.isTrace() ) {
transport = new TransportLogger(transport);
}
- transport = new WireFormatNegotiator(transport,format, activeIOTransport.getMinmumWireFormatVersion());
+ if( format instanceof OpenWireFormat ) {
+ transport = new WireFormatNegotiator(transport, (OpenWireFormat) format, activeIOTransport.getMinmumWireFormatVersion());
+ }
+
transport = new InactivityMonitor(transport, activeIOTransport.getMaxInactivityDuration());
transport = new MutexTransport(transport);
transport = new ResponseCorrelator(transport);
@@ -275,7 +279,9 @@ public class ActiveIOTransportFactory extends TransportFactory {
if( activeIOTransport.isTrace() ) {
transport = new TransportLogger(transport);
}
- transport = new WireFormatNegotiator(transport,format, activeIOTransport.getMinmumWireFormatVersion());
+ if( format instanceof OpenWireFormat ) {
+ transport = new WireFormatNegotiator(transport, (OpenWireFormat) format, activeIOTransport.getMinmumWireFormatVersion());
+ }
transport = new InactivityMonitor(transport, activeIOTransport.getMaxInactivityDuration());
return transport;
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
index 067c76fe25..1435864d0f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
@@ -64,8 +64,10 @@ public class TcpTransportFactory extends TransportFactory {
transport = new TransportLogger(transport);
}
- if( format instanceof OpenWireFormat )
- transport = new WireFormatNegotiator(transport, format, tcpTransport.getMinmumWireFormatVersion());
+ // Only need the OpenWireFormat if using openwire
+ if( format instanceof OpenWireFormat ) {
+ transport = new WireFormatNegotiator(transport, (OpenWireFormat)format, tcpTransport.getMinmumWireFormatVersion());
+ }
if( tcpTransport.getMaxInactivityDuration() > 0 ) {
transport = new InactivityMonitor(transport, tcpTransport.getMaxInactivityDuration());
@@ -83,7 +85,11 @@ public class TcpTransportFactory extends TransportFactory {
transport = new TransportLogger(transport);
}
- transport = new WireFormatNegotiator(transport, format, tcpTransport.getMinmumWireFormatVersion());
+ // Only need the OpenWireFormat if using openwire
+ if( format instanceof OpenWireFormat ) {
+ transport = new WireFormatNegotiator(transport, (OpenWireFormat)format, tcpTransport.getMinmumWireFormatVersion());
+ }
+
if( tcpTransport.getMaxInactivityDuration() > 0 ) {
transport = new InactivityMonitor(transport, tcpTransport.getMaxInactivityDuration());
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java b/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
index 9b14279734..013fdd69d7 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
@@ -83,7 +83,7 @@ public class UdpTransportFactory extends TransportFactory {
protected Transport createTransport(URI location, WireFormat wf) throws UnknownHostException, IOException {
OpenWireFormat wireFormat = (OpenWireFormat) wf;
- wireFormat.setPrefixPacketSize(false);
+ wireFormat.setSizePrefixDisabled(true);
return new UdpTransport(wireFormat, location);
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java b/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
index 3ca3d8ea5c..c67624667c 100755
--- a/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
+++ b/activemq-core/src/main/java/org/apache/activemq/util/MarshallingSupport.java
@@ -61,13 +61,21 @@ public class MarshallingSupport {
}
}
+ static public HashMap unmarshalPrimitiveMap(DataInputStream in) throws IOException {
+ return unmarshalPrimitiveMap(in, Integer.MAX_VALUE);
+ }
+
/**
* @param in
* @return
+ * @throws IOException
* @throws IOException
*/
- static public HashMap unmarshalPrimitiveMap(DataInputStream in) throws IOException {
+ public static HashMap unmarshalPrimitiveMap(DataInputStream in, int max_property_size) throws IOException {
int size = in.readInt();
+ if( size > max_property_size ) {
+ throw new IOException("Primitive map is larger than the allowed size: "+size);
+ }
if( size < 0 ) {
return null;
} else {
@@ -266,4 +274,5 @@ public class MarshallingSupport {
}
}
+
}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
index f057b67285..31f508f722 100755
--- a/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
@@ -35,9 +35,15 @@ public class MarshallingBrokerTest extends BrokerTest {
public WireFormat wireFormat = new OpenWireFormat();
public void initCombos() {
+
+ OpenWireFormat wf1 = new OpenWireFormat();
+ wf1.setCacheEnabled(false);
+ OpenWireFormat wf2 = new OpenWireFormat();
+ wf2.setCacheEnabled(true);
+
addCombinationValues( "wireFormat", new Object[]{
- new OpenWireFormat(true),
- new OpenWireFormat(false),
+ wf1,
+ wf2,
});
}
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
index 810965559e..b382794269 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
@@ -22,6 +22,7 @@ import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URL;
@@ -153,5 +154,5 @@ abstract public class DataFileGenerator extends Assert {
}
}
- abstract protected Object createObject();
+ abstract protected Object createObject() throws IOException;
}
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java b/activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java
index edf0e53487..d52b4c966d 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/WireFormatInfoData.java
@@ -16,13 +16,16 @@
*/
package org.apache.activemq.openwire;
+import java.io.IOException;
+
import org.apache.activemq.command.WireFormatInfo;
public class WireFormatInfoData extends DataFileGenerator {
- protected Object createObject() {
+ protected Object createObject() throws IOException {
WireFormatInfo rc = new WireFormatInfo();
rc.setResponseRequired(false);
+ rc.setCacheEnabled(true);
rc.setVersion(1);
return rc;
}
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java
index aa13731116..0ecfafc091 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQBytesMessageTest extends ActiveMQMessageTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java
index 62694c6f3e..9af8252a2e 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public abstract class ActiveMQDestinationTestSupport extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java
index a0714a8f4b..ec7c3f963b 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQMapMessageTest extends ActiveMQMessageTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java
index 2f2037b4c3..bc4048ce1f 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQMessageTest extends MessageTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java
index 1b874e4779..e88dbef3d2 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQObjectMessageTest extends ActiveMQMessageTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java
index 6516221b64..a0ad108772 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQQueueTest extends ActiveMQDestinationTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java
index c39cd9c60a..1870f005fe 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQStreamMessageTest extends ActiveMQMessageTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java
index 0ec0d93b3b..102cb53793 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public abstract class ActiveMQTempDestinationTestSupport extends ActiveMQDestinationTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java
index 3bcee31b0e..9dfd271020 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQTempQueueTest extends ActiveMQTempDestinationTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java
index dc4b00d600..c0e9ec3712 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQTempTopicTest extends ActiveMQTempDestinationTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java
index 33cc69c173..783a167651 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQTextMessageTest extends ActiveMQMessageTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTopicTest.java
index 9c7ba1b064..be43de2159 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTopicTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTopicTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ActiveMQTopicTest extends ActiveMQDestinationTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BaseCommandTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BaseCommandTestSupport.java
index 7708e3d3ae..c9b3066255 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BaseCommandTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BaseCommandTestSupport.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public abstract class BaseCommandTestSupport extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerIdTest.java
index 59cb8f9de5..b11771b8e6 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class BrokerIdTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java
index 8bc3b5fd7a..bfe675f4cc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class BrokerInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionErrorTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionErrorTest.java
index f501335de2..641191d970 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionErrorTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionErrorTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ConnectionErrorTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionIdTest.java
index 7545e9aa2c..86d0a94632 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ConnectionIdTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionInfoTest.java
index 6b1103b349..0273c689d4 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ConnectionInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerIdTest.java
index d1a8179016..733be2bf52 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ConsumerIdTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java
index b7d5cad6c1..d55607e722 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ConsumerInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ControlCommandTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ControlCommandTest.java
index 0fb7297d84..59febc60c9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ControlCommandTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ControlCommandTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ControlCommandTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataArrayResponseTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataArrayResponseTest.java
index 7fc957c05d..dd63c62ef7 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataArrayResponseTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataArrayResponseTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class DataArrayResponseTest extends ResponseTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataResponseTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataResponseTest.java
index e6dfa3d3a4..9f9700c38b 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataResponseTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DataResponseTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class DataResponseTest extends ResponseTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DestinationInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DestinationInfoTest.java
index 3dd1630f40..a138760845 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DestinationInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DestinationInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class DestinationInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DiscoveryEventTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DiscoveryEventTest.java
index 2ec41f321f..913b38a8ac 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DiscoveryEventTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/DiscoveryEventTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class DiscoveryEventTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ExceptionResponseTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ExceptionResponseTest.java
index f5fdb1e1ac..753504e393 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ExceptionResponseTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ExceptionResponseTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ExceptionResponseTest extends ResponseTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/FlushCommandTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/FlushCommandTest.java
index bff4893f4c..550deae206 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/FlushCommandTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/FlushCommandTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class FlushCommandTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/IntegerResponseTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/IntegerResponseTest.java
index eacf61f6d0..ccdad39a02 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/IntegerResponseTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/IntegerResponseTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class IntegerResponseTest extends ResponseTest {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalQueueAckTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalQueueAckTest.java
index 8e473b7042..2bb4d63726 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalQueueAckTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalQueueAckTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class JournalQueueAckTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTopicAckTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTopicAckTest.java
index da09663d0e..c26851791d 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTopicAckTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTopicAckTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class JournalTopicAckTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTraceTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTraceTest.java
index c442747e40..00c323aa46 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTraceTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTraceTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class JournalTraceTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTransactionTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTransactionTest.java
index 0888375614..c29e9856aa 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTransactionTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/JournalTransactionTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class JournalTransactionTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/KeepAliveInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/KeepAliveInfoTest.java
index 0e7a1509e0..3b6d466c83 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/KeepAliveInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/KeepAliveInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class KeepAliveInfoTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/LocalTransactionIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/LocalTransactionIdTest.java
index 756a5f634b..5a5b363493 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/LocalTransactionIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/LocalTransactionIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class LocalTransactionIdTest extends TransactionIdTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java
index 7cf1d5c653..07c6fcbd35 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class MessageAckTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationTest.java
index 45ee2f122f..08218d54bc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class MessageDispatchNotificationTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchTest.java
index e9b4416656..d0c10a60e9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageDispatchTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class MessageDispatchTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageIdTest.java
index 588e8d099d..97333f75a0 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class MessageIdTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
index fa5f353016..8ea87f3f2a 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public abstract class MessageTestSupport extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java
index 38edcb2154..a7382fa906 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java
@@ -1 +1,57 @@
-/**
*
* Copyright 2005-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.openwire.v1;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;
/**
* Test case for the OpenWire marshalling for NetworkBridgeFilter
*
*
* NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the modify the groovy scripts in the
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
* @version $Revision: $
*/
public class NetworkBridgeFilterTest extends DataFileGeneratorTestSupport {
public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest();
public Object createObject() throws Exception {
NetworkBridgeFilter info = new NetworkBridgeFilter();
populateObject(info);
return info;
}
protected void populateObject(Object object) throws Exception {
super.populateObject(object);
NetworkBridgeFilter info = (NetworkBridgeFilter) object;
info.setNetworkTTL(1);
info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1"));
}
}
\ No newline at end of file
+/**
+ *
+ * Copyright 2005-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.openwire.v1;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+/**
+ * Test case for the OpenWire marshalling for NetworkBridgeFilter
+ *
+ *
+ * NOTE!: This file is auto generated - do not modify!
+ * if you need to make a change, please see the modify the groovy scripts in the
+ * under src/gram/script and then use maven openwire:generate to regenerate
+ * this file.
+ *
+ * @version $Revision: $
+ */
+public class NetworkBridgeFilterTest extends DataFileGeneratorTestSupport {
+
+
+ public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest();
+
+ public Object createObject() throws Exception {
+ NetworkBridgeFilter info = new NetworkBridgeFilter();
+ populateObject(info);
+ return info;
+ }
+
+
+ protected void populateObject(Object object) throws Exception {
+ super.populateObject(object);
+ NetworkBridgeFilter info = (NetworkBridgeFilter) object;
+ info.setNetworkTTL(1);
+ info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1"));
+
+ }
+ }
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerIdTest.java
index faedb172f8..f22fa43df9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ProducerIdTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerInfoTest.java
index c0310e561f..178b426ee8 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ProducerInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ProducerInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveInfoTest.java
index 2e604a898c..a57bd37da3 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class RemoveInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
index 46b1bb8d2d..0406719a4a 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class RemoveSubscriptionInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ReplayCommandTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ReplayCommandTest.java
index 111f69a4e9..963012e67c 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ReplayCommandTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ReplayCommandTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ReplayCommandTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java
index 05b07a2c2c..477f37d06f 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ResponseTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java
index c8c6607bc5..0714c5e06d 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class SessionIdTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java
index 086d840ec4..f40deaf6e4 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class SessionInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java
index 31d7a25336..f9c2f81aff 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class ShutdownInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
index 5c65552bd1..0611c2edd9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class SubscriptionInfoTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java
index 489808af0d..1fc6e494e8 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public abstract class TransactionIdTestSupport extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java
index 1e910b6cc9..264e232560 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class TransactionInfoTest extends BaseCommandTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
index 4f64585954..0e09956ee9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class WireFormatInfoTest extends DataFileGeneratorTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java
index 25337bfc04..a9b47be6b5 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.command.*;
* under src/gram/script and then use maven openwire:generate to regenerate
* this file.
*
- * @version $Revision: $
+ * @version $Revision$
*/
public class XATransactionIdTest extends TransactionIdTestSupport {
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
index 4ee0943e7b..9b7c596ced 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
@@ -38,10 +38,10 @@ public class InactivityMonitorTest extends CombinationTestSupport implements Tra
protected void setUp() throws Exception {
super.setUp();
- server = TransportFactory.bind("localhost", new URI("tcp://localhost:61616?maxInactivityDuration="+serverInactivityLimit));
+ server = TransportFactory.bind("localhost", new URI("tcp://localhost:61616?trace=true&maxInactivityDuration="+serverInactivityLimit));
server.setAcceptListener(this);
server.start();
- clientTransport = TransportFactory.connect(new URI("tcp://localhost:61616?maxInactivityDuration="+clientInactivityLimit));
+ clientTransport = TransportFactory.connect(new URI("tcp://localhost:61616?trace=true&maxInactivityDuration="+clientInactivityLimit));
clientTransport.setTransportListener(new TransportListener() {
public void onCommand(Command command) {
clientReceiveCount.incrementAndGet();
@@ -130,8 +130,10 @@ public class InactivityMonitorTest extends CombinationTestSupport implements Tra
Thread.sleep(4000);
- assertEquals(0, clientErrorCount.get());
- assertEquals(0, serverErrorCount.get());
+ if( clientErrorCount.get() > 0 )
+ assertEquals(0, clientErrorCount.get());
+ if( serverErrorCount.get() > 0 )
+ assertEquals(0, serverErrorCount.get());
}
/**
diff --git a/activemq-dotnet/activemq-dotnet.csproj b/activemq-dotnet/activemq-dotnet.csproj
index a014ad11c9..b62316fb15 100644
--- a/activemq-dotnet/activemq-dotnet.csproj
+++ b/activemq-dotnet/activemq-dotnet.csproj
@@ -87,6 +87,7 @@
+
@@ -160,6 +161,7 @@
+
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
index cb85e3c6d0..2835f33ec3 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
@@ -1 +1,85 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for BrokerId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class BrokerId : AbstractCommand, DataStructure
{
public const byte ID_BrokerId = 124;
string value;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(Value);
return answer;
}
public override bool Equals(object that) {
if (that is BrokerId) {
return Equals((BrokerId) that);
}
return false;
}
public virtual bool Equals(BrokerId that) {
if (! Equals(this.Value, that.Value)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " Value=" + Value
+ " ]";
}
public override byte GetDataStructureType() {
return ID_BrokerId;
}
// Properties
public string Value
{
get { return value; }
set { this.value = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for BrokerId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class BrokerId : AbstractCommand, DataStructure
+ {
+ public const byte ID_BrokerId = 124;
+
+ string value;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(Value);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is BrokerId) {
+ return Equals((BrokerId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(BrokerId that) {
+ if (! Equals(this.Value, that.Value)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Value=" + Value
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_BrokerId;
+ }
+
+
+ // Properties
+
+ public string Value
+ {
+ get { return value; }
+ set { this.value = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
index 2d87fdb412..b23e949d04 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
@@ -1 +1,95 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for BrokerInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class BrokerInfo : BaseCommand
{
public const byte ID_BrokerInfo = 2;
BrokerId brokerId;
string brokerURL;
BrokerInfo[] peerBrokerInfos;
string brokerName;
bool slaveBroker;
public override string ToString() {
return GetType().Name + "["
+ " BrokerId=" + BrokerId
+ " BrokerURL=" + BrokerURL
+ " PeerBrokerInfos=" + PeerBrokerInfos
+ " BrokerName=" + BrokerName
+ " SlaveBroker=" + SlaveBroker
+ " ]";
}
public override byte GetDataStructureType() {
return ID_BrokerInfo;
}
// Properties
public BrokerId BrokerId
{
get { return brokerId; }
set { this.brokerId = value; }
}
public string BrokerURL
{
get { return brokerURL; }
set { this.brokerURL = value; }
}
public BrokerInfo[] PeerBrokerInfos
{
get { return peerBrokerInfos; }
set { this.peerBrokerInfos = value; }
}
public string BrokerName
{
get { return brokerName; }
set { this.brokerName = value; }
}
public bool SlaveBroker
{
get { return slaveBroker; }
set { this.slaveBroker = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for BrokerInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class BrokerInfo : BaseCommand
+ {
+ public const byte ID_BrokerInfo = 2;
+
+ BrokerId brokerId;
+ string brokerURL;
+ BrokerInfo[] peerBrokerInfos;
+ string brokerName;
+ bool slaveBroker;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " BrokerId=" + BrokerId
+ + " BrokerURL=" + BrokerURL
+ + " PeerBrokerInfos=" + PeerBrokerInfos
+ + " BrokerName=" + BrokerName
+ + " SlaveBroker=" + SlaveBroker
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_BrokerInfo;
+ }
+
+
+ // Properties
+
+ public BrokerId BrokerId
+ {
+ get { return brokerId; }
+ set { this.brokerId = value; }
+ }
+
+ public string BrokerURL
+ {
+ get { return brokerURL; }
+ set { this.brokerURL = value; }
+ }
+
+ public BrokerInfo[] PeerBrokerInfos
+ {
+ get { return peerBrokerInfos; }
+ set { this.peerBrokerInfos = value; }
+ }
+
+ public string BrokerName
+ {
+ get { return brokerName; }
+ set { this.brokerName = value; }
+ }
+
+ public bool SlaveBroker
+ {
+ get { return slaveBroker; }
+ set { this.slaveBroker = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
index 0d62ddeb7d..7c5f3f0f63 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ConnectionError
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ConnectionError : BaseCommand
{
public const byte ID_ConnectionError = 16;
BrokerError exception;
ConnectionId connectionId;
public override string ToString() {
return GetType().Name + "["
+ " Exception=" + Exception
+ " ConnectionId=" + ConnectionId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ConnectionError;
}
// Properties
public BrokerError Exception
{
get { return exception; }
set { this.exception = value; }
}
public ConnectionId ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ConnectionError
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ConnectionError : BaseCommand
+ {
+ public const byte ID_ConnectionError = 16;
+
+ BrokerError exception;
+ ConnectionId connectionId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Exception=" + Exception
+ + " ConnectionId=" + ConnectionId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ConnectionError;
+ }
+
+
+ // Properties
+
+ public BrokerError Exception
+ {
+ get { return exception; }
+ set { this.exception = value; }
+ }
+
+ public ConnectionId ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
index d16b366ade..66231994a8 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
@@ -1 +1,85 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ConnectionId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ConnectionId : AbstractCommand, DataStructure
{
public const byte ID_ConnectionId = 120;
string value;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(Value);
return answer;
}
public override bool Equals(object that) {
if (that is ConnectionId) {
return Equals((ConnectionId) that);
}
return false;
}
public virtual bool Equals(ConnectionId that) {
if (! Equals(this.Value, that.Value)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " Value=" + Value
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ConnectionId;
}
// Properties
public string Value
{
get { return value; }
set { this.value = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ConnectionId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ConnectionId : AbstractCommand, DataStructure
+ {
+ public const byte ID_ConnectionId = 120;
+
+ string value;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(Value);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is ConnectionId) {
+ return Equals((ConnectionId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(ConnectionId that) {
+ if (! Equals(this.Value, that.Value)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Value=" + Value
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ConnectionId;
+ }
+
+
+ // Properties
+
+ public string Value
+ {
+ get { return value; }
+ set { this.value = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
index 41c04f5165..8dbbaf6546 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
@@ -1 +1,95 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ConnectionInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ConnectionInfo : BaseCommand
{
public const byte ID_ConnectionInfo = 3;
ConnectionId connectionId;
string clientId;
string password;
string userName;
BrokerId[] brokerPath;
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " ClientId=" + ClientId
+ " Password=" + Password
+ " UserName=" + UserName
+ " BrokerPath=" + BrokerPath
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ConnectionInfo;
}
// Properties
public ConnectionId ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public string ClientId
{
get { return clientId; }
set { this.clientId = value; }
}
public string Password
{
get { return password; }
set { this.password = value; }
}
public string UserName
{
get { return userName; }
set { this.userName = value; }
}
public BrokerId[] BrokerPath
{
get { return brokerPath; }
set { this.brokerPath = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ConnectionInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ConnectionInfo : BaseCommand
+ {
+ public const byte ID_ConnectionInfo = 3;
+
+ ConnectionId connectionId;
+ string clientId;
+ string password;
+ string userName;
+ BrokerId[] brokerPath;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " ClientId=" + ClientId
+ + " Password=" + Password
+ + " UserName=" + UserName
+ + " BrokerPath=" + BrokerPath
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ConnectionInfo;
+ }
+
+
+ // Properties
+
+ public ConnectionId ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public string ClientId
+ {
+ get { return clientId; }
+ set { this.clientId = value; }
+ }
+
+ public string Password
+ {
+ get { return password; }
+ set { this.password = value; }
+ }
+
+ public string UserName
+ {
+ get { return userName; }
+ set { this.userName = value; }
+ }
+
+ public BrokerId[] BrokerPath
+ {
+ get { return brokerPath; }
+ set { this.brokerPath = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs
index 358f36db5e..de285f9956 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs
@@ -1 +1,105 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ConsumerId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ConsumerId : AbstractCommand, DataStructure
{
public const byte ID_ConsumerId = 122;
string connectionId;
long sessionId;
long value;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(ConnectionId);
answer = (answer * 37) + HashCode(SessionId);
answer = (answer * 37) + HashCode(Value);
return answer;
}
public override bool Equals(object that) {
if (that is ConsumerId) {
return Equals((ConsumerId) that);
}
return false;
}
public virtual bool Equals(ConsumerId that) {
if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
if (! Equals(this.SessionId, that.SessionId)) return false;
if (! Equals(this.Value, that.Value)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " SessionId=" + SessionId
+ " Value=" + Value
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ConsumerId;
}
// Properties
public string ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public long SessionId
{
get { return sessionId; }
set { this.sessionId = value; }
}
public long Value
{
get { return value; }
set { this.value = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ConsumerId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ConsumerId : AbstractCommand, DataStructure
+ {
+ public const byte ID_ConsumerId = 122;
+
+ string connectionId;
+ long sessionId;
+ long value;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(ConnectionId);
+ answer = (answer * 37) + HashCode(SessionId);
+ answer = (answer * 37) + HashCode(Value);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is ConsumerId) {
+ return Equals((ConsumerId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(ConsumerId that) {
+ if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
+ if (! Equals(this.SessionId, that.SessionId)) return false;
+ if (! Equals(this.Value, that.Value)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " SessionId=" + SessionId
+ + " Value=" + Value
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ConsumerId;
+ }
+
+
+ // Properties
+
+ public string ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public long SessionId
+ {
+ get { return sessionId; }
+ set { this.sessionId = value; }
+ }
+
+ public long Value
+ {
+ get { return value; }
+ set { this.value = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs
index 894ea6fcf2..5d3a9870b3 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs
@@ -1 +1,175 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ConsumerInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ConsumerInfo : BaseCommand
{
public const byte ID_ConsumerInfo = 5;
ConsumerId consumerId;
bool browser;
ActiveMQDestination destination;
int prefetchSize;
int maximumPendingMessageLimit;
bool dispatchAsync;
string selector;
string subcriptionName;
bool noLocal;
bool exclusive;
bool retroactive;
byte priority;
BrokerId[] brokerPath;
BooleanExpression additionalPredicate;
bool networkSubscription;
public override string ToString() {
return GetType().Name + "["
+ " ConsumerId=" + ConsumerId
+ " Browser=" + Browser
+ " Destination=" + Destination
+ " PrefetchSize=" + PrefetchSize
+ " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit
+ " DispatchAsync=" + DispatchAsync
+ " Selector=" + Selector
+ " SubcriptionName=" + SubcriptionName
+ " NoLocal=" + NoLocal
+ " Exclusive=" + Exclusive
+ " Retroactive=" + Retroactive
+ " Priority=" + Priority
+ " BrokerPath=" + BrokerPath
+ " AdditionalPredicate=" + AdditionalPredicate
+ " NetworkSubscription=" + NetworkSubscription
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ConsumerInfo;
}
// Properties
public ConsumerId ConsumerId
{
get { return consumerId; }
set { this.consumerId = value; }
}
public bool Browser
{
get { return browser; }
set { this.browser = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public int PrefetchSize
{
get { return prefetchSize; }
set { this.prefetchSize = value; }
}
public int MaximumPendingMessageLimit
{
get { return maximumPendingMessageLimit; }
set { this.maximumPendingMessageLimit = value; }
}
public bool DispatchAsync
{
get { return dispatchAsync; }
set { this.dispatchAsync = value; }
}
public string Selector
{
get { return selector; }
set { this.selector = value; }
}
public string SubcriptionName
{
get { return subcriptionName; }
set { this.subcriptionName = value; }
}
public bool NoLocal
{
get { return noLocal; }
set { this.noLocal = value; }
}
public bool Exclusive
{
get { return exclusive; }
set { this.exclusive = value; }
}
public bool Retroactive
{
get { return retroactive; }
set { this.retroactive = value; }
}
public byte Priority
{
get { return priority; }
set { this.priority = value; }
}
public BrokerId[] BrokerPath
{
get { return brokerPath; }
set { this.brokerPath = value; }
}
public BooleanExpression AdditionalPredicate
{
get { return additionalPredicate; }
set { this.additionalPredicate = value; }
}
public bool NetworkSubscription
{
get { return networkSubscription; }
set { this.networkSubscription = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ConsumerInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ConsumerInfo : BaseCommand
+ {
+ public const byte ID_ConsumerInfo = 5;
+
+ ConsumerId consumerId;
+ bool browser;
+ ActiveMQDestination destination;
+ int prefetchSize;
+ int maximumPendingMessageLimit;
+ bool dispatchAsync;
+ string selector;
+ string subcriptionName;
+ bool noLocal;
+ bool exclusive;
+ bool retroactive;
+ byte priority;
+ BrokerId[] brokerPath;
+ BooleanExpression additionalPredicate;
+ bool networkSubscription;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConsumerId=" + ConsumerId
+ + " Browser=" + Browser
+ + " Destination=" + Destination
+ + " PrefetchSize=" + PrefetchSize
+ + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit
+ + " DispatchAsync=" + DispatchAsync
+ + " Selector=" + Selector
+ + " SubcriptionName=" + SubcriptionName
+ + " NoLocal=" + NoLocal
+ + " Exclusive=" + Exclusive
+ + " Retroactive=" + Retroactive
+ + " Priority=" + Priority
+ + " BrokerPath=" + BrokerPath
+ + " AdditionalPredicate=" + AdditionalPredicate
+ + " NetworkSubscription=" + NetworkSubscription
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ConsumerInfo;
+ }
+
+
+ // Properties
+
+ public ConsumerId ConsumerId
+ {
+ get { return consumerId; }
+ set { this.consumerId = value; }
+ }
+
+ public bool Browser
+ {
+ get { return browser; }
+ set { this.browser = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public int PrefetchSize
+ {
+ get { return prefetchSize; }
+ set { this.prefetchSize = value; }
+ }
+
+ public int MaximumPendingMessageLimit
+ {
+ get { return maximumPendingMessageLimit; }
+ set { this.maximumPendingMessageLimit = value; }
+ }
+
+ public bool DispatchAsync
+ {
+ get { return dispatchAsync; }
+ set { this.dispatchAsync = value; }
+ }
+
+ public string Selector
+ {
+ get { return selector; }
+ set { this.selector = value; }
+ }
+
+ public string SubcriptionName
+ {
+ get { return subcriptionName; }
+ set { this.subcriptionName = value; }
+ }
+
+ public bool NoLocal
+ {
+ get { return noLocal; }
+ set { this.noLocal = value; }
+ }
+
+ public bool Exclusive
+ {
+ get { return exclusive; }
+ set { this.exclusive = value; }
+ }
+
+ public bool Retroactive
+ {
+ get { return retroactive; }
+ set { this.retroactive = value; }
+ }
+
+ public byte Priority
+ {
+ get { return priority; }
+ set { this.priority = value; }
+ }
+
+ public BrokerId[] BrokerPath
+ {
+ get { return brokerPath; }
+ set { this.brokerPath = value; }
+ }
+
+ public BooleanExpression AdditionalPredicate
+ {
+ get { return additionalPredicate; }
+ set { this.additionalPredicate = value; }
+ }
+
+ public bool NetworkSubscription
+ {
+ get { return networkSubscription; }
+ set { this.networkSubscription = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs
index 9e60e1445e..25969600d6 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ControlCommand
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ControlCommand : BaseCommand
{
public const byte ID_ControlCommand = 14;
string command;
public override string ToString() {
return GetType().Name + "["
+ " Command=" + Command
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ControlCommand;
}
// Properties
public string Command
{
get { return command; }
set { this.command = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ControlCommand
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ControlCommand : BaseCommand
+ {
+ public const byte ID_ControlCommand = 14;
+
+ string command;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Command=" + Command
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ControlCommand;
+ }
+
+
+ // Properties
+
+ public string Command
+ {
+ get { return command; }
+ set { this.command = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs
index 67242ef9f7..82d73eaa00 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for DataArrayResponse
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class DataArrayResponse : Response
{
public const byte ID_DataArrayResponse = 33;
DataStructure[] data;
public override string ToString() {
return GetType().Name + "["
+ " Data=" + Data
+ " ]";
}
public override byte GetDataStructureType() {
return ID_DataArrayResponse;
}
// Properties
public DataStructure[] Data
{
get { return data; }
set { this.data = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for DataArrayResponse
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class DataArrayResponse : Response
+ {
+ public const byte ID_DataArrayResponse = 33;
+
+ DataStructure[] data;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Data=" + Data
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_DataArrayResponse;
+ }
+
+
+ // Properties
+
+ public DataStructure[] Data
+ {
+ get { return data; }
+ set { this.data = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs
index 264092f635..b15e5b8d10 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for DataResponse
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class DataResponse : Response
{
public const byte ID_DataResponse = 32;
DataStructure data;
public override string ToString() {
return GetType().Name + "["
+ " Data=" + Data
+ " ]";
}
public override byte GetDataStructureType() {
return ID_DataResponse;
}
// Properties
public DataStructure Data
{
get { return data; }
set { this.data = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for DataResponse
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class DataResponse : Response
+ {
+ public const byte ID_DataResponse = 32;
+
+ DataStructure data;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Data=" + Data
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_DataResponse;
+ }
+
+
+ // Properties
+
+ public DataStructure Data
+ {
+ get { return data; }
+ set { this.data = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs
index c522d5fe2a..aff7c7dd95 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs
@@ -1 +1,95 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for DestinationInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class DestinationInfo : BaseCommand
{
public const byte ID_DestinationInfo = 8;
ConnectionId connectionId;
ActiveMQDestination destination;
byte operationType;
long timeout;
BrokerId[] brokerPath;
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " Destination=" + Destination
+ " OperationType=" + OperationType
+ " Timeout=" + Timeout
+ " BrokerPath=" + BrokerPath
+ " ]";
}
public override byte GetDataStructureType() {
return ID_DestinationInfo;
}
// Properties
public ConnectionId ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public byte OperationType
{
get { return operationType; }
set { this.operationType = value; }
}
public long Timeout
{
get { return timeout; }
set { this.timeout = value; }
}
public BrokerId[] BrokerPath
{
get { return brokerPath; }
set { this.brokerPath = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for DestinationInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class DestinationInfo : BaseCommand
+ {
+ public const byte ID_DestinationInfo = 8;
+
+ ConnectionId connectionId;
+ ActiveMQDestination destination;
+ byte operationType;
+ long timeout;
+ BrokerId[] brokerPath;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " Destination=" + Destination
+ + " OperationType=" + OperationType
+ + " Timeout=" + Timeout
+ + " BrokerPath=" + BrokerPath
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_DestinationInfo;
+ }
+
+
+ // Properties
+
+ public ConnectionId ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public byte OperationType
+ {
+ get { return operationType; }
+ set { this.operationType = value; }
+ }
+
+ public long Timeout
+ {
+ get { return timeout; }
+ set { this.timeout = value; }
+ }
+
+ public BrokerId[] BrokerPath
+ {
+ get { return brokerPath; }
+ set { this.brokerPath = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs
index 78be853a3a..d4d70f853a 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for DiscoveryEvent
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class DiscoveryEvent : AbstractCommand, DataStructure
{
public const byte ID_DiscoveryEvent = 40;
string serviceName;
string brokerName;
public override string ToString() {
return GetType().Name + "["
+ " ServiceName=" + ServiceName
+ " BrokerName=" + BrokerName
+ " ]";
}
public override byte GetDataStructureType() {
return ID_DiscoveryEvent;
}
// Properties
public string ServiceName
{
get { return serviceName; }
set { this.serviceName = value; }
}
public string BrokerName
{
get { return brokerName; }
set { this.brokerName = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for DiscoveryEvent
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class DiscoveryEvent : AbstractCommand, DataStructure
+ {
+ public const byte ID_DiscoveryEvent = 40;
+
+ string serviceName;
+ string brokerName;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ServiceName=" + ServiceName
+ + " BrokerName=" + BrokerName
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_DiscoveryEvent;
+ }
+
+
+ // Properties
+
+ public string ServiceName
+ {
+ get { return serviceName; }
+ set { this.serviceName = value; }
+ }
+
+ public string BrokerName
+ {
+ get { return brokerName; }
+ set { this.brokerName = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs
index c56043acce..8e3aee9281 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ExceptionResponse
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ExceptionResponse : Response
{
public const byte ID_ExceptionResponse = 31;
BrokerError exception;
public override string ToString() {
return GetType().Name + "["
+ " Exception=" + Exception
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ExceptionResponse;
}
// Properties
public BrokerError Exception
{
get { return exception; }
set { this.exception = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ExceptionResponse
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ExceptionResponse : Response
+ {
+ public const byte ID_ExceptionResponse = 31;
+
+ BrokerError exception;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Exception=" + Exception
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ExceptionResponse;
+ }
+
+
+ // Properties
+
+ public BrokerError Exception
+ {
+ get { return exception; }
+ set { this.exception = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs
index 9c06ef2a01..3cb60557db 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs
@@ -1 +1,55 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for FlushCommand
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class FlushCommand : BaseCommand
{
public const byte ID_FlushCommand = 15;
public override string ToString() {
return GetType().Name + "["
+ " ]";
}
public override byte GetDataStructureType() {
return ID_FlushCommand;
}
// Properties
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for FlushCommand
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class FlushCommand : BaseCommand
+ {
+ public const byte ID_FlushCommand = 15;
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_FlushCommand;
+ }
+
+
+ // Properties
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs
index ed4df4afe8..030ea53768 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for IntegerResponse
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class IntegerResponse : Response
{
public const byte ID_IntegerResponse = 34;
int result;
public override string ToString() {
return GetType().Name + "["
+ " Result=" + Result
+ " ]";
}
public override byte GetDataStructureType() {
return ID_IntegerResponse;
}
// Properties
public int Result
{
get { return result; }
set { this.result = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for IntegerResponse
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class IntegerResponse : Response
+ {
+ public const byte ID_IntegerResponse = 34;
+
+ int result;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Result=" + Result
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_IntegerResponse;
+ }
+
+
+ // Properties
+
+ public int Result
+ {
+ get { return result; }
+ set { this.result = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs
index 5e1401afa4..a1218b14d9 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for JournalQueueAck
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class JournalQueueAck : AbstractCommand, DataStructure
{
public const byte ID_JournalQueueAck = 52;
ActiveMQDestination destination;
MessageAck messageAck;
public override string ToString() {
return GetType().Name + "["
+ " Destination=" + Destination
+ " MessageAck=" + MessageAck
+ " ]";
}
public override byte GetDataStructureType() {
return ID_JournalQueueAck;
}
// Properties
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public MessageAck MessageAck
{
get { return messageAck; }
set { this.messageAck = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for JournalQueueAck
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class JournalQueueAck : AbstractCommand, DataStructure
+ {
+ public const byte ID_JournalQueueAck = 52;
+
+ ActiveMQDestination destination;
+ MessageAck messageAck;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Destination=" + Destination
+ + " MessageAck=" + MessageAck
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_JournalQueueAck;
+ }
+
+
+ // Properties
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public MessageAck MessageAck
+ {
+ get { return messageAck; }
+ set { this.messageAck = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs
index b6ce227c8a..7cb6a6b6df 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs
@@ -1 +1,103 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for JournalTopicAck
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class JournalTopicAck : AbstractCommand, DataStructure
{
public const byte ID_JournalTopicAck = 50;
ActiveMQDestination destination;
MessageId messageId;
long messageSequenceId;
string subscritionName;
string clientId;
TransactionId transactionId;
public override string ToString() {
return GetType().Name + "["
+ " Destination=" + Destination
+ " MessageId=" + MessageId
+ " MessageSequenceId=" + MessageSequenceId
+ " SubscritionName=" + SubscritionName
+ " ClientId=" + ClientId
+ " TransactionId=" + TransactionId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_JournalTopicAck;
}
// Properties
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public MessageId MessageId
{
get { return messageId; }
set { this.messageId = value; }
}
public long MessageSequenceId
{
get { return messageSequenceId; }
set { this.messageSequenceId = value; }
}
public string SubscritionName
{
get { return subscritionName; }
set { this.subscritionName = value; }
}
public string ClientId
{
get { return clientId; }
set { this.clientId = value; }
}
public TransactionId TransactionId
{
get { return transactionId; }
set { this.transactionId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for JournalTopicAck
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class JournalTopicAck : AbstractCommand, DataStructure
+ {
+ public const byte ID_JournalTopicAck = 50;
+
+ ActiveMQDestination destination;
+ MessageId messageId;
+ long messageSequenceId;
+ string subscritionName;
+ string clientId;
+ TransactionId transactionId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Destination=" + Destination
+ + " MessageId=" + MessageId
+ + " MessageSequenceId=" + MessageSequenceId
+ + " SubscritionName=" + SubscritionName
+ + " ClientId=" + ClientId
+ + " TransactionId=" + TransactionId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_JournalTopicAck;
+ }
+
+
+ // Properties
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public MessageId MessageId
+ {
+ get { return messageId; }
+ set { this.messageId = value; }
+ }
+
+ public long MessageSequenceId
+ {
+ get { return messageSequenceId; }
+ set { this.messageSequenceId = value; }
+ }
+
+ public string SubscritionName
+ {
+ get { return subscritionName; }
+ set { this.subscritionName = value; }
+ }
+
+ public string ClientId
+ {
+ get { return clientId; }
+ set { this.clientId = value; }
+ }
+
+ public TransactionId TransactionId
+ {
+ get { return transactionId; }
+ set { this.transactionId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs
index a89ff10ed3..74781a0ab0 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for JournalTrace
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class JournalTrace : AbstractCommand, DataStructure
{
public const byte ID_JournalTrace = 53;
string message;
public override string ToString() {
return GetType().Name + "["
+ " Message=" + Message
+ " ]";
}
public override byte GetDataStructureType() {
return ID_JournalTrace;
}
// Properties
public string Message
{
get { return message; }
set { this.message = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for JournalTrace
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class JournalTrace : AbstractCommand, DataStructure
+ {
+ public const byte ID_JournalTrace = 53;
+
+ string message;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Message=" + Message
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_JournalTrace;
+ }
+
+
+ // Properties
+
+ public string Message
+ {
+ get { return message; }
+ set { this.message = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs
index da8e5eb0f2..ed622c98fe 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs
@@ -1 +1,79 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for JournalTransaction
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class JournalTransaction : AbstractCommand, DataStructure
{
public const byte ID_JournalTransaction = 54;
TransactionId transactionId;
byte type;
bool wasPrepared;
public override string ToString() {
return GetType().Name + "["
+ " TransactionId=" + TransactionId
+ " Type=" + Type
+ " WasPrepared=" + WasPrepared
+ " ]";
}
public override byte GetDataStructureType() {
return ID_JournalTransaction;
}
// Properties
public TransactionId TransactionId
{
get { return transactionId; }
set { this.transactionId = value; }
}
public byte Type
{
get { return type; }
set { this.type = value; }
}
public bool WasPrepared
{
get { return wasPrepared; }
set { this.wasPrepared = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for JournalTransaction
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class JournalTransaction : AbstractCommand, DataStructure
+ {
+ public const byte ID_JournalTransaction = 54;
+
+ TransactionId transactionId;
+ byte type;
+ bool wasPrepared;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " TransactionId=" + TransactionId
+ + " Type=" + Type
+ + " WasPrepared=" + WasPrepared
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_JournalTransaction;
+ }
+
+
+ // Properties
+
+ public TransactionId TransactionId
+ {
+ get { return transactionId; }
+ set { this.transactionId = value; }
+ }
+
+ public byte Type
+ {
+ get { return type; }
+ set { this.type = value; }
+ }
+
+ public bool WasPrepared
+ {
+ get { return wasPrepared; }
+ set { this.wasPrepared = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
index d700e9b877..e81de5d3ce 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
@@ -1 +1,55 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for KeepAliveInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class KeepAliveInfo : AbstractCommand, Command
{
public const byte ID_KeepAliveInfo = 10;
public override string ToString() {
return GetType().Name + "["
+ " ]";
}
public override byte GetDataStructureType() {
return ID_KeepAliveInfo;
}
// Properties
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for KeepAliveInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class KeepAliveInfo : AbstractCommand, Command
+ {
+ public const byte ID_KeepAliveInfo = 10;
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_KeepAliveInfo;
+ }
+
+
+ // Properties
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs
index 23f2192007..8a498e6f07 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs
@@ -1 +1,95 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for LocalTransactionId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class LocalTransactionId : TransactionId
{
public const byte ID_LocalTransactionId = 111;
long value;
ConnectionId connectionId;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(Value);
answer = (answer * 37) + HashCode(ConnectionId);
return answer;
}
public override bool Equals(object that) {
if (that is LocalTransactionId) {
return Equals((LocalTransactionId) that);
}
return false;
}
public virtual bool Equals(LocalTransactionId that) {
if (! Equals(this.Value, that.Value)) return false;
if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " Value=" + Value
+ " ConnectionId=" + ConnectionId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_LocalTransactionId;
}
// Properties
public long Value
{
get { return value; }
set { this.value = value; }
}
public ConnectionId ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for LocalTransactionId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class LocalTransactionId : TransactionId
+ {
+ public const byte ID_LocalTransactionId = 111;
+
+ long value;
+ ConnectionId connectionId;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(Value);
+ answer = (answer * 37) + HashCode(ConnectionId);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is LocalTransactionId) {
+ return Equals((LocalTransactionId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(LocalTransactionId that) {
+ if (! Equals(this.Value, that.Value)) return false;
+ if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Value=" + Value
+ + " ConnectionId=" + ConnectionId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_LocalTransactionId;
+ }
+
+
+ // Properties
+
+ public long Value
+ {
+ get { return value; }
+ set { this.value = value; }
+ }
+
+ public ConnectionId ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs
index aca63580c4..9a712cbc57 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs
@@ -1 +1,255 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for Message
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class Message : BaseCommand, MarshallAware, MessageReference
{
public const byte ID_Message = 0;
ProducerId producerId;
ActiveMQDestination destination;
TransactionId transactionId;
ActiveMQDestination originalDestination;
MessageId messageId;
TransactionId originalTransactionId;
string groupID;
int groupSequence;
string correlationId;
bool persistent;
long expiration;
byte priority;
ActiveMQDestination replyTo;
long timestamp;
string type;
byte[] content;
byte[] marshalledProperties;
DataStructure dataStructure;
ConsumerId targetConsumerId;
bool compressed;
int redeliveryCounter;
BrokerId[] brokerPath;
long arrival;
string userID;
bool recievedByDFBridge;
public override string ToString() {
return GetType().Name + "["
+ " ProducerId=" + ProducerId
+ " Destination=" + Destination
+ " TransactionId=" + TransactionId
+ " OriginalDestination=" + OriginalDestination
+ " MessageId=" + MessageId
+ " OriginalTransactionId=" + OriginalTransactionId
+ " GroupID=" + GroupID
+ " GroupSequence=" + GroupSequence
+ " CorrelationId=" + CorrelationId
+ " Persistent=" + Persistent
+ " Expiration=" + Expiration
+ " Priority=" + Priority
+ " ReplyTo=" + ReplyTo
+ " Timestamp=" + Timestamp
+ " Type=" + Type
+ " Content=" + Content
+ " MarshalledProperties=" + MarshalledProperties
+ " DataStructure=" + DataStructure
+ " TargetConsumerId=" + TargetConsumerId
+ " Compressed=" + Compressed
+ " RedeliveryCounter=" + RedeliveryCounter
+ " BrokerPath=" + BrokerPath
+ " Arrival=" + Arrival
+ " UserID=" + UserID
+ " RecievedByDFBridge=" + RecievedByDFBridge
+ " ]";
}
public override byte GetDataStructureType() {
return ID_Message;
}
// Properties
public ProducerId ProducerId
{
get { return producerId; }
set { this.producerId = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public TransactionId TransactionId
{
get { return transactionId; }
set { this.transactionId = value; }
}
public ActiveMQDestination OriginalDestination
{
get { return originalDestination; }
set { this.originalDestination = value; }
}
public MessageId MessageId
{
get { return messageId; }
set { this.messageId = value; }
}
public TransactionId OriginalTransactionId
{
get { return originalTransactionId; }
set { this.originalTransactionId = value; }
}
public string GroupID
{
get { return groupID; }
set { this.groupID = value; }
}
public int GroupSequence
{
get { return groupSequence; }
set { this.groupSequence = value; }
}
public string CorrelationId
{
get { return correlationId; }
set { this.correlationId = value; }
}
public bool Persistent
{
get { return persistent; }
set { this.persistent = value; }
}
public long Expiration
{
get { return expiration; }
set { this.expiration = value; }
}
public byte Priority
{
get { return priority; }
set { this.priority = value; }
}
public ActiveMQDestination ReplyTo
{
get { return replyTo; }
set { this.replyTo = value; }
}
public long Timestamp
{
get { return timestamp; }
set { this.timestamp = value; }
}
public string Type
{
get { return type; }
set { this.type = value; }
}
public byte[] Content
{
get { return content; }
set { this.content = value; }
}
public byte[] MarshalledProperties
{
get { return marshalledProperties; }
set { this.marshalledProperties = value; }
}
public DataStructure DataStructure
{
get { return dataStructure; }
set { this.dataStructure = value; }
}
public ConsumerId TargetConsumerId
{
get { return targetConsumerId; }
set { this.targetConsumerId = value; }
}
public bool Compressed
{
get { return compressed; }
set { this.compressed = value; }
}
public int RedeliveryCounter
{
get { return redeliveryCounter; }
set { this.redeliveryCounter = value; }
}
public BrokerId[] BrokerPath
{
get { return brokerPath; }
set { this.brokerPath = value; }
}
public long Arrival
{
get { return arrival; }
set { this.arrival = value; }
}
public string UserID
{
get { return userID; }
set { this.userID = value; }
}
public bool RecievedByDFBridge
{
get { return recievedByDFBridge; }
set { this.recievedByDFBridge = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for Message
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class Message : BaseCommand, MarshallAware, MessageReference
+ {
+ public const byte ID_Message = 0;
+
+ ProducerId producerId;
+ ActiveMQDestination destination;
+ TransactionId transactionId;
+ ActiveMQDestination originalDestination;
+ MessageId messageId;
+ TransactionId originalTransactionId;
+ string groupID;
+ int groupSequence;
+ string correlationId;
+ bool persistent;
+ long expiration;
+ byte priority;
+ ActiveMQDestination replyTo;
+ long timestamp;
+ string type;
+ byte[] content;
+ byte[] marshalledProperties;
+ DataStructure dataStructure;
+ ConsumerId targetConsumerId;
+ bool compressed;
+ int redeliveryCounter;
+ BrokerId[] brokerPath;
+ long arrival;
+ string userID;
+ bool recievedByDFBridge;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ProducerId=" + ProducerId
+ + " Destination=" + Destination
+ + " TransactionId=" + TransactionId
+ + " OriginalDestination=" + OriginalDestination
+ + " MessageId=" + MessageId
+ + " OriginalTransactionId=" + OriginalTransactionId
+ + " GroupID=" + GroupID
+ + " GroupSequence=" + GroupSequence
+ + " CorrelationId=" + CorrelationId
+ + " Persistent=" + Persistent
+ + " Expiration=" + Expiration
+ + " Priority=" + Priority
+ + " ReplyTo=" + ReplyTo
+ + " Timestamp=" + Timestamp
+ + " Type=" + Type
+ + " Content=" + Content
+ + " MarshalledProperties=" + MarshalledProperties
+ + " DataStructure=" + DataStructure
+ + " TargetConsumerId=" + TargetConsumerId
+ + " Compressed=" + Compressed
+ + " RedeliveryCounter=" + RedeliveryCounter
+ + " BrokerPath=" + BrokerPath
+ + " Arrival=" + Arrival
+ + " UserID=" + UserID
+ + " RecievedByDFBridge=" + RecievedByDFBridge
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_Message;
+ }
+
+
+ // Properties
+
+ public ProducerId ProducerId
+ {
+ get { return producerId; }
+ set { this.producerId = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public TransactionId TransactionId
+ {
+ get { return transactionId; }
+ set { this.transactionId = value; }
+ }
+
+ public ActiveMQDestination OriginalDestination
+ {
+ get { return originalDestination; }
+ set { this.originalDestination = value; }
+ }
+
+ public MessageId MessageId
+ {
+ get { return messageId; }
+ set { this.messageId = value; }
+ }
+
+ public TransactionId OriginalTransactionId
+ {
+ get { return originalTransactionId; }
+ set { this.originalTransactionId = value; }
+ }
+
+ public string GroupID
+ {
+ get { return groupID; }
+ set { this.groupID = value; }
+ }
+
+ public int GroupSequence
+ {
+ get { return groupSequence; }
+ set { this.groupSequence = value; }
+ }
+
+ public string CorrelationId
+ {
+ get { return correlationId; }
+ set { this.correlationId = value; }
+ }
+
+ public bool Persistent
+ {
+ get { return persistent; }
+ set { this.persistent = value; }
+ }
+
+ public long Expiration
+ {
+ get { return expiration; }
+ set { this.expiration = value; }
+ }
+
+ public byte Priority
+ {
+ get { return priority; }
+ set { this.priority = value; }
+ }
+
+ public ActiveMQDestination ReplyTo
+ {
+ get { return replyTo; }
+ set { this.replyTo = value; }
+ }
+
+ public long Timestamp
+ {
+ get { return timestamp; }
+ set { this.timestamp = value; }
+ }
+
+ public string Type
+ {
+ get { return type; }
+ set { this.type = value; }
+ }
+
+ public byte[] Content
+ {
+ get { return content; }
+ set { this.content = value; }
+ }
+
+ public byte[] MarshalledProperties
+ {
+ get { return marshalledProperties; }
+ set { this.marshalledProperties = value; }
+ }
+
+ public DataStructure DataStructure
+ {
+ get { return dataStructure; }
+ set { this.dataStructure = value; }
+ }
+
+ public ConsumerId TargetConsumerId
+ {
+ get { return targetConsumerId; }
+ set { this.targetConsumerId = value; }
+ }
+
+ public bool Compressed
+ {
+ get { return compressed; }
+ set { this.compressed = value; }
+ }
+
+ public int RedeliveryCounter
+ {
+ get { return redeliveryCounter; }
+ set { this.redeliveryCounter = value; }
+ }
+
+ public BrokerId[] BrokerPath
+ {
+ get { return brokerPath; }
+ set { this.brokerPath = value; }
+ }
+
+ public long Arrival
+ {
+ get { return arrival; }
+ set { this.arrival = value; }
+ }
+
+ public string UserID
+ {
+ get { return userID; }
+ set { this.userID = value; }
+ }
+
+ public bool RecievedByDFBridge
+ {
+ get { return recievedByDFBridge; }
+ set { this.recievedByDFBridge = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs
index e2e7ebc1fa..6032cd6863 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs
@@ -1 +1,111 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for MessageAck
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class MessageAck : BaseCommand
{
public const byte ID_MessageAck = 22;
ActiveMQDestination destination;
TransactionId transactionId;
ConsumerId consumerId;
byte ackType;
MessageId firstMessageId;
MessageId lastMessageId;
int messageCount;
public override string ToString() {
return GetType().Name + "["
+ " Destination=" + Destination
+ " TransactionId=" + TransactionId
+ " ConsumerId=" + ConsumerId
+ " AckType=" + AckType
+ " FirstMessageId=" + FirstMessageId
+ " LastMessageId=" + LastMessageId
+ " MessageCount=" + MessageCount
+ " ]";
}
public override byte GetDataStructureType() {
return ID_MessageAck;
}
// Properties
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public TransactionId TransactionId
{
get { return transactionId; }
set { this.transactionId = value; }
}
public ConsumerId ConsumerId
{
get { return consumerId; }
set { this.consumerId = value; }
}
public byte AckType
{
get { return ackType; }
set { this.ackType = value; }
}
public MessageId FirstMessageId
{
get { return firstMessageId; }
set { this.firstMessageId = value; }
}
public MessageId LastMessageId
{
get { return lastMessageId; }
set { this.lastMessageId = value; }
}
public int MessageCount
{
get { return messageCount; }
set { this.messageCount = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for MessageAck
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class MessageAck : BaseCommand
+ {
+ public const byte ID_MessageAck = 22;
+
+ ActiveMQDestination destination;
+ TransactionId transactionId;
+ ConsumerId consumerId;
+ byte ackType;
+ MessageId firstMessageId;
+ MessageId lastMessageId;
+ int messageCount;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " Destination=" + Destination
+ + " TransactionId=" + TransactionId
+ + " ConsumerId=" + ConsumerId
+ + " AckType=" + AckType
+ + " FirstMessageId=" + FirstMessageId
+ + " LastMessageId=" + LastMessageId
+ + " MessageCount=" + MessageCount
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_MessageAck;
+ }
+
+
+ // Properties
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public TransactionId TransactionId
+ {
+ get { return transactionId; }
+ set { this.transactionId = value; }
+ }
+
+ public ConsumerId ConsumerId
+ {
+ get { return consumerId; }
+ set { this.consumerId = value; }
+ }
+
+ public byte AckType
+ {
+ get { return ackType; }
+ set { this.ackType = value; }
+ }
+
+ public MessageId FirstMessageId
+ {
+ get { return firstMessageId; }
+ set { this.firstMessageId = value; }
+ }
+
+ public MessageId LastMessageId
+ {
+ get { return lastMessageId; }
+ set { this.lastMessageId = value; }
+ }
+
+ public int MessageCount
+ {
+ get { return messageCount; }
+ set { this.messageCount = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs
index 10b5005462..7cddb89dfa 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs
@@ -1 +1,87 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for MessageDispatch
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class MessageDispatch : BaseCommand
{
public const byte ID_MessageDispatch = 21;
ConsumerId consumerId;
ActiveMQDestination destination;
Message message;
int redeliveryCounter;
public override string ToString() {
return GetType().Name + "["
+ " ConsumerId=" + ConsumerId
+ " Destination=" + Destination
+ " Message=" + Message
+ " RedeliveryCounter=" + RedeliveryCounter
+ " ]";
}
public override byte GetDataStructureType() {
return ID_MessageDispatch;
}
// Properties
public ConsumerId ConsumerId
{
get { return consumerId; }
set { this.consumerId = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public Message Message
{
get { return message; }
set { this.message = value; }
}
public int RedeliveryCounter
{
get { return redeliveryCounter; }
set { this.redeliveryCounter = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for MessageDispatch
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class MessageDispatch : BaseCommand
+ {
+ public const byte ID_MessageDispatch = 21;
+
+ ConsumerId consumerId;
+ ActiveMQDestination destination;
+ Message message;
+ int redeliveryCounter;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConsumerId=" + ConsumerId
+ + " Destination=" + Destination
+ + " Message=" + Message
+ + " RedeliveryCounter=" + RedeliveryCounter
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_MessageDispatch;
+ }
+
+
+ // Properties
+
+ public ConsumerId ConsumerId
+ {
+ get { return consumerId; }
+ set { this.consumerId = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public Message Message
+ {
+ get { return message; }
+ set { this.message = value; }
+ }
+
+ public int RedeliveryCounter
+ {
+ get { return redeliveryCounter; }
+ set { this.redeliveryCounter = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs
index dfd2c9abb0..909cc1713d 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs
@@ -1 +1,87 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for MessageDispatchNotification
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class MessageDispatchNotification : BaseCommand
{
public const byte ID_MessageDispatchNotification = 90;
ConsumerId consumerId;
ActiveMQDestination destination;
long deliverySequenceId;
MessageId messageId;
public override string ToString() {
return GetType().Name + "["
+ " ConsumerId=" + ConsumerId
+ " Destination=" + Destination
+ " DeliverySequenceId=" + DeliverySequenceId
+ " MessageId=" + MessageId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_MessageDispatchNotification;
}
// Properties
public ConsumerId ConsumerId
{
get { return consumerId; }
set { this.consumerId = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public long DeliverySequenceId
{
get { return deliverySequenceId; }
set { this.deliverySequenceId = value; }
}
public MessageId MessageId
{
get { return messageId; }
set { this.messageId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for MessageDispatchNotification
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class MessageDispatchNotification : BaseCommand
+ {
+ public const byte ID_MessageDispatchNotification = 90;
+
+ ConsumerId consumerId;
+ ActiveMQDestination destination;
+ long deliverySequenceId;
+ MessageId messageId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConsumerId=" + ConsumerId
+ + " Destination=" + Destination
+ + " DeliverySequenceId=" + DeliverySequenceId
+ + " MessageId=" + MessageId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_MessageDispatchNotification;
+ }
+
+
+ // Properties
+
+ public ConsumerId ConsumerId
+ {
+ get { return consumerId; }
+ set { this.consumerId = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public long DeliverySequenceId
+ {
+ get { return deliverySequenceId; }
+ set { this.deliverySequenceId = value; }
+ }
+
+ public MessageId MessageId
+ {
+ get { return messageId; }
+ set { this.messageId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs
index 478afb8165..6f5d8d48fe 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs
@@ -1 +1,105 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for MessageId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class MessageId : AbstractCommand, DataStructure
{
public const byte ID_MessageId = 110;
ProducerId producerId;
long producerSequenceId;
long brokerSequenceId;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(ProducerId);
answer = (answer * 37) + HashCode(ProducerSequenceId);
answer = (answer * 37) + HashCode(BrokerSequenceId);
return answer;
}
public override bool Equals(object that) {
if (that is MessageId) {
return Equals((MessageId) that);
}
return false;
}
public virtual bool Equals(MessageId that) {
if (! Equals(this.ProducerId, that.ProducerId)) return false;
if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false;
if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " ProducerId=" + ProducerId
+ " ProducerSequenceId=" + ProducerSequenceId
+ " BrokerSequenceId=" + BrokerSequenceId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_MessageId;
}
// Properties
public ProducerId ProducerId
{
get { return producerId; }
set { this.producerId = value; }
}
public long ProducerSequenceId
{
get { return producerSequenceId; }
set { this.producerSequenceId = value; }
}
public long BrokerSequenceId
{
get { return brokerSequenceId; }
set { this.brokerSequenceId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for MessageId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class MessageId : AbstractCommand, DataStructure
+ {
+ public const byte ID_MessageId = 110;
+
+ ProducerId producerId;
+ long producerSequenceId;
+ long brokerSequenceId;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(ProducerId);
+ answer = (answer * 37) + HashCode(ProducerSequenceId);
+ answer = (answer * 37) + HashCode(BrokerSequenceId);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is MessageId) {
+ return Equals((MessageId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(MessageId that) {
+ if (! Equals(this.ProducerId, that.ProducerId)) return false;
+ if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false;
+ if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ProducerId=" + ProducerId
+ + " ProducerSequenceId=" + ProducerSequenceId
+ + " BrokerSequenceId=" + BrokerSequenceId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_MessageId;
+ }
+
+
+ // Properties
+
+ public ProducerId ProducerId
+ {
+ get { return producerId; }
+ set { this.producerId = value; }
+ }
+
+ public long ProducerSequenceId
+ {
+ get { return producerSequenceId; }
+ set { this.producerSequenceId = value; }
+ }
+
+ public long BrokerSequenceId
+ {
+ get { return brokerSequenceId; }
+ set { this.brokerSequenceId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs
index 5adf833775..9dc4d5cbd9 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for NetworkBridgeFilter
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class NetworkBridgeFilter : AbstractCommand, DataStructure, BooleanExpression
{
public const byte ID_NetworkBridgeFilter = 91;
int networkTTL;
BrokerId networkBrokerId;
public override string ToString() {
return GetType().Name + "["
+ " NetworkTTL=" + NetworkTTL
+ " NetworkBrokerId=" + NetworkBrokerId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_NetworkBridgeFilter;
}
// Properties
public int NetworkTTL
{
get { return networkTTL; }
set { this.networkTTL = value; }
}
public BrokerId NetworkBrokerId
{
get { return networkBrokerId; }
set { this.networkBrokerId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for NetworkBridgeFilter
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class NetworkBridgeFilter : AbstractCommand, DataStructure, BooleanExpression
+ {
+ public const byte ID_NetworkBridgeFilter = 91;
+
+ int networkTTL;
+ BrokerId networkBrokerId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " NetworkTTL=" + NetworkTTL
+ + " NetworkBrokerId=" + NetworkBrokerId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_NetworkBridgeFilter;
+ }
+
+
+ // Properties
+
+ public int NetworkTTL
+ {
+ get { return networkTTL; }
+ set { this.networkTTL = value; }
+ }
+
+ public BrokerId NetworkBrokerId
+ {
+ get { return networkBrokerId; }
+ set { this.networkBrokerId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs
index 84bf7403ce..d9dfb75df7 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs
@@ -1 +1,105 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ProducerId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ProducerId : AbstractCommand, DataStructure
{
public const byte ID_ProducerId = 123;
string connectionId;
long value;
long sessionId;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(ConnectionId);
answer = (answer * 37) + HashCode(Value);
answer = (answer * 37) + HashCode(SessionId);
return answer;
}
public override bool Equals(object that) {
if (that is ProducerId) {
return Equals((ProducerId) that);
}
return false;
}
public virtual bool Equals(ProducerId that) {
if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
if (! Equals(this.Value, that.Value)) return false;
if (! Equals(this.SessionId, that.SessionId)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " Value=" + Value
+ " SessionId=" + SessionId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ProducerId;
}
// Properties
public string ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public long Value
{
get { return value; }
set { this.value = value; }
}
public long SessionId
{
get { return sessionId; }
set { this.sessionId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ProducerId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ProducerId : AbstractCommand, DataStructure
+ {
+ public const byte ID_ProducerId = 123;
+
+ string connectionId;
+ long value;
+ long sessionId;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(ConnectionId);
+ answer = (answer * 37) + HashCode(Value);
+ answer = (answer * 37) + HashCode(SessionId);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is ProducerId) {
+ return Equals((ProducerId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(ProducerId that) {
+ if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
+ if (! Equals(this.Value, that.Value)) return false;
+ if (! Equals(this.SessionId, that.SessionId)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " Value=" + Value
+ + " SessionId=" + SessionId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ProducerId;
+ }
+
+
+ // Properties
+
+ public string ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public long Value
+ {
+ get { return value; }
+ set { this.value = value; }
+ }
+
+ public long SessionId
+ {
+ get { return sessionId; }
+ set { this.sessionId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs
index 295882cea4..3508eb38fe 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs
@@ -1 +1,79 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ProducerInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ProducerInfo : BaseCommand
{
public const byte ID_ProducerInfo = 6;
ProducerId producerId;
ActiveMQDestination destination;
BrokerId[] brokerPath;
public override string ToString() {
return GetType().Name + "["
+ " ProducerId=" + ProducerId
+ " Destination=" + Destination
+ " BrokerPath=" + BrokerPath
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ProducerInfo;
}
// Properties
public ProducerId ProducerId
{
get { return producerId; }
set { this.producerId = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public BrokerId[] BrokerPath
{
get { return brokerPath; }
set { this.brokerPath = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ProducerInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ProducerInfo : BaseCommand
+ {
+ public const byte ID_ProducerInfo = 6;
+
+ ProducerId producerId;
+ ActiveMQDestination destination;
+ BrokerId[] brokerPath;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ProducerId=" + ProducerId
+ + " Destination=" + Destination
+ + " BrokerPath=" + BrokerPath
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ProducerInfo;
+ }
+
+
+ // Properties
+
+ public ProducerId ProducerId
+ {
+ get { return producerId; }
+ set { this.producerId = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public BrokerId[] BrokerPath
+ {
+ get { return brokerPath; }
+ set { this.brokerPath = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs
index 3de679d9d6..c7e73f0683 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for RemoveInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class RemoveInfo : BaseCommand
{
public const byte ID_RemoveInfo = 12;
DataStructure objectId;
public override string ToString() {
return GetType().Name + "["
+ " ObjectId=" + ObjectId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_RemoveInfo;
}
// Properties
public DataStructure ObjectId
{
get { return objectId; }
set { this.objectId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for RemoveInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class RemoveInfo : BaseCommand
+ {
+ public const byte ID_RemoveInfo = 12;
+
+ DataStructure objectId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ObjectId=" + ObjectId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_RemoveInfo;
+ }
+
+
+ // Properties
+
+ public DataStructure ObjectId
+ {
+ get { return objectId; }
+ set { this.objectId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
index 4404187817..a3b1fa9fb3 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
@@ -1 +1,79 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for RemoveSubscriptionInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class RemoveSubscriptionInfo : BaseCommand
{
public const byte ID_RemoveSubscriptionInfo = 0;
ConnectionId connectionId;
string subcriptionName;
string clientId;
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " SubcriptionName=" + SubcriptionName
+ " ClientId=" + ClientId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_RemoveSubscriptionInfo;
}
// Properties
public ConnectionId ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public string SubcriptionName
{
get { return subcriptionName; }
set { this.subcriptionName = value; }
}
public string ClientId
{
get { return clientId; }
set { this.clientId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for RemoveSubscriptionInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class RemoveSubscriptionInfo : BaseCommand
+ {
+ public const byte ID_RemoveSubscriptionInfo = 0;
+
+ ConnectionId connectionId;
+ string subcriptionName;
+ string clientId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " SubcriptionName=" + SubcriptionName
+ + " ClientId=" + ClientId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_RemoveSubscriptionInfo;
+ }
+
+
+ // Properties
+
+ public ConnectionId ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public string SubcriptionName
+ {
+ get { return subcriptionName; }
+ set { this.subcriptionName = value; }
+ }
+
+ public string ClientId
+ {
+ get { return clientId; }
+ set { this.clientId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ReplayCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ReplayCommand.cs
index 323da8e4f1..8b2420b675 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ReplayCommand.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ReplayCommand.cs
@@ -1 +1,55 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ReplayCommand
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ReplayCommand : BaseCommand
{
public const byte ID_ReplayCommand = 38;
public override string ToString() {
return GetType().Name + "["
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ReplayCommand;
}
// Properties
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ReplayCommand
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ReplayCommand : BaseCommand
+ {
+ public const byte ID_ReplayCommand = 38;
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ReplayCommand;
+ }
+
+
+ // Properties
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs
index 03c5614793..0bfdb79d6e 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for Response
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class Response : BaseCommand
{
public const byte ID_Response = 30;
short correlationId;
public override string ToString() {
return GetType().Name + "["
+ " CorrelationId=" + CorrelationId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_Response;
}
// Properties
public short CorrelationId
{
get { return correlationId; }
set { this.correlationId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for Response
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class Response : BaseCommand
+ {
+ public const byte ID_Response = 30;
+
+ short correlationId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " CorrelationId=" + CorrelationId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_Response;
+ }
+
+
+ // Properties
+
+ public short CorrelationId
+ {
+ get { return correlationId; }
+ set { this.correlationId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs
index e72ffdbacf..17b373790c 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs
@@ -1 +1,95 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for SessionId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class SessionId : AbstractCommand, DataStructure
{
public const byte ID_SessionId = 121;
string connectionId;
long value;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(ConnectionId);
answer = (answer * 37) + HashCode(Value);
return answer;
}
public override bool Equals(object that) {
if (that is SessionId) {
return Equals((SessionId) that);
}
return false;
}
public virtual bool Equals(SessionId that) {
if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
if (! Equals(this.Value, that.Value)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " Value=" + Value
+ " ]";
}
public override byte GetDataStructureType() {
return ID_SessionId;
}
// Properties
public string ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public long Value
{
get { return value; }
set { this.value = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for SessionId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class SessionId : AbstractCommand, DataStructure
+ {
+ public const byte ID_SessionId = 121;
+
+ string connectionId;
+ long value;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(ConnectionId);
+ answer = (answer * 37) + HashCode(Value);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is SessionId) {
+ return Equals((SessionId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(SessionId that) {
+ if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
+ if (! Equals(this.Value, that.Value)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " Value=" + Value
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_SessionId;
+ }
+
+
+ // Properties
+
+ public string ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public long Value
+ {
+ get { return value; }
+ set { this.value = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs
index cba8f2de1e..dc077d5942 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs
@@ -1 +1,63 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for SessionInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class SessionInfo : BaseCommand
{
public const byte ID_SessionInfo = 4;
SessionId sessionId;
public override string ToString() {
return GetType().Name + "["
+ " SessionId=" + SessionId
+ " ]";
}
public override byte GetDataStructureType() {
return ID_SessionInfo;
}
// Properties
public SessionId SessionId
{
get { return sessionId; }
set { this.sessionId = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for SessionInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class SessionInfo : BaseCommand
+ {
+ public const byte ID_SessionInfo = 4;
+
+ SessionId sessionId;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " SessionId=" + SessionId
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_SessionInfo;
+ }
+
+
+ // Properties
+
+ public SessionId SessionId
+ {
+ get { return sessionId; }
+ set { this.sessionId = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs
index e9e45bd905..19b0f305ec 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs
@@ -1 +1,55 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for ShutdownInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ShutdownInfo : BaseCommand
{
public const byte ID_ShutdownInfo = 11;
public override string ToString() {
return GetType().Name + "["
+ " ]";
}
public override byte GetDataStructureType() {
return ID_ShutdownInfo;
}
// Properties
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for ShutdownInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ShutdownInfo : BaseCommand
+ {
+ public const byte ID_ShutdownInfo = 11;
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_ShutdownInfo;
+ }
+
+
+ // Properties
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs
index ca0ebda1c3..831ea242eb 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs
@@ -1 +1,87 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for SubscriptionInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class SubscriptionInfo : AbstractCommand, DataStructure
{
public const byte ID_SubscriptionInfo = 55;
string clientId;
ActiveMQDestination destination;
string selector;
string subcriptionName;
public override string ToString() {
return GetType().Name + "["
+ " ClientId=" + ClientId
+ " Destination=" + Destination
+ " Selector=" + Selector
+ " SubcriptionName=" + SubcriptionName
+ " ]";
}
public override byte GetDataStructureType() {
return ID_SubscriptionInfo;
}
// Properties
public string ClientId
{
get { return clientId; }
set { this.clientId = value; }
}
public ActiveMQDestination Destination
{
get { return destination; }
set { this.destination = value; }
}
public string Selector
{
get { return selector; }
set { this.selector = value; }
}
public string SubcriptionName
{
get { return subcriptionName; }
set { this.subcriptionName = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for SubscriptionInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class SubscriptionInfo : AbstractCommand, DataStructure
+ {
+ public const byte ID_SubscriptionInfo = 55;
+
+ string clientId;
+ ActiveMQDestination destination;
+ string selector;
+ string subcriptionName;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ClientId=" + ClientId
+ + " Destination=" + Destination
+ + " Selector=" + Selector
+ + " SubcriptionName=" + SubcriptionName
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_SubscriptionInfo;
+ }
+
+
+ // Properties
+
+ public string ClientId
+ {
+ get { return clientId; }
+ set { this.clientId = value; }
+ }
+
+ public ActiveMQDestination Destination
+ {
+ get { return destination; }
+ set { this.destination = value; }
+ }
+
+ public string Selector
+ {
+ get { return selector; }
+ set { this.selector = value; }
+ }
+
+ public string SubcriptionName
+ {
+ get { return subcriptionName; }
+ set { this.subcriptionName = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs
index ef495d742e..bd3201bfe2 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs
@@ -1 +1,75 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for TransactionId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class TransactionId : AbstractCommand, DataStructure
{
public const byte ID_TransactionId = 0;
public override int GetHashCode() {
int answer = 0;
return answer;
}
public override bool Equals(object that) {
if (that is TransactionId) {
return Equals((TransactionId) that);
}
return false;
}
public virtual bool Equals(TransactionId that) {
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " ]";
}
public override byte GetDataStructureType() {
return ID_TransactionId;
}
// Properties
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for TransactionId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class TransactionId : AbstractCommand, DataStructure
+ {
+ public const byte ID_TransactionId = 0;
+
+
+ public override int GetHashCode() {
+ int answer = 0;
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is TransactionId) {
+ return Equals((TransactionId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(TransactionId that) {
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_TransactionId;
+ }
+
+
+ // Properties
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs
index af348241e3..45acbbd7db 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs
@@ -1 +1,79 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for TransactionInfo
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class TransactionInfo : BaseCommand
{
public const byte ID_TransactionInfo = 7;
ConnectionId connectionId;
TransactionId transactionId;
byte type;
public override string ToString() {
return GetType().Name + "["
+ " ConnectionId=" + ConnectionId
+ " TransactionId=" + TransactionId
+ " Type=" + Type
+ " ]";
}
public override byte GetDataStructureType() {
return ID_TransactionInfo;
}
// Properties
public ConnectionId ConnectionId
{
get { return connectionId; }
set { this.connectionId = value; }
}
public TransactionId TransactionId
{
get { return transactionId; }
set { this.transactionId = value; }
}
public byte Type
{
get { return type; }
set { this.type = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for TransactionInfo
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class TransactionInfo : BaseCommand
+ {
+ public const byte ID_TransactionInfo = 7;
+
+ ConnectionId connectionId;
+ TransactionId transactionId;
+ byte type;
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " ConnectionId=" + ConnectionId
+ + " TransactionId=" + TransactionId
+ + " Type=" + Type
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_TransactionInfo;
+ }
+
+
+ // Properties
+
+ public ConnectionId ConnectionId
+ {
+ get { return connectionId; }
+ set { this.connectionId = value; }
+ }
+
+ public TransactionId TransactionId
+ {
+ get { return transactionId; }
+ set { this.transactionId = value; }
+ }
+
+ public byte Type
+ {
+ get { return type; }
+ set { this.type = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
index 73d4732d53..f530f9a20e 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
@@ -31,8 +31,17 @@ namespace ActiveMQ.Commands
public class WireFormatInfo : AbstractCommand, Command, MarshallAware
{
public const byte ID_WireFormatInfo = 1;
-
- byte[] magic;
+ static private byte[] MAGIC = new byte[] {
+ 'A'&0xFF,
+ 'c'&0xFF,
+ 't'&0xFF,
+ 'i'&0xFF,
+ 'v'&0xFF,
+ 'e'&0xFF,
+ 'M'&0xFF,
+ 'Q'&0xFF };
+
+ byte[] magic = MAGIC;
int version;
byte[] marshalledProperties;
@@ -85,23 +94,28 @@ namespace ActiveMQ.Commands
public bool StackTraceEnabled
{
- get { return true.Equals(Properties["stackTrace"]) ; }
- set { Properties["stackTrace"] = value; }
+ get { return true.Equals(Properties["StackTraceEnabled"]) ; }
+ set { Properties["StackTraceEnabled"] = value; }
}
public bool TcpNoDelayEnabled
{
- get { return true.Equals(Properties["tcpNoDelay"]); }
- set { Properties["tcpNoDelay"] = value; }
+ get { return true.Equals(Properties["TcpNoDelayEnabled"]); }
+ set { Properties["TcpNoDelayEnabled"] = value; }
}
- public bool PrefixPacketSize
+ public bool SizePrefixDisabled
{
- get { return true.Equals(Properties["prefixPacketSize"]); }
- set { Properties["prefixPacketSize"] = value; }
+ get { return true.Equals(Properties["SizePrefixDisabled"]); }
+ set { Properties["SizePrefixDisabled"] = value; }
}
public bool TightEncodingEnabled
{
- get { return true.Equals(Properties["tightEncoding"]); }
- set { Properties["tightEncoding"] = value; }
+ get { return true.Equals(Properties["TightEncodingEnabled"]); }
+ set { Properties["TightEncodingEnabled"] = value; }
+ }
+ public bool CacheEnabled
+ {
+ get { return true.Equals(Properties["CacheEnabled"]); }
+ set { Properties["CacheEnabled"] = value; }
}
// MarshallAware interface
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
index 92ae012f4d..4033959bb3 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
@@ -1 +1,105 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
using System;
using System.Collections;
using ActiveMQ.OpenWire;
using ActiveMQ.Commands;
namespace ActiveMQ.Commands
{
//
// Marshalling code for Open Wire Format for XATransactionId
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class XATransactionId : TransactionId, Xid
{
public const byte ID_XATransactionId = 112;
int formatId;
byte[] globalTransactionId;
byte[] branchQualifier;
public override int GetHashCode() {
int answer = 0;
answer = (answer * 37) + HashCode(FormatId);
answer = (answer * 37) + HashCode(GlobalTransactionId);
answer = (answer * 37) + HashCode(BranchQualifier);
return answer;
}
public override bool Equals(object that) {
if (that is XATransactionId) {
return Equals((XATransactionId) that);
}
return false;
}
public virtual bool Equals(XATransactionId that) {
if (! Equals(this.FormatId, that.FormatId)) return false;
if (! Equals(this.GlobalTransactionId, that.GlobalTransactionId)) return false;
if (! Equals(this.BranchQualifier, that.BranchQualifier)) return false;
return true;
}
public override string ToString() {
return GetType().Name + "["
+ " FormatId=" + FormatId
+ " GlobalTransactionId=" + GlobalTransactionId
+ " BranchQualifier=" + BranchQualifier
+ " ]";
}
public override byte GetDataStructureType() {
return ID_XATransactionId;
}
// Properties
public int FormatId
{
get { return formatId; }
set { this.formatId = value; }
}
public byte[] GlobalTransactionId
{
get { return globalTransactionId; }
set { this.globalTransactionId = value; }
}
public byte[] BranchQualifier
{
get { return branchQualifier; }
set { this.branchQualifier = value; }
}
}
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+ //
+ // Marshalling code for Open Wire Format for XATransactionId
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class XATransactionId : TransactionId, Xid
+ {
+ public const byte ID_XATransactionId = 112;
+
+ int formatId;
+ byte[] globalTransactionId;
+ byte[] branchQualifier;
+
+ public override int GetHashCode() {
+ int answer = 0;
+ answer = (answer * 37) + HashCode(FormatId);
+ answer = (answer * 37) + HashCode(GlobalTransactionId);
+ answer = (answer * 37) + HashCode(BranchQualifier);
+ return answer;
+
+ }
+
+
+ public override bool Equals(object that) {
+ if (that is XATransactionId) {
+ return Equals((XATransactionId) that);
+ }
+ return false;
+ }
+
+ public virtual bool Equals(XATransactionId that) {
+ if (! Equals(this.FormatId, that.FormatId)) return false;
+ if (! Equals(this.GlobalTransactionId, that.GlobalTransactionId)) return false;
+ if (! Equals(this.BranchQualifier, that.BranchQualifier)) return false;
+ return true;
+
+ }
+
+
+ public override string ToString() {
+ return GetType().Name + "["
+ + " FormatId=" + FormatId
+ + " GlobalTransactionId=" + GlobalTransactionId
+ + " BranchQualifier=" + BranchQualifier
+ + " ]";
+
+ }
+
+
+
+ public override byte GetDataStructureType() {
+ return ID_XATransactionId;
+ }
+
+
+ // Properties
+
+ public int FormatId
+ {
+ get { return formatId; }
+ set { this.formatId = value; }
+ }
+
+ public byte[] GlobalTransactionId
+ {
+ get { return globalTransactionId; }
+ set { this.globalTransactionId = value; }
+ }
+
+ public byte[] BranchQualifier
+ {
+ get { return branchQualifier; }
+ set { this.branchQualifier = value; }
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
index fd2bbb971a..a88e5a394c 100755
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
@@ -1,750 +1,942 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * 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.
- */
-using ActiveMQ.Commands;
-using System;
-using System.Collections;
-using System.IO;
-using System.Text;
-
-namespace ActiveMQ.OpenWire
-
-{
- ///
- /// A base class with useful implementation inheritence methods
- /// for creating marshallers of the OpenWire protocol
- ///
- public abstract class BaseDataStreamMarshaller
- {
- public const byte NULL = 0;
- public const byte BOOLEAN_TYPE = 1;
- public const byte BYTE_TYPE = 2;
- public const byte CHAR_TYPE = 3;
- public const byte SHORT_TYPE = 4;
- public const byte INTEGER_TYPE = 5;
- public const byte LONG_TYPE = 6;
- public const byte DOUBLE_TYPE = 7;
- public const byte FLOAT_TYPE = 8;
- public const byte STRING_TYPE = 9;
- public const byte BYTE_ARRAY_TYPE = 10;
-
- private static String[] HEX_TABLE = new String[]{
- "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0a", "0b", "0c", "0d", "0e", "0f",
- "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", "1e", "1f",
- "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2a", "2b", "2c", "2d", "2e", "2f",
- "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3a", "3b", "3c", "3d", "3e", "3f",
- "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4a", "4b", "4c", "4d", "4e", "4f",
- "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5a", "5b", "5c", "5d", "5e", "5f",
- "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6a", "6b", "6c", "6d", "6e", "6f",
- "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7a", "7b", "7c", "7d", "7e", "7f",
- "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8a", "8b", "8c", "8d", "8e", "8f",
- "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9a", "9b", "9c", "9d", "9e", "9f",
- "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af",
- "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf",
- "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf",
- "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8", "d9", "da", "db", "dc", "dd", "de", "df",
- "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef",
- "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff",
- };
-
- public abstract DataStructure CreateObject();
- public abstract byte GetDataStructureType();
-
- public virtual int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
- {
- return 0;
- }
- public virtual void TightMarshal2(
- OpenWireFormat wireFormat,
- Object o,
- BinaryWriter dataOut,
- BooleanStream bs)
- {
- }
-
- public virtual void TightUnmarshal(
- OpenWireFormat wireFormat,
- Object o,
- BinaryReader dataIn,
- BooleanStream bs)
- {
- }
-
-
- protected virtual DataStructure TightUnmarshalNestedObject(
- OpenWireFormat wireFormat,
- BinaryReader dataIn,
- BooleanStream bs)
- {
- return wireFormat.TightUnmarshalNestedObject(dataIn, bs);
- }
-
- protected virtual int TightMarshalNestedObject1(
- OpenWireFormat wireFormat,
- DataStructure o,
- BooleanStream bs)
- {
- return wireFormat.TightMarshalNestedObject1(o, bs);
- }
-
- protected virtual void TightMarshalNestedObject2(
- OpenWireFormat wireFormat,
- DataStructure o,
- BinaryWriter dataOut,
- BooleanStream bs)
- {
- wireFormat.TightMarshalNestedObject2(o, dataOut, bs);
- }
-
- protected virtual DataStructure TightUnmarshalCachedObject(
- OpenWireFormat wireFormat,
- BinaryReader dataIn,
- BooleanStream bs)
- {
- /*
- if (wireFormat.isCacheEnabled()) {
- if (bs.ReadBoolean()) {
- short index = dataIndataIn.ReadInt16()Int16();
- DataStructure value = wireFormat.UnmarshalNestedObject(dataIn, bs);
- wireFormat.setInUnmarshallCache(index, value);
- return value;
- } else {
- short index = dataIn.ReadInt16();
- return wireFormat.getFromUnmarshallCache(index);
- }
- } else {
- return wireFormat.UnmarshalNestedObject(dataIn, bs);
- }
- */
- return wireFormat.TightUnmarshalNestedObject(dataIn, bs);
- }
-
- protected virtual int TightMarshalCachedObject1(
- OpenWireFormat wireFormat,
- DataStructure o,
- BooleanStream bs)
- {
- /*
- if (wireFormat.isCacheEnabled()) {
- Short index = wireFormat.getMarshallCacheIndex(o);
- bs.WriteBoolean(index == null);
- if (index == null) {
- int rc = wireFormat.Marshal1NestedObject(o, bs);
- wireFormat.addToMarshallCache(o);
- return 2 + rc;
- } else {
- return 2;
- }
- } else {
- return wireFormat.Marshal1NestedObject(o, bs);
- }
- */
- return wireFormat.TightMarshalNestedObject1(o, bs);
- }
-
- protected virtual void TightMarshalCachedObject2(
- OpenWireFormat wireFormat,
- DataStructure o,
- BinaryWriter dataOut,
- BooleanStream bs)
- {
- /*
- if (wireFormat.isCacheEnabled()) {
- Short index = wireFormat.getMarshallCacheIndex(o);
- if (bs.ReadBoolean()) {
- dataOut.Write(index.shortValue(), dataOut);
- wireFormat.Marshal2NestedObject(o, dataOut, bs);
- } else {
- dataOut.Write(index.shortValue(), dataOut);
- }
- } else {
- wireFormat.Marshal2NestedObject(o, dataOut, bs);
- }
- */
- wireFormat.TightMarshalNestedObject2(o, dataOut, bs);
- }
-
-
-
- protected virtual String TightUnmarshalString(BinaryReader dataIn, BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- if (bs.ReadBoolean())
- {
- return ReadAsciiString(dataIn);
- }
- else
- {
- return dataIn.ReadString();
- }
- }
- else
- {
- return null;
- }
- }
-
- protected virtual String ReadAsciiString(BinaryReader dataIn)
- {
- int size = dataIn.ReadInt16();
- byte[] data = new byte[size];
- dataIn.Read(data, 0, size);
- char[] text = new char[size];
- for (int i = 0; i < size; i++)
- {
- text[i] = (char) data[i];
- }
- return new String(text);
- }
-
- protected virtual int TightMarshalString1(String value, BooleanStream bs)
- {
- bs.WriteBoolean(value != null);
- if (value != null)
- {
- int strlen = value.Length;
-
- int utflen = 0;
- int c = 0;
- bool isOnlyAscii = true;
- char[] charr = value.ToCharArray();
- for (int i = 0; i < strlen; i++)
- {
- c = charr[i];
- if ((c >= 0x0001) && (c <= 0x007F))
- {
- utflen++;
- }
- else if (c > 0x07FF)
- {
- utflen += 3;
- isOnlyAscii = false;
- }
- else
- {
- isOnlyAscii = false;
- utflen += 2;
- }
- }
-
- if (utflen >= Int16.MaxValue)
- throw new IOException("Encountered a String value that is too long to encode.");
-
- bs.WriteBoolean(isOnlyAscii);
- return utflen + 2;
- }
- else
- {
- return 0;
- }
- }
-
- public static void TightMarshalString2(String value, BinaryWriter dataOut, BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- // If we verified it only holds ascii values
- if (bs.ReadBoolean())
- {
- dataOut.Write((short) value.Length);
- // now lets write the bytes
- char[] chars = value.ToCharArray();
- for (int i = 0; i < chars.Length; i++)
- {
- dataOut.Write((byte)(chars[i]&0xFF00>>8));
- }
- }
- else
- {
- dataOut.Write(value);
- }
- }
- }
-
- public virtual int TightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs)
- {
- if (o == 0L)
- {
- bs.WriteBoolean(false);
- bs.WriteBoolean(false);
- return 0;
- }
- else
- {
- ulong ul = (ulong) o;
- if ((ul & 0xFFFFFFFFFFFF0000ul) == 0L)
- {
- bs.WriteBoolean(false);
- bs.WriteBoolean(true);
- return 2;
- }
- else if ((ul & 0xFFFFFFFF00000000ul) == 0L)
- {
- bs.WriteBoolean(true);
- bs.WriteBoolean(false);
- return 4;
- }
- else
- {
- bs.WriteBoolean(true);
- bs.WriteBoolean(true);
- return 8;
- }
- }
- }
-
- public virtual void TightMarshalLong2(
- OpenWireFormat wireFormat,
- long o,
- BinaryWriter dataOut,
- BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- if (bs.ReadBoolean())
- {
- dataOut.Write(o);
- }
- else
- {
- dataOut.Write((int)o);
- }
- }
- else
- {
- if (bs.ReadBoolean())
- {
- dataOut.Write((short)o);
- }
- }
- }
- public virtual long TightUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn, BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- if (bs.ReadBoolean())
- {
- return dataIn.ReadInt64(); // dataIn.ReadInt64();
- }
- else
- {
- return dataIn.ReadInt32();
- }
- }
- else
- {
- if (bs.ReadBoolean())
- {
- return dataIn.ReadInt16();
- }
- else
- {
- return 0;
- }
- }
- }
- protected virtual int TightMarshalObjectArray1(
- OpenWireFormat wireFormat,
- DataStructure[] objects,
- BooleanStream bs)
- {
- if (objects != null)
- {
- int rc = 0;
- bs.WriteBoolean(true);
- rc += 2;
- for (int i = 0; i < objects.Length; i++)
- {
- rc += TightMarshalNestedObject1(wireFormat, objects[i], bs);
- }
- return rc;
- }
- else
- {
- bs.WriteBoolean(false);
- return 0;
- }
- }
-
- protected virtual void TightMarshalObjectArray2(
- OpenWireFormat wireFormat,
- DataStructure[] objects,
- BinaryWriter dataOut,
- BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- dataOut.Write((short) objects.Length);
- for (int i = 0; i < objects.Length; i++)
- {
- TightMarshalNestedObject2(wireFormat, objects[i], dataOut, bs);
- }
- }
- }
-
- protected virtual byte[] ReadBytes(BinaryReader dataIn, bool flag)
- {
- if (flag)
- {
- int size = dataIn.ReadInt32();
- return dataIn.ReadBytes(size);
- }
- else
- {
- return null;
- }
- }
-
- protected virtual byte[] ReadBytes(BinaryReader dataIn)
- {
- int size = dataIn.ReadInt32();
- return dataIn.ReadBytes(size);
- }
-
- protected virtual byte[] ReadBytes(BinaryReader dataIn, int size)
- {
- return dataIn.ReadBytes(size);
- }
-
- protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut)
- {
- dataOut.Write(command.Length);
- dataOut.Write(command);
- }
-
- protected virtual BrokerError TightUnmarshalBrokerError(
- OpenWireFormat wireFormat,
- BinaryReader dataIn,
- BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- BrokerError answer = new BrokerError();
-
- answer.ExceptionClass = TightUnmarshalString(dataIn, bs);
- answer.Message = TightUnmarshalString(dataIn, bs);
- if (wireFormat.StackTraceEnabled)
- {
- short length = dataIn.ReadInt16();
- StackTraceElement[] stackTrace = new StackTraceElement[length];
- for (int i = 0; i < stackTrace.Length; i++)
- {
- StackTraceElement element = new StackTraceElement();
- element.ClassName = TightUnmarshalString(dataIn, bs);
- element.MethodName = TightUnmarshalString(dataIn, bs);
- element.FileName = TightUnmarshalString(dataIn, bs);
- element.LineNumber = dataIn.ReadInt32();
- stackTrace[i] = element;
- }
- answer.StackTraceElements = stackTrace;
- answer.Cause = TightUnmarshalBrokerError(wireFormat, dataIn, bs);
- }
- return answer;
- }
- else
- {
- return null;
- }
- }
-
- protected int TightMarshalBrokerError1(OpenWireFormat wireFormat, BrokerError o, BooleanStream bs)
- {
- if (o == null)
- {
- bs.WriteBoolean(false);
- return 0;
- }
- else
- {
- int rc = 0;
- bs.WriteBoolean(true);
- rc += TightMarshalString1(o.ExceptionClass, bs);
- rc += TightMarshalString1(o.Message, bs);
- if (wireFormat.StackTraceEnabled)
- {
- rc += 2;
- StackTraceElement[] stackTrace = o.StackTraceElements;
- for (int i = 0; i < stackTrace.Length; i++)
- {
- StackTraceElement element = stackTrace[i];
- rc += TightMarshalString1(element.ClassName, bs);
- rc += TightMarshalString1(element.MethodName, bs);
- rc += TightMarshalString1(element.FileName, bs);
- rc += 4;
- }
- rc += TightMarshalBrokerError1(wireFormat, o.Cause, bs);
- }
-
- return rc;
- }
- }
-
- protected void TightMarshalBrokerError2(
- OpenWireFormat wireFormat,
- BrokerError o,
- BinaryWriter dataOut,
- BooleanStream bs)
- {
- if (bs.ReadBoolean())
- {
- TightMarshalString2(o.ExceptionClass, dataOut, bs);
- TightMarshalString2(o.Message, dataOut, bs);
- if (wireFormat.StackTraceEnabled)
- {
- StackTraceElement[] stackTrace = o.StackTraceElements;
- dataOut.Write((short) stackTrace.Length);
-
- for (int i = 0; i < stackTrace.Length; i++)
- {
- StackTraceElement element = stackTrace[i];
- TightMarshalString2(element.ClassName, dataOut, bs);
- TightMarshalString2(element.MethodName, dataOut, bs);
- TightMarshalString2(element.FileName, dataOut, bs);
- dataOut.Write(element.LineNumber);
- }
- TightMarshalBrokerError2(wireFormat, o.Cause, dataOut, bs);
- }
- }
- }
-
- ///
- /// Marshals the primitive type map to a byte array
- ///
- public static byte[] MarshalPrimitiveMap(IDictionary map)
- {
- if (map == null)
- {
- return null;
- }
- else
- {
- MemoryStream memoryStream = new MemoryStream();
- MarshalPrimitiveMap(map, new OpenWireBinaryWriter(memoryStream));
- return memoryStream.GetBuffer();
- }
- }
- public static void MarshalPrimitiveMap(IDictionary map, BinaryWriter dataOut)
- {
- if (map == null)
- {
- dataOut.Write((int)-1);
- }
- else
- {
- dataOut.Write(map.Count);
- foreach (DictionaryEntry entry in map)
- {
- String name = (String) entry.Key;
- dataOut.Write(name);
- Object value = entry.Value;
- MarshalPrimitive(dataOut, value);
- }
- }}
-
-
-
- ///
- /// Unmarshals the primitive type map from the given byte array
- ///
- public static IDictionary UnmarshalPrimitiveMap(byte[] data)
- {
- if (data == null)
- {
- return new Hashtable();
- }
- else
- {
- return UnmarshalPrimitiveMap(new OpenWireBinaryReader(new MemoryStream(data)));
- }
- }
-
- public static IDictionary UnmarshalPrimitiveMap(BinaryReader dataIn)
- {
- int size = dataIn.ReadInt32();
- if (size < 0)
- {
- return null;
- }
- else
- {
- IDictionary answer = new Hashtable(size);
- for (int i=0; i < size; i++)
- {
- String name = dataIn.ReadString();
- answer[name] = UnmarshalPrimitive(dataIn);
- }
- return answer;
- }
-
- }
-
- public static void MarshalPrimitive(BinaryWriter dataOut, Object value)
- {
- if (value == null)
- {
- dataOut.Write(NULL);
- }
- else if (value is bool)
- {
- dataOut.Write(BOOLEAN_TYPE);
- dataOut.Write((bool) value);
- }
- else if (value is byte)
- {
- dataOut.Write(BYTE_TYPE);
- dataOut.Write(((Byte)value));
- }
- else if (value is char)
- {
- dataOut.Write(CHAR_TYPE);
- dataOut.Write((char) value);
- }
- else if (value is short)
- {
- dataOut.Write(SHORT_TYPE);
- dataOut.Write((short) value);
- }
- else if (value is int)
- {
- dataOut.Write(INTEGER_TYPE);
- dataOut.Write((int) value);
- }
- else if (value is long)
- {
- dataOut.Write(LONG_TYPE);
- dataOut.Write((long) value);
- }
- else if (value is float)
- {
- dataOut.Write(FLOAT_TYPE);
- dataOut.Write((float) value);
- }
- else if (value is double)
- {
- dataOut.Write(DOUBLE_TYPE);
- dataOut.Write((double) value);
- }
- else if (value is byte[])
- {
- byte[] data = (byte[]) value;
- dataOut.Write(BYTE_ARRAY_TYPE);
- dataOut.Write(data.Length);
- dataOut.Write(data);
- }
- else if (value is string)
- {
- dataOut.Write(STRING_TYPE);
- dataOut.Write((string) value);
- }
- else
- {
- throw new IOException("Object is not a primitive: " + value);
- }
- }
-
- public static Object UnmarshalPrimitive(BinaryReader dataIn)
- {
- Object value=null;
- switch (dataIn.ReadByte())
- {
- case BYTE_TYPE:
- value = dataIn.ReadByte();
- break;
- case BOOLEAN_TYPE:
- value = dataIn.ReadBoolean();
- break;
- case CHAR_TYPE:
- value = dataIn.ReadChar();
- break;
- case SHORT_TYPE:
- value = dataIn.ReadInt16();
- break;
- case INTEGER_TYPE:
- value = dataIn.ReadInt32();
- break;
- case LONG_TYPE:
- value = dataIn.ReadInt64();
- break;
- case FLOAT_TYPE:
- value = dataIn.ReadSingle();
- break;
- case DOUBLE_TYPE:
- value = dataIn.ReadDouble();
- break;
- case BYTE_ARRAY_TYPE:
- int size = dataIn.ReadInt32();
- byte[] data = new byte[size];
- dataIn.Read(data, 0, size);
- value = data;
- break;
- case STRING_TYPE:
- value = dataIn.ReadString();
- break;
- }
- return value;
- }
-
- ///
- /// Converts the object to a String
- ///
- public static string ToString(MessageId id)
- {
- return ToString(id.ProducerId) + ":" + id.ProducerSequenceId;
- }
- ///
- /// Converts the object to a String
- ///
- public static string ToString(ProducerId id)
- {
- return id.ConnectionId + ":" + id.SessionId + ":" + id.Value;
- }
-
-
- ///
- /// Converts the given transaction ID into a String
- ///
- public static String ToString(TransactionId txnId)
- {
- if (txnId is LocalTransactionId)
- {
- LocalTransactionId ltxnId = (LocalTransactionId) txnId;
- return "" + ltxnId.Value;
- }
- else if (txnId is XATransactionId)
- {
- XATransactionId xaTxnId = (XATransactionId) txnId;
- return "XID:" + xaTxnId.FormatId + ":" + ToHexFromBytes(xaTxnId.GlobalTransactionId) + ":" + ToHexFromBytes(xaTxnId.BranchQualifier);
- }
- return null;
- }
-
- ///
- /// Creates the byte array into hexidecimal
- ///
- public static String ToHexFromBytes(byte[] data)
- {
- StringBuilder buffer = new StringBuilder(data.Length * 2);
- for (int i = 0; i < data.Length; i++)
- {
- buffer.Append(HEX_TABLE[0xFF & data[i]]);
- }
- return buffer.ToString();
- }
-
- }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.
+ */
+using ActiveMQ.Commands;
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+namespace ActiveMQ.OpenWire
+
+{
+ ///
+ /// A base class with useful implementation inheritence methods
+ /// for creating marshallers of the OpenWire protocol
+ ///
+ public abstract class BaseDataStreamMarshaller
+ {
+ public const byte NULL = 0;
+ public const byte BOOLEAN_TYPE = 1;
+ public const byte BYTE_TYPE = 2;
+ public const byte CHAR_TYPE = 3;
+ public const byte SHORT_TYPE = 4;
+ public const byte INTEGER_TYPE = 5;
+ public const byte LONG_TYPE = 6;
+ public const byte DOUBLE_TYPE = 7;
+ public const byte FLOAT_TYPE = 8;
+ public const byte STRING_TYPE = 9;
+ public const byte BYTE_ARRAY_TYPE = 10;
+
+ private static String[] HEX_TABLE = new String[]{
+ "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0a", "0b", "0c", "0d", "0e", "0f",
+ "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", "1e", "1f",
+ "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2a", "2b", "2c", "2d", "2e", "2f",
+ "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3a", "3b", "3c", "3d", "3e", "3f",
+ "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4a", "4b", "4c", "4d", "4e", "4f",
+ "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5a", "5b", "5c", "5d", "5e", "5f",
+ "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6a", "6b", "6c", "6d", "6e", "6f",
+ "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7a", "7b", "7c", "7d", "7e", "7f",
+ "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8a", "8b", "8c", "8d", "8e", "8f",
+ "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9a", "9b", "9c", "9d", "9e", "9f",
+ "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af",
+ "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf",
+ "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf",
+ "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8", "d9", "da", "db", "dc", "dd", "de", "df",
+ "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef",
+ "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff",
+ };
+
+ public abstract DataStructure CreateObject();
+ public abstract byte GetDataStructureType();
+
+ public virtual int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+ {
+ return 0;
+ }
+ public virtual void TightMarshal2(
+ OpenWireFormat wireFormat,
+ Object o,
+ BinaryWriter dataOut,
+ BooleanStream bs)
+ {
+ }
+
+ public virtual void TightUnmarshal(
+ OpenWireFormat wireFormat,
+ Object o,
+ BinaryReader dataIn,
+ BooleanStream bs)
+ {
+ }
+
+
+ protected virtual DataStructure TightUnmarshalNestedObject(
+ OpenWireFormat wireFormat,
+ BinaryReader dataIn,
+ BooleanStream bs)
+ {
+ return wireFormat.TightUnmarshalNestedObject(dataIn, bs);
+ }
+
+ protected virtual int TightMarshalNestedObject1(
+ OpenWireFormat wireFormat,
+ DataStructure o,
+ BooleanStream bs)
+ {
+ return wireFormat.TightMarshalNestedObject1(o, bs);
+ }
+
+ protected virtual void TightMarshalNestedObject2(
+ OpenWireFormat wireFormat,
+ DataStructure o,
+ BinaryWriter dataOut,
+ BooleanStream bs)
+ {
+ wireFormat.TightMarshalNestedObject2(o, dataOut, bs);
+ }
+
+ protected virtual DataStructure TightUnmarshalCachedObject(
+ OpenWireFormat wireFormat,
+ BinaryReader dataIn,
+ BooleanStream bs)
+ {
+ /*
+ if (wireFormat.isCacheEnabled()) {
+ if (bs.ReadBoolean()) {
+ short index = dataIndataIn.ReadInt16()Int16();
+ DataStructure value = wireFormat.UnmarshalNestedObject(dataIn, bs);
+ wireFormat.setInUnmarshallCache(index, value);
+ return value;
+ } else {
+ short index = dataIn.ReadInt16();
+ return wireFormat.getFromUnmarshallCache(index);
+ }
+ } else {
+ return wireFormat.UnmarshalNestedObject(dataIn, bs);
+ }
+ */
+ return wireFormat.TightUnmarshalNestedObject(dataIn, bs);
+ }
+
+ protected virtual int TightMarshalCachedObject1(
+ OpenWireFormat wireFormat,
+ DataStructure o,
+ BooleanStream bs)
+ {
+ /*
+ if (wireFormat.isCacheEnabled()) {
+ Short index = wireFormat.getMarshallCacheIndex(o);
+ bs.WriteBoolean(index == null);
+ if (index == null) {
+ int rc = wireFormat.Marshal1NestedObject(o, bs);
+ wireFormat.addToMarshallCache(o);
+ return 2 + rc;
+ } else {
+ return 2;
+ }
+ } else {
+ return wireFormat.Marshal1NestedObject(o, bs);
+ }
+ */
+ return wireFormat.TightMarshalNestedObject1(o, bs);
+ }
+
+ protected virtual void TightMarshalCachedObject2(
+ OpenWireFormat wireFormat,
+ DataStructure o,
+ BinaryWriter dataOut,
+ BooleanStream bs)
+ {
+ /*
+ if (wireFormat.isCacheEnabled()) {
+ Short index = wireFormat.getMarshallCacheIndex(o);
+ if (bs.ReadBoolean()) {
+ dataOut.Write(index.shortValue(), dataOut);
+ wireFormat.Marshal2NestedObject(o, dataOut, bs);
+ } else {
+ dataOut.Write(index.shortValue(), dataOut);
+ }
+ } else {
+ wireFormat.Marshal2NestedObject(o, dataOut, bs);
+ }
+ */
+ wireFormat.TightMarshalNestedObject2(o, dataOut, bs);
+ }
+
+
+
+ protected virtual String TightUnmarshalString(BinaryReader dataIn, BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ if (bs.ReadBoolean())
+ {
+ return ReadAsciiString(dataIn);
+ }
+ else
+ {
+ return dataIn.ReadString();
+ }
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ protected virtual int TightMarshalString1(String value, BooleanStream bs)
+ {
+ bs.WriteBoolean(value != null);
+ if (value != null)
+ {
+ int strlen = value.Length;
+
+ int utflen = 0;
+ int c = 0;
+ bool isOnlyAscii = true;
+ char[] charr = value.ToCharArray();
+ for (int i = 0; i < strlen; i++)
+ {
+ c = charr[i];
+ if ((c >= 0x0001) && (c <= 0x007F))
+ {
+ utflen++;
+ }
+ else if (c > 0x07FF)
+ {
+ utflen += 3;
+ isOnlyAscii = false;
+ }
+ else
+ {
+ isOnlyAscii = false;
+ utflen += 2;
+ }
+ }
+
+ if (utflen >= Int16.MaxValue)
+ throw new IOException("Encountered a String value that is too long to encode.");
+
+ bs.WriteBoolean(isOnlyAscii);
+ return utflen + 2;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ public static void TightMarshalString2(String value, BinaryWriter dataOut, BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ // If we verified it only holds ascii values
+ if (bs.ReadBoolean())
+ {
+ dataOut.Write((short) value.Length);
+ // now lets write the bytes
+ char[] chars = value.ToCharArray();
+ for (int i = 0; i < chars.Length; i++)
+ {
+ dataOut.Write((byte)(chars[i]&0xFF00>>8));
+ }
+ }
+ else
+ {
+ dataOut.Write(value);
+ }
+ }
+ }
+
+ public virtual int TightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs)
+ {
+ if (o == 0L)
+ {
+ bs.WriteBoolean(false);
+ bs.WriteBoolean(false);
+ return 0;
+ }
+ else
+ {
+ ulong ul = (ulong) o;
+ if ((ul & 0xFFFFFFFFFFFF0000ul) == 0L)
+ {
+ bs.WriteBoolean(false);
+ bs.WriteBoolean(true);
+ return 2;
+ }
+ else if ((ul & 0xFFFFFFFF00000000ul) == 0L)
+ {
+ bs.WriteBoolean(true);
+ bs.WriteBoolean(false);
+ return 4;
+ }
+ else
+ {
+ bs.WriteBoolean(true);
+ bs.WriteBoolean(true);
+ return 8;
+ }
+ }
+ }
+
+ public virtual void TightMarshalLong2(
+ OpenWireFormat wireFormat,
+ long o,
+ BinaryWriter dataOut,
+ BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ if (bs.ReadBoolean())
+ {
+ dataOut.Write(o);
+ }
+ else
+ {
+ dataOut.Write((int)o);
+ }
+ }
+ else
+ {
+ if (bs.ReadBoolean())
+ {
+ dataOut.Write((short)o);
+ }
+ }
+ }
+ public virtual long TightUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn, BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ if (bs.ReadBoolean())
+ {
+ return dataIn.ReadInt64(); // dataIn.ReadInt64();
+ }
+ else
+ {
+ return dataIn.ReadInt32();
+ }
+ }
+ else
+ {
+ if (bs.ReadBoolean())
+ {
+ return dataIn.ReadInt16();
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ }
+ protected virtual int TightMarshalObjectArray1(
+ OpenWireFormat wireFormat,
+ DataStructure[] objects,
+ BooleanStream bs)
+ {
+ if (objects != null)
+ {
+ int rc = 0;
+ bs.WriteBoolean(true);
+ rc += 2;
+ for (int i = 0; i < objects.Length; i++)
+ {
+ rc += TightMarshalNestedObject1(wireFormat, objects[i], bs);
+ }
+ return rc;
+ }
+ else
+ {
+ bs.WriteBoolean(false);
+ return 0;
+ }
+ }
+
+ protected virtual void TightMarshalObjectArray2(
+ OpenWireFormat wireFormat,
+ DataStructure[] objects,
+ BinaryWriter dataOut,
+ BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ dataOut.Write((short) objects.Length);
+ for (int i = 0; i < objects.Length; i++)
+ {
+ TightMarshalNestedObject2(wireFormat, objects[i], dataOut, bs);
+ }
+ }
+ }
+
+
+ protected virtual BrokerError TightUnmarshalBrokerError(
+ OpenWireFormat wireFormat,
+ BinaryReader dataIn,
+ BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ BrokerError answer = new BrokerError();
+
+ answer.ExceptionClass = TightUnmarshalString(dataIn, bs);
+ answer.Message = TightUnmarshalString(dataIn, bs);
+ if (wireFormat.StackTraceEnabled)
+ {
+ short length = dataIn.ReadInt16();
+ StackTraceElement[] stackTrace = new StackTraceElement[length];
+ for (int i = 0; i < stackTrace.Length; i++)
+ {
+ StackTraceElement element = new StackTraceElement();
+ element.ClassName = TightUnmarshalString(dataIn, bs);
+ element.MethodName = TightUnmarshalString(dataIn, bs);
+ element.FileName = TightUnmarshalString(dataIn, bs);
+ element.LineNumber = dataIn.ReadInt32();
+ stackTrace[i] = element;
+ }
+ answer.StackTraceElements = stackTrace;
+ answer.Cause = TightUnmarshalBrokerError(wireFormat, dataIn, bs);
+ }
+ return answer;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ protected int TightMarshalBrokerError1(OpenWireFormat wireFormat, BrokerError o, BooleanStream bs)
+ {
+ if (o == null)
+ {
+ bs.WriteBoolean(false);
+ return 0;
+ }
+ else
+ {
+ int rc = 0;
+ bs.WriteBoolean(true);
+ rc += TightMarshalString1(o.ExceptionClass, bs);
+ rc += TightMarshalString1(o.Message, bs);
+ if (wireFormat.StackTraceEnabled)
+ {
+ rc += 2;
+ StackTraceElement[] stackTrace = o.StackTraceElements;
+ for (int i = 0; i < stackTrace.Length; i++)
+ {
+ StackTraceElement element = stackTrace[i];
+ rc += TightMarshalString1(element.ClassName, bs);
+ rc += TightMarshalString1(element.MethodName, bs);
+ rc += TightMarshalString1(element.FileName, bs);
+ rc += 4;
+ }
+ rc += TightMarshalBrokerError1(wireFormat, o.Cause, bs);
+ }
+
+ return rc;
+ }
+ }
+
+ protected void TightMarshalBrokerError2(
+ OpenWireFormat wireFormat,
+ BrokerError o,
+ BinaryWriter dataOut,
+ BooleanStream bs)
+ {
+ if (bs.ReadBoolean())
+ {
+ TightMarshalString2(o.ExceptionClass, dataOut, bs);
+ TightMarshalString2(o.Message, dataOut, bs);
+ if (wireFormat.StackTraceEnabled)
+ {
+ StackTraceElement[] stackTrace = o.StackTraceElements;
+ dataOut.Write((short) stackTrace.Length);
+
+ for (int i = 0; i < stackTrace.Length; i++)
+ {
+ StackTraceElement element = stackTrace[i];
+ TightMarshalString2(element.ClassName, dataOut, bs);
+ TightMarshalString2(element.MethodName, dataOut, bs);
+ TightMarshalString2(element.FileName, dataOut, bs);
+ dataOut.Write(element.LineNumber);
+ }
+ TightMarshalBrokerError2(wireFormat, o.Cause, dataOut, bs);
+ }
+ }
+ }
+
+
+ public virtual void LooseMarshal(
+ OpenWireFormat wireFormat,
+ Object o,
+ BinaryWriter dataOut)
+ {
+ }
+
+ public virtual void LooseUnmarshal(
+ OpenWireFormat wireFormat,
+ Object o,
+ BinaryReader dataIn)
+ {
+ }
+
+
+ protected virtual DataStructure LooseUnmarshalNestedObject(
+ OpenWireFormat wireFormat,
+ BinaryReader dataIn)
+ {
+ return wireFormat.LooseUnmarshalNestedObject(dataIn);
+ }
+
+ protected virtual void LooseMarshalNestedObject(
+ OpenWireFormat wireFormat,
+ DataStructure o,
+ BinaryWriter dataOut)
+ {
+ wireFormat.LooseMarshalNestedObject(o, dataOut);
+ }
+
+ protected virtual DataStructure LooseUnmarshalCachedObject(
+ OpenWireFormat wireFormat,
+ BinaryReader dataIn)
+ {
+ /*
+ if (wireFormat.isCacheEnabled()) {
+ if (bs.ReadBoolean()) {
+ short index = dataIndataIn.ReadInt16()Int16();
+ DataStructure value = wireFormat.UnmarshalNestedObject(dataIn, bs);
+ wireFormat.setInUnmarshallCache(index, value);
+ return value;
+ } else {
+ short index = dataIn.ReadInt16();
+ return wireFormat.getFromUnmarshallCache(index);
+ }
+ } else {
+ return wireFormat.UnmarshalNestedObject(dataIn, bs);
+ }
+ */
+ return wireFormat.LooseUnmarshalNestedObject(dataIn);
+ }
+
+
+ protected virtual void LooseMarshalCachedObject(
+ OpenWireFormat wireFormat,
+ DataStructure o,
+ BinaryWriter dataOut)
+ {
+ /*
+ if (wireFormat.isCacheEnabled()) {
+ Short index = wireFormat.getMarshallCacheIndex(o);
+ if (bs.ReadBoolean()) {
+ dataOut.Write(index.shortValue(), dataOut);
+ wireFormat.Marshal2NestedObject(o, dataOut, bs);
+ } else {
+ dataOut.Write(index.shortValue(), dataOut);
+ }
+ } else {
+ wireFormat.Marshal2NestedObject(o, dataOut, bs);
+ }
+ */
+ wireFormat.LooseMarshalNestedObject(o, dataOut);
+ }
+
+
+
+ protected virtual String LooseUnmarshalString(BinaryReader dataIn)
+ {
+ if (dataIn.ReadBoolean())
+ {
+ return dataIn.ReadString();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+
+ public static void LooseMarshalString(String value, BinaryWriter dataOut)
+ {
+ dataOut.Write(value != null);
+ if (value != null)
+ {
+ dataOut.Write(value);
+ }
+ }
+
+ public virtual void LooseMarshalLong(
+ OpenWireFormat wireFormat,
+ long o,
+ BinaryWriter dataOut)
+ {
+ dataOut.Write(o);
+ }
+
+ public virtual long LooseUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn)
+ {
+ return dataIn.ReadInt64();
+ }
+
+ protected virtual void LooseMarshalObjectArray(
+ OpenWireFormat wireFormat,
+ DataStructure[] objects,
+ BinaryWriter dataOut)
+ {
+ dataOut.Write(objects!=null);
+ if (objects!=null)
+ {
+ dataOut.Write((short) objects.Length);
+ for (int i = 0; i < objects.Length; i++)
+ {
+ LooseMarshalNestedObject(wireFormat, objects[i], dataOut);
+ }
+ }
+ }
+
+ protected virtual BrokerError LooseUnmarshalBrokerError(
+ OpenWireFormat wireFormat,
+ BinaryReader dataIn)
+ {
+ if (dataIn.ReadBoolean())
+ {
+ BrokerError answer = new BrokerError();
+
+ answer.ExceptionClass = LooseUnmarshalString(dataIn);
+ answer.Message = LooseUnmarshalString(dataIn);
+ if (wireFormat.StackTraceEnabled)
+ {
+ short length = dataIn.ReadInt16();
+ StackTraceElement[] stackTrace = new StackTraceElement[length];
+ for (int i = 0; i < stackTrace.Length; i++)
+ {
+ StackTraceElement element = new StackTraceElement();
+ element.ClassName = LooseUnmarshalString(dataIn);
+ element.MethodName = LooseUnmarshalString(dataIn);
+ element.FileName = LooseUnmarshalString(dataIn);
+ element.LineNumber = dataIn.ReadInt32();
+ stackTrace[i] = element;
+ }
+ answer.StackTraceElements = stackTrace;
+ answer.Cause = LooseUnmarshalBrokerError(wireFormat, dataIn);
+ }
+ return answer;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ protected void LooseMarshalBrokerError(
+ OpenWireFormat wireFormat,
+ BrokerError o,
+ BinaryWriter dataOut)
+ {
+ dataOut.Write(o!=null);
+ if (o!=null)
+ {
+ LooseMarshalString(o.ExceptionClass, dataOut);
+ LooseMarshalString(o.Message, dataOut);
+ if (wireFormat.StackTraceEnabled)
+ {
+ StackTraceElement[] stackTrace = o.StackTraceElements;
+ dataOut.Write((short) stackTrace.Length);
+
+ for (int i = 0; i < stackTrace.Length; i++)
+ {
+ StackTraceElement element = stackTrace[i];
+ LooseMarshalString(element.ClassName, dataOut);
+ LooseMarshalString(element.MethodName, dataOut);
+ LooseMarshalString(element.FileName, dataOut);
+ dataOut.Write(element.LineNumber);
+ }
+ LooseMarshalBrokerError(wireFormat, o.Cause, dataOut);
+ }
+ }
+ }
+
+ protected virtual byte[] ReadBytes(BinaryReader dataIn, bool flag)
+ {
+ if (flag)
+ {
+ int size = dataIn.ReadInt32();
+ return dataIn.ReadBytes(size);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ protected virtual byte[] ReadBytes(BinaryReader dataIn)
+ {
+ int size = dataIn.ReadInt32();
+ return dataIn.ReadBytes(size);
+ }
+
+ protected virtual byte[] ReadBytes(BinaryReader dataIn, int size)
+ {
+ return dataIn.ReadBytes(size);
+ }
+
+ protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut)
+ {
+ dataOut.Write(command.Length);
+ dataOut.Write(command);
+ }
+
+ protected virtual String ReadAsciiString(BinaryReader dataIn)
+ {
+ int size = dataIn.ReadInt16();
+ byte[] data = new byte[size];
+ dataIn.Read(data, 0, size);
+ char[] text = new char[size];
+ for (int i = 0; i < size; i++)
+ {
+ text[i] = (char) data[i];
+ }
+ return new String(text);
+ }
+
+
+ ///
+ /// Marshals the primitive type map to a byte array
+ ///
+ public static byte[] MarshalPrimitiveMap(IDictionary map)
+ {
+ if (map == null)
+ {
+ return null;
+ }
+ else
+ {
+ MemoryStream memoryStream = new MemoryStream();
+ MarshalPrimitiveMap(map, new OpenWireBinaryWriter(memoryStream));
+ return memoryStream.GetBuffer();
+ }
+ }
+ public static void MarshalPrimitiveMap(IDictionary map, BinaryWriter dataOut)
+ {
+ if (map == null)
+ {
+ dataOut.Write((int)-1);
+ }
+ else
+ {
+ dataOut.Write(map.Count);
+ foreach (DictionaryEntry entry in map)
+ {
+ String name = (String) entry.Key;
+ dataOut.Write(name);
+ Object value = entry.Value;
+ MarshalPrimitive(dataOut, value);
+ }
+ }}
+
+
+
+ ///
+ /// Unmarshals the primitive type map from the given byte array
+ ///
+ public static IDictionary UnmarshalPrimitiveMap(byte[] data)
+ {
+ if (data == null)
+ {
+ return new Hashtable();
+ }
+ else
+ {
+ return UnmarshalPrimitiveMap(new OpenWireBinaryReader(new MemoryStream(data)));
+ }
+ }
+
+ public static IDictionary UnmarshalPrimitiveMap(BinaryReader dataIn)
+ {
+ int size = dataIn.ReadInt32();
+ if (size < 0)
+ {
+ return null;
+ }
+ else
+ {
+ IDictionary answer = new Hashtable(size);
+ for (int i=0; i < size; i++)
+ {
+ String name = dataIn.ReadString();
+ answer[name] = UnmarshalPrimitive(dataIn);
+ }
+ return answer;
+ }
+
+ }
+
+ public static void MarshalPrimitive(BinaryWriter dataOut, Object value)
+ {
+ if (value == null)
+ {
+ dataOut.Write(NULL);
+ }
+ else if (value is bool)
+ {
+ dataOut.Write(BOOLEAN_TYPE);
+ dataOut.Write((bool) value);
+ }
+ else if (value is byte)
+ {
+ dataOut.Write(BYTE_TYPE);
+ dataOut.Write(((Byte)value));
+ }
+ else if (value is char)
+ {
+ dataOut.Write(CHAR_TYPE);
+ dataOut.Write((char) value);
+ }
+ else if (value is short)
+ {
+ dataOut.Write(SHORT_TYPE);
+ dataOut.Write((short) value);
+ }
+ else if (value is int)
+ {
+ dataOut.Write(INTEGER_TYPE);
+ dataOut.Write((int) value);
+ }
+ else if (value is long)
+ {
+ dataOut.Write(LONG_TYPE);
+ dataOut.Write((long) value);
+ }
+ else if (value is float)
+ {
+ dataOut.Write(FLOAT_TYPE);
+ dataOut.Write((float) value);
+ }
+ else if (value is double)
+ {
+ dataOut.Write(DOUBLE_TYPE);
+ dataOut.Write((double) value);
+ }
+ else if (value is byte[])
+ {
+ byte[] data = (byte[]) value;
+ dataOut.Write(BYTE_ARRAY_TYPE);
+ dataOut.Write(data.Length);
+ dataOut.Write(data);
+ }
+ else if (value is string)
+ {
+ dataOut.Write(STRING_TYPE);
+ dataOut.Write((string) value);
+ }
+ else
+ {
+ throw new IOException("Object is not a primitive: " + value);
+ }
+ }
+
+ public static Object UnmarshalPrimitive(BinaryReader dataIn)
+ {
+ Object value=null;
+ switch (dataIn.ReadByte())
+ {
+ case BYTE_TYPE:
+ value = dataIn.ReadByte();
+ break;
+ case BOOLEAN_TYPE:
+ value = dataIn.ReadBoolean();
+ break;
+ case CHAR_TYPE:
+ value = dataIn.ReadChar();
+ break;
+ case SHORT_TYPE:
+ value = dataIn.ReadInt16();
+ break;
+ case INTEGER_TYPE:
+ value = dataIn.ReadInt32();
+ break;
+ case LONG_TYPE:
+ value = dataIn.ReadInt64();
+ break;
+ case FLOAT_TYPE:
+ value = dataIn.ReadSingle();
+ break;
+ case DOUBLE_TYPE:
+ value = dataIn.ReadDouble();
+ break;
+ case BYTE_ARRAY_TYPE:
+ int size = dataIn.ReadInt32();
+ byte[] data = new byte[size];
+ dataIn.Read(data, 0, size);
+ value = data;
+ break;
+ case STRING_TYPE:
+ value = dataIn.ReadString();
+ break;
+ }
+ return value;
+ }
+
+ ///
+ /// Converts the object to a String
+ ///
+ public static string ToString(MessageId id)
+ {
+ return ToString(id.ProducerId) + ":" + id.ProducerSequenceId;
+ }
+ ///
+ /// Converts the object to a String
+ ///
+ public static string ToString(ProducerId id)
+ {
+ return id.ConnectionId + ":" + id.SessionId + ":" + id.Value;
+ }
+
+
+ ///
+ /// Converts the given transaction ID into a String
+ ///
+ public static String ToString(TransactionId txnId)
+ {
+ if (txnId is LocalTransactionId)
+ {
+ LocalTransactionId ltxnId = (LocalTransactionId) txnId;
+ return "" + ltxnId.Value;
+ }
+ else if (txnId is XATransactionId)
+ {
+ XATransactionId xaTxnId = (XATransactionId) txnId;
+ return "XID:" + xaTxnId.FormatId + ":" + ToHexFromBytes(xaTxnId.GlobalTransactionId) + ":" + ToHexFromBytes(xaTxnId.BranchQualifier);
+ }
+ return null;
+ }
+
+ ///
+ /// Creates the byte array into hexidecimal
+ ///
+ public static String ToHexFromBytes(byte[] data)
+ {
+ StringBuilder buffer = new StringBuilder(data.Length * 2);
+ for (int i = 0; i < data.Length; i++)
+ {
+ buffer.Append(HEX_TABLE[0xFF & data[i]]);
+ }
+ return buffer.ToString();
+ }
+
+ }
+}
+
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs
index ec5cfdad77..3ae3a917f4 100755
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs
@@ -26,37 +26,37 @@ namespace ActiveMQ.OpenWire
///
public class OpenWireFormat
{
- static private char[] MAGIC = new char[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
private BaseDataStreamMarshaller[] dataMarshallers;
private const byte NULL_TYPE = 0;
- private WireFormatInfo wireFormatInfo = new WireFormatInfo();
-
+
+ private int version=1;
+ private bool stackTraceEnabled=false;
+ private bool tightEncodingEnabled=false;
+ private bool sizePrefixDisabled=false;
+
public OpenWireFormat()
{
- // lets configure the wire format
- wireFormatInfo.Magic = CreateMagicBytes();
- wireFormatInfo.Version = 1;
- wireFormatInfo.StackTraceEnabled = true;
- wireFormatInfo.TcpNoDelayEnabled = true;
- wireFormatInfo.PrefixPacketSize = true;
- wireFormatInfo.TightEncodingEnabled = true;
-
dataMarshallers = new BaseDataStreamMarshaller[256];
MarshallerFactory factory = new MarshallerFactory();
factory.configure(this);
}
-
- public WireFormatInfo WireFormatInfo {
- get {
- return wireFormatInfo;
- }
- }
-
+
public bool StackTraceEnabled {
- get {
- return wireFormatInfo.StackTraceEnabled;
- }
+ get { return stackTraceEnabled; }
+ set { stackTraceEnabled = value; }
+ }
+ public int Version {
+ get { return version; }
+ set { version = value; }
+ }
+ public bool SizePrefixDisabled {
+ get { return sizePrefixDisabled; }
+ set { sizePrefixDisabled = value; }
+ }
+ public bool TightEncodingEnabled {
+ get { return tightEncodingEnabled; }
+ set { tightEncodingEnabled = value; }
}
public void addMarshaller(BaseDataStreamMarshaller marshaller)
@@ -75,15 +75,42 @@ namespace ActiveMQ.OpenWire
BaseDataStreamMarshaller dsm = dataMarshallers[type & 0xFF];
if (dsm == null)
throw new IOException("Unknown data type: " + type);
-
- BooleanStream bs = new BooleanStream();
- size += dsm.TightMarshal1(this, c, bs);
- size += bs.MarshalledSize();
-
- ds.Write(size);
- ds.Write(type);
- bs.Marshal(ds);
- dsm.TightMarshal2(this, c, ds, bs);
+
+ if(tightEncodingEnabled) {
+
+ BooleanStream bs = new BooleanStream();
+ size += dsm.TightMarshal1(this, c, bs);
+ size += bs.MarshalledSize();
+
+ if( !sizePrefixDisabled ) {
+ ds.Write(size);
+ }
+
+ ds.Write(type);
+ bs.Marshal(ds);
+ dsm.TightMarshal2(this, c, ds, bs);
+
+ } else {
+
+ BinaryWriter looseOut = ds;
+ MemoryStream ms = null;
+ // If we are prefixing then we need to first write it to memory,
+ // otherwise we can write direct to the stream.
+ if( !sizePrefixDisabled ) {
+ ms= new MemoryStream();
+ looseOut = new OpenWireBinaryWriter(ms);
+ looseOut.Write(size);
+ }
+
+ looseOut.Write(type);
+ dsm.LooseMarshal(this, c, looseOut);
+
+ if( !sizePrefixDisabled ) {
+ ms.Position=0;
+ looseOut.Write( (int)ms.Length-4 );
+ ds.Write(ms.GetBuffer(), 0, (int)ms.Length);
+ }
+ }
}
else
{
@@ -95,7 +122,9 @@ namespace ActiveMQ.OpenWire
public Object Unmarshal(BinaryReader dis)
{
// lets ignore the size of the packet
- dis.ReadInt32();
+ if( !sizePrefixDisabled ) {
+ dis.ReadInt32();
+ }
// first byte is the type of the packet
byte dataType = dis.ReadByte();
@@ -106,10 +135,16 @@ namespace ActiveMQ.OpenWire
throw new IOException("Unknown data type: " + dataType);
//Console.WriteLine("Parsing type: " + dataType + " with: " + dsm);
Object data = dsm.CreateObject();
- BooleanStream bs = new BooleanStream();
- bs.Unmarshal(dis);
- dsm.TightUnmarshal(this, data, dis, bs);
- return data;
+
+ if(tightEncodingEnabled) {
+ BooleanStream bs = new BooleanStream();
+ bs.Unmarshal(dis);
+ dsm.TightUnmarshal(this, data, dis, bs);
+ return data;
+ } else {
+ dsm.LooseUnmarshal(this, data, dis);
+ return data;
+ }
}
else
{
@@ -205,18 +240,40 @@ namespace ActiveMQ.OpenWire
return null;
}
}
+
+
- ///
- /// Method CreateMagicBytes
- ///
- private byte[] CreateMagicBytes()
+ public void LooseMarshalNestedObject(DataStructure o, BinaryWriter dataOut)
{
- byte[] answer = new byte[MAGIC.Length];
- for (int i = 0; i < answer.Length; i++)
- {
- answer[i] = (byte) MAGIC[i];
- }
- return answer;
+ dataOut.Write(o!=null);
+ if( o!=null ) {
+ byte type = o.GetDataStructureType();
+ dataOut.Write(type);
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[type & 0xFF];
+ if( dsm == null )
+ throw new IOException("Unknown data type: "+type);
+ dsm.LooseMarshal(this, o, dataOut);
+ }
}
+
+ public DataStructure LooseUnmarshalNestedObject(BinaryReader dis)
+ {
+ if (dis.ReadBoolean())
+ {
+
+ byte dataType = dis.ReadByte();
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[dataType & 0xFF];
+ if (dsm == null)
+ throw new IOException("Unknown data type: " + dataType);
+ DataStructure data = dsm.CreateObject();
+ dsm.LooseUnmarshal(this, data, dis);
+ return data;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
index bdd9dfe6b9..948e0365f9 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
index 007c4d32c8..cd5d668e19 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
@@ -48,7 +48,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -71,5 +70,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.PhysicalName, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ActiveMQDestination info = (ActiveMQDestination)o;
+ info.PhysicalName = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ActiveMQDestination info = (ActiveMQDestination)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.PhysicalName, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
index 16611c91f9..e1aa9ea5e9 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
index ba1bfb7f10..7966be25df 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
@@ -63,7 +63,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -88,5 +87,37 @@ namespace ActiveMQ.OpenWire.V1
info.AfterMarshall(wireFormat);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ActiveMQMessage info = (ActiveMQMessage)o;
+
+ info.BeforeUnmarshall(wireFormat);
+
+
+ info.AfterUnmarshall(wireFormat);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ActiveMQMessage info = (ActiveMQMessage)o;
+
+ info.BeforeMarshall(wireFormat);
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ info.AfterMarshall(wireFormat);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
index 960c93cccd..b4e097ec2b 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
index 45e72dcade..0299497fb1 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
index a12d906ee1..61dd6be296 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
index f8c17ff22e..1fe5b5b67c 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
@@ -45,7 +45,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -64,5 +63,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
index 99efd9b1c6..61528228f7 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
index 992a6fef54..ab44dc1968 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
index 7bacf1d6dc..e6c6ed2a18 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
index 229246d6c2..cc6a2c6208 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
index 3096b746ce..858f591474 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
@@ -49,7 +49,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -73,5 +72,32 @@ namespace ActiveMQ.OpenWire.V1
bs.ReadBoolean();
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ BaseCommand info = (BaseCommand)o;
+ info.CommandId = dataIn.ReadInt16();
+ info.ResponseRequired = dataIn.ReadBoolean();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ BaseCommand info = (BaseCommand)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ dataOut.Write(info.CommandId);
+ dataOut.Write(info.ResponseRequired);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
index 72de6241ae..7971a97904 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.Value, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ BrokerId info = (BrokerId)o;
+ info.Value = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ BrokerId info = (BrokerId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.Value, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
index 2034e436d5..76ffb16fad 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
@@ -74,7 +74,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -105,5 +104,49 @@ namespace ActiveMQ.OpenWire.V1
bs.ReadBoolean();
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ BrokerInfo info = (BrokerInfo)o;
+ info.BrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.BrokerURL = LooseUnmarshalString(dataIn);
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ BrokerInfo[] value = new BrokerInfo[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (BrokerInfo) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.PeerBrokerInfos = value;
+ }
+ else {
+ info.PeerBrokerInfos = null;
+ }
+ info.BrokerName = LooseUnmarshalString(dataIn);
+ info.SlaveBroker = dataIn.ReadBoolean();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ BrokerInfo info = (BrokerInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.BrokerId, dataOut);
+ LooseMarshalString(info.BrokerURL, dataOut);
+ LooseMarshalObjectArray(wireFormat, info.PeerBrokerInfos, dataOut);
+ LooseMarshalString(info.BrokerName, dataOut);
+ dataOut.Write(info.SlaveBroker);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
index 3bc23749d9..b72f8a2b44 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
@@ -60,7 +60,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -85,5 +84,32 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalNestedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ConnectionError info = (ConnectionError)o;
+ info.Exception = LooseUnmarshalBrokerError(wireFormat, dataIn);
+ info.ConnectionId = (ConnectionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ConnectionError info = (ConnectionError)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalBrokerError(wireFormat, info.Exception, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
index e923f31fcd..b1fb5eb6d8 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.Value, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ConnectionId info = (ConnectionId)o;
+ info.Value = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ConnectionId info = (ConnectionId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.Value, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
index 9b5cbf3dec..781649ce94 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
@@ -74,7 +74,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -105,5 +104,49 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ConnectionInfo info = (ConnectionInfo)o;
+ info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.ClientId = LooseUnmarshalString(dataIn);
+ info.Password = LooseUnmarshalString(dataIn);
+ info.UserName = LooseUnmarshalString(dataIn);
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ BrokerId[] value = new BrokerId[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.BrokerPath = value;
+ }
+ else {
+ info.BrokerPath = null;
+ }
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ConnectionInfo info = (ConnectionInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+ LooseMarshalString(info.ClientId, dataOut);
+ LooseMarshalString(info.Password, dataOut);
+ LooseMarshalString(info.UserName, dataOut);
+ LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
index 006225b275..61c1560450 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -88,5 +87,34 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ConsumerId info = (ConsumerId)o;
+ info.ConnectionId = LooseUnmarshalString(dataIn);
+ info.SessionId = LooseUnmarshalLong(wireFormat, dataIn);
+ info.Value = LooseUnmarshalLong(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ConsumerId info = (ConsumerId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.ConnectionId, dataOut);
+ LooseMarshalLong(wireFormat, info.SessionId, dataOut);
+ LooseMarshalLong(wireFormat, info.Value, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
index 1653570d6a..ea2daa59bb 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
@@ -84,7 +84,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -132,5 +131,69 @@ namespace ActiveMQ.OpenWire.V1
bs.ReadBoolean();
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ConsumerInfo info = (ConsumerInfo)o;
+ info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Browser = dataIn.ReadBoolean();
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.PrefetchSize = dataIn.ReadInt32();
+ info.MaximumPendingMessageLimit = dataIn.ReadInt32();
+ info.DispatchAsync = dataIn.ReadBoolean();
+ info.Selector = LooseUnmarshalString(dataIn);
+ info.SubcriptionName = LooseUnmarshalString(dataIn);
+ info.NoLocal = dataIn.ReadBoolean();
+ info.Exclusive = dataIn.ReadBoolean();
+ info.Retroactive = dataIn.ReadBoolean();
+ info.Priority = dataIn.ReadByte();
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ BrokerId[] value = new BrokerId[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.BrokerPath = value;
+ }
+ else {
+ info.BrokerPath = null;
+ }
+ info.AdditionalPredicate = (BooleanExpression) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.NetworkSubscription = dataIn.ReadBoolean();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ConsumerInfo info = (ConsumerInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+ dataOut.Write(info.Browser);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ dataOut.Write(info.PrefetchSize);
+ dataOut.Write(info.MaximumPendingMessageLimit);
+ dataOut.Write(info.DispatchAsync);
+ LooseMarshalString(info.Selector, dataOut);
+ LooseMarshalString(info.SubcriptionName, dataOut);
+ dataOut.Write(info.NoLocal);
+ dataOut.Write(info.Exclusive);
+ dataOut.Write(info.Retroactive);
+ dataOut.Write(info.Priority);
+ LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.AdditionalPredicate, dataOut);
+ dataOut.Write(info.NetworkSubscription);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
index 1f21e116c4..2ca2810eb2 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.Command, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ControlCommand info = (ControlCommand)o;
+ info.Command = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ControlCommand info = (ControlCommand)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.Command, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
index 0c9785fdde..2dbd8c5dd2 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
@@ -70,7 +70,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -93,5 +92,41 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalObjectArray2(wireFormat, info.Data, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ DataArrayResponse info = (DataArrayResponse)o;
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ DataStructure[] value = new DataStructure[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (DataStructure) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.Data = value;
+ }
+ else {
+ info.Data = null;
+ }
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ DataArrayResponse info = (DataArrayResponse)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalObjectArray(wireFormat, info.Data, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
index 3160b06b87..d0f4353b24 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalNestedObject2(wireFormat, (DataStructure)info.Data, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ DataResponse info = (DataResponse)o;
+ info.Data = (DataStructure) LooseUnmarshalNestedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ DataResponse info = (DataResponse)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.Data, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
index a3ce380cfa..221386d5b7 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
@@ -74,7 +74,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -104,5 +103,49 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ DestinationInfo info = (DestinationInfo)o;
+ info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.OperationType = dataIn.ReadByte();
+ info.Timeout = LooseUnmarshalLong(wireFormat, dataIn);
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ BrokerId[] value = new BrokerId[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.BrokerPath = value;
+ }
+ else {
+ info.BrokerPath = null;
+ }
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ DestinationInfo info = (DestinationInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ dataOut.Write(info.OperationType);
+ LooseMarshalLong(wireFormat, info.Timeout, dataOut);
+ LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
index 3902dfe0a2..79c3426752 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
@@ -60,7 +60,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -85,5 +84,32 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.BrokerName, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ DiscoveryEvent info = (DiscoveryEvent)o;
+ info.ServiceName = LooseUnmarshalString(dataIn);
+ info.BrokerName = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ DiscoveryEvent info = (DiscoveryEvent)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.ServiceName, dataOut);
+ LooseMarshalString(info.BrokerName, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
index 43fa01a581..1f3a3478e7 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalBrokerError2(wireFormat, info.Exception, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ExceptionResponse info = (ExceptionResponse)o;
+ info.Exception = LooseUnmarshalBrokerError(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ExceptionResponse info = (ExceptionResponse)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalBrokerError(wireFormat, info.Exception, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
index dd0dd2e098..89ac2797b2 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
index 6586fb4c1f..37e0f8c740 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -81,5 +80,30 @@ namespace ActiveMQ.OpenWire.V1
dataOut.Write(info.Result);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ IntegerResponse info = (IntegerResponse)o;
+ info.Result = dataIn.ReadInt32();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ IntegerResponse info = (IntegerResponse)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ dataOut.Write(info.Result);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
index 61124cb859..fce0ad180a 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
@@ -60,7 +60,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -85,5 +84,32 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageAck, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ JournalQueueAck info = (JournalQueueAck)o;
+ info.Destination = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.MessageAck = (MessageAck) LooseUnmarshalNestedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ JournalQueueAck info = (JournalQueueAck)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageAck, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
index c166be9946..4fa71313c6 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
@@ -64,7 +64,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -97,5 +96,40 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ JournalTopicAck info = (JournalTopicAck)o;
+ info.Destination = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.MessageSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+ info.SubscritionName = LooseUnmarshalString(dataIn);
+ info.ClientId = LooseUnmarshalString(dataIn);
+ info.TransactionId = (TransactionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ JournalTopicAck info = (JournalTopicAck)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+ LooseMarshalLong(wireFormat, info.MessageSequenceId, dataOut);
+ LooseMarshalString(info.SubscritionName, dataOut);
+ LooseMarshalString(info.ClientId, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
index 09325784f6..89af3f1d70 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.Message, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ JournalTrace info = (JournalTrace)o;
+ info.Message = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ JournalTrace info = (JournalTrace)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.Message, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
index c29794af12..7508e0d924 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -87,5 +86,34 @@ namespace ActiveMQ.OpenWire.V1
bs.ReadBoolean();
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ JournalTransaction info = (JournalTransaction)o;
+ info.TransactionId = (TransactionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.Type = dataIn.ReadByte();
+ info.WasPrepared = dataIn.ReadBoolean();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ JournalTransaction info = (JournalTransaction)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+ dataOut.Write(info.Type);
+ dataOut.Write(info.WasPrepared);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
index 9a95e8c67c..fa5dd5c595 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
index 58b5c25416..6de67e13ff 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
@@ -60,7 +60,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -85,5 +84,32 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ LocalTransactionId info = (LocalTransactionId)o;
+ info.Value = LooseUnmarshalLong(wireFormat, dataIn);
+ info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ LocalTransactionId info = (LocalTransactionId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalLong(wireFormat, info.Value, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
index 5478e9746d..2e56d78c37 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
@@ -65,7 +65,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -98,5 +97,42 @@ namespace ActiveMQ.OpenWire.V1
dataOut.Write(info.MessageCount);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ MessageAck info = (MessageAck)o;
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.AckType = dataIn.ReadByte();
+ info.FirstMessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.LastMessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.MessageCount = dataIn.ReadInt32();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ MessageAck info = (MessageAck)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+ dataOut.Write(info.AckType);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.FirstMessageId, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.LastMessageId, dataOut);
+ dataOut.Write(info.MessageCount);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
index d55df0a09c..4babc02c6d 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
@@ -62,7 +62,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -90,5 +89,36 @@ namespace ActiveMQ.OpenWire.V1
dataOut.Write(info.RedeliveryCounter);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ MessageDispatch info = (MessageDispatch)o;
+ info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Message = (Message) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.RedeliveryCounter = dataIn.ReadInt32();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ MessageDispatch info = (MessageDispatch)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.Message, dataOut);
+ dataOut.Write(info.RedeliveryCounter);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
index d0d6d36bb2..35fd37749a 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
@@ -1 +1,125 @@
-//
//
// Copyright 2005-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.
//
using System;
using System.Collections;
using System.IO;
using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;
namespace ActiveMQ.OpenWire.V1
{
//
// Marshalling code for Open Wire Format for MessageDispatchNotification
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
{
public override DataStructure CreateObject()
{
return new MessageDispatchNotification();
}
public override byte GetDataStructureType()
{
return MessageDispatchNotification.ID_MessageDispatchNotification;
}
//
// Un-marshal an object instance from the data input stream
//
public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
base.TightUnmarshal(wireFormat, o, dataIn, bs);
MessageDispatchNotification info = (MessageDispatchNotification)o;
info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
}
//
// Write the booleans that this object uses to a BooleanStream
//
public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
MessageDispatchNotification info = (MessageDispatchNotification)o;
int rc = base.TightMarshal1(wireFormat, info, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
return rc + 0;
}
//
// Write a object instance to data output stream
//
public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
base.TightMarshal2(wireFormat, o, dataOut, bs);
MessageDispatchNotification info = (MessageDispatchNotification)o;
TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
}
}
}
\ No newline at end of file
+//
+//
+// Copyright 2005-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.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+ //
+ // Marshalling code for Open Wire Format for MessageDispatchNotification
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
+ {
+
+
+ public override DataStructure CreateObject()
+ {
+ return new MessageDispatchNotification();
+ }
+
+ public override byte GetDataStructureType()
+ {
+ return MessageDispatchNotification.ID_MessageDispatchNotification;
+ }
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ {
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+ MessageDispatchNotification info = (MessageDispatchNotification)o;
+ info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+ info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+ info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+ info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+
+ }
+
+ //
+ // Write the booleans that this object uses to a BooleanStream
+ //
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ MessageDispatchNotification info = (MessageDispatchNotification)o;
+
+ int rc = base.TightMarshal1(wireFormat, info, bs);
+ rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+ rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+ rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
+ rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
+
+ return rc + 0;
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+ MessageDispatchNotification info = (MessageDispatchNotification)o;
+ TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+ TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+ TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
+ TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
+
+ }
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ MessageDispatchNotification info = (MessageDispatchNotification)o;
+ info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.DeliverySequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+ info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ MessageDispatchNotification info = (MessageDispatchNotification)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalLong(wireFormat, info.DeliverySequenceId, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
index c3763d719a..89f877c5fe 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -88,5 +87,34 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalLong2(wireFormat, info.BrokerSequenceId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ MessageId info = (MessageId)o;
+ info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.ProducerSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+ info.BrokerSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ MessageId info = (MessageId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
+ LooseMarshalLong(wireFormat, info.ProducerSequenceId, dataOut);
+ LooseMarshalLong(wireFormat, info.BrokerSequenceId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
index fb181aba17..6386e021a6 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
@@ -83,7 +83,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -159,5 +158,97 @@ namespace ActiveMQ.OpenWire.V1
bs.ReadBoolean();
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ Message info = (Message)o;
+ info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.OriginalDestination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.OriginalTransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.GroupID = LooseUnmarshalString(dataIn);
+ info.GroupSequence = dataIn.ReadInt32();
+ info.CorrelationId = LooseUnmarshalString(dataIn);
+ info.Persistent = dataIn.ReadBoolean();
+ info.Expiration = LooseUnmarshalLong(wireFormat, dataIn);
+ info.Priority = dataIn.ReadByte();
+ info.ReplyTo = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.Timestamp = LooseUnmarshalLong(wireFormat, dataIn);
+ info.Type = LooseUnmarshalString(dataIn);
+ info.Content = ReadBytes(dataIn, dataIn.ReadBoolean());
+ info.MarshalledProperties = ReadBytes(dataIn, dataIn.ReadBoolean());
+ info.DataStructure = (DataStructure) LooseUnmarshalNestedObject(wireFormat, dataIn);
+ info.TargetConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Compressed = dataIn.ReadBoolean();
+ info.RedeliveryCounter = dataIn.ReadInt32();
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ BrokerId[] value = new BrokerId[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.BrokerPath = value;
+ }
+ else {
+ info.BrokerPath = null;
+ }
+ info.Arrival = LooseUnmarshalLong(wireFormat, dataIn);
+ info.UserID = LooseUnmarshalString(dataIn);
+ info.RecievedByDFBridge = dataIn.ReadBoolean();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ Message info = (Message)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.OriginalDestination, dataOut);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut);
+ LooseMarshalString(info.GroupID, dataOut);
+ dataOut.Write(info.GroupSequence);
+ LooseMarshalString(info.CorrelationId, dataOut);
+ dataOut.Write(info.Persistent);
+ LooseMarshalLong(wireFormat, info.Expiration, dataOut);
+ dataOut.Write(info.Priority);
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.ReplyTo, dataOut);
+ LooseMarshalLong(wireFormat, info.Timestamp, dataOut);
+ LooseMarshalString(info.Type, dataOut);
+ dataOut.Write(info.Content!=null);
+ if(info.Content!=null) {
+ dataOut.Write(info.Content.Length);
+ dataOut.Write(info.Content);
+ }
+ dataOut.Write(info.MarshalledProperties!=null);
+ if(info.MarshalledProperties!=null) {
+ dataOut.Write(info.MarshalledProperties.Length);
+ dataOut.Write(info.MarshalledProperties);
+ }
+ LooseMarshalNestedObject(wireFormat, (DataStructure)info.DataStructure, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.TargetConsumerId, dataOut);
+ dataOut.Write(info.Compressed);
+ dataOut.Write(info.RedeliveryCounter);
+ LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+ LooseMarshalLong(wireFormat, info.Arrival, dataOut);
+ LooseMarshalString(info.UserID, dataOut);
+ dataOut.Write(info.RecievedByDFBridge);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
index 549975fc0c..16ad141263 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
@@ -1 +1,114 @@
-//
//
// Copyright 2005-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.
//
using System;
using System.Collections;
using System.IO;
using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;
namespace ActiveMQ.OpenWire.V1
{
//
// Marshalling code for Open Wire Format for NetworkBridgeFilter
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller
{
public override DataStructure CreateObject()
{
return new NetworkBridgeFilter();
}
public override byte GetDataStructureType()
{
return NetworkBridgeFilter.ID_NetworkBridgeFilter;
}
//
// Un-marshal an object instance from the data input stream
//
public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
base.TightUnmarshal(wireFormat, o, dataIn, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
info.NetworkTTL = dataIn.ReadInt32();
info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
}
//
// Write the booleans that this object uses to a BooleanStream
//
public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
int rc = base.TightMarshal1(wireFormat, info, bs);
rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
return rc + 4;
}
//
// Write a object instance to data output stream
//
public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
base.TightMarshal2(wireFormat, o, dataOut, bs);
NetworkBridgeFilter info = (NetworkBridgeFilter)o;
dataOut.Write(info.NetworkTTL);
TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
}
}
}
\ No newline at end of file
+//
+//
+// Copyright 2005-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.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+ //
+ // Marshalling code for Open Wire Format for NetworkBridgeFilter
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller
+ {
+
+
+ public override DataStructure CreateObject()
+ {
+ return new NetworkBridgeFilter();
+ }
+
+ public override byte GetDataStructureType()
+ {
+ return NetworkBridgeFilter.ID_NetworkBridgeFilter;
+ }
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ {
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+ info.NetworkTTL = dataIn.ReadInt32();
+ info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+
+ }
+
+ //
+ // Write the booleans that this object uses to a BooleanStream
+ //
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+
+ int rc = base.TightMarshal1(wireFormat, info, bs);
+ rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
+
+ return rc + 4;
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+ dataOut.Write(info.NetworkTTL);
+ TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
+
+ }
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+ info.NetworkTTL = dataIn.ReadInt32();
+ info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ dataOut.Write(info.NetworkTTL);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
+
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
index 0713b6f514..49415bd14d 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -88,5 +87,34 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalLong2(wireFormat, info.SessionId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ProducerId info = (ProducerId)o;
+ info.ConnectionId = LooseUnmarshalString(dataIn);
+ info.Value = LooseUnmarshalLong(wireFormat, dataIn);
+ info.SessionId = LooseUnmarshalLong(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ProducerId info = (ProducerId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.ConnectionId, dataOut);
+ LooseMarshalLong(wireFormat, info.Value, dataOut);
+ LooseMarshalLong(wireFormat, info.SessionId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
index f3746ef97f..e11d9a2eac 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
@@ -72,7 +72,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -99,5 +98,45 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ ProducerInfo info = (ProducerInfo)o;
+ info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+
+ if (dataIn.ReadBoolean()) {
+ short size = dataIn.ReadInt16();
+ BrokerId[] value = new BrokerId[size];
+ for( int i=0; i < size; i++ ) {
+ value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+ }
+ info.BrokerPath = value;
+ }
+ else {
+ info.BrokerPath = null;
+ }
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ ProducerInfo info = (ProducerInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
index 6b40e3e4dd..a3d59d848b 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalCachedObject2(wireFormat, (DataStructure)info.ObjectId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ RemoveInfo info = (RemoveInfo)o;
+ info.ObjectId = (DataStructure) LooseUnmarshalCachedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ RemoveInfo info = (RemoveInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ObjectId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
index 7af7d30d8c..5f6749fec3 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -88,5 +87,34 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.ClientId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
+ info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.SubcriptionName = LooseUnmarshalString(dataIn);
+ info.ClientId = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+ LooseMarshalString(info.SubcriptionName, dataOut);
+ LooseMarshalString(info.ClientId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs
index 4bb7628635..042c3c7117 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs
@@ -1 +1,97 @@
-//
//
// Copyright 2005-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.
//
using System;
using System.Collections;
using System.IO;
using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;
namespace ActiveMQ.OpenWire.V1
{
//
// Marshalling code for Open Wire Format for ReplayCommand
//
//
// NOTE!: This file is autogenerated - do not modify!
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
public class ReplayCommandMarshaller : BaseCommandMarshaller
{
public override DataStructure CreateObject()
{
return new ReplayCommand();
}
public override byte GetDataStructureType()
{
return ReplayCommand.ID_ReplayCommand;
}
//
// Un-marshal an object instance from the data input stream
//
public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
base.TightUnmarshal(wireFormat, o, dataIn, bs);
}
//
// Write the booleans that this object uses to a BooleanStream
//
public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ReplayCommand info = (ReplayCommand)o;
int rc = base.TightMarshal1(wireFormat, info, bs);
return rc + 0;
}
//
// Write a object instance to data output stream
//
public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
}
}
\ No newline at end of file
+//
+//
+// Copyright 2005-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.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+ //
+ // Marshalling code for Open Wire Format for ReplayCommand
+ //
+ //
+ // NOTE!: This file is autogenerated - do not modify!
+ // if you need to make a change, please see the Groovy scripts in the
+ // activemq-core module
+ //
+ public class ReplayCommandMarshaller : BaseCommandMarshaller
+ {
+
+
+ public override DataStructure CreateObject()
+ {
+ return new ReplayCommand();
+ }
+
+ public override byte GetDataStructureType()
+ {
+ return ReplayCommand.ID_ReplayCommand;
+ }
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ {
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+ }
+
+ //
+ // Write the booleans that this object uses to a BooleanStream
+ //
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ ReplayCommand info = (ReplayCommand)o;
+
+ int rc = base.TightMarshal1(wireFormat, info, bs);
+
+ return rc + 0;
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+ }
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
+ }
+}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
index 69a77b6029..9f03da1364 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -81,5 +80,30 @@ namespace ActiveMQ.OpenWire.V1
dataOut.Write(info.CorrelationId);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ Response info = (Response)o;
+ info.CorrelationId = dataIn.ReadInt16();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ Response info = (Response)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ dataOut.Write(info.CorrelationId);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
index 4331d25ebd..5abeb01c52 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
@@ -60,7 +60,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -85,5 +84,32 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ SessionId info = (SessionId)o;
+ info.ConnectionId = LooseUnmarshalString(dataIn);
+ info.Value = LooseUnmarshalLong(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ SessionId info = (SessionId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.ConnectionId, dataOut);
+ LooseMarshalLong(wireFormat, info.Value, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
index a9001d7d92..fda05ff8ab 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
@@ -59,7 +59,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -82,5 +81,30 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalCachedObject2(wireFormat, (DataStructure)info.SessionId, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ SessionInfo info = (SessionInfo)o;
+ info.SessionId = (SessionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ SessionInfo info = (SessionInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.SessionId, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs
index 0d37c92b93..0e620294c4 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs
@@ -56,7 +56,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -75,5 +74,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
index d481ec5a9e..610eda2d1c 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
@@ -62,7 +62,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -91,5 +90,36 @@ namespace ActiveMQ.OpenWire.V1
TightMarshalString2(info.SubcriptionName, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ SubscriptionInfo info = (SubscriptionInfo)o;
+ info.ClientId = LooseUnmarshalString(dataIn);
+ info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Selector = LooseUnmarshalString(dataIn);
+ info.SubcriptionName = LooseUnmarshalString(dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ SubscriptionInfo info = (SubscriptionInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalString(info.ClientId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+ LooseMarshalString(info.Selector, dataOut);
+ LooseMarshalString(info.SubcriptionName, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs
index a9b792b06e..1558591531 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs
@@ -45,7 +45,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -64,5 +63,24 @@ namespace ActiveMQ.OpenWire.V1
base.TightMarshal2(wireFormat, o, dataOut, bs);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
index 8c690f5131..8cc4314e71 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -87,5 +86,34 @@ namespace ActiveMQ.OpenWire.V1
dataOut.Write(info.Type);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ TransactionInfo info = (TransactionInfo)o;
+ info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+ info.Type = dataIn.ReadByte();
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ TransactionInfo info = (TransactionInfo)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+ LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+ dataOut.Write(info.Type);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
index f6ff7dbee7..ea6819e82a 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
@@ -66,7 +66,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -99,5 +98,47 @@ namespace ActiveMQ.OpenWire.V1
info.AfterMarshall(wireFormat);
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ WireFormatInfo info = (WireFormatInfo)o;
+
+ info.BeforeUnmarshall(wireFormat);
+
+ info.Magic = ReadBytes(dataIn, 8);
+ info.Version = dataIn.ReadInt32();
+ info.MarshalledProperties = ReadBytes(dataIn, dataIn.ReadBoolean());
+
+ info.AfterUnmarshall(wireFormat);
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ WireFormatInfo info = (WireFormatInfo)o;
+
+ info.BeforeMarshall(wireFormat);
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ dataOut.Write(info.Magic, 0, 8);
+ dataOut.Write(info.Version);
+ dataOut.Write(info.MarshalledProperties!=null);
+ if(info.MarshalledProperties!=null) {
+ dataOut.Write(info.MarshalledProperties.Length);
+ dataOut.Write(info.MarshalledProperties);
+ }
+
+ info.AfterMarshall(wireFormat);
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
index e05c8e0b03..3bdcc6e833 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
@@ -61,7 +61,6 @@ namespace ActiveMQ.OpenWire.V1
}
-
//
// Write the booleans that this object uses to a BooleanStream
//
@@ -95,5 +94,42 @@ namespace ActiveMQ.OpenWire.V1
}
}
+
+ //
+ // Un-marshal an object instance from the data input stream
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ {
+ base.LooseUnmarshal(wireFormat, o, dataIn);
+
+ XATransactionId info = (XATransactionId)o;
+ info.FormatId = dataIn.ReadInt32();
+ info.GlobalTransactionId = ReadBytes(dataIn, dataIn.ReadBoolean());
+ info.BranchQualifier = ReadBytes(dataIn, dataIn.ReadBoolean());
+
+ }
+
+ //
+ // Write a object instance to data output stream
+ //
+ public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+ XATransactionId info = (XATransactionId)o;
+
+ base.LooseMarshal(wireFormat, o, dataOut);
+ dataOut.Write(info.FormatId);
+ dataOut.Write(info.GlobalTransactionId!=null);
+ if(info.GlobalTransactionId!=null) {
+ dataOut.Write(info.GlobalTransactionId.Length);
+ dataOut.Write(info.GlobalTransactionId);
+ }
+ dataOut.Write(info.BranchQualifier!=null);
+ if(info.BranchQualifier!=null) {
+ dataOut.Write(info.BranchQualifier.Length);
+ dataOut.Write(info.BranchQualifier);
+ }
+
+ }
+
}
}
diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
index dbcb491cb9..54dd194f05 100644
--- a/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
+++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
@@ -72,7 +72,14 @@ namespace ActiveMQ.Transport.Tcp
readThread.Start();
// lets send the wireformat we're using
- Oneway(wireformat.WireFormatInfo);
+ WireFormatInfo info = new WireFormatInfo();
+ info.StackTraceEnabled=false;
+ info.TightEncodingEnabled=false;
+ info.TcpNoDelayEnabled=false;
+ info.CacheEnabled=false;
+ info.SizePrefixDisabled=false;
+
+ Oneway(info);
}
}
diff --git a/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java b/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
index a3e177cfcf..5f66e2458f 100755
--- a/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
+++ b/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
@@ -106,9 +106,9 @@ public class ConfigTest extends TestCase {
// Check spring configured wire format factory
WireFormat myWireFormat = myTransportServer.getWireFormatFactory().createWireFormat();
assertTrue("WireFormat should be OpenWireFormat", myWireFormat instanceof OpenWireFormat);
- assertEquals("WireFormat Config Error (stackTraceEnabled)", false, ((OpenWireFormat)myWireFormat).isStackTraceEnabled());
- assertEquals("WireFormat Config Error (tcpNoDelayEnabled)", true, ((OpenWireFormat)myWireFormat).isTcpNoDelayEnabled());
- assertEquals("WireFormat Config Error (cacheEnabled)", false, ((OpenWireFormat)myWireFormat).isCacheEnabled());
+ assertEquals("WireFormat Config Error (stackTraceEnabled)", false, ((OpenWireFormat)myWireFormat).getPreferedWireFormatInfo().isStackTraceEnabled());
+ assertEquals("WireFormat Config Error (tcpNoDelayEnabled)", true, ((OpenWireFormat)myWireFormat).getPreferedWireFormatInfo().isTcpNoDelayEnabled());
+ assertEquals("WireFormat Config Error (cacheEnabled)", false, ((OpenWireFormat)myWireFormat).getPreferedWireFormatInfo().isCacheEnabled());
System.out.println("Success");
// Check network connectors
diff --git a/openwire-cpp/src/command/ConnectionError.hpp b/openwire-cpp/src/command/ConnectionError.hpp
index f59b4ba87a..dcdf06b2eb 100644
--- a/openwire-cpp/src/command/ConnectionError.hpp
+++ b/openwire-cpp/src/command/ConnectionError.hpp
@@ -1 +1,81 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef ConnectionError_hpp_
#define ConnectionError_hpp_
#include
#include "command/BaseCommand.hpp"
#include "BrokerError.hpp"
#include "command/ConnectionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for ConnectionError
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class ConnectionError : public BaseCommand
{
private:
p exception ;
p connectionId ;
public:
const static int TYPE = 16;
public:
ConnectionError() ;
virtual ~ConnectionError() ;
virtual int getCommandType() ;
virtual p getException() ;
virtual void setException(p exception) ;
virtual p getConnectionId() ;
virtual void setConnectionId(p connectionId) ;
} ;
/* namespace */
}
}
}
}
#endif /*ConnectionError_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef ConnectionError_hpp_
+#define ConnectionError_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+#include "BrokerError.hpp"
+#include "command/ConnectionId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for ConnectionError
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class ConnectionError : public BaseCommand
+{
+private:
+ p exception ;
+ p connectionId ;
+
+public:
+ const static int TYPE = 16;
+
+public:
+ ConnectionError() ;
+ virtual ~ConnectionError() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getException() ;
+ virtual void setException(p exception) ;
+
+ virtual p getConnectionId() ;
+ virtual void setConnectionId(p connectionId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*ConnectionError_hpp_*/
diff --git a/openwire-cpp/src/command/ControlCommand.hpp b/openwire-cpp/src/command/ControlCommand.hpp
index 7fc2e1158a..4eabfdc453 100644
--- a/openwire-cpp/src/command/ControlCommand.hpp
+++ b/openwire-cpp/src/command/ControlCommand.hpp
@@ -1 +1,75 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef ControlCommand_hpp_
#define ControlCommand_hpp_
#include
#include "command/BaseCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for ControlCommand
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class ControlCommand : public BaseCommand
{
private:
p command ;
public:
const static int TYPE = 14;
public:
ControlCommand() ;
virtual ~ControlCommand() ;
virtual int getCommandType() ;
virtual p getCommand() ;
virtual void setCommand(p command) ;
} ;
/* namespace */
}
}
}
}
#endif /*ControlCommand_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef ControlCommand_hpp_
+#define ControlCommand_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for ControlCommand
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class ControlCommand : public BaseCommand
+{
+private:
+ p command ;
+
+public:
+ const static int TYPE = 14;
+
+public:
+ ControlCommand() ;
+ virtual ~ControlCommand() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getCommand() ;
+ virtual void setCommand(p command) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*ControlCommand_hpp_*/
diff --git a/openwire-cpp/src/command/DataArrayResponse.hpp b/openwire-cpp/src/command/DataArrayResponse.hpp
index f4f57ed4a7..252ac4f7b1 100644
--- a/openwire-cpp/src/command/DataArrayResponse.hpp
+++ b/openwire-cpp/src/command/DataArrayResponse.hpp
@@ -1 +1,76 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef DataArrayResponse_hpp_
#define DataArrayResponse_hpp_
#include
#include "command/Response.hpp"
#include "command/IDataStructure.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for DataArrayResponse
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class DataArrayResponse : public Response
{
private:
ap data ;
public:
const static int TYPE = 33;
public:
DataArrayResponse() ;
virtual ~DataArrayResponse() ;
virtual int getCommandType() ;
virtual ap getData() ;
virtual void setData(ap data) ;
} ;
/* namespace */
}
}
}
}
#endif /*DataArrayResponse_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef DataArrayResponse_hpp_
+#define DataArrayResponse_hpp_
+
+#include
+#include "command/Response.hpp"
+
+#include "command/IDataStructure.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for DataArrayResponse
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class DataArrayResponse : public Response
+{
+private:
+ ap data ;
+
+public:
+ const static int TYPE = 33;
+
+public:
+ DataArrayResponse() ;
+ virtual ~DataArrayResponse() ;
+
+ virtual int getCommandType() ;
+
+ virtual ap getData() ;
+ virtual void setData(ap data) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*DataArrayResponse_hpp_*/
diff --git a/openwire-cpp/src/command/DataResponse.hpp b/openwire-cpp/src/command/DataResponse.hpp
index ff85d8b0d3..1e40f60fb8 100644
--- a/openwire-cpp/src/command/DataResponse.hpp
+++ b/openwire-cpp/src/command/DataResponse.hpp
@@ -1 +1,76 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef DataResponse_hpp_
#define DataResponse_hpp_
#include
#include "command/Response.hpp"
#include "command/IDataStructure.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for DataResponse
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class DataResponse : public Response
{
private:
p data ;
public:
const static int TYPE = 32;
public:
DataResponse() ;
virtual ~DataResponse() ;
virtual int getCommandType() ;
virtual p getData() ;
virtual void setData(p data) ;
} ;
/* namespace */
}
}
}
}
#endif /*DataResponse_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef DataResponse_hpp_
+#define DataResponse_hpp_
+
+#include
+#include "command/Response.hpp"
+
+#include "command/IDataStructure.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for DataResponse
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class DataResponse : public Response
+{
+private:
+ p data ;
+
+public:
+ const static int TYPE = 32;
+
+public:
+ DataResponse() ;
+ virtual ~DataResponse() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getData() ;
+ virtual void setData(p data) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*DataResponse_hpp_*/
diff --git a/openwire-cpp/src/command/DestinationInfo.hpp b/openwire-cpp/src/command/DestinationInfo.hpp
index 6122915ce3..79e46f2955 100644
--- a/openwire-cpp/src/command/DestinationInfo.hpp
+++ b/openwire-cpp/src/command/DestinationInfo.hpp
@@ -1 +1,94 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef DestinationInfo_hpp_
#define DestinationInfo_hpp_
#include
#include "command/BaseCommand.hpp"
#include "command/ConnectionId.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/BrokerId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for DestinationInfo
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class DestinationInfo : public BaseCommand
{
private:
p connectionId ;
p destination ;
char operationType ;
long long timeout ;
ap brokerPath ;
public:
const static int TYPE = 8;
public:
DestinationInfo() ;
virtual ~DestinationInfo() ;
virtual int getCommandType() ;
virtual p getConnectionId() ;
virtual void setConnectionId(p connectionId) ;
virtual p getDestination() ;
virtual void setDestination(p destination) ;
virtual char getOperationType() ;
virtual void setOperationType(char operationType) ;
virtual long long getTimeout() ;
virtual void setTimeout(long long timeout) ;
virtual ap getBrokerPath() ;
virtual void setBrokerPath(ap brokerPath) ;
} ;
/* namespace */
}
}
}
}
#endif /*DestinationInfo_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef DestinationInfo_hpp_
+#define DestinationInfo_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+#include "command/ConnectionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/BrokerId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for DestinationInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class DestinationInfo : public BaseCommand
+{
+private:
+ p connectionId ;
+ p destination ;
+ char operationType ;
+ long long timeout ;
+ ap brokerPath ;
+
+public:
+ const static int TYPE = 8;
+
+public:
+ DestinationInfo() ;
+ virtual ~DestinationInfo() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getConnectionId() ;
+ virtual void setConnectionId(p connectionId) ;
+
+ virtual p getDestination() ;
+ virtual void setDestination(p destination) ;
+
+ virtual char getOperationType() ;
+ virtual void setOperationType(char operationType) ;
+
+ virtual long long getTimeout() ;
+ virtual void setTimeout(long long timeout) ;
+
+ virtual ap getBrokerPath() ;
+ virtual void setBrokerPath(ap brokerPath) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*DestinationInfo_hpp_*/
diff --git a/openwire-cpp/src/command/DiscoveryEvent.hpp b/openwire-cpp/src/command/DiscoveryEvent.hpp
index db6e574b01..9606a1a5be 100644
--- a/openwire-cpp/src/command/DiscoveryEvent.hpp
+++ b/openwire-cpp/src/command/DiscoveryEvent.hpp
@@ -1 +1,79 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef DiscoveryEvent_hpp_
#define DiscoveryEvent_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for DiscoveryEvent
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class DiscoveryEvent : public AbstractCommand
{
private:
p serviceName ;
p brokerName ;
public:
const static int TYPE = 40;
public:
DiscoveryEvent() ;
virtual ~DiscoveryEvent() ;
virtual int getCommandType() ;
virtual p getServiceName() ;
virtual void setServiceName(p serviceName) ;
virtual p getBrokerName() ;
virtual void setBrokerName(p brokerName) ;
} ;
/* namespace */
}
}
}
}
#endif /*DiscoveryEvent_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef DiscoveryEvent_hpp_
+#define DiscoveryEvent_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for DiscoveryEvent
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class DiscoveryEvent : public AbstractCommand
+{
+private:
+ p serviceName ;
+ p brokerName ;
+
+public:
+ const static int TYPE = 40;
+
+public:
+ DiscoveryEvent() ;
+ virtual ~DiscoveryEvent() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getServiceName() ;
+ virtual void setServiceName(p serviceName) ;
+
+ virtual p getBrokerName() ;
+ virtual void setBrokerName(p brokerName) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*DiscoveryEvent_hpp_*/
diff --git a/openwire-cpp/src/command/FlushCommand.hpp b/openwire-cpp/src/command/FlushCommand.hpp
index d7ef6d1ad8..be21bdb9b5 100644
--- a/openwire-cpp/src/command/FlushCommand.hpp
+++ b/openwire-cpp/src/command/FlushCommand.hpp
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef FlushCommand_hpp_
#define FlushCommand_hpp_
#include
#include "command/BaseCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for FlushCommand
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class FlushCommand : public BaseCommand
{
private:
public:
const static int TYPE = 15;
public:
FlushCommand() ;
virtual ~FlushCommand() ;
virtual int getCommandType() ;
} ;
/* namespace */
}
}
}
}
#endif /*FlushCommand_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef FlushCommand_hpp_
+#define FlushCommand_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for FlushCommand
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class FlushCommand : public BaseCommand
+{
+private:
+
+public:
+ const static int TYPE = 15;
+
+public:
+ FlushCommand() ;
+ virtual ~FlushCommand() ;
+
+ virtual int getCommandType() ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*FlushCommand_hpp_*/
diff --git a/openwire-cpp/src/command/IntegerResponse.hpp b/openwire-cpp/src/command/IntegerResponse.hpp
index 8a57753e3c..ec7bed9638 100644
--- a/openwire-cpp/src/command/IntegerResponse.hpp
+++ b/openwire-cpp/src/command/IntegerResponse.hpp
@@ -1 +1,75 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef IntegerResponse_hpp_
#define IntegerResponse_hpp_
#include
#include "command/Response.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for IntegerResponse
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class IntegerResponse : public Response
{
private:
int result ;
public:
const static int TYPE = 34;
public:
IntegerResponse() ;
virtual ~IntegerResponse() ;
virtual int getCommandType() ;
virtual int getResult() ;
virtual void setResult(int result) ;
} ;
/* namespace */
}
}
}
}
#endif /*IntegerResponse_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef IntegerResponse_hpp_
+#define IntegerResponse_hpp_
+
+#include
+#include "command/Response.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for IntegerResponse
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class IntegerResponse : public Response
+{
+private:
+ int result ;
+
+public:
+ const static int TYPE = 34;
+
+public:
+ IntegerResponse() ;
+ virtual ~IntegerResponse() ;
+
+ virtual int getCommandType() ;
+
+ virtual int getResult() ;
+ virtual void setResult(int result) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*IntegerResponse_hpp_*/
diff --git a/openwire-cpp/src/command/JournalQueueAck.hpp b/openwire-cpp/src/command/JournalQueueAck.hpp
index 4df1fbe342..77adbf6077 100644
--- a/openwire-cpp/src/command/JournalQueueAck.hpp
+++ b/openwire-cpp/src/command/JournalQueueAck.hpp
@@ -1 +1,81 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef JournalQueueAck_hpp_
#define JournalQueueAck_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageAck.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalQueueAck
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalQueueAck : public AbstractCommand
{
private:
p destination ;
p messageAck ;
public:
const static int TYPE = 52;
public:
JournalQueueAck() ;
virtual ~JournalQueueAck() ;
virtual int getCommandType() ;
virtual p getDestination() ;
virtual void setDestination(p destination) ;
virtual p getMessageAck() ;
virtual void setMessageAck(p messageAck) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalQueueAck_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef JournalQueueAck_hpp_
+#define JournalQueueAck_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageAck.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for JournalQueueAck
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class JournalQueueAck : public AbstractCommand
+{
+private:
+ p destination ;
+ p messageAck ;
+
+public:
+ const static int TYPE = 52;
+
+public:
+ JournalQueueAck() ;
+ virtual ~JournalQueueAck() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getDestination() ;
+ virtual void setDestination(p destination) ;
+
+ virtual p getMessageAck() ;
+ virtual void setMessageAck(p messageAck) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*JournalQueueAck_hpp_*/
diff --git a/openwire-cpp/src/command/JournalTopicAck.hpp b/openwire-cpp/src/command/JournalTopicAck.hpp
index 06a7b27aa3..98d4f7dbd1 100644
--- a/openwire-cpp/src/command/JournalTopicAck.hpp
+++ b/openwire-cpp/src/command/JournalTopicAck.hpp
@@ -1 +1,98 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef JournalTopicAck_hpp_
#define JournalTopicAck_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageId.hpp"
#include "command/TransactionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTopicAck
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTopicAck : public AbstractCommand
{
private:
p destination ;
p messageId ;
long long messageSequenceId ;
p subscritionName ;
p clientId ;
p transactionId ;
public:
const static int TYPE = 50;
public:
JournalTopicAck() ;
virtual ~JournalTopicAck() ;
virtual int getCommandType() ;
virtual p getDestination() ;
virtual void setDestination(p destination) ;
virtual p getMessageId() ;
virtual void setMessageId(p messageId) ;
virtual long long getMessageSequenceId() ;
virtual void setMessageSequenceId(long long messageSequenceId) ;
virtual p getSubscritionName() ;
virtual void setSubscritionName(p subscritionName) ;
virtual p getClientId() ;
virtual void setClientId(p clientId) ;
virtual p getTransactionId() ;
virtual void setTransactionId(p transactionId) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTopicAck_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef JournalTopicAck_hpp_
+#define JournalTopicAck_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageId.hpp"
+#include "command/TransactionId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for JournalTopicAck
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class JournalTopicAck : public AbstractCommand
+{
+private:
+ p destination ;
+ p messageId ;
+ long long messageSequenceId ;
+ p subscritionName ;
+ p clientId ;
+ p transactionId ;
+
+public:
+ const static int TYPE = 50;
+
+public:
+ JournalTopicAck() ;
+ virtual ~JournalTopicAck() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getDestination() ;
+ virtual void setDestination(p destination) ;
+
+ virtual p getMessageId() ;
+ virtual void setMessageId(p messageId) ;
+
+ virtual long long getMessageSequenceId() ;
+ virtual void setMessageSequenceId(long long messageSequenceId) ;
+
+ virtual p getSubscritionName() ;
+ virtual void setSubscritionName(p subscritionName) ;
+
+ virtual p getClientId() ;
+ virtual void setClientId(p clientId) ;
+
+ virtual p getTransactionId() ;
+ virtual void setTransactionId(p transactionId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*JournalTopicAck_hpp_*/
diff --git a/openwire-cpp/src/command/JournalTrace.hpp b/openwire-cpp/src/command/JournalTrace.hpp
index f2c68d590d..044543d438 100644
--- a/openwire-cpp/src/command/JournalTrace.hpp
+++ b/openwire-cpp/src/command/JournalTrace.hpp
@@ -1 +1,75 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef JournalTrace_hpp_
#define JournalTrace_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTrace
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTrace : public AbstractCommand
{
private:
p message ;
public:
const static int TYPE = 53;
public:
JournalTrace() ;
virtual ~JournalTrace() ;
virtual int getCommandType() ;
virtual p getMessage() ;
virtual void setMessage(p message) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTrace_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef JournalTrace_hpp_
+#define JournalTrace_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for JournalTrace
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class JournalTrace : public AbstractCommand
+{
+private:
+ p message ;
+
+public:
+ const static int TYPE = 53;
+
+public:
+ JournalTrace() ;
+ virtual ~JournalTrace() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getMessage() ;
+ virtual void setMessage(p message) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*JournalTrace_hpp_*/
diff --git a/openwire-cpp/src/command/JournalTransaction.hpp b/openwire-cpp/src/command/JournalTransaction.hpp
index 492aaf7d3b..732f40770c 100644
--- a/openwire-cpp/src/command/JournalTransaction.hpp
+++ b/openwire-cpp/src/command/JournalTransaction.hpp
@@ -1 +1,84 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef JournalTransaction_hpp_
#define JournalTransaction_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "command/TransactionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTransaction
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTransaction : public AbstractCommand
{
private:
p transactionId ;
char type ;
bool wasPrepared ;
public:
const static int TYPE = 54;
public:
JournalTransaction() ;
virtual ~JournalTransaction() ;
virtual int getCommandType() ;
virtual p getTransactionId() ;
virtual void setTransactionId(p transactionId) ;
virtual char getType() ;
virtual void setType(char type) ;
virtual bool getWasPrepared() ;
virtual void setWasPrepared(bool wasPrepared) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTransaction_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef JournalTransaction_hpp_
+#define JournalTransaction_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+#include "command/TransactionId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for JournalTransaction
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class JournalTransaction : public AbstractCommand
+{
+private:
+ p transactionId ;
+ char type ;
+ bool wasPrepared ;
+
+public:
+ const static int TYPE = 54;
+
+public:
+ JournalTransaction() ;
+ virtual ~JournalTransaction() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getTransactionId() ;
+ virtual void setTransactionId(p transactionId) ;
+
+ virtual char getType() ;
+ virtual void setType(char type) ;
+
+ virtual bool getWasPrepared() ;
+ virtual void setWasPrepared(bool wasPrepared) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*JournalTransaction_hpp_*/
diff --git a/openwire-cpp/src/command/KeepAliveInfo.hpp b/openwire-cpp/src/command/KeepAliveInfo.hpp
index 9f2446f39f..6935962fe2 100644
--- a/openwire-cpp/src/command/KeepAliveInfo.hpp
+++ b/openwire-cpp/src/command/KeepAliveInfo.hpp
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef KeepAliveInfo_hpp_
#define KeepAliveInfo_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for KeepAliveInfo
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class KeepAliveInfo : public AbstractCommand
{
private:
public:
const static int TYPE = 10;
public:
KeepAliveInfo() ;
virtual ~KeepAliveInfo() ;
virtual int getCommandType() ;
} ;
/* namespace */
}
}
}
}
#endif /*KeepAliveInfo_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef KeepAliveInfo_hpp_
+#define KeepAliveInfo_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for KeepAliveInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class KeepAliveInfo : public AbstractCommand
+{
+private:
+
+public:
+ const static int TYPE = 10;
+
+public:
+ KeepAliveInfo() ;
+ virtual ~KeepAliveInfo() ;
+
+ virtual int getCommandType() ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*KeepAliveInfo_hpp_*/
diff --git a/openwire-cpp/src/command/LocalTransactionId.hpp b/openwire-cpp/src/command/LocalTransactionId.hpp
index 8d1ffafeb3..77e0f17577 100644
--- a/openwire-cpp/src/command/LocalTransactionId.hpp
+++ b/openwire-cpp/src/command/LocalTransactionId.hpp
@@ -1 +1,80 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef LocalTransactionId_hpp_
#define LocalTransactionId_hpp_
#include
#include "command/TransactionId.hpp"
#include "command/ConnectionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for LocalTransactionId
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class LocalTransactionId : public TransactionId
{
private:
long long value ;
p connectionId ;
public:
const static int TYPE = 111;
public:
LocalTransactionId() ;
virtual ~LocalTransactionId() ;
virtual int getCommandType() ;
virtual long long getValue() ;
virtual void setValue(long long value) ;
virtual p getConnectionId() ;
virtual void setConnectionId(p connectionId) ;
} ;
/* namespace */
}
}
}
}
#endif /*LocalTransactionId_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef LocalTransactionId_hpp_
+#define LocalTransactionId_hpp_
+
+#include
+#include "command/TransactionId.hpp"
+
+#include "command/ConnectionId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for LocalTransactionId
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class LocalTransactionId : public TransactionId
+{
+private:
+ long long value ;
+ p connectionId ;
+
+public:
+ const static int TYPE = 111;
+
+public:
+ LocalTransactionId() ;
+ virtual ~LocalTransactionId() ;
+
+ virtual int getCommandType() ;
+
+ virtual long long getValue() ;
+ virtual void setValue(long long value) ;
+
+ virtual p getConnectionId() ;
+ virtual void setConnectionId(p connectionId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*LocalTransactionId_hpp_*/
diff --git a/openwire-cpp/src/command/MessageDispatch.hpp b/openwire-cpp/src/command/MessageDispatch.hpp
index 6761368acc..fe7918db50 100644
--- a/openwire-cpp/src/command/MessageDispatch.hpp
+++ b/openwire-cpp/src/command/MessageDispatch.hpp
@@ -1 +1,90 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef MessageDispatch_hpp_
#define MessageDispatch_hpp_
#include
#include "command/BaseCommand.hpp"
#include "command/ConsumerId.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/Message.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for MessageDispatch
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class MessageDispatch : public BaseCommand
{
private:
p consumerId ;
p destination ;
p message ;
int redeliveryCounter ;
public:
const static int TYPE = 21;
public:
MessageDispatch() ;
virtual ~MessageDispatch() ;
virtual int getCommandType() ;
virtual p getConsumerId() ;
virtual void setConsumerId(p consumerId) ;
virtual p getDestination() ;
virtual void setDestination(p destination) ;
virtual p getMessage() ;
virtual void setMessage(p message) ;
virtual int getRedeliveryCounter() ;
virtual void setRedeliveryCounter(int redeliveryCounter) ;
} ;
/* namespace */
}
}
}
}
#endif /*MessageDispatch_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef MessageDispatch_hpp_
+#define MessageDispatch_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+#include "command/ConsumerId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/Message.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for MessageDispatch
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class MessageDispatch : public BaseCommand
+{
+private:
+ p consumerId ;
+ p destination ;
+ p message ;
+ int redeliveryCounter ;
+
+public:
+ const static int TYPE = 21;
+
+public:
+ MessageDispatch() ;
+ virtual ~MessageDispatch() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getConsumerId() ;
+ virtual void setConsumerId(p consumerId) ;
+
+ virtual p getDestination() ;
+ virtual void setDestination(p destination) ;
+
+ virtual p getMessage() ;
+ virtual void setMessage(p message) ;
+
+ virtual int getRedeliveryCounter() ;
+ virtual void setRedeliveryCounter(int redeliveryCounter) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*MessageDispatch_hpp_*/
diff --git a/openwire-cpp/src/command/MessageDispatchNotification.hpp b/openwire-cpp/src/command/MessageDispatchNotification.hpp
index ca3e5e547f..9088d6c07a 100644
--- a/openwire-cpp/src/command/MessageDispatchNotification.hpp
+++ b/openwire-cpp/src/command/MessageDispatchNotification.hpp
@@ -1 +1,90 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef MessageDispatchNotification_hpp_
#define MessageDispatchNotification_hpp_
#include
#include "command/BaseCommand.hpp"
#include "command/ConsumerId.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for MessageDispatchNotification
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class MessageDispatchNotification : public BaseCommand
{
private:
p consumerId ;
p destination ;
long long deliverySequenceId ;
p messageId ;
public:
const static int TYPE = 90;
public:
MessageDispatchNotification() ;
virtual ~MessageDispatchNotification() ;
virtual int getCommandType() ;
virtual p getConsumerId() ;
virtual void setConsumerId(p consumerId) ;
virtual p getDestination() ;
virtual void setDestination(p destination) ;
virtual long long getDeliverySequenceId() ;
virtual void setDeliverySequenceId(long long deliverySequenceId) ;
virtual p getMessageId() ;
virtual void setMessageId(p messageId) ;
} ;
/* namespace */
}
}
}
}
#endif /*MessageDispatchNotification_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef MessageDispatchNotification_hpp_
+#define MessageDispatchNotification_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+#include "command/ConsumerId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for MessageDispatchNotification
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class MessageDispatchNotification : public BaseCommand
+{
+private:
+ p consumerId ;
+ p destination ;
+ long long deliverySequenceId ;
+ p messageId ;
+
+public:
+ const static int TYPE = 90;
+
+public:
+ MessageDispatchNotification() ;
+ virtual ~MessageDispatchNotification() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getConsumerId() ;
+ virtual void setConsumerId(p consumerId) ;
+
+ virtual p getDestination() ;
+ virtual void setDestination(p destination) ;
+
+ virtual long long getDeliverySequenceId() ;
+ virtual void setDeliverySequenceId(long long deliverySequenceId) ;
+
+ virtual p getMessageId() ;
+ virtual void setMessageId(p messageId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*MessageDispatchNotification_hpp_*/
diff --git a/openwire-cpp/src/command/MessageId.hpp b/openwire-cpp/src/command/MessageId.hpp
index f5d703532e..1cd50ca909 100644
--- a/openwire-cpp/src/command/MessageId.hpp
+++ b/openwire-cpp/src/command/MessageId.hpp
@@ -1 +1,84 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef MessageId_hpp_
#define MessageId_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "command/ProducerId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for MessageId
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class MessageId : public AbstractCommand
{
private:
p producerId ;
long long producerSequenceId ;
long long brokerSequenceId ;
public:
const static int TYPE = 110;
public:
MessageId() ;
virtual ~MessageId() ;
virtual int getCommandType() ;
virtual p getProducerId() ;
virtual void setProducerId(p producerId) ;
virtual long long getProducerSequenceId() ;
virtual void setProducerSequenceId(long long producerSequenceId) ;
virtual long long getBrokerSequenceId() ;
virtual void setBrokerSequenceId(long long brokerSequenceId) ;
} ;
/* namespace */
}
}
}
}
#endif /*MessageId_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef MessageId_hpp_
+#define MessageId_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+#include "command/ProducerId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for MessageId
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class MessageId : public AbstractCommand
+{
+private:
+ p producerId ;
+ long long producerSequenceId ;
+ long long brokerSequenceId ;
+
+public:
+ const static int TYPE = 110;
+
+public:
+ MessageId() ;
+ virtual ~MessageId() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getProducerId() ;
+ virtual void setProducerId(p producerId) ;
+
+ virtual long long getProducerSequenceId() ;
+ virtual void setProducerSequenceId(long long producerSequenceId) ;
+
+ virtual long long getBrokerSequenceId() ;
+ virtual void setBrokerSequenceId(long long brokerSequenceId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*MessageId_hpp_*/
diff --git a/openwire-cpp/src/command/NetworkBridgeFilter.cpp b/openwire-cpp/src/command/NetworkBridgeFilter.cpp
index 4625f39121..8e74fb4521 100644
--- a/openwire-cpp/src/command/NetworkBridgeFilter.cpp
+++ b/openwire-cpp/src/command/NetworkBridgeFilter.cpp
@@ -1 +1,61 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#include "command/NetworkBridgeFilter.hpp"
using namespace apache::activemq::client::command;
/*
*
* Marshalling code for Open Wire Format for NetworkBridgeFilter
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
NetworkBridgeFilter::NetworkBridgeFilter()
{
this->networkTTL = 0 ;
this->networkBrokerId = 0 ;
}
NetworkBridgeFilter::~NetworkBridgeFilter()
{
}
int NetworkBridgeFilter::getNetworkTTL()
{
return networkTTL ;
}
void NetworkBridgeFilter::setNetworkTTL(int networkTTL)
{
this->networkTTL = networkTTL ;
}
p NetworkBridgeFilter::getNetworkBrokerId()
{
return networkBrokerId ;
}
void NetworkBridgeFilter::setNetworkBrokerId(p networkBrokerId)
{
this->networkBrokerId = networkBrokerId ;
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#include "command/NetworkBridgeFilter.hpp"
+
+using namespace apache::activemq::client::command;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for NetworkBridgeFilter
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+NetworkBridgeFilter::NetworkBridgeFilter()
+{
+ this->networkTTL = 0 ;
+ this->networkBrokerId = 0 ;
+}
+
+NetworkBridgeFilter::~NetworkBridgeFilter()
+{
+}
+
+
+int NetworkBridgeFilter::getNetworkTTL()
+{
+ return networkTTL ;
+}
+
+void NetworkBridgeFilter::setNetworkTTL(int networkTTL)
+{
+ this->networkTTL = networkTTL ;
+}
+
+
+p NetworkBridgeFilter::getNetworkBrokerId()
+{
+ return networkBrokerId ;
+}
+
+void NetworkBridgeFilter::setNetworkBrokerId(p networkBrokerId)
+{
+ this->networkBrokerId = networkBrokerId ;
+}
diff --git a/openwire-cpp/src/command/NetworkBridgeFilter.hpp b/openwire-cpp/src/command/NetworkBridgeFilter.hpp
index 642211d6f7..e728dbe842 100644
--- a/openwire-cpp/src/command/NetworkBridgeFilter.hpp
+++ b/openwire-cpp/src/command/NetworkBridgeFilter.hpp
@@ -1 +1,80 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef NetworkBridgeFilter_hpp_
#define NetworkBridgeFilter_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "command/BrokerId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for NetworkBridgeFilter
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class NetworkBridgeFilter : public AbstractCommand
{
private:
int networkTTL ;
p networkBrokerId ;
public:
const static int TYPE = 91;
public:
NetworkBridgeFilter() ;
virtual ~NetworkBridgeFilter() ;
virtual int getCommandType() ;
virtual int getNetworkTTL() ;
virtual void setNetworkTTL(int networkTTL) ;
virtual p getNetworkBrokerId() ;
virtual void setNetworkBrokerId(p networkBrokerId) ;
} ;
/* namespace */
}
}
}
}
#endif /*NetworkBridgeFilter_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef NetworkBridgeFilter_hpp_
+#define NetworkBridgeFilter_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+#include "command/BrokerId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for NetworkBridgeFilter
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class NetworkBridgeFilter : public AbstractCommand
+{
+private:
+ int networkTTL ;
+ p networkBrokerId ;
+
+public:
+ const static int TYPE = 91;
+
+public:
+ NetworkBridgeFilter() ;
+ virtual ~NetworkBridgeFilter() ;
+
+ virtual int getCommandType() ;
+
+ virtual int getNetworkTTL() ;
+ virtual void setNetworkTTL(int networkTTL) ;
+
+ virtual p getNetworkBrokerId() ;
+ virtual void setNetworkBrokerId(p networkBrokerId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*NetworkBridgeFilter_hpp_*/
diff --git a/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp b/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp
index e2617e561f..4384ac2d3b 100644
--- a/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp
+++ b/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp
@@ -1 +1,84 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef RemoveSubscriptionInfo_hpp_
#define RemoveSubscriptionInfo_hpp_
#include
#include "command/BaseCommand.hpp"
#include "command/ConnectionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for RemoveSubscriptionInfo
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class RemoveSubscriptionInfo : public BaseCommand
{
private:
p connectionId ;
p subcriptionName ;
p clientId ;
public:
const static int TYPE = 0;
public:
RemoveSubscriptionInfo() ;
virtual ~RemoveSubscriptionInfo() ;
virtual int getCommandType() ;
virtual p getConnectionId() ;
virtual void setConnectionId(p connectionId) ;
virtual p getSubcriptionName() ;
virtual void setSubcriptionName(p subcriptionName) ;
virtual p getClientId() ;
virtual void setClientId(p clientId) ;
} ;
/* namespace */
}
}
}
}
#endif /*RemoveSubscriptionInfo_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef RemoveSubscriptionInfo_hpp_
+#define RemoveSubscriptionInfo_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+#include "command/ConnectionId.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for RemoveSubscriptionInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class RemoveSubscriptionInfo : public BaseCommand
+{
+private:
+ p connectionId ;
+ p subcriptionName ;
+ p clientId ;
+
+public:
+ const static int TYPE = 0;
+
+public:
+ RemoveSubscriptionInfo() ;
+ virtual ~RemoveSubscriptionInfo() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getConnectionId() ;
+ virtual void setConnectionId(p connectionId) ;
+
+ virtual p getSubcriptionName() ;
+ virtual void setSubcriptionName(p subcriptionName) ;
+
+ virtual p getClientId() ;
+ virtual void setClientId(p clientId) ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*RemoveSubscriptionInfo_hpp_*/
diff --git a/openwire-cpp/src/command/ReplayCommand.hpp b/openwire-cpp/src/command/ReplayCommand.hpp
index e4e6465ab0..bcda2ecda6 100644
--- a/openwire-cpp/src/command/ReplayCommand.hpp
+++ b/openwire-cpp/src/command/ReplayCommand.hpp
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef ReplayCommand_hpp_
#define ReplayCommand_hpp_
#include
#include "command/BaseCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for ReplayCommand
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class ReplayCommand : public BaseCommand
{
private:
public:
const static int TYPE = 38;
public:
ReplayCommand() ;
virtual ~ReplayCommand() ;
virtual int getCommandType() ;
} ;
/* namespace */
}
}
}
}
#endif /*ReplayCommand_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef ReplayCommand_hpp_
+#define ReplayCommand_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for ReplayCommand
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class ReplayCommand : public BaseCommand
+{
+private:
+
+public:
+ const static int TYPE = 38;
+
+public:
+ ReplayCommand() ;
+ virtual ~ReplayCommand() ;
+
+ virtual int getCommandType() ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*ReplayCommand_hpp_*/
diff --git a/openwire-cpp/src/command/ShutdownInfo.hpp b/openwire-cpp/src/command/ShutdownInfo.hpp
index 87b060a450..55feeb5489 100644
--- a/openwire-cpp/src/command/ShutdownInfo.hpp
+++ b/openwire-cpp/src/command/ShutdownInfo.hpp
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef ShutdownInfo_hpp_
#define ShutdownInfo_hpp_
#include
#include "command/BaseCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for ShutdownInfo
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class ShutdownInfo : public BaseCommand
{
private:
public:
const static int TYPE = 11;
public:
ShutdownInfo() ;
virtual ~ShutdownInfo() ;
virtual int getCommandType() ;
} ;
/* namespace */
}
}
}
}
#endif /*ShutdownInfo_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef ShutdownInfo_hpp_
+#define ShutdownInfo_hpp_
+
+#include
+#include "command/BaseCommand.hpp"
+
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for ShutdownInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class ShutdownInfo : public BaseCommand
+{
+private:
+
+public:
+ const static int TYPE = 11;
+
+public:
+ ShutdownInfo() ;
+ virtual ~ShutdownInfo() ;
+
+ virtual int getCommandType() ;
+
+
+} ;
+
+/* namespace */
+ }
+ }
+ }
+}
+
+#endif /*ShutdownInfo_hpp_*/
diff --git a/openwire-cpp/src/command/SubscriptionInfo.hpp b/openwire-cpp/src/command/SubscriptionInfo.hpp
index 5d09d94670..ba095cd52d 100644
--- a/openwire-cpp/src/command/SubscriptionInfo.hpp
+++ b/openwire-cpp/src/command/SubscriptionInfo.hpp
@@ -1 +1,88 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/
#ifndef SubscriptionInfo_hpp_
#define SubscriptionInfo_hpp_
#include
#include "command/AbstractCommand.hpp"
#include "command/ActiveMQDestination.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for SubscriptionInfo
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class SubscriptionInfo : public AbstractCommand
{
private:
p clientId ;
p destination ;
p selector ;
p subcriptionName ;
public:
const static int TYPE = 55;
public:
SubscriptionInfo() ;
virtual ~SubscriptionInfo() ;
virtual int getCommandType() ;
virtual p getClientId() ;
virtual void setClientId(p clientId) ;
virtual p getDestination() ;
virtual void setDestination(p destination) ;
virtual p getSelector() ;
virtual void setSelector(p selector) ;
virtual p getSubcriptionName() ;
virtual void setSubcriptionName(p subcriptionName) ;
} ;
/* namespace */
}
}
}
}
#endif /*SubscriptionInfo_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+#ifndef SubscriptionInfo_hpp_
+#define SubscriptionInfo_hpp_
+
+#include
+#include "command/AbstractCommand.hpp"
+
+#include "command/ActiveMQDestination.hpp"
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+ namespace activemq
+ {
+ namespace client
+ {
+ namespace command
+ {
+ using namespace ifr;
+ using namespace std;
+ using namespace apache::activemq::client;
+
+/*
+ *
+ * Marshalling code for Open Wire Format for SubscriptionInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
+ */
+class SubscriptionInfo : public AbstractCommand
+{
+private:
+ p clientId ;
+ p destination ;
+ p selector ;
+ p subcriptionName ;
+
+public:
+ const static int TYPE = 55;
+
+public:
+ SubscriptionInfo() ;
+ virtual ~SubscriptionInfo() ;
+
+ virtual int getCommandType() ;
+
+ virtual p getClientId() ;
+ virtual void setClientId(p clientId) ;
+
+ virtual p getDestination() ;
+ virtual void setDestination(p destination) ;
+
+ virtual p