Adjusted openwire generators

- Got .NET working again after bing WireFormat change
 - Fixed generated indenting for the java and csharp stuff.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383767 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java

@@ -41,47 +41,47 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
     
 
     protected void generateTightUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
-        out.print("        ");
+
         String propertyName = property.getSimpleName();
         String type = property.getType().getSimpleName();
 
         if (type.equals("boolean")) {
-            out.println("info." + propertyName + " = bs.ReadBoolean();");
+            out.println("        info." + propertyName + " = bs.ReadBoolean();");
         }
         else if (type.equals("byte")) {
-            out.println("info." + propertyName + " = dataIn.ReadByte();");
+            out.println("        info." + propertyName + " = dataIn.ReadByte();");
         }
         else if (type.equals("char")) {
-            out.println("info." + propertyName + " = dataIn.ReadChar();");
+            out.println("        info." + propertyName + " = dataIn.ReadChar();");
         }
         else if (type.equals("short")) {
-            out.println("info." + propertyName + " = dataIn.ReadInt16();");
+            out.println("        info." + propertyName + " = dataIn.ReadInt16();");
         }
         else if (type.equals("int")) {
-            out.println("info." + propertyName + " = dataIn.ReadInt32();");
+            out.println("        info." + propertyName + " = dataIn.ReadInt32();");
         }
         else if (type.equals("long")) {
-            out.println("info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);");
         }
         else if (type.equals("String")) {
-            out.println("info." + propertyName + " = TightUnmarshalString(dataIn, bs);");
+            out.println("        info." + propertyName + " = TightUnmarshalString(dataIn, bs);");
         }
         else if (type.equals("byte[]") || type.equals("ByteSequence")) {
             if (size != null) {
-                out.println("info." + propertyName + " = ReadBytes(dataIn, " + size.asInt() + ");");
+                out.println("        info." + propertyName + " = ReadBytes(dataIn, " + size.asInt() + ");");
             }
             else {
-                out.println("info." + propertyName + " = ReadBytes(dataIn, bs.ReadBoolean());");
+                out.println("        info." + propertyName + " = ReadBytes(dataIn, bs.ReadBoolean());");
             }
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + propertyName + " = TightUnmarshalBrokerError(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = TightUnmarshalBrokerError(wireFormat, dataIn, bs);");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + propertyName + " = (" + type + ") TightUnmarshalCachedObject(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = (" + type + ") TightUnmarshalCachedObject(wireFormat, dataIn, bs);");
         }
         else {
-            out.println("info." + propertyName + " = (" + type + ") TightUnmarshalNestedObject(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = (" + type + ") TightUnmarshalNestedObject(wireFormat, dataIn, bs);");
         }
     }
 
@@ -125,9 +125,8 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getSimpleName();
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.WriteBoolean(" + getter + ");");
+                out.println("        bs.WriteBoolean(" + getter + ");");
             }
             else if (type.equals("byte")) {
                 baseSize += 1;
@@ -142,14 +141,15 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
                 baseSize += 4;
             }
             else if (type.equals("long")) {
-                out.println("rc += TightMarshalLong1(wireFormat, " + getter + ", bs);");
+                out.println("        rc += TightMarshalLong1(wireFormat, " + getter + ", bs);");
             }
             else if (type.equals("String")) {
-                out.println("rc += TightMarshalString1(" + getter + ", bs);");
+                out.print("");
+                out.println("        rc += TightMarshalString1(" + getter + ", bs);");
             }
             else if (type.equals("byte[]") || type.equals("ByteSequence")) {
                 if (size == null) {
-                    out.println("bs.WriteBoolean(" + getter + "!=null);");
+                    out.println("        bs.WriteBoolean(" + getter + "!=null);");
                     out.println("        rc += " + getter + "==null ? 0 : " + getter + ".Length+4;");
                 }
                 else {
@@ -158,21 +158,21 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("rc += TightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
+                    out.println("        rc += TightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("rc += TightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
+                    out.println("        rc += TightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("rc += TightMarshalBrokerError1(wireFormat, " + getter + ", bs);");
+                out.println("        rc += TightMarshalBrokerError1(wireFormat, " + getter + ", bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
             }
         }
@@ -189,34 +189,33 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getSimpleName();
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.ReadBoolean();");
+                out.println("        bs.ReadBoolean();");
             }
             else if (type.equals("byte")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("long")) {
-                out.println("TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else if (type.equals("String")) {
-                out.println("TightMarshalString2(" + getter + ", dataOut, bs);");
+                out.println("        TightMarshalString2(" + getter + ", dataOut, bs);");
             }
             else if (type.equals("byte[]") || type.equals("ByteSequence")) {
                 if (size != null) {
-                    out.println("dataOut.Write(" + getter + ", 0, " + size.asInt() + ");");
+                    out.println("        dataOut.Write(" + getter + ", 0, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("if(bs.ReadBoolean()) {");
+                    out.println("        if(bs.ReadBoolean()) {");
                     out.println("           dataOut.Write(" + getter + ".Length);");
                     out.println("           dataOut.Write(" + getter + ");");
                     out.println("        }");
@@ -224,21 +223,21 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("TightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
+                    out.println("        TightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("TightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("        TightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("TightMarshalBrokerError2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        TightMarshalBrokerError2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
                 else {
-                    out.println("TightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        TightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
             }
         }

activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java

@@ -115,50 +115,49 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
     }
 
     protected void generateTightUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
-        out.print("        ");
         String setter = property.getSetter().getSimpleName();
         String type = property.getType().getSimpleName();
 
         if (type.equals("boolean")) {
-            out.println("info." + setter + "(bs.readBoolean());");
+            out.println("        info." + setter + "(bs.readBoolean());");
         }
         else if (type.equals("byte")) {
-            out.println("info." + setter + "(dataIn.readByte());");
+            out.println("        info." + setter + "(dataIn.readByte());");
         }
         else if (type.equals("char")) {
-            out.println("info." + setter + "(dataIn.readChar());");
+            out.println("        info." + setter + "(dataIn.readChar());");
         }
         else if (type.equals("short")) {
-            out.println("info." + setter + "(dataIn.readShort());");
+            out.println("        info." + setter + "(dataIn.readShort());");
         }
         else if (type.equals("int")) {
-            out.println("info." + setter + "(dataIn.readInt());");
+            out.println("        info." + setter + "(dataIn.readInt());");
         }
         else if (type.equals("long")) {
-            out.println("info." + setter + "(tightUnmarshalLong(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "(tightUnmarshalLong(wireFormat, dataIn, bs));");
         }
         else if (type.equals("String")) {
-            out.println("info." + setter + "(tightUnmarshalString(dataIn, bs));");
+            out.println("        info." + setter + "(tightUnmarshalString(dataIn, bs));");
         }
         else if (type.equals("byte[]")) {
             if (size != null) {
-                out.println("info." + setter + "(tightUnmarshalConstByteArray(dataIn, bs, "+ size.asInt() +"));");
+                out.println("        info." + setter + "(tightUnmarshalConstByteArray(dataIn, bs, "+ size.asInt() +"));");
             }
             else {
-                out.println("info." + setter + "(tightUnmarshalByteArray(dataIn, bs));");
+                out.println("        info." + setter + "(tightUnmarshalByteArray(dataIn, bs));");
             }
         }
         else if (type.equals("ByteSequence")) {
-            out.println("info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));");
+            out.println("        info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));");
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
         }
         else {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
         }
     }
 
@@ -202,9 +201,8 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getGetter().getSimpleName() + "()";
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.writeBoolean(" + getter + ");");
+                out.println("        bs.writeBoolean(" + getter + ");");
             }
             else if (type.equals("byte")) {
                 baseSize += 1;
@@ -219,39 +217,39 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
                 baseSize += 4;
             }
             else if (type.equals("long")) {
-                out.println("rc+=tightMarshalLong1(wireFormat, " + getter + ", bs);");
+                out.println("        rc+=tightMarshalLong1(wireFormat, " + getter + ", bs);");
             }
             else if (type.equals("String")) {
-                out.println("rc += tightMarshalString1(" + getter + ", bs);");
+                out.println("        rc += tightMarshalString1(" + getter + ", bs);");
             }
             else if (type.equals("byte[]")) {
                 if (size == null) {
-                    out.println("rc += tightMarshalByteArray1(" + getter + ", bs);");
+                    out.println("        rc += tightMarshalByteArray1(" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += tightMarshalConstByteArray1(" + getter + ", bs, "+size.asInt()+");");
+                    out.println("        rc += tightMarshalConstByteArray1(" + getter + ", bs, "+size.asInt()+");");
                 }
             }
             else if (type.equals("ByteSequence")) {
-                out.println("rc += tightMarshalByteSequence1(" + getter + ", bs);");
+                out.println("        rc += tightMarshalByteSequence1(" + getter + ", bs);");
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("rc += tightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
+                    out.println("        rc += tightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("rc += tightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
+                    out.println("        rc += tightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("rc += tightMarshalThrowable1(wireFormat, " + getter + ", bs);");
+                out.println("        rc += tightMarshalThrowable1(wireFormat, " + getter + ", bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
             }
         }
@@ -268,56 +266,55 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getGetter().getSimpleName() + "()";
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.readBoolean();");
+                out.println("        bs.readBoolean();");
             }
             else if (type.equals("byte")) {
-                out.println("dataOut.writeByte(" + getter + ");");
+                out.println("        dataOut.writeByte(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("dataOut.writeChar(" + getter + ");");
+                out.println("        dataOut.writeChar(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("dataOut.writeShort(" + getter + ");");
+                out.println("        dataOut.writeShort(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("dataOut.writeInt(" + getter + ");");
+                out.println("        dataOut.writeInt(" + getter + ");");
             }
             else if (type.equals("long")) {
-                out.println("tightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        tightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else if (type.equals("String")) {
-                out.println("tightMarshalString2(" + getter + ", dataOut, bs);");
+                out.println("        tightMarshalString2(" + getter + ", dataOut, bs);");
             }
             else if (type.equals("byte[]")) {
                 if (size != null) {
-                    out.println("tightMarshalConstByteArray2(" + getter + ", dataOut, bs, " + size.asInt() + ");");
+                    out.println("        tightMarshalConstByteArray2(" + getter + ", dataOut, bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("tightMarshalByteArray2(" + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalByteArray2(" + getter + ", dataOut, bs);");
                 }
             }
             else if (type.equals("ByteSequence")) {
-                out.println("tightMarshalByteSequence2(" + getter + ", dataOut, bs);");
+                out.println("        tightMarshalByteSequence2(" + getter + ", dataOut, bs);");
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("tightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
+                    out.println("        tightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("tightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("tightMarshalThrowable2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        tightMarshalThrowable2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
                 else {
-                    out.println("tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
             }
         }
@@ -335,56 +332,55 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getGetter().getSimpleName() + "()";
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("dataOut.writeBoolean("+ getter + ");");
+                out.println("        dataOut.writeBoolean("+ getter + ");");
             }
             else if (type.equals("byte")) {
-                out.println("dataOut.writeByte(" + getter + ");");
+                out.println("        dataOut.writeByte(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("dataOut.writeChar(" + getter + ");");
+                out.println("        dataOut.writeChar(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("dataOut.writeShort(" + getter + ");");
+                out.println("        dataOut.writeShort(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("dataOut.writeInt(" + getter + ");");
+                out.println("        dataOut.writeInt(" + getter + ");");
             }
             else if (type.equals("long")) {
-                out.println("looseMarshalLong(wireFormat, " + getter + ", dataOut);");
+                out.println("        looseMarshalLong(wireFormat, " + getter + ", dataOut);");
             }
             else if (type.equals("String")) {
-                out.println("looseMarshalString(" + getter + ", dataOut);");
+                out.println("        looseMarshalString(" + getter + ", dataOut);");
             }
             else if (type.equals("byte[]")) {
                 if (size != null) {
-                    out.println("looseMarshalConstByteArray(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
+                    out.println("        looseMarshalConstByteArray(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("looseMarshalByteArray(wireFormat, " + getter + ", dataOut);");
+                    out.println("        looseMarshalByteArray(wireFormat, " + getter + ", dataOut);");
                 }
             }
             else if (type.equals("ByteSequence")) {
-                out.println("looseMarshalByteSequence(wireFormat, " + getter + ", dataOut);");
+                out.println("        looseMarshalByteSequence(wireFormat, " + getter + ", dataOut);");
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("looseMarshalObjectArrayConstSize(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
+                    out.println("        looseMarshalObjectArrayConstSize(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("looseMarshalObjectArray(wireFormat, " + getter + ", dataOut);");
+                    out.println("        looseMarshalObjectArray(wireFormat, " + getter + ", dataOut);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("looseMarshalThrowable(wireFormat, " + getter + ", dataOut);");
+                out.println("        looseMarshalThrowable(wireFormat, " + getter + ", dataOut);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
+                    out.println("        looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
                 }
                 else {
-                    out.println("looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
+                    out.println("        looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
                 }
             }
         }
@@ -410,50 +406,49 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
     }
 
     protected void generateLooseUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
-        out.print("        ");
         String setter = property.getSetter().getSimpleName();
         String type = property.getType().getSimpleName();
 
         if (type.equals("boolean")) {
-            out.println("info." + setter + "(dataIn.readBoolean());");
+            out.println("        info." + setter + "(dataIn.readBoolean());");
         }
         else if (type.equals("byte")) {
-            out.println("info." + setter + "(dataIn.readByte());");
+            out.println("        info." + setter + "(dataIn.readByte());");
         }
         else if (type.equals("char")) {
-            out.println("info." + setter + "(dataIn.readChar());");
+            out.println("        info." + setter + "(dataIn.readChar());");
         }
         else if (type.equals("short")) {
-            out.println("info." + setter + "(dataIn.readShort());");
+            out.println("        info." + setter + "(dataIn.readShort());");
         }
         else if (type.equals("int")) {
-            out.println("info." + setter + "(dataIn.readInt());");
+            out.println("        info." + setter + "(dataIn.readInt());");
         }
         else if (type.equals("long")) {
-            out.println("info." + setter + "(looseUnmarshalLong(wireFormat, dataIn));");
+            out.println("        info." + setter + "(looseUnmarshalLong(wireFormat, dataIn));");
         }
         else if (type.equals("String")) {
-            out.println("info." + setter + "(looseUnmarshalString(dataIn));");
+            out.println("        info." + setter + "(looseUnmarshalString(dataIn));");
         }
         else if (type.equals("byte[]")) {
             if (size != null) {
-                out.println("info." + setter + "(looseUnmarshalConstByteArray(dataIn, " + size.asInt() + "));");
+                out.println("        info." + setter + "(looseUnmarshalConstByteArray(dataIn, " + size.asInt() + "));");
             }
             else {
-                out.println("info." + setter + "(looseUnmarshalByteArray(dataIn));");
+                out.println("        info." + setter + "(looseUnmarshalByteArray(dataIn));");
             }
         }
         else if (type.equals("ByteSequence")) {
-            out.println("info." + setter + "(looseUnmarshalByteSequence(dataIn));");
+            out.println("        info." + setter + "(looseUnmarshalByteSequence(dataIn));");
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
         }
         else {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
         }
     }
 

activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireScript.java

@@ -76,7 +76,7 @@ public abstract class OpenWireScript extends GramSupport {
         }
         else {
             String simpleName = j.getSimpleName();
-            return simpleName.equals("ActiveMQMessage");
+            return simpleName.equals("ActiveMQMessage") || simpleName.equals("WireFormatInfo");
         }
         /*
          * else { // is it a message type String simpleName = j.getSimpleName();

activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy

@@ -111,7 +111,6 @@ out << """
         ${jclass.simpleName} info = (${jclass.simpleName})o;
 """
 
-
 if( marshallerAware ) out << """
         info.BeforeMarshall(wireFormat);
 """

activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java

@@ -16,14 +16,6 @@
  */
 package org.apache.activemq.command;
 
-import org.activeio.ByteArrayInputStream;
-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;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -32,6 +24,14 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.activeio.ByteArrayInputStream;
+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;
+
 /**
  * 
  * @openwire:marshaller code="1"

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);

    }
}
+/**
+ *
+ * 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);
+
+    }
+}

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"));

            }
        }
+/**
+ *
+ * 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"));
+
+            }
+        }

activemq-dotnet/activemq-dotnet.csproj

@@ -203,6 +203,7 @@
         <Compile Include="src\test\csharp\ActiveMQ\OpenWire\BooleanStreamTest.cs"/>
         <Compile Include="src\test\csharp\ActiveMQ\OpenWire\EndianTest.cs"/>
         <Compile Include="src\test\csharp\ActiveMQ\TestMain.cs"/>
+        <Compile Include="src\test\csharp\CommonAssemblyInfo.cs"/>
         <Compile Include="src\test\csharp\JMS\AsyncConsumeTest.cs"/>
         <Compile Include="src\test\csharp\JMS\BadConsumeTest.cs"/>
         <Compile Include="src\test\csharp\JMS\BytesMessageTest.cs"/>

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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

    }
}
+/*
+* 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
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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

    }
}
+/*
+* 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
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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

    }
}
+/*
+* 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
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

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

    }
}
+/*
+* 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
+
+    }
+}

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs

@@ -100,8 +100,8 @@ namespace ActiveMQ.Commands
         }
         public bool TightEncodingEnabled
         {
-            get { return true.Equals(Properties["tightEncodingEnabled"]); }
-            set { Properties["tightEncodingEnabled"] = value; }
+            get { return true.Equals(Properties["tightEncoding"]); }
+            set { Properties["tightEncoding"] = value; }
         }
 		
 		// MarshallAware interface

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; }            
        }

    }
}
+/*
+* 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; }            
+        }
+
+    }
+}

activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire.Client.build

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<project name="OpenWire.Core" default="build">
-    <!--
-        Required properties:
-            * build.dir             - (path) root level to build to, assemblies will go in ${build.dir}/bin
-            * build.debug           - (true|false) debug build?
-            * current.build.defines - framework-specific build defines
-    -->
-    <target name="build">
-        <!-- build OpenWire.Core -->
-        <csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project.name}.dll" doc="${build.dir}/bin/${project.name}.xml">
-            <nowarn>
-                <!-- do not report warnings for missing XML comments -->
-                <warning number="1591" />
-                <!-- do not report deprecation warnings -->
-                <warning number="0618" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <!-- common assembly-level attributes -->
-                <include name="../CommonAssemblyInfo.cs" />               
-            </sources>                       
-            <resources basedir="Resources">
-                <include name="**/*" />
-            </resources>
-            <references>
-                <include name="${build.dir}/bin/log4net.dll"/>
-                <include name="System.Web.dll"/>
-            </references>
-        </csc>
-    </target>
-</project>

activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs

@@ -1 +1,95 @@
-//
//
// 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);

    }
  }
}
+//
+//
+// 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);
+
+    }
+  }
+}

activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs

@@ -1 +1,88 @@
-//
//
// 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);

    }
  }
}
+//
+//
+// 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);
+
+    }
+  }
+}

activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs

@@ -55,10 +55,15 @@ namespace ActiveMQ.OpenWire.V1
         base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
+
+        info.BeforeUnmarshall(wireFormat);
+        
         info.Magic = ReadBytes(dataIn, 8);
         info.Version = dataIn.ReadInt32();
         info.MarshalledProperties = ReadBytes(dataIn, bs.ReadBoolean());
 
+        info.AfterUnmarshall(wireFormat);
+
     }
 
 
@@ -68,6 +73,8 @@ namespace ActiveMQ.OpenWire.V1
     public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         WireFormatInfo info = (WireFormatInfo)o;
 
+        info.BeforeMarshall(wireFormat);
+
         int rc = base.TightMarshal1(wireFormat, info, bs);
         bs.WriteBoolean(info.MarshalledProperties!=null);
         rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4;
@@ -89,6 +96,8 @@ namespace ActiveMQ.OpenWire.V1
            dataOut.Write(info.MarshalledProperties);
         }
 
+        info.AfterMarshall(wireFormat);
+
     }
   }
 }

activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs

@@ -2,15 +2,15 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <autogenerated>
 //     This code was generated by a tool.
-//      Mono Runtime Version: 1.1.4322.2032
+//     Runtime Version: 1.1.4322.2032
 //
 //     Changes to this file may cause incorrect behavior and will be lost if 
 //     the code is regenerated.
 // </autogenerated>
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(false)]

activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire.Client.build

@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<project name="OpenWire.Core" default="test">
-  <!--
-    Required properties:
-    * build.dir             - (path) root level to build to, assemblies will go in ${build.dir}/bin
-    * build.debug           - (true|false) debug build?
-    * current.build.defines - framework-specific build defines
-  -->
-  <target name="build">
-    <!-- build test assembly -->
-    <csc target="library" define="${current.build.defines}"
-      warnaserror="true" debug="${build.debug}"
-      output="${build.dir}/bin/${project.name}.Tests.dll">
-      <nowarn>
-        <!-- do not report warnings for missing XML comments -->
-        <warning number="1591" />
-        <!-- do not report deprecation warnings -->
-        <warning number="0618" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="**/*.cs" />
-        <!-- common assembly-level attributes -->
-        <include name="../../src/CommonAssemblyInfo.cs" />
-      </sources>
-      <references defaultexcludes="true">
-        <include name="mscorlib.dll" />
-        <include name="System.dll" />
-        <include name="nunit.framework.dll" />
-        <include name="log4net.dll" />
-        <include name="${build.dir}/bin/${project.name}.dll" />
-      </references>
-      <resources failonempty="false" basedir="Resources"
-        dynamicprefix="true" prefix="XML:">
-        <include name="**/*.xml" />
-      </resources>
-    </csc>
-  </target>
-  <target name="test" depends="build">
-    <nunit2>
-      <formatter type="Plain" />
-      <test assemblyname="${build.dir}/bin/${project.name}.Tests.dll">
-      </test>
-    </nunit2>
-  </target>
-</project>

activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs

@@ -2,15 +2,15 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <autogenerated>
 //     This code was generated by a tool.
-//      Mono Runtime Version: 1.1.4322.2032
+//     Runtime Version: 1.1.4322.2032
 //
 //     Changes to this file may cause incorrect behavior and will be lost if 
 //     the code is regenerated.
 // </autogenerated>
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(false)]

assembly/pom.xml

@@ -24,7 +24,7 @@
   </parent>
 
   <artifactId>activemq-assembly</artifactId>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
   

assembly/src/release/example/src/ConsumerTool.java

@@ -74,7 +74,6 @@ public class ConsumerTool extends ToolSupport implements MessageListener, Except
             tool.receiveTimeOut = Long.parseLong(args[8]);
         }
         
-        
 		tool.run();
     }
 

assembly/src/test/resources/log4j.properties

@@ -1,10 +1,7 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, out
-
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.activemq=INFO
+log4j.rootLogger=INFO, stdout
 
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

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 <string>
#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<BrokerError> exception ;
    p<ConnectionId> connectionId ;

public:
    const static int TYPE = 16;

public:
    ConnectionError() ;
    virtual ~ConnectionError() ;

    virtual int getCommandType() ;

    virtual p<BrokerError> getException() ;
    virtual void setException(p<BrokerError> exception) ;

    virtual p<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*ConnectionError_hpp_*/
+/*
+* 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 <string>
+#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<BrokerError> exception ;
+    p<ConnectionId> connectionId ;
+
+public:
+    const static int TYPE = 16;
+
+public:
+    ConnectionError() ;
+    virtual ~ConnectionError() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<BrokerError> getException() ;
+    virtual void setException(p<BrokerError> exception) ;
+
+    virtual p<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*ConnectionError_hpp_*/

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 <string>
#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<string> command ;

public:
    const static int TYPE = 14;

public:
    ControlCommand() ;
    virtual ~ControlCommand() ;

    virtual int getCommandType() ;

    virtual p<string> getCommand() ;
    virtual void setCommand(p<string> command) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*ControlCommand_hpp_*/
+/*
+* 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 <string>
+#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<string> command ;
+
+public:
+    const static int TYPE = 14;
+
+public:
+    ControlCommand() ;
+    virtual ~ControlCommand() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<string> getCommand() ;
+    virtual void setCommand(p<string> command) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*ControlCommand_hpp_*/

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 <string>
#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<IDataStructure> data ;

public:
    const static int TYPE = 33;

public:
    DataArrayResponse() ;
    virtual ~DataArrayResponse() ;

    virtual int getCommandType() ;

    virtual ap<IDataStructure> getData() ;
    virtual void setData(ap<IDataStructure> data) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*DataArrayResponse_hpp_*/
+/*
+* 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 <string>
+#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<IDataStructure> data ;
+
+public:
+    const static int TYPE = 33;
+
+public:
+    DataArrayResponse() ;
+    virtual ~DataArrayResponse() ;
+
+    virtual int getCommandType() ;
+
+    virtual ap<IDataStructure> getData() ;
+    virtual void setData(ap<IDataStructure> data) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*DataArrayResponse_hpp_*/

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 <string>
#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<IDataStructure> data ;

public:
    const static int TYPE = 32;

public:
    DataResponse() ;
    virtual ~DataResponse() ;

    virtual int getCommandType() ;

    virtual p<IDataStructure> getData() ;
    virtual void setData(p<IDataStructure> data) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*DataResponse_hpp_*/
+/*
+* 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 <string>
+#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<IDataStructure> data ;
+
+public:
+    const static int TYPE = 32;
+
+public:
+    DataResponse() ;
+    virtual ~DataResponse() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<IDataStructure> getData() ;
+    virtual void setData(p<IDataStructure> data) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*DataResponse_hpp_*/

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 <string>
#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> connectionId ;
    p<ActiveMQDestination> destination ;
    char operationType ;
    long long timeout ;
    ap<BrokerId> brokerPath ;

public:
    const static int TYPE = 8;

public:
    DestinationInfo() ;
    virtual ~DestinationInfo() ;

    virtual int getCommandType() ;

    virtual p<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;

    virtual p<ActiveMQDestination> getDestination() ;
    virtual void setDestination(p<ActiveMQDestination> destination) ;

    virtual char getOperationType() ;
    virtual void setOperationType(char operationType) ;

    virtual long long getTimeout() ;
    virtual void setTimeout(long long timeout) ;

    virtual ap<BrokerId> getBrokerPath() ;
    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*DestinationInfo_hpp_*/
+/*
+* 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 <string>
+#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> connectionId ;
+    p<ActiveMQDestination> destination ;
+    char operationType ;
+    long long timeout ;
+    ap<BrokerId> brokerPath ;
+
+public:
+    const static int TYPE = 8;
+
+public:
+    DestinationInfo() ;
+    virtual ~DestinationInfo() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual char getOperationType() ;
+    virtual void setOperationType(char operationType) ;
+
+    virtual long long getTimeout() ;
+    virtual void setTimeout(long long timeout) ;
+
+    virtual ap<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*DestinationInfo_hpp_*/

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 <string>
#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<string> serviceName ;
    p<string> brokerName ;

public:
    const static int TYPE = 40;

public:
    DiscoveryEvent() ;
    virtual ~DiscoveryEvent() ;

    virtual int getCommandType() ;

    virtual p<string> getServiceName() ;
    virtual void setServiceName(p<string> serviceName) ;

    virtual p<string> getBrokerName() ;
    virtual void setBrokerName(p<string> brokerName) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*DiscoveryEvent_hpp_*/
+/*
+* 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 <string>
+#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<string> serviceName ;
+    p<string> brokerName ;
+
+public:
+    const static int TYPE = 40;
+
+public:
+    DiscoveryEvent() ;
+    virtual ~DiscoveryEvent() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<string> getServiceName() ;
+    virtual void setServiceName(p<string> serviceName) ;
+
+    virtual p<string> getBrokerName() ;
+    virtual void setBrokerName(p<string> brokerName) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*DiscoveryEvent_hpp_*/

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 <string>
#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_*/
+/*
+* 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 <string>
+#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_*/

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 <string>
#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_*/
+/*
+* 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 <string>
+#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_*/

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 <string>
#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<ActiveMQDestination> destination ;
    p<MessageAck> messageAck ;

public:
    const static int TYPE = 52;

public:
    JournalQueueAck() ;
    virtual ~JournalQueueAck() ;

    virtual int getCommandType() ;

    virtual p<ActiveMQDestination> getDestination() ;
    virtual void setDestination(p<ActiveMQDestination> destination) ;

    virtual p<MessageAck> getMessageAck() ;
    virtual void setMessageAck(p<MessageAck> messageAck) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*JournalQueueAck_hpp_*/
+/*
+* 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 <string>
+#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<ActiveMQDestination> destination ;
+    p<MessageAck> messageAck ;
+
+public:
+    const static int TYPE = 52;
+
+public:
+    JournalQueueAck() ;
+    virtual ~JournalQueueAck() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<MessageAck> getMessageAck() ;
+    virtual void setMessageAck(p<MessageAck> messageAck) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*JournalQueueAck_hpp_*/

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 <string>
#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<ActiveMQDestination> destination ;
    p<MessageId> messageId ;
    long long messageSequenceId ;
    p<string> subscritionName ;
    p<string> clientId ;
    p<TransactionId> transactionId ;

public:
    const static int TYPE = 50;

public:
    JournalTopicAck() ;
    virtual ~JournalTopicAck() ;

    virtual int getCommandType() ;

    virtual p<ActiveMQDestination> getDestination() ;
    virtual void setDestination(p<ActiveMQDestination> destination) ;

    virtual p<MessageId> getMessageId() ;
    virtual void setMessageId(p<MessageId> messageId) ;

    virtual long long getMessageSequenceId() ;
    virtual void setMessageSequenceId(long long messageSequenceId) ;

    virtual p<string> getSubscritionName() ;
    virtual void setSubscritionName(p<string> subscritionName) ;

    virtual p<string> getClientId() ;
    virtual void setClientId(p<string> clientId) ;

    virtual p<TransactionId> getTransactionId() ;
    virtual void setTransactionId(p<TransactionId> transactionId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*JournalTopicAck_hpp_*/
+/*
+* 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 <string>
+#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<ActiveMQDestination> destination ;
+    p<MessageId> messageId ;
+    long long messageSequenceId ;
+    p<string> subscritionName ;
+    p<string> clientId ;
+    p<TransactionId> transactionId ;
+
+public:
+    const static int TYPE = 50;
+
+public:
+    JournalTopicAck() ;
+    virtual ~JournalTopicAck() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<MessageId> getMessageId() ;
+    virtual void setMessageId(p<MessageId> messageId) ;
+
+    virtual long long getMessageSequenceId() ;
+    virtual void setMessageSequenceId(long long messageSequenceId) ;
+
+    virtual p<string> getSubscritionName() ;
+    virtual void setSubscritionName(p<string> subscritionName) ;
+
+    virtual p<string> getClientId() ;
+    virtual void setClientId(p<string> clientId) ;
+
+    virtual p<TransactionId> getTransactionId() ;
+    virtual void setTransactionId(p<TransactionId> transactionId) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*JournalTopicAck_hpp_*/

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 <string>
#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<string> message ;

public:
    const static int TYPE = 53;

public:
    JournalTrace() ;
    virtual ~JournalTrace() ;

    virtual int getCommandType() ;

    virtual p<string> getMessage() ;
    virtual void setMessage(p<string> message) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*JournalTrace_hpp_*/
+/*
+* 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 <string>
+#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<string> message ;
+
+public:
+    const static int TYPE = 53;
+
+public:
+    JournalTrace() ;
+    virtual ~JournalTrace() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<string> getMessage() ;
+    virtual void setMessage(p<string> message) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*JournalTrace_hpp_*/

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 <string>
#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> transactionId ;
    char type ;
    bool wasPrepared ;

public:
    const static int TYPE = 54;

public:
    JournalTransaction() ;
    virtual ~JournalTransaction() ;

    virtual int getCommandType() ;

    virtual p<TransactionId> getTransactionId() ;
    virtual void setTransactionId(p<TransactionId> transactionId) ;

    virtual char getType() ;
    virtual void setType(char type) ;

    virtual bool getWasPrepared() ;
    virtual void setWasPrepared(bool wasPrepared) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*JournalTransaction_hpp_*/
+/*
+* 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 <string>
+#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> transactionId ;
+    char type ;
+    bool wasPrepared ;
+
+public:
+    const static int TYPE = 54;
+
+public:
+    JournalTransaction() ;
+    virtual ~JournalTransaction() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<TransactionId> getTransactionId() ;
+    virtual void setTransactionId(p<TransactionId> transactionId) ;
+
+    virtual char getType() ;
+    virtual void setType(char type) ;
+
+    virtual bool getWasPrepared() ;
+    virtual void setWasPrepared(bool wasPrepared) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*JournalTransaction_hpp_*/

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 <string>
#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_*/
+/*
+* 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 <string>
+#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_*/

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 <string>
#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> 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<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*LocalTransactionId_hpp_*/
+/*
+* 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 <string>
+#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> 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<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*LocalTransactionId_hpp_*/

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 <string>
#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> consumerId ;
    p<ActiveMQDestination> destination ;
    p<Message> message ;
    int redeliveryCounter ;

public:
    const static int TYPE = 21;

public:
    MessageDispatch() ;
    virtual ~MessageDispatch() ;

    virtual int getCommandType() ;

    virtual p<ConsumerId> getConsumerId() ;
    virtual void setConsumerId(p<ConsumerId> consumerId) ;

    virtual p<ActiveMQDestination> getDestination() ;
    virtual void setDestination(p<ActiveMQDestination> destination) ;

    virtual p<Message> getMessage() ;
    virtual void setMessage(p<Message> message) ;

    virtual int getRedeliveryCounter() ;
    virtual void setRedeliveryCounter(int redeliveryCounter) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*MessageDispatch_hpp_*/
+/*
+* 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 <string>
+#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> consumerId ;
+    p<ActiveMQDestination> destination ;
+    p<Message> message ;
+    int redeliveryCounter ;
+
+public:
+    const static int TYPE = 21;
+
+public:
+    MessageDispatch() ;
+    virtual ~MessageDispatch() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ConsumerId> getConsumerId() ;
+    virtual void setConsumerId(p<ConsumerId> consumerId) ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<Message> getMessage() ;
+    virtual void setMessage(p<Message> message) ;
+
+    virtual int getRedeliveryCounter() ;
+    virtual void setRedeliveryCounter(int redeliveryCounter) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*MessageDispatch_hpp_*/

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 <string>
#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> consumerId ;
    p<ActiveMQDestination> destination ;
    long long deliverySequenceId ;
    p<MessageId> messageId ;

public:
    const static int TYPE = 90;

public:
    MessageDispatchNotification() ;
    virtual ~MessageDispatchNotification() ;

    virtual int getCommandType() ;

    virtual p<ConsumerId> getConsumerId() ;
    virtual void setConsumerId(p<ConsumerId> consumerId) ;

    virtual p<ActiveMQDestination> getDestination() ;
    virtual void setDestination(p<ActiveMQDestination> destination) ;

    virtual long long getDeliverySequenceId() ;
    virtual void setDeliverySequenceId(long long deliverySequenceId) ;

    virtual p<MessageId> getMessageId() ;
    virtual void setMessageId(p<MessageId> messageId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*MessageDispatchNotification_hpp_*/
+/*
+* 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 <string>
+#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> consumerId ;
+    p<ActiveMQDestination> destination ;
+    long long deliverySequenceId ;
+    p<MessageId> messageId ;
+
+public:
+    const static int TYPE = 90;
+
+public:
+    MessageDispatchNotification() ;
+    virtual ~MessageDispatchNotification() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ConsumerId> getConsumerId() ;
+    virtual void setConsumerId(p<ConsumerId> consumerId) ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual long long getDeliverySequenceId() ;
+    virtual void setDeliverySequenceId(long long deliverySequenceId) ;
+
+    virtual p<MessageId> getMessageId() ;
+    virtual void setMessageId(p<MessageId> messageId) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*MessageDispatchNotification_hpp_*/

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 <string>
#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> producerId ;
    long long producerSequenceId ;
    long long brokerSequenceId ;

public:
    const static int TYPE = 110;

public:
    MessageId() ;
    virtual ~MessageId() ;

    virtual int getCommandType() ;

    virtual p<ProducerId> getProducerId() ;
    virtual void setProducerId(p<ProducerId> 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_*/
+/*
+* 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 <string>
+#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> producerId ;
+    long long producerSequenceId ;
+    long long brokerSequenceId ;
+
+public:
+    const static int TYPE = 110;
+
+public:
+    MessageId() ;
+    virtual ~MessageId() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ProducerId> getProducerId() ;
+    virtual void setProducerId(p<ProducerId> 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_*/

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<BrokerId> NetworkBridgeFilter::getNetworkBrokerId()
{
    return networkBrokerId ;
}

void NetworkBridgeFilter::setNetworkBrokerId(p<BrokerId> networkBrokerId)
{
    this->networkBrokerId = networkBrokerId ;
}
+/*
+* 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<BrokerId> NetworkBridgeFilter::getNetworkBrokerId()
+{
+    return networkBrokerId ;
+}
+
+void NetworkBridgeFilter::setNetworkBrokerId(p<BrokerId> networkBrokerId)
+{
+    this->networkBrokerId = networkBrokerId ;
+}

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 <string>
#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<BrokerId> networkBrokerId ;

public:
    const static int TYPE = 91;

public:
    NetworkBridgeFilter() ;
    virtual ~NetworkBridgeFilter() ;

    virtual int getCommandType() ;

    virtual int getNetworkTTL() ;
    virtual void setNetworkTTL(int networkTTL) ;

    virtual p<BrokerId> getNetworkBrokerId() ;
    virtual void setNetworkBrokerId(p<BrokerId> networkBrokerId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*NetworkBridgeFilter_hpp_*/
+/*
+* 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 <string>
+#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<BrokerId> networkBrokerId ;
+
+public:
+    const static int TYPE = 91;
+
+public:
+    NetworkBridgeFilter() ;
+    virtual ~NetworkBridgeFilter() ;
+
+    virtual int getCommandType() ;
+
+    virtual int getNetworkTTL() ;
+    virtual void setNetworkTTL(int networkTTL) ;
+
+    virtual p<BrokerId> getNetworkBrokerId() ;
+    virtual void setNetworkBrokerId(p<BrokerId> networkBrokerId) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*NetworkBridgeFilter_hpp_*/

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 <string>
#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> connectionId ;
    p<string> subcriptionName ;
    p<string> clientId ;

public:
    const static int TYPE = 0;

public:
    RemoveSubscriptionInfo() ;
    virtual ~RemoveSubscriptionInfo() ;

    virtual int getCommandType() ;

    virtual p<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;

    virtual p<string> getSubcriptionName() ;
    virtual void setSubcriptionName(p<string> subcriptionName) ;

    virtual p<string> getClientId() ;
    virtual void setClientId(p<string> clientId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*RemoveSubscriptionInfo_hpp_*/
+/*
+* 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 <string>
+#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> connectionId ;
+    p<string> subcriptionName ;
+    p<string> clientId ;
+
+public:
+    const static int TYPE = 0;
+
+public:
+    RemoveSubscriptionInfo() ;
+    virtual ~RemoveSubscriptionInfo() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+    virtual p<string> getSubcriptionName() ;
+    virtual void setSubcriptionName(p<string> subcriptionName) ;
+
+    virtual p<string> getClientId() ;
+    virtual void setClientId(p<string> clientId) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*RemoveSubscriptionInfo_hpp_*/

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 <string>
#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_*/
+/*
+* 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 <string>
+#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_*/

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 <string>
#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<string> clientId ;
    p<ActiveMQDestination> destination ;
    p<string> selector ;
    p<string> subcriptionName ;

public:
    const static int TYPE = 55;

public:
    SubscriptionInfo() ;
    virtual ~SubscriptionInfo() ;

    virtual int getCommandType() ;

    virtual p<string> getClientId() ;
    virtual void setClientId(p<string> clientId) ;

    virtual p<ActiveMQDestination> getDestination() ;
    virtual void setDestination(p<ActiveMQDestination> destination) ;

    virtual p<string> getSelector() ;
    virtual void setSelector(p<string> selector) ;

    virtual p<string> getSubcriptionName() ;
    virtual void setSubcriptionName(p<string> subcriptionName) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*SubscriptionInfo_hpp_*/
+/*
+* 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 <string>
+#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<string> clientId ;
+    p<ActiveMQDestination> destination ;
+    p<string> selector ;
+    p<string> subcriptionName ;
+
+public:
+    const static int TYPE = 55;
+
+public:
+    SubscriptionInfo() ;
+    virtual ~SubscriptionInfo() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<string> getClientId() ;
+    virtual void setClientId(p<string> clientId) ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<string> getSelector() ;
+    virtual void setSelector(p<string> selector) ;
+
+    virtual p<string> getSubcriptionName() ;
+    virtual void setSubcriptionName(p<string> subcriptionName) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*SubscriptionInfo_hpp_*/

openwire-cpp/src/command/TransactionId.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 TransactionId_hpp_
#define TransactionId_hpp_

#include <string>
#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 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
 *
 */
class TransactionId : public AbstractCommand
{
private:

public:
    const static int TYPE = 0;

public:
    TransactionId() ;
    virtual ~TransactionId() ;

    virtual int getCommandType() ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*TransactionId_hpp_*/
+/*
+* 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 TransactionId_hpp_
+#define TransactionId_hpp_
+
+#include <string>
+#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 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
+ *
+ */
+class TransactionId : public AbstractCommand
+{
+private:
+
+public:
+    const static int TYPE = 0;
+
+public:
+    TransactionId() ;
+    virtual ~TransactionId() ;
+
+    virtual int getCommandType() ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*TransactionId_hpp_*/

openwire-cpp/src/command/TransactionInfo.hpp

@@ -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.
*/
#ifndef TransactionInfo_hpp_
#define TransactionInfo_hpp_

#include <string>
#include "command/BaseCommand.hpp"
    
#include "command/ConnectionId.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 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
 *
 */
class TransactionInfo : public BaseCommand
{
private:
    p<ConnectionId> connectionId ;
    p<TransactionId> transactionId ;
    char type ;

public:
    const static int TYPE = 7;

public:
    TransactionInfo() ;
    virtual ~TransactionInfo() ;

    virtual int getCommandType() ;

    virtual p<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;

    virtual p<TransactionId> getTransactionId() ;
    virtual void setTransactionId(p<TransactionId> transactionId) ;

    virtual char getType() ;
    virtual void setType(char type) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*TransactionInfo_hpp_*/
+/*
+* 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 TransactionInfo_hpp_
+#define TransactionInfo_hpp_
+
+#include <string>
+#include "command/BaseCommand.hpp"
+    
+#include "command/ConnectionId.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 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
+ *
+ */
+class TransactionInfo : public BaseCommand
+{
+private:
+    p<ConnectionId> connectionId ;
+    p<TransactionId> transactionId ;
+    char type ;
+
+public:
+    const static int TYPE = 7;
+
+public:
+    TransactionInfo() ;
+    virtual ~TransactionInfo() ;
+
+    virtual int getCommandType() ;
+
+    virtual p<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+    virtual p<TransactionId> getTransactionId() ;
+    virtual void setTransactionId(p<TransactionId> transactionId) ;
+
+    virtual char getType() ;
+    virtual void setType(char type) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*TransactionInfo_hpp_*/

openwire-cpp/src/command/XATransactionId.hpp

@@ -1 +1,83 @@
-/*
* 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 XATransactionId_hpp_
#define XATransactionId_hpp_

#include <string>
#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 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
 *
 */
class XATransactionId : public TransactionId
{
private:
    int formatId ;
    ap<char> globalTransactionId ;
    ap<char> branchQualifier ;

public:
    const static int TYPE = 112;

public:
    XATransactionId() ;
    virtual ~XATransactionId() ;

    virtual int getCommandType() ;

    virtual int getFormatId() ;
    virtual void setFormatId(int formatId) ;

    virtual ap<char> getGlobalTransactionId() ;
    virtual void setGlobalTransactionId(ap<char> globalTransactionId) ;

    virtual ap<char> getBranchQualifier() ;
    virtual void setBranchQualifier(ap<char> branchQualifier) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*XATransactionId_hpp_*/
+/*
+* 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 XATransactionId_hpp_
+#define XATransactionId_hpp_
+
+#include <string>
+#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 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
+ *
+ */
+class XATransactionId : public TransactionId
+{
+private:
+    int formatId ;
+    ap<char> globalTransactionId ;
+    ap<char> branchQualifier ;
+
+public:
+    const static int TYPE = 112;
+
+public:
+    XATransactionId() ;
+    virtual ~XATransactionId() ;
+
+    virtual int getCommandType() ;
+
+    virtual int getFormatId() ;
+    virtual void setFormatId(int formatId) ;
+
+    virtual ap<char> getGlobalTransactionId() ;
+    virtual void setGlobalTransactionId(ap<char> globalTransactionId) ;
+
+    virtual ap<char> getBranchQualifier() ;
+    virtual void setBranchQualifier(ap<char> branchQualifier) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*XATransactionId_hpp_*/

openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.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 ActiveMQBytesMessageMarshaller_hpp_
#define ActiveMQBytesMessageMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQBytesMessageMarshaller() ;
    virtual ~ActiveMQBytesMessageMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQBytesMessageMarshaller_hpp_*/
+/*
+* 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 ActiveMQBytesMessageMarshaller_hpp_
+#define ActiveMQBytesMessageMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQMessageMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller
+{
+public:
+    ActiveMQBytesMessageMarshaller() ;
+    virtual ~ActiveMQBytesMessageMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQBytesMessageMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.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 ActiveMQDestinationMarshaller_hpp_
#define ActiveMQDestinationMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller
{
public:
    ActiveMQDestinationMarshaller() ;
    virtual ~ActiveMQDestinationMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQDestinationMarshaller_hpp_*/
+/*
+* 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 ActiveMQDestinationMarshaller_hpp_
+#define ActiveMQDestinationMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/BaseDataStreamMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller
+{
+public:
+    ActiveMQDestinationMarshaller() ;
+    virtual ~ActiveMQDestinationMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQDestinationMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.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 ActiveMQMapMessageMarshaller_hpp_
#define ActiveMQMapMessageMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQMapMessageMarshaller() ;
    virtual ~ActiveMQMapMessageMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQMapMessageMarshaller_hpp_*/
+/*
+* 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 ActiveMQMapMessageMarshaller_hpp_
+#define ActiveMQMapMessageMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQMessageMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller
+{
+public:
+    ActiveMQMapMessageMarshaller() ;
+    virtual ~ActiveMQMapMessageMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQMapMessageMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQMessageMarshaller.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 ActiveMQMessageMarshaller_hpp_
#define ActiveMQMessageMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/MessageMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQMessageMarshaller : public MessageMarshaller
{
public:
    ActiveMQMessageMarshaller() ;
    virtual ~ActiveMQMessageMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQMessageMarshaller_hpp_*/
+/*
+* 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 ActiveMQMessageMarshaller_hpp_
+#define ActiveMQMessageMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/MessageMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQMessageMarshaller : public MessageMarshaller
+{
+public:
+    ActiveMQMessageMarshaller() ;
+    virtual ~ActiveMQMessageMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQMessageMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.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 ActiveMQObjectMessageMarshaller_hpp_
#define ActiveMQObjectMessageMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQObjectMessageMarshaller() ;
    virtual ~ActiveMQObjectMessageMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQObjectMessageMarshaller_hpp_*/
+/*
+* 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 ActiveMQObjectMessageMarshaller_hpp_
+#define ActiveMQObjectMessageMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQMessageMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller
+{
+public:
+    ActiveMQObjectMessageMarshaller() ;
+    virtual ~ActiveMQObjectMessageMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQObjectMessageMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQQueueMarshaller.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 ActiveMQQueueMarshaller_hpp_
#define ActiveMQQueueMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller
{
public:
    ActiveMQQueueMarshaller() ;
    virtual ~ActiveMQQueueMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQQueueMarshaller_hpp_*/
+/*
+* 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 ActiveMQQueueMarshaller_hpp_
+#define ActiveMQQueueMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQDestinationMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller
+{
+public:
+    ActiveMQQueueMarshaller() ;
+    virtual ~ActiveMQQueueMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQQueueMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.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 ActiveMQStreamMessageMarshaller_hpp_
#define ActiveMQStreamMessageMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQStreamMessageMarshaller() ;
    virtual ~ActiveMQStreamMessageMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQStreamMessageMarshaller_hpp_*/
+/*
+* 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 ActiveMQStreamMessageMarshaller_hpp_
+#define ActiveMQStreamMessageMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQMessageMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller
+{
+public:
+    ActiveMQStreamMessageMarshaller() ;
+    virtual ~ActiveMQStreamMessageMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQStreamMessageMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.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 ActiveMQTempDestinationMarshaller_hpp_
#define ActiveMQTempDestinationMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller
{
public:
    ActiveMQTempDestinationMarshaller() ;
    virtual ~ActiveMQTempDestinationMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTempDestinationMarshaller_hpp_*/
+/*
+* 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 ActiveMQTempDestinationMarshaller_hpp_
+#define ActiveMQTempDestinationMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQDestinationMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller
+{
+public:
+    ActiveMQTempDestinationMarshaller() ;
+    virtual ~ActiveMQTempDestinationMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQTempDestinationMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.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 ActiveMQTempQueueMarshaller_hpp_
#define ActiveMQTempQueueMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQTempDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller
{
public:
    ActiveMQTempQueueMarshaller() ;
    virtual ~ActiveMQTempQueueMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTempQueueMarshaller_hpp_*/
+/*
+* 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 ActiveMQTempQueueMarshaller_hpp_
+#define ActiveMQTempQueueMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQTempDestinationMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller
+{
+public:
+    ActiveMQTempQueueMarshaller() ;
+    virtual ~ActiveMQTempQueueMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQTempQueueMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.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 ActiveMQTempTopicMarshaller_hpp_
#define ActiveMQTempTopicMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQTempDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQTempTopicMarshaller : public ActiveMQTempDestinationMarshaller
{
public:
    ActiveMQTempTopicMarshaller() ;
    virtual ~ActiveMQTempTopicMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTempTopicMarshaller_hpp_*/
+/*
+* 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 ActiveMQTempTopicMarshaller_hpp_
+#define ActiveMQTempTopicMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQTempDestinationMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQTempTopicMarshaller : public ActiveMQTempDestinationMarshaller
+{
+public:
+    ActiveMQTempTopicMarshaller() ;
+    virtual ~ActiveMQTempTopicMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQTempTopicMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQTextMessageMarshaller.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 ActiveMQTextMessageMarshaller_hpp_
#define ActiveMQTextMessageMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQTextMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQTextMessageMarshaller() ;
    virtual ~ActiveMQTextMessageMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTextMessageMarshaller_hpp_*/
+/*
+* 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 ActiveMQTextMessageMarshaller_hpp_
+#define ActiveMQTextMessageMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQMessageMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQTextMessageMarshaller : public ActiveMQMessageMarshaller
+{
+public:
+    ActiveMQTextMessageMarshaller() ;
+    virtual ~ActiveMQTextMessageMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQTextMessageMarshaller_hpp_*/

openwire-cpp/src/marshal/ActiveMQTopicMarshaller.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 ActiveMQTopicMarshaller_hpp_
#define ActiveMQTopicMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ActiveMQTopicMarshaller : public ActiveMQDestinationMarshaller
{
public:
    ActiveMQTopicMarshaller() ;
    virtual ~ActiveMQTopicMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTopicMarshaller_hpp_*/
+/*
+* 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 ActiveMQTopicMarshaller_hpp_
+#define ActiveMQTopicMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/ActiveMQDestinationMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ActiveMQTopicMarshaller : public ActiveMQDestinationMarshaller
+{
+public:
+    ActiveMQTopicMarshaller() ;
+    virtual ~ActiveMQTopicMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ActiveMQTopicMarshaller_hpp_*/

openwire-cpp/src/marshal/BaseCommandMarshaller.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 BaseCommandMarshaller_hpp_
#define BaseCommandMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class BaseCommandMarshaller : public BaseDataStreamMarshaller
{
public:
    BaseCommandMarshaller() ;
    virtual ~BaseCommandMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*BaseCommandMarshaller_hpp_*/
+/*
+* 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 BaseCommandMarshaller_hpp_
+#define BaseCommandMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/BaseDataStreamMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class BaseCommandMarshaller : public BaseDataStreamMarshaller
+{
+public:
+    BaseCommandMarshaller() ;
+    virtual ~BaseCommandMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*BaseCommandMarshaller_hpp_*/

openwire-cpp/src/marshal/ConnectionErrorMarshaller.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 ConnectionErrorMarshaller_hpp_
#define ConnectionErrorMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseCommandMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ConnectionErrorMarshaller : public BaseCommandMarshaller
{
public:
    ConnectionErrorMarshaller() ;
    virtual ~ConnectionErrorMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ConnectionErrorMarshaller_hpp_*/
+/*
+* 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 ConnectionErrorMarshaller_hpp_
+#define ConnectionErrorMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/BaseCommandMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ConnectionErrorMarshaller : public BaseCommandMarshaller
+{
+public:
+    ConnectionErrorMarshaller() ;
+    virtual ~ConnectionErrorMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ConnectionErrorMarshaller_hpp_*/

openwire-cpp/src/marshal/ConnectionIdMarshaller.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 ConnectionIdMarshaller_hpp_
#define ConnectionIdMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ConnectionIdMarshaller : public BaseDataStreamMarshaller
{
public:
    ConnectionIdMarshaller() ;
    virtual ~ConnectionIdMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ConnectionIdMarshaller_hpp_*/
+/*
+* 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 ConnectionIdMarshaller_hpp_
+#define ConnectionIdMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/BaseDataStreamMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ConnectionIdMarshaller : public BaseDataStreamMarshaller
+{
+public:
+    ConnectionIdMarshaller() ;
+    virtual ~ConnectionIdMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ConnectionIdMarshaller_hpp_*/

openwire-cpp/src/marshal/ConnectionInfoMarshaller.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 ConnectionInfoMarshaller_hpp_
#define ConnectionInfoMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseCommandMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ConnectionInfoMarshaller : public BaseCommandMarshaller
{
public:
    ConnectionInfoMarshaller() ;
    virtual ~ConnectionInfoMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ConnectionInfoMarshaller_hpp_*/
+/*
+* 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 ConnectionInfoMarshaller_hpp_
+#define ConnectionInfoMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/BaseCommandMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ConnectionInfoMarshaller : public BaseCommandMarshaller
+{
+public:
+    ConnectionInfoMarshaller() ;
+    virtual ~ConnectionInfoMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ConnectionInfoMarshaller_hpp_*/

openwire-cpp/src/marshal/ConsumerIdMarshaller.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 ConsumerIdMarshaller_hpp_
#define ConsumerIdMarshaller_hpp_

#include <string>

#include "command/DataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;

/*
 *
 */
class ConsumerIdMarshaller : public BaseDataStreamMarshaller
{
public:
    ConsumerIdMarshaller() ;
    virtual ~ConsumerIdMarshaller() ;

    virtual DataStructure* createCommand() ;
    virtual byte getDataStructureType() ;
    
    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ConsumerIdMarshaller_hpp_*/
+/*
+* 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 ConsumerIdMarshaller_hpp_
+#define ConsumerIdMarshaller_hpp_
+
+#include <string>
+
+#include "command/DataStructure.hpp"
+
+/* we could cut this down  - for now include all possible headers */
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "io/BinaryReader.hpp"
+#include "io/BinaryWriter.hpp"
+
+#include "command/BaseDataStreamMarshaller.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace marshal
+      {
+        using namespace ifr ;
+        using namespace apache::activemq::client::command;
+        using namespace apache::activemq::client::io;
+
+/*
+ *
+ */
+class ConsumerIdMarshaller : public BaseDataStreamMarshaller
+{
+public:
+    ConsumerIdMarshaller() ;
+    virtual ~ConsumerIdMarshaller() ;
+
+    virtual DataStructure* createCommand() ;
+    virtual byte getDataStructureType() ;
+    
+    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
+    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
+    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
+} ;
+
+/* namespace */
+     }
+    }
+  }
+}
+#endif /*ConsumerIdMarshaller_hpp_*/