- Since we WireFormatInfo needs to be flexible and extensible so that feilds can be added witout changing it's on the wire encoding, we are now using a primitive map to store it's data.

- Extracted the NetworkBridgeFilter out of the Demand based forwarding bridge and made it a serializable class so that a bridge can be used with a remote broker.
- Cleaned up many of the warnings gram was spewing out by having it suck in more files.



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

activemq-core/maven.xml

@@ -110,7 +110,7 @@
     <java classname="org.codehaus.gram.Gram" fork="true">
       <classpath refid="openwire.classpath" />
       <sysproperty key="openwire.version" value="${openwire.version}" />
-      <arg value="src/main/java/org/apache/activemq/command" />
+      <arg value="src/main/java" />
       <arg value="src/gram/script/GenerateCppMarshallingClasses.groovy" />
       <arg value="src/gram/script/GenerateCppMarshallingHeaders.groovy" />
       <arg value="src/gram/script/GenerateJavaMarshalling.groovy" />

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

@@ -16,12 +16,13 @@
  */
 package org.apache.activemq.openwire.tool;
 
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JProperty;
-
-import java.io.*;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Iterator;
 
+import org.codehaus.jam.JProperty;
+
 /**
  *
  * @version $Revision$
@@ -31,7 +32,7 @@ public abstract class OpenWireCSharpClassesScript extends OpenWireClassesScript
     public Object run() {
         filePostFix = ".cs";
         if (destDir == null) {
-            destDir = new File("../openwire-dotnet/src/ActiveMQ/Commands");
+            destDir = new File("../activemq-dotnet/src/main/csharp/ActiveMQ/Commands");
         }
         
         return super.run();

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

@@ -33,7 +33,7 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
     public Object run() {
         filePostFix = ".cs";
         if (destDir == null) {
-            destDir = new File("../openwire-dotnet/src/ActiveMQ/OpenWire/V"+getOpenwireVersion());
+            destDir = new File("../activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V"+getOpenwireVersion());
         }
         
         return super.run();
@@ -49,16 +49,16 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             out.println("info." + propertyName + " = bs.ReadBoolean();");
         }
         else if (type.equals("byte")) {
-            out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadByte(dataIn);");
+            out.println("info." + propertyName + " = dataIn.ReadByte();");
         }
         else if (type.equals("char")) {
-            out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadChar(dataIn);");
+            out.println("info." + propertyName + " = dataIn.ReadChar();");
         }
         else if (type.equals("short")) {
-            out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadShort(dataIn);");
+            out.println("info." + propertyName + " = dataIn.ReadInt16();");
         }
         else if (type.equals("int")) {
-            out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadInt(dataIn);");
+            out.println("info." + propertyName + " = dataIn.ReadInt32();");
         }
         else if (type.equals("long")) {
             out.println("info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);");
@@ -101,7 +101,7 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
         }
         else {
             out.println("        if (bs.ReadBoolean()) {");
-            out.println("            short size = BaseDataStreamMarshaller.ReadShort(dataIn);");
+            out.println("            short size = dataIn.ReadInt16();");
             out.println("            " + arrayType + "[] value = new " + arrayType + "[size];");
             out.println("            for( int i=0; i < size; i++ ) {");
             out.println("                value[i] = (" + arrayType + ") TightUnmarshalNestedObject(wireFormat,dataIn, bs);");
@@ -169,10 +169,10 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("rc += TightMarshalCachedObject1(wireFormat, " + getter + ", bs);");
+                    out.println("rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += TightMarshalNestedObject1(wireFormat, " + getter + ", bs);");
+                    out.println("rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
             }
         }
@@ -194,16 +194,16 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
                 out.println("bs.ReadBoolean();");
             }
             else if (type.equals("byte")) {
-                out.println("BaseDataStreamMarshaller.WriteByte(" + getter + ", dataOut);");
+                out.println("dataOut.Write(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("BaseDataStreamMarshaller.WriteChar(" + getter + ", dataOut);");
+                out.println("dataOut.Write(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("BaseDataStreamMarshaller.WriteShort(" + getter + ", dataOut);");
+                out.println("dataOut.Write(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("BaseDataStreamMarshaller.WriteInt(" + getter + ", dataOut);");
+                out.println("dataOut.Write(" + getter + ");");
             }
             else if (type.equals("long")) {
                 out.println("TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
@@ -217,7 +217,7 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
                 }
                 else {
                     out.println("if(bs.ReadBoolean()) {");
-                    out.println("           BaseDataStreamMarshaller.WriteInt(" + getter + ".Length, dataOut);");
+                    out.println("           dataOut.Write(" + getter + ".Length);");
                     out.println("           dataOut.Write(" + getter + ");");
                     out.println("        }");
                 }
@@ -235,10 +235,10 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("TightMarshalCachedObject2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
                 else {
-                    out.println("TightMarshalNestedObject2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("TightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
             }
         }

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

@@ -159,7 +159,7 @@ public abstract class OpenWireClassesScript extends OpenWireScript {
     protected void initialiseManuallyMaintainedClasses() {
         String[] names = { "ActiveMQDestination", "ActiveMQTempDestination", "ActiveMQQueue", "ActiveMQTopic", "ActiveMQTempQueue", "ActiveMQTempTopic",
                 "BaseCommand", "ActiveMQMessage", "ActiveMQTextMessage", "ActiveMQMapMessage", "ActiveMQBytesMessage", "ActiveMQStreamMessage",
-                "ActiveMQStreamMessage", "DataStructureSupport" };
+                "ActiveMQStreamMessage", "DataStructureSupport", "WireFormatInfo", "ActiveMQObjectMessage" };
 
         for (int i = 0; i < names.length; i++) {
             manuallyMaintainedClasses.add(names[i]);

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

@@ -152,19 +152,19 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             out.println("info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));");
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + setter + "((" + type + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
+            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + setter + "((" + type + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
+            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
         }
         else {
-            out.println("info." + setter + "((" + type + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
+            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
         }
     }
 
     protected void generateTightUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
         JClass propertyType = property.getType();
-        String arrayType = propertyType.getArrayComponentType().getSimpleName();
+        String arrayType = propertyType.getArrayComponentType().getQualifiedName();
         String setter = property.getSetter().getSimpleName();
         out.println();
         if (size != null) {
@@ -248,10 +248,10 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("rc += tightMarshalCachedObject1(wireFormat, " + getter + ", bs);");
+                    out.println("rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += tightMarshalNestedObject1(wireFormat, " + getter + ", bs);");
+                    out.println("rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
             }
         }
@@ -314,10 +314,10 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("tightMarshalCachedObject2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
                 else {
-                    out.println("tightMarshalNestedObject2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
             }
         }
@@ -381,10 +381,10 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("looseMarshalCachedObject(wireFormat, " + getter + ", dataOut);");
+                    out.println("looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
                 }
                 else {
-                    out.println("looseMarshalNestedObject(wireFormat, " + getter + ", dataOut);");
+                    out.println("looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
                 }
             }
         }
@@ -447,19 +447,19 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip
             out.println("info." + setter + "(looseUnmarshalByteSequence(dataIn));");
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + setter + "((" + type + ") looseUnmarsalThrowable(wireFormat, dataIn));");
+            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + setter + "((" + type + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
+            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
         }
         else {
-            out.println("info." + setter + "((" + type + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
+            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
         }
     }
 
     protected void generateLooseUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
         JClass propertyType = property.getType();
-        String arrayType = propertyType.getArrayComponentType().getSimpleName();
+        String arrayType = propertyType.getArrayComponentType().getQualifiedName();
         String setter = property.getSetter().getSimpleName();
         out.println();
         if (size != null) {

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

@@ -74,7 +74,7 @@ class GenerateCMarshalling extends OpenWireScript {
    
    def generateFields(out, jclass) {
    
-      println("getting fields for: ${jclass.simpleName}");
+//      println("getting fields for: ${jclass.simpleName}");
       if( jclass.superclass == null || jclass.superclass.simpleName.equals("Object") ) {
 out << """
    ow_byte structType;

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

@@ -57,7 +57,13 @@ namespace ActiveMQ.Commands
     //         if you need to make a change, please see the Groovy scripts in the
     //         activemq-core module
     //
-    public class ${jclass.simpleName} : $baseClass
+    public class ${jclass.simpleName} : $baseClass"""
+        
+    for( i in jclass.interfaces ) {
+    	out << ", ${i.simpleName}";
+    }
+    
+out << """
     {
         public const byte ID_${jclass.simpleName} = ${getOpenWireOpCode(jclass)};
     			

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

@@ -49,6 +49,7 @@ import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
+
 """
 for (pkg in jclass.importedPackages) {
     for (clazz in pkg.classes) {

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

@@ -117,6 +117,7 @@ public interface CommandTypes {
     /////////////////////////////////////////////////// 
     
     byte  MESSAGE_DISPATCH_NOTIFICATION     = 90;
+    byte  NETWORK_BRIDGE_FILTER             = 91;
     
     ///////////////////////////////////////////////////
     //

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

@@ -49,7 +49,7 @@ public class ConsumerInfo extends BaseCommand {
     protected byte priority;
     protected BrokerId[] brokerPath;
     
-    protected transient BooleanExpression additionalPredicate;
+    protected BooleanExpression additionalPredicate;
     protected transient boolean networkSubscription; //this subscription originated from a network connection
     
     public ConsumerInfo() {
@@ -278,7 +278,7 @@ public class ConsumerInfo extends BaseCommand {
      * into the selector on the fly.  Handy if if say a Security Broker interceptor wants to 
      * filter out messages based on security level of the consumer.
      * 
-     * @return
+     * @openwire:property version=1
      */
     public BooleanExpression getAdditionalPredicate() {
         return additionalPredicate;

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

@@ -0,0 +1,137 @@
+/** 
+ * <a href="http://activemq.org">ActiveMQ: The Open Source Message Fabric</a>
+ * 
+ * Copyright 2005 Hiram Chirino
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT 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.command;
+
+import java.io.IOException;
+
+import javax.jms.JMSException;
+
+import org.apache.activemq.filter.BooleanExpression;
+import org.apache.activemq.filter.MessageEvaluationContext;
+import org.apache.activemq.util.JMSExceptionSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @openwire:marshaller code="91"
+ * @version $Revision: 1.12 $
+ */
+public class NetworkBridgeFilter implements DataStructure, BooleanExpression {
+    
+    static final Log log=LogFactory.getLog(NetworkBridgeFilter.class);
+    public static final byte DATA_STRUCTURE_TYPE=CommandTypes.NETWORK_BRIDGE_FILTER;
+
+    private BrokerId networkBrokerId;
+    private int networkTTL;
+
+    public NetworkBridgeFilter() {
+    }
+    
+    public NetworkBridgeFilter(BrokerId remoteBrokerPath, int networkTTL) {
+        this.networkBrokerId = remoteBrokerPath;
+        this.networkTTL = networkTTL;
+    }
+
+    public byte getDataStructureType() {
+        return DATA_STRUCTURE_TYPE;
+    }
+
+    public boolean isMarshallAware() {
+        return false;
+    }
+
+
+    public boolean matches(MessageEvaluationContext message) throws JMSException{
+        try{
+            return matchesForwardingFilter(message.getMessage());
+        }catch(IOException e){
+            throw JMSExceptionSupport.create(e);
+        }
+    }
+    
+    public Object evaluate(MessageEvaluationContext message) throws JMSException{
+        return matches(message)?Boolean.TRUE:Boolean.FALSE;
+    }
+    
+    protected boolean matchesForwardingFilter(Message message){
+        
+        if ( contains(message.getBrokerPath(), networkBrokerId) ){
+            if (log.isTraceEnabled()){
+                log.trace("Message all ready routed once through this broker - ignoring: " + message);
+            }
+            return false;
+        }
+        
+        int hops = message.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
+        
+        if(hops >= networkTTL){
+            if (log.isTraceEnabled()){
+                log.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message);
+            }
+            return false;
+        }
+        
+        // Don't propagate advisory messages about network subscriptions
+        if(message.isAdvisory()&&message.getDataStructure()!=null
+                        &&message.getDataStructure().getDataStructureType()==CommandTypes.CONSUMER_INFO){
+            ConsumerInfo info=(ConsumerInfo) message.getDataStructure();
+            hops = info.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
+            if(hops >= networkTTL ){
+                if (log.isTraceEnabled()){
+                    log.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message);
+                }
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    public static boolean contains(BrokerId[] brokerPath,BrokerId brokerId){
+        if(brokerPath!=null){
+            for(int i=0;i<brokerPath.length;i++){
+                if(brokerId.equals(brokerPath[i]))
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @openwire:property version=1
+     */
+    public int getNetworkTTL() {
+        return networkTTL;
+    }
+    public void setNetworkTTL(int networkTTL) {
+        this.networkTTL = networkTTL;
+    }
+    
+    /**
+     * @openwire:property version=1 cache=true
+     */
+    public BrokerId getNetworkBrokerId() {
+        return networkBrokerId;
+    }
+
+    public void setNetworkBrokerId(BrokerId remoteBrokerPath) {
+        this.networkBrokerId = remoteBrokerPath;
+    }
+
+}

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

@@ -16,29 +16,36 @@
  */
 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;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 
  * @openwire:marshaller code="1"
  * @version $Revision$
  */
-public class WireFormatInfo implements Command {
+public class WireFormatInfo implements Command, MarshallAware {
 
     public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO;
     static final private byte MAGIC[] = new byte[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
 
-    protected int version;
     protected byte magic[] = MAGIC;
-
-    protected boolean stackTraceEnabled;
-    protected boolean tcpNoDelayEnabled;
-    protected boolean cacheEnabled;
-    protected boolean tightEncodingEnabled;
-    protected boolean prefixPacketSize;
+    protected int version;
+    protected transient HashMap properties;
+    protected ByteSequence marshalledProperties;
 
     public byte getDataStructureType() {
         return DATA_STRUCTURE_TYPE;
@@ -48,13 +55,17 @@ public class WireFormatInfo implements Command {
         return true;
     }
 
+    public boolean isMarshallAware() {
+        return true;
+    }
+
+
     /**
      * @openwire:property version=1 size=8 testSize=-1
      */
     public byte[] getMagic() {
         return magic;
     }
-
     public void setMagic(byte[] magic) {
         this.magic = magic;
     }
@@ -65,119 +76,194 @@ public class WireFormatInfo implements Command {
     public int getVersion() {
         return version;
     }
-
     public void setVersion(int version) {
         this.version = version;
     }
+    
+    /**
+     * @openwire:property version=1
+     */
+    public ByteSequence getMarshalledProperties() {
+        return marshalledProperties;
+    }
+    public void setMarshalledProperties(ByteSequence marshalledProperties) {
+        this.marshalledProperties = marshalledProperties;
+    }
+
+    //////////////////////
+    // 
+    // Implementation Methods.
+    //
+    //////////////////////
+    
+    public Object getProperty(String name) throws IOException {
+        if( properties == null ) {
+            if( marshalledProperties ==null )
+                return null;
+            properties = unmarsallProperties(marshalledProperties);
+        }
+        return properties.get(name);
+    }
+    
+    public Map getProperties() throws IOException {
+        if( properties == null ) {
+            if( marshalledProperties==null )
+                return Collections.EMPTY_MAP;
+            properties = unmarsallProperties(marshalledProperties);
+        }
+        return Collections.unmodifiableMap(properties);
+    }
+    
+    public void clearProperties() {
+        marshalledProperties = null;
+        properties=null;
+    }
+
+    public void setProperty(String name, Object value) throws IOException {
+        lazyCreateProperties();
+        properties.put(name, value);
+    }
+
+    protected void lazyCreateProperties() throws IOException {
+        if( properties == null ) {
+            if( marshalledProperties == null ) {
+                properties = new HashMap();
+            } else {
+                properties = unmarsallProperties(marshalledProperties);
+                marshalledProperties = null;
+            }
+        }
+    }
+    
+    private HashMap unmarsallProperties(ByteSequence marshalledProperties) throws IOException {
+        return MarshallingSupport.unmarshalPrimitiveMap(new DataInputStream(new ByteArrayInputStream(marshalledProperties)));
+    }
+
+    public void beforeMarshall(WireFormat wireFormat) throws IOException {
+        // Need to marshal the properties.
+        if( marshalledProperties==null && properties!=null ) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DataOutputStream os = new DataOutputStream(baos);
+            MarshallingSupport.marshalPrimitiveMap(properties, os);
+            os.close();
+            marshalledProperties = baos.toByteSequence();
+        }
+    }
+
+    public void afterMarshall(WireFormat wireFormat) throws IOException {
+    }
+
+    public void beforeUnmarshall(WireFormat wireFormat) throws IOException {
+    }
+
+    public void afterUnmarshall(WireFormat wireFormat) throws IOException {
+    }
+
 
     public boolean isValid() {
         return magic != null && Arrays.equals(magic, MAGIC);
     }
 
-    public void setCommandId(short value) {
-    }
-
-    public short getCommandId() {
-        return 0;
-    }
-
-    public boolean isResponseRequired() {
-        return false;
-    }
-
-    public boolean isResponse() {
-        return false;
-    }
-
-    public boolean isBrokerInfo() {
-        return false;
-    }
-
-    public boolean isMessageDispatch() {
-        return false;
-    }
-
-    public boolean isMessage() {
-        return false;
-    }
-
-    public boolean isMessageAck() {
-        return false;
-    }
-
     public void setResponseRequired(boolean responseRequired) {
     }
 
     /**
-     * @openwire:property version=1
+     * @throws IOException 
      */
-    public boolean isCacheEnabled() {
-        return cacheEnabled;
+    public boolean isCacheEnabled() throws IOException {
+        return Boolean.TRUE == getProperty("cache");
     }
-
-    public void setCacheEnabled(boolean cacheEnabled) {
-        this.cacheEnabled = cacheEnabled;
+    public void setCacheEnabled(boolean cacheEnabled) throws IOException {
+        setProperty("cache", cacheEnabled ? Boolean.TRUE : Boolean.FALSE);
     }
 
     /**
-     * @openwire:property version=1
+     * @throws IOException 
      */
-    public boolean isStackTraceEnabled() {
-        return stackTraceEnabled;
+    public boolean isStackTraceEnabled() throws IOException {
+        return Boolean.TRUE == getProperty("stackTrace");
     }
-
-    public void setStackTraceEnabled(boolean stackTraceEnabled) {
-        this.stackTraceEnabled = stackTraceEnabled;
+    public void setStackTraceEnabled(boolean stackTraceEnabled) throws IOException {
+        setProperty("stackTrace", stackTraceEnabled ? Boolean.TRUE : Boolean.FALSE);
     }
 
     /**
-     * @openwire:property version=1
+     * @throws IOException 
      */
-    public boolean isTcpNoDelayEnabled() {
-        return tcpNoDelayEnabled;
+    public boolean isTcpNoDelayEnabled() throws IOException {
+        return Boolean.TRUE == getProperty("tcpNoDelay");
     }
-
-    public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) {
-        this.tcpNoDelayEnabled = tcpNoDelayEnabled;
+    public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) throws IOException {
+        setProperty("tcpNoDelay", tcpNoDelayEnabled ? Boolean.TRUE : Boolean.FALSE);
     }
 
     /**
-     * @openwire:property version=1
+     * @throws IOException 
      */
-    public boolean isPrefixPacketSize() {
-        return prefixPacketSize;
+    public boolean isPrefixPacketSize() throws IOException {
+        return Boolean.TRUE == getProperty("prefixPacketSize");
     }
-    public void setPrefixPacketSize(boolean prefixPacketSize) {
-        this.prefixPacketSize = prefixPacketSize;
+    public void setPrefixPacketSize(boolean prefixPacketSize) throws IOException {
+        setProperty("prefixPacketSize", prefixPacketSize ? Boolean.TRUE : Boolean.FALSE);
     }
 
     /**
-     * @openwire:property version=1
+     * @throws IOException 
      */
-    public boolean isTightEncodingEnabled() {
-        return tightEncodingEnabled;
+    public boolean isTightEncodingEnabled() throws IOException {
+        return Boolean.TRUE == getProperty("tightEncoding");
     }
-    public void setTightEncodingEnabled(boolean tightEncodingEnabled) {
-        this.tightEncodingEnabled = tightEncodingEnabled;
+    public void setTightEncodingEnabled(boolean tightEncodingEnabled) throws IOException {
+        setProperty("tightEncoding", tightEncodingEnabled ? Boolean.TRUE : Boolean.FALSE);
     }
 
     public Response visit(CommandVisitor visitor) throws Exception {
         return visitor.processWireFormat(this);
     }
 
-    public boolean isMarshallAware() {
-        return false;
-    }
-
-    public boolean isMessageDispatchNotification(){
-        return false;
-    }
-    
-    public boolean isShutdownInfo(){
-        return false;
-    }
-
     public String toString() {
         return IntrospectionSupport.toString(this, WireFormatInfo.class);
     }
+
+    ///////////////////////////////////////////////////////////////
+    //
+    // This are not implemented.
+    //
+    ///////////////////////////////////////////////////////////////
+    
+    public void setCommandId(short value) {
+    }
+    public short getCommandId() {
+        return 0;
+    }
+    public boolean isResponseRequired() {
+        return false;
+    }
+    public boolean isResponse() {
+        return false;
+    }
+    public boolean isBrokerInfo() {
+        return false;
+    }
+    public boolean isMessageDispatch() {
+        return false;
+    }
+    public boolean isMessage() {
+        return false;
+    }
+    public boolean isMessageAck() {
+        return false;
+    }
+    public boolean isMessageDispatchNotification(){
+        return false;
+    }
+    public boolean isShutdownInfo(){
+        return false;
+    }
+    public void setCachedMarshalledForm(WireFormat wireFormat, ByteSequence data) {
+    }
+    public ByteSequence getCachedMarshalledForm(WireFormat wireFormat) {
+        return null;
+    }
+
 }

activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java

@@ -14,14 +14,12 @@
 package org.apache.activemq.network;
 
 import java.io.IOException;
-import javax.jms.JMSException;
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.BrokerId;
 import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.command.Command;
-import org.apache.activemq.command.CommandTypes;
 import org.apache.activemq.command.ConnectionId;
 import org.apache.activemq.command.ConnectionInfo;
 import org.apache.activemq.command.ConsumerId;
@@ -31,20 +29,18 @@ import org.apache.activemq.command.ExceptionResponse;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.NetworkBridgeFilter;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.command.Response;
 import org.apache.activemq.command.SessionInfo;
 import org.apache.activemq.command.ShutdownInfo;
 import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.filter.BooleanExpression;
 import org.apache.activemq.filter.DestinationFilter;
-import org.apache.activemq.filter.MessageEvaluationContext;
 import org.apache.activemq.transport.DefaultTransportListener;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.util.IdGenerator;
-import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
@@ -61,7 +57,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
  * @version $Revision$
  */
 public class DemandForwardingBridge implements Bridge{
-    static final private Log log=LogFactory.getLog(DemandForwardingBridge.class);
+    static final Log log=LogFactory.getLog(DemandForwardingBridge.class);
     protected final Transport localBroker;
     protected final Transport remoteBroker;
     protected IdGenerator idGenerator=new IdGenerator();
@@ -610,7 +606,7 @@ public class DemandForwardingBridge implements Bridge{
 
 
 
-    private boolean contains(BrokerId[] brokerPath,BrokerId brokerId){
+    public static boolean contains(BrokerId[] brokerPath,BrokerId brokerId){
         if(brokerPath!=null){
             for(int i=0;i<brokerPath.length;i++){
                 if(brokerId.equals(brokerPath[i]))
@@ -718,19 +714,7 @@ public class DemandForwardingBridge implements Bridge{
        
         // This works for now since we use a VM connection to the local broker.
         // may need to change if we ever subscribe to a remote broker.
-        sub.getLocalInfo().setAdditionalPredicate(new BooleanExpression(){
-            public boolean matches(MessageEvaluationContext message) throws JMSException{
-                try{
-                    return matchesForwardingFilter(message.getMessage());
-                }catch(IOException e){
-                    throw JMSExceptionSupport.create(e);
-                }
-            }
-
-            public Object evaluate(MessageEvaluationContext message) throws JMSException{
-                return matches(message)?Boolean.TRUE:Boolean.FALSE;
-            }
-        });
+        sub.getLocalInfo().setAdditionalPredicate(new NetworkBridgeFilter(remoteBrokerPath[0], networkTTL));
     }
     
     protected void  removeDemandSubscription(ConsumerId id) throws IOException{
@@ -742,34 +726,6 @@ public class DemandForwardingBridge implements Bridge{
         }
     }
     
-    protected boolean matchesForwardingFilter(Message message){
-        if (contains(message.getBrokerPath(),remoteBrokerPath[0])){
-            if (log.isTraceEnabled()){
-                log.trace("Message all ready routed once through this broker - ignoring: " + message);
-            }
-            return false;
-        }
-        int hops = message.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
-        if(hops >= networkTTL){
-            if (log.isTraceEnabled()){
-                log.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message);
-            }
-            return false;
-        }
-        // Don't propagate advisory messages about network subscriptions
-        if(message.isAdvisory()&&message.getDataStructure()!=null
-                        &&message.getDataStructure().getDataStructureType()==CommandTypes.CONSUMER_INFO){
-            ConsumerInfo info=(ConsumerInfo) message.getDataStructure();
-            hops = info.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
-            if(hops >= networkTTL){
-                if (log.isTraceEnabled()){
-                    log.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message);
-                }
-                return false;
-            }
-        }
-        return true;
-    }
     
     protected void waitStarted() throws InterruptedException {
         startedLatch.await();

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQMessageMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQQueueMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQTempTopicMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQTextMessageMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ActiveMQTopicMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for BaseCommandMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for BrokerIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for BrokerInfoMarshaller
  *
@@ -64,14 +65,14 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-        info.setBrokerId((BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrokerURL(tightUnmarshalString(dataIn, bs));
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerInfo value[] = new BrokerInfo[size];
+            org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setPeerBrokerInfos(value);
         }
@@ -92,7 +93,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
         BrokerInfo info = (BrokerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getBrokerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getBrokerId(), bs);
     rc += tightMarshalString1(info.getBrokerURL(), bs);
     rc += tightMarshalObjectArray1(wireFormat, info.getPeerBrokerInfos(), bs);
     rc += tightMarshalString1(info.getBrokerName(), bs);
@@ -112,7 +113,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getBrokerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getBrokerId(), dataOut, bs);
     tightMarshalString2(info.getBrokerURL(), dataOut, bs);
     tightMarshalObjectArray2(wireFormat, info.getPeerBrokerInfos(), dataOut, bs);
     tightMarshalString2(info.getBrokerName(), dataOut, bs);
@@ -131,14 +132,14 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         BrokerInfo info = (BrokerInfo)o;
-        info.setBrokerId((BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setBrokerURL(looseUnmarshalString(dataIn));
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerInfo value[] = new BrokerInfo[size];
+            org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setPeerBrokerInfos(value);
         }
@@ -159,7 +160,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller {
         BrokerInfo info = (BrokerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getBrokerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getBrokerId(), dataOut);
     looseMarshalString(info.getBrokerURL(), dataOut);
     looseMarshalObjectArray(wireFormat, info.getPeerBrokerInfos(), dataOut);
     looseMarshalString(info.getBrokerName(), dataOut);

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConnectionErrorMarshaller
  *
@@ -64,8 +65,8 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionError info = (ConnectionError)o;
-        info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
-        info.setConnectionId((ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +80,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getConnectionId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
 
         return rc + 0;
     }
@@ -96,7 +97,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
 
         ConnectionError info = (ConnectionError)o;
     tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
 
     }
 
@@ -111,8 +112,8 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ConnectionError info = (ConnectionError)o;
-        info.setException((Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
-        info.setConnectionId((ConnectionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -126,7 +127,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller {
 
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalThrowable(wireFormat, info.getException(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getConnectionId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConnectionIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConnectionInfoMarshaller
  *
@@ -64,16 +65,16 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
         info.setPassword(tightUnmarshalString(dataIn, bs));
         info.setUserName(tightUnmarshalString(dataIn, bs));
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -92,7 +93,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
         ConnectionInfo info = (ConnectionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
     rc += tightMarshalString1(info.getClientId(), bs);
     rc += tightMarshalString1(info.getPassword(), bs);
     rc += tightMarshalString1(info.getUserName(), bs);
@@ -112,7 +113,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
     tightMarshalString2(info.getClientId(), dataOut, bs);
     tightMarshalString2(info.getPassword(), dataOut, bs);
     tightMarshalString2(info.getUserName(), dataOut, bs);
@@ -131,16 +132,16 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
         info.setPassword(looseUnmarshalString(dataIn));
         info.setUserName(looseUnmarshalString(dataIn));
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -159,7 +160,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
         ConnectionInfo info = (ConnectionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
     looseMarshalString(info.getClientId(), dataOut);
     looseMarshalString(info.getPassword(), dataOut);
     looseMarshalString(info.getUserName(), dataOut);

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConsumerIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConsumerInfoMarshaller
  *
@@ -64,9 +65,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrowser(bs.readBoolean());
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setPrefetchSize(dataIn.readInt());
         info.setMaximumPendingMessageLimit(dataIn.readInt());
         info.setDispatchAsync(bs.readBoolean());
@@ -79,15 +80,16 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
         else {
             info.setBrokerPath(null);
         }
+        info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setNetworkSubscription(bs.readBoolean());
 
     }
@@ -101,9 +103,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
         ConsumerInfo info = (ConsumerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
     bs.writeBoolean(info.isBrowser());
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
             bs.writeBoolean(info.isDispatchAsync());
     rc += tightMarshalString1(info.getSelector(), bs);
     rc += tightMarshalString1(info.getSubcriptionName(), bs);
@@ -111,6 +113,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
     bs.writeBoolean(info.isExclusive());
     bs.writeBoolean(info.isRetroactive());
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getAdditionalPredicate(), bs);
     bs.writeBoolean(info.isNetworkSubscription());
 
         return rc + 9;
@@ -127,9 +130,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
     bs.readBoolean();
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     dataOut.writeInt(info.getPrefetchSize());
     dataOut.writeInt(info.getMaximumPendingMessageLimit());
     bs.readBoolean();
@@ -140,6 +143,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
     bs.readBoolean();
     dataOut.writeByte(info.getPriority());
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut, bs);
     bs.readBoolean();
 
     }
@@ -155,9 +159,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setBrowser(dataIn.readBoolean());
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setPrefetchSize(dataIn.readInt());
         info.setMaximumPendingMessageLimit(dataIn.readInt());
         info.setDispatchAsync(dataIn.readBoolean());
@@ -170,15 +174,16 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
         else {
             info.setBrokerPath(null);
         }
+        info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setNetworkSubscription(dataIn.readBoolean());
 
     }
@@ -192,9 +197,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
         ConsumerInfo info = (ConsumerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
     dataOut.writeBoolean(info.isBrowser());
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     dataOut.writeInt(info.getPrefetchSize());
     dataOut.writeInt(info.getMaximumPendingMessageLimit());
     dataOut.writeBoolean(info.isDispatchAsync());
@@ -205,6 +210,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
     dataOut.writeBoolean(info.isRetroactive());
     dataOut.writeByte(info.getPriority());
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut);
     dataOut.writeBoolean(info.isNetworkSubscription());
 
     }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ControlCommandMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DataArrayResponseMarshaller
  *
@@ -67,9 +68,9 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller {
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            DataStructure value[] = new DataStructure[size];
+            org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setData(value);
         }
@@ -122,9 +123,9 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller {
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            DataStructure value[] = new DataStructure[size];
+            org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setData(value);
         }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DataResponseMarshaller
  *
@@ -64,7 +65,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         DataResponse info = (DataResponse)o;
-        info.setData((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setData((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -77,7 +78,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
         DataResponse info = (DataResponse)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getData(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getData(), bs);
 
         return rc + 0;
     }
@@ -93,7 +94,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DataResponse info = (DataResponse)o;
-    tightMarshalNestedObject2(wireFormat, info.getData(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getData(), dataOut, bs);
 
     }
 
@@ -108,7 +109,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         DataResponse info = (DataResponse)o;
-        info.setData((DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setData((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -121,7 +122,7 @@ public class DataResponseMarshaller extends ResponseMarshaller {
         DataResponse info = (DataResponse)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getData(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getData(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DestinationInfoMarshaller
  *
@@ -64,16 +65,16 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs));
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -92,8 +93,8 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
         DestinationInfo info = (DestinationInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
         rc+=tightMarshalLong1(wireFormat, info.getTimeout(), bs);
     rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
@@ -111,8 +112,8 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     dataOut.writeByte(info.getOperationType());
     tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs);
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
@@ -130,16 +131,16 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(looseUnmarshalLong(wireFormat, dataIn));
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -158,8 +159,8 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller {
         DestinationInfo info = (DestinationInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     dataOut.writeByte(info.getOperationType());
     looseMarshalLong(wireFormat, info.getTimeout(), dataOut);
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);

activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DiscoveryEventMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ExceptionResponseMarshaller
  *
@@ -64,7 +65,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
+        info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
 
     }
 
@@ -108,7 +109,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        info.setException((Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
+        info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
 
     }
 

activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for FlushCommandMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for IntegerResponseMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalQueueAckMarshaller
  *
@@ -64,8 +65,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageAck((MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageAck((org.apache.activemq.command.MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -78,8 +79,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller {
         JournalQueueAck info = (JournalQueueAck)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageAck(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageAck(), bs);
 
         return rc + 0;
     }
@@ -95,8 +96,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-    tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageAck(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageAck(), dataOut, bs);
 
     }
 
@@ -111,8 +112,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.setDestination((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setMessageAck((MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageAck((org.apache.activemq.command.MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -125,8 +126,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller {
         JournalQueueAck info = (JournalQueueAck)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageAck(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageAck(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalTopicAckMarshaller
  *
@@ -64,12 +65,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setSubscritionName(tightUnmarshalString(dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -82,12 +83,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
         JournalTopicAck info = (JournalTopicAck)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs);
     rc += tightMarshalString1(info.getSubscritionName(), bs);
     rc += tightMarshalString1(info.getClientId(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
 
         return rc + 0;
     }
@@ -103,12 +104,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-    tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getMessageSequenceId(), dataOut, bs);
     tightMarshalString2(info.getSubscritionName(), dataOut, bs);
     tightMarshalString2(info.getClientId(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
 
     }
 
@@ -123,12 +124,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setMessageSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setSubscritionName(looseUnmarshalString(dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -141,12 +142,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
         JournalTopicAck info = (JournalTopicAck)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
     looseMarshalLong(wireFormat, info.getMessageSequenceId(), dataOut);
     looseMarshalString(info.getSubscritionName(), dataOut);
     looseMarshalString(info.getClientId(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalTraceMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalTransactionMarshaller
  *
@@ -64,7 +65,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
         info.setWasPrepared(bs.readBoolean());
 
@@ -79,7 +80,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller {
         JournalTransaction info = (JournalTransaction)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
         bs.writeBoolean(info.getWasPrepared());
 
         return rc + 1;
@@ -96,7 +97,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-    tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
     dataOut.writeByte(info.getType());
     bs.readBoolean();
 
@@ -113,7 +114,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setType(dataIn.readByte());
         info.setWasPrepared(dataIn.readBoolean());
 
@@ -128,7 +129,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller {
         JournalTransaction info = (JournalTransaction)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
     dataOut.writeByte(info.getType());
     dataOut.writeBoolean(info.getWasPrepared());
 

activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for KeepAliveInfoMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller
  *
@@ -65,7 +66,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs));
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +80,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
 
         return rc + 0;
     }
@@ -96,7 +97,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
 
         LocalTransactionId info = (LocalTransactionId)o;
     tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
 
     }
 
@@ -112,7 +113,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(looseUnmarshalLong(wireFormat, dataIn));
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
 
     }
 
@@ -126,7 +127,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller {
 
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalLong(wireFormat, info.getValue(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java

@@ -39,52 +39,53 @@ public class MarshallerFactory {
     static final private DataStreamMarshaller marshaller[] = new DataStreamMarshaller[256];
     static {
 
-        add(new MessageIdMarshaller());
-        add(new BrokerInfoMarshaller());
-        add(new ActiveMQTempQueueMarshaller());
         add(new LocalTransactionIdMarshaller());
-        add(new RemoveSubscriptionInfoMarshaller());
         add(new IntegerResponseMarshaller());
         add(new ActiveMQQueueMarshaller());
-        add(new DestinationInfoMarshaller());
-        add(new ActiveMQBytesMessageMarshaller());
-        add(new ShutdownInfoMarshaller());
-        add(new DataResponseMarshaller());
-        add(new SessionIdMarshaller());
-        add(new DataArrayResponseMarshaller());
-        add(new JournalQueueAckMarshaller());
-        add(new WireFormatInfoMarshaller());
-        add(new ResponseMarshaller());
-        add(new ConnectionErrorMarshaller());
         add(new ActiveMQObjectMessageMarshaller());
-        add(new ConsumerInfoMarshaller());
-        add(new ActiveMQTempTopicMarshaller());
         add(new ConnectionIdMarshaller());
-        add(new DiscoveryEventMarshaller());
         add(new ConnectionInfoMarshaller());
-        add(new KeepAliveInfoMarshaller());
-        add(new XATransactionIdMarshaller());
-        add(new JournalTraceMarshaller());
-        add(new FlushCommandMarshaller());
-        add(new ConsumerIdMarshaller());
-        add(new JournalTopicAckMarshaller());
-        add(new ActiveMQTextMessageMarshaller());
-        add(new BrokerIdMarshaller());
-        add(new MessageDispatchMarshaller());
         add(new ProducerInfoMarshaller());
-        add(new SubscriptionInfoMarshaller());
-        add(new ActiveMQMapMessageMarshaller());
         add(new MessageDispatchNotificationMarshaller());
         add(new SessionInfoMarshaller());
-        add(new ActiveMQMessageMarshaller());
         add(new TransactionInfoMarshaller());
         add(new ActiveMQStreamMessageMarshaller());
         add(new MessageAckMarshaller());
         add(new ProducerIdMarshaller());
-        add(new ActiveMQTopicMarshaller());
+        add(new MessageIdMarshaller());
+        add(new ActiveMQTempQueueMarshaller());
+        add(new RemoveSubscriptionInfoMarshaller());
+        add(new SessionIdMarshaller());
+        add(new DataArrayResponseMarshaller());
+        add(new JournalQueueAckMarshaller());
+        add(new ResponseMarshaller());
+        add(new ConnectionErrorMarshaller());
+        add(new ConsumerInfoMarshaller());
+        add(new XATransactionIdMarshaller());
+        add(new JournalTraceMarshaller());
+        add(new ConsumerIdMarshaller());
+        add(new ActiveMQTextMessageMarshaller());
+        add(new SubscriptionInfoMarshaller());
         add(new JournalTransactionMarshaller());
-        add(new RemoveInfoMarshaller());
         add(new ControlCommandMarshaller());
+        add(new NetworkBridgeFilterMarshaller());
+        add(new ActiveMQBytesMessageMarshaller());
+        add(new WireFormatInfoMarshaller());
+        add(new ActiveMQTempTopicMarshaller());
+        add(new DiscoveryEventMarshaller());
+        add(new ActiveMQTopicMarshaller());
+        add(new BrokerInfoMarshaller());
+        add(new DestinationInfoMarshaller());
+        add(new ShutdownInfoMarshaller());
+        add(new DataResponseMarshaller());
+        add(new KeepAliveInfoMarshaller());
+        add(new FlushCommandMarshaller());
+        add(new JournalTopicAckMarshaller());
+        add(new BrokerIdMarshaller());
+        add(new MessageDispatchMarshaller());
+        add(new ActiveMQMapMessageMarshaller());
+        add(new ActiveMQMessageMarshaller());
+        add(new RemoveInfoMarshaller());
         add(new ExceptionResponseMarshaller());
 
 	}

activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageAckMarshaller
  *
@@ -64,12 +65,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageAck info = (MessageAck)o;
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setAckType(dataIn.readByte());
-        info.setFirstMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setLastMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setFirstMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setLastMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageCount(dataIn.readInt());
 
     }
@@ -83,11 +84,11 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
         MessageAck info = (MessageAck)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-        rc += tightMarshalNestedObject1(wireFormat, info.getFirstMessageId(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getLastMessageId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getFirstMessageId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getLastMessageId(), bs);
     
         return rc + 5;
     }
@@ -103,12 +104,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageAck info = (MessageAck)o;
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
     dataOut.writeByte(info.getAckType());
-    tightMarshalNestedObject2(wireFormat, info.getFirstMessageId(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getLastMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getLastMessageId(), dataOut, bs);
     dataOut.writeInt(info.getMessageCount());
 
     }
@@ -124,12 +125,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageAck info = (MessageAck)o;
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setAckType(dataIn.readByte());
-        info.setFirstMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setLastMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setFirstMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setLastMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setMessageCount(dataIn.readInt());
 
     }
@@ -143,12 +144,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller {
         MessageAck info = (MessageAck)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
     dataOut.writeByte(info.getAckType());
-    looseMarshalNestedObject(wireFormat, info.getFirstMessageId(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getLastMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getLastMessageId(), dataOut);
     dataOut.writeInt(info.getMessageCount());
 
     }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageDispatchMarshaller
  *
@@ -64,9 +65,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessage((Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessage((org.apache.activemq.command.Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setRedeliveryCounter(dataIn.readInt());
 
     }
@@ -80,9 +81,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
         MessageDispatch info = (MessageDispatch)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessage(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessage(), bs);
     
         return rc + 4;
     }
@@ -98,9 +99,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessage(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessage(), dataOut, bs);
     dataOut.writeInt(info.getRedeliveryCounter());
 
     }
@@ -116,9 +117,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setMessage((Message) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setMessage((org.apache.activemq.command.Message) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setRedeliveryCounter(dataIn.readInt());
 
     }
@@ -132,9 +133,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller {
         MessageDispatch info = (MessageDispatch)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessage(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessage(), dataOut);
     dataOut.writeInt(info.getRedeliveryCounter());
 
     }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller
  *
@@ -64,10 +65,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -80,10 +81,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
         MessageDispatchNotification info = (MessageDispatchNotification)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
 
         return rc + 0;
     }
@@ -99,10 +100,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getDeliverySequenceId(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
 
     }
 
@@ -117,10 +118,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setDeliverySequenceId(looseUnmarshalLong(wireFormat, dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -133,10 +134,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller
         MessageDispatchNotification info = (MessageDispatchNotification)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     looseMarshalLong(wireFormat, info.getDeliverySequenceId(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageIdMarshaller
  *
@@ -64,7 +65,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
 
@@ -79,7 +80,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
         MessageId info = (MessageId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
 
@@ -97,7 +98,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
-    tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs);
 
@@ -114,7 +115,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
 
@@ -129,7 +130,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
         MessageId info = (MessageId)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
     looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut);
     looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut);
 

activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageMarshaller
  *
@@ -52,33 +53,33 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
 
         info.beforeUnmarshall(wireFormat);
         
-        info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setOriginalDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setOriginalTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setGroupID(tightUnmarshalString(dataIn, bs));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(tightUnmarshalString(dataIn, bs));
         info.setPersistent(bs.readBoolean());
         info.setExpiration(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setTimestamp(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setType(tightUnmarshalString(dataIn, bs));
         info.setContent(tightUnmarshalByteSequence(dataIn, bs));
         info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
-        info.setDataStructure((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setTargetConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDataStructure((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setCompressed(bs.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -104,23 +105,23 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
         info.beforeMarshall(wireFormat);
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getOriginalDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getOriginalTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs);
     rc += tightMarshalString1(info.getGroupID(), bs);
         rc += tightMarshalString1(info.getCorrelationId(), bs);
     bs.writeBoolean(info.isPersistent());
     rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);
-        rc += tightMarshalNestedObject1(wireFormat, info.getReplyTo(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
     rc += tightMarshalString1(info.getType(), bs);
     rc += tightMarshalByteSequence1(info.getContent(), bs);
     rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getDataStructure(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTargetConsumerId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);
     bs.writeBoolean(info.isCompressed());
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs);
@@ -141,25 +142,25 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         Message info = (Message)o;
-    tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getOriginalDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getOriginalTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);
     tightMarshalString2(info.getGroupID(), dataOut, bs);
     dataOut.writeInt(info.getGroupSequence());
     tightMarshalString2(info.getCorrelationId(), dataOut, bs);
     bs.readBoolean();
     tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);
     dataOut.writeByte(info.getPriority());
-    tightMarshalNestedObject2(wireFormat, info.getReplyTo(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);
     tightMarshalString2(info.getType(), dataOut, bs);
     tightMarshalByteSequence2(info.getContent(), dataOut, bs);
     tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getDataStructure(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTargetConsumerId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);
     bs.readBoolean();
     dataOut.writeInt(info.getRedeliveryCounter());
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
@@ -185,33 +186,33 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
 
         info.beforeUnmarshall(wireFormat);
         
-        info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setOriginalDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setOriginalTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setGroupID(looseUnmarshalString(dataIn));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(looseUnmarshalString(dataIn));
         info.setPersistent(dataIn.readBoolean());
         info.setExpiration(looseUnmarshalLong(wireFormat, dataIn));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));
         info.setType(looseUnmarshalString(dataIn));
         info.setContent(looseUnmarshalByteSequence(dataIn));
         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
-        info.setDataStructure((DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setTargetConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDataStructure((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setCompressed(dataIn.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -237,25 +238,25 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller {
         info.beforeMarshall(wireFormat);
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getOriginalDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getOriginalTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);
     looseMarshalString(info.getGroupID(), dataOut);
     dataOut.writeInt(info.getGroupSequence());
     looseMarshalString(info.getCorrelationId(), dataOut);
     dataOut.writeBoolean(info.isPersistent());
     looseMarshalLong(wireFormat, info.getExpiration(), dataOut);
     dataOut.writeByte(info.getPriority());
-    looseMarshalNestedObject(wireFormat, info.getReplyTo(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);
     looseMarshalLong(wireFormat, info.getTimestamp(), dataOut);
     looseMarshalString(info.getType(), dataOut);
     looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);
     looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getDataStructure(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTargetConsumerId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);
     dataOut.writeBoolean(info.isCompressed());
     dataOut.writeInt(info.getRedeliveryCounter());
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);

activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java

@@ -0,0 +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.*;



/**
 * 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/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ProducerIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ProducerInfoMarshaller
  *
@@ -64,14 +65,14 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -90,8 +91,8 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
         ProducerInfo info = (ProducerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
     rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
         return rc + 0;
@@ -108,8 +109,8 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
 
     }
@@ -125,14 +126,14 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -151,8 +152,8 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller {
         ProducerInfo info = (ProducerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
 
     }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for RemoveInfoMarshaller
  *
@@ -64,7 +65,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.setObjectId((DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setObjectId((org.apache.activemq.command.DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -77,7 +78,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
         RemoveInfo info = (RemoveInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getObjectId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getObjectId(), bs);
 
         return rc + 0;
     }
@@ -93,7 +94,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getObjectId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getObjectId(), dataOut, bs);
 
     }
 
@@ -108,7 +109,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.setObjectId((DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setObjectId((org.apache.activemq.command.DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn));
 
     }
 
@@ -121,7 +122,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller {
         RemoveInfo info = (RemoveInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getObjectId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getObjectId(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for RemoveSubscriptionInfoMarshaller
  *
@@ -64,7 +65,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
 
@@ -79,7 +80,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
     rc += tightMarshalString1(info.getSubcriptionName(), bs);
     rc += tightMarshalString1(info.getClientId(), bs);
 
@@ -97,7 +98,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
     tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
     tightMarshalString2(info.getClientId(), dataOut, bs);
 
@@ -114,7 +115,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setSubcriptionName(looseUnmarshalString(dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
 
@@ -129,7 +130,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller {
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
     looseMarshalString(info.getSubcriptionName(), dataOut);
     looseMarshalString(info.getClientId(), dataOut);
 

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ResponseMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for SessionIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for SessionInfoMarshaller
  *
@@ -64,7 +65,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         SessionInfo info = (SessionInfo)o;
-        info.setSessionId((SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setSessionId((org.apache.activemq.command.SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -77,7 +78,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
         SessionInfo info = (SessionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getSessionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getSessionId(), bs);
 
         return rc + 0;
     }
@@ -93,7 +94,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionInfo info = (SessionInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getSessionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getSessionId(), dataOut, bs);
 
     }
 
@@ -108,7 +109,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         SessionInfo info = (SessionInfo)o;
-        info.setSessionId((SessionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setSessionId((org.apache.activemq.command.SessionId) looseUnmarsalCachedObject(wireFormat, dataIn));
 
     }
 
@@ -121,7 +122,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller {
         SessionInfo info = (SessionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getSessionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getSessionId(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ShutdownInfoMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for SubscriptionInfoMarshaller
  *
@@ -65,7 +66,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller {
 
         SubscriptionInfo info = (SubscriptionInfo)o;
         info.setClientId(tightUnmarshalString(dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSelector(tightUnmarshalString(dataIn, bs));
         info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
 
@@ -81,7 +82,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller {
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc += tightMarshalString1(info.getClientId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
     rc += tightMarshalString1(info.getSelector(), bs);
     rc += tightMarshalString1(info.getSubcriptionName(), bs);
 
@@ -100,7 +101,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller {
 
         SubscriptionInfo info = (SubscriptionInfo)o;
     tightMarshalString2(info.getClientId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     tightMarshalString2(info.getSelector(), dataOut, bs);
     tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
 
@@ -118,7 +119,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller {
 
         SubscriptionInfo info = (SubscriptionInfo)o;
         info.setClientId(looseUnmarshalString(dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setSelector(looseUnmarshalString(dataIn));
         info.setSubcriptionName(looseUnmarshalString(dataIn));
 
@@ -134,7 +135,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller {
 
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalString(info.getClientId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     looseMarshalString(info.getSelector(), dataOut);
     looseMarshalString(info.getSubcriptionName(), dataOut);
 

activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for TransactionIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for TransactionInfoMarshaller
  *
@@ -64,8 +65,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
 
     }
@@ -79,8 +80,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
         TransactionInfo info = (TransactionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
     
         return rc + 1;
     }
@@ -96,8 +97,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
     dataOut.writeByte(info.getType());
 
     }
@@ -113,8 +114,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setType(dataIn.readByte());
 
     }
@@ -128,8 +129,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller {
         TransactionInfo info = (TransactionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
     dataOut.writeByte(info.getType());
 
     }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
  *
@@ -64,13 +65,14 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
         info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));
         info.setVersion(dataIn.readInt());
-        info.setCacheEnabled(bs.readBoolean());
-        info.setStackTraceEnabled(bs.readBoolean());
-        info.setTcpNoDelayEnabled(bs.readBoolean());
-        info.setPrefixPacketSize(bs.readBoolean());
-        info.setTightEncodingEnabled(bs.readBoolean());
+        info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
 
     }
 
@@ -82,13 +84,11 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
 
         WireFormatInfo info = (WireFormatInfo)o;
 
+        info.beforeMarshall(wireFormat);
+
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);
-        bs.writeBoolean(info.isCacheEnabled());
-    bs.writeBoolean(info.isStackTraceEnabled());
-    bs.writeBoolean(info.isTcpNoDelayEnabled());
-    bs.writeBoolean(info.isPrefixPacketSize());
-    bs.writeBoolean(info.isTightEncodingEnabled());
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
 
         return rc + 4;
     }
@@ -106,11 +106,9 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
         WireFormatInfo info = (WireFormatInfo)o;
     tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);
     dataOut.writeInt(info.getVersion());
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
+    tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
 
     }
 
@@ -125,13 +123,14 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
         info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));
         info.setVersion(dataIn.readInt());
-        info.setCacheEnabled(dataIn.readBoolean());
-        info.setStackTraceEnabled(dataIn.readBoolean());
-        info.setTcpNoDelayEnabled(dataIn.readBoolean());
-        info.setPrefixPacketSize(dataIn.readBoolean());
-        info.setTightEncodingEnabled(dataIn.readBoolean());
+        info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
+
+        info.afterUnmarshall(wireFormat);
 
     }
 
@@ -143,14 +142,12 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
 
         WireFormatInfo info = (WireFormatInfo)o;
 
+        info.beforeMarshall(wireFormat);
+
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);
     dataOut.writeInt(info.getVersion());
-    dataOut.writeBoolean(info.isCacheEnabled());
-    dataOut.writeBoolean(info.isStackTraceEnabled());
-    dataOut.writeBoolean(info.isTcpNoDelayEnabled());
-    dataOut.writeBoolean(info.isPrefixPacketSize());
-    dataOut.writeBoolean(info.isTightEncodingEnabled());
+    looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
 
     }
 }

activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java

@@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for XATransactionIdMarshaller
  *

activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java

@@ -69,7 +69,7 @@ public class WireFormatNegotiator extends TransportFilter {
         super.oneway(command);
     }
 
-    protected WireFormatInfo createWireFormatInfo() {
+    protected WireFormatInfo createWireFormatInfo() throws IOException {
         WireFormatInfo info = new WireFormatInfo();
         info.setVersion(wireFormat.getVersion());
         if ( wireFormat instanceof OpenWireFormat ) {
@@ -98,20 +98,24 @@ public class WireFormatNegotiator extends TransportFilter {
                 wireFormat.setVersion(info.getVersion());
             }
             if ( wireFormat instanceof OpenWireFormat ) {
-                if( !info.isStackTraceEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setStackTraceEnabled(false);
-                }
-                if( info.isTcpNoDelayEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true);
-                }
-                if( !info.isCacheEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setCacheEnabled(false);
-                }
-                if( !info.isPrefixPacketSize() ) {
-                    ((OpenWireFormat)wireFormat).setPrefixPacketSize(false);
-                }
-                if( !info.isTightEncodingEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false);
+                try {
+                    if( !info.isStackTraceEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setStackTraceEnabled(false);
+                    }
+                    if( info.isTcpNoDelayEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true);
+                    }
+                    if( !info.isCacheEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setCacheEnabled(false);
+                    }
+                    if( !info.isPrefixPacketSize() ) {
+                        ((OpenWireFormat)wireFormat).setPrefixPacketSize(false);
+                    }
+                    if( !info.isTightEncodingEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false);
+                    }
+                } catch (IOException e) {
+                    commandListener.onException(e);
                 }
             }
                 

activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java

@@ -54,13 +54,13 @@ public class ActiveIOTransport implements Transport {
             public void onCommand(Object command) {
                 if (command.getClass() == WireFormatInfo.class) {
                     WireFormatInfo info = (WireFormatInfo) command;
-                    if (info.isTcpNoDelayEnabled()) {
-                        try {
+                    try {
+                        if (info.isTcpNoDelayEnabled()) {
                             enableTcpNodeDelay();
                         }
-                        catch (SocketException e) {
-                            onError(e);
-                        }
+                    }
+                    catch (IOException e) {
+                        onError(e);
                     }
                 }
                 transportListener.onCommand((Command) command);

activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java

@@ -16,6 +16,24 @@
  */
 package org.apache.activemq.openwire;
 
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.activeio.ByteSequence;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
@@ -29,34 +47,16 @@ import org.apache.activemq.command.LocalTransactionId;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.NetworkBridgeFilter;
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.SessionId;
 import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.filter.BooleanExpression;
 import org.apache.activemq.openwire.v1.ActiveMQTextMessageTest;
 import org.apache.activemq.openwire.v1.BrokerInfoTest;
 import org.apache.activemq.openwire.v1.MessageAckTest;
 import org.apache.activemq.test.TestSupport;
 
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URL;
-import java.util.*;
-
-import junit.framework.TestCase;
-
 public abstract class DataFileGeneratorTestSupport extends TestSupport {
 
     protected static final Object[] EMPTY_ARGUMENTS = {};
@@ -316,4 +316,9 @@ public abstract class DataFileGeneratorTestSupport extends TestSupport {
         // exception each time
         return singletonException;
     }
+    
+    protected BooleanExpression createBooleanExpression(String string) {
+        return new NetworkBridgeFilter(new BrokerId(string), 10);
+    }
+
 }

activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java

@@ -70,6 +70,7 @@ public class ConsumerInfoTest extends BaseCommandTestSupport {
 	            }
 	            info.setBrokerPath(value);
             }
+        info.setAdditionalPredicate(createBooleanExpression("AdditionalPredicate:6"));
         info.setNetworkSubscription(false);
 
             }

activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java

@@ -0,0 +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-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java

@@ -51,11 +51,12 @@ public class WireFormatInfoTest extends DataFileGeneratorTestSupport {
     		super.populateObject(object);
     		WireFormatInfo info = (WireFormatInfo) object;
         info.setVersion(1);
-        info.setCacheEnabled(true);
-        info.setStackTraceEnabled(false);
-        info.setTcpNoDelayEnabled(true);
-        info.setPrefixPacketSize(false);
-        info.setTightEncodingEnabled(true);
+        
+    		{
+        		byte data[] = "MarshalledProperties:1".getBytes();
+        		info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,data.length));
+    		}
+    		
 
             }
         }

activemq-dotnet/activemq-dotnet.csproj

@@ -49,6 +49,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ActiveMQTextMessage.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ActiveMQTopic.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BaseCommand.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\BooleanExpression.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerError.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerInfo.cs"/>
@@ -80,6 +81,8 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageDispatch.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageDispatchNotification.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageId.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageReference.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\NetworkBridgeFilter.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ProducerId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ProducerInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\RemoveInfo.cs"/>
@@ -93,6 +96,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\TransactionInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\WireFormatInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\XATransactionId.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\Xid.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Connection.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\ConnectionClosedException.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\ConnectionFactory.cs"/>
@@ -151,6 +155,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageDispatchNotificationMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageMarshaller.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\NetworkBridgeFilterMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\ProducerIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\ProducerInfoMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\RemoveInfoMarshaller.cs"/>

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

@@ -16,6 +16,7 @@
  */
 using ActiveMQ.Commands;
 using System;
+using ActiveMQ.OpenWire;
 
 namespace ActiveMQ.Commands
 {
@@ -137,6 +138,32 @@ namespace ActiveMQ.Commands
                 return -1;
             }
         }
+		
+		public virtual void BeforeMarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void AfterMarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void BeforeUnmarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void AfterUnmarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data)
+		{
+		}
+		
+		public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat)
+		{
+			return null;
+		}
+		
     }
 }
 

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

@@ -1,316 +1,295 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using ActiveMQ.OpenWire;
-using JMS;
-
-
-namespace ActiveMQ.Commands
-{
-	public delegate void AcknowledgeHandler(ActiveMQMessage message);
-}
-
-namespace ActiveMQ.Commands
-{
-	public class ActiveMQMessage : Message, IMessage, MarshallAware
-    {
-        public const byte ID_ActiveMQMessage = 23;
-        
-        protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
-        
-        private PrimitiveMap properties;
-        
-        public event AcknowledgeHandler Acknowledger;
-        
-        public static ActiveMQMessage Transform(IMessage message)
-        {
-            return (ActiveMQMessage) message;
-        }
-        
-        // TODO generate Equals method
-        // TODO generate GetHashCode method
-        
-        
-        public override byte GetDataStructureType()
-        {
-            return ID_ActiveMQMessage;
-        }
-        
-        public void Acknowledge()
-        {
-            if (Acknowledger == null)
-			{
-                throw new JMSException("No Acknowledger has been associated with this message: " + this);
-			}
-            else
-			{
-                Acknowledger(this);
-            }
-        }
-        
-        
-        // Properties
-        
-        public IPrimitiveMap Properties
-        {
-            get {
-                if (properties == null)
-                {
-                    properties = PrimitiveMap.Unmarshal(MarshalledProperties);
-                }
-                return properties;
-            }
-        }
-        
-        public IDestination FromDestination
-        {
-            get { return Destination; }
-            set { this.Destination = ActiveMQDestination.Transform(value); }
-        }
-        
-        
-        // IMessage interface
-        
-        // JMS headers
-        
-        /// <summary>
-        /// The correlation ID used to correlate messages with conversations or long running business processes
-        /// </summary>
-        public string JMSCorrelationID
-        {
-            get {
-                return CorrelationId;
-            }
-            set {
-                CorrelationId = value;
-            }
-        }
-        
-        /// <summary>
-        /// The destination of the message
-        /// </summary>
-        public IDestination JMSDestination
-        {
-            get {
-                return OriginalDestination;
-            }
-        }
-        
-        /// <summary>
-        /// The time in milliseconds that this message should expire in
-        /// </summary>
-        public long JMSExpiration
-        {
-            get {
-                return Expiration;
-            }
-            set {
-                Expiration = value;
-            }
-        }
-        
-        /// <summary>
-        /// The message ID which is set by the provider
-        /// </summary>
-        public string JMSMessageId
-        {
-            get {
-                return BaseDataStreamMarshaller.ToString(MessageId);
-            }
-        }
-        
-        /// <summary>
-        /// Whether or not this message is persistent
-        /// </summary>
-        public bool JMSPersistent
-        {
-            get {
-                return Persistent;
-            }
-            set {
-                Persistent = value;
-            }
-        }
-        
-        /// <summary>
-        /// The Priority on this message
-        /// </summary>
-        public byte JMSPriority
-        {
-            get {
-                return Priority;
-            }
-            set {
-                Priority = value;
-            }
-        }
-        
-        /// <summary>
-        /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
-        /// </summary>
-        public bool JMSRedelivered
-        {
-            get {
-                return RedeliveryCounter > 0;
-            }
-        }
-        
-        
-        /// <summary>
-        /// The destination that the consumer of this message should send replies to
-        /// </summary>
-        public IDestination JMSReplyTo
-        {
-            get {
-                return ReplyTo;
-            }
-            set {
-                ReplyTo = ActiveMQDestination.Transform(value);
-            }
-        }
-        
-        
-        /// <summary>
-        /// The timestamp the broker added to the message
-        /// </summary>
-        public long JMSTimestamp
-        {
-            get {
-                return Timestamp;
-            }
-        }
-        
-        /// <summary>
-        /// The type name of this message
-        /// </summary>
-        public string JMSType
-        {
-            get {
-                return Type;
-            }
-            set {
-                Type = value;
-            }
-        }
-        
-        
-        // JMS Extension headers
-        
-        /// <summary>
-        /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
-        /// </summary>
-        public int JMSXDeliveryCount
-        {
-            get {
-                return RedeliveryCounter + 1;
-            }
-        }
-        
-        
-        /// <summary>
-        /// The Message Group ID used to group messages together to the same consumer for the same group ID value
-        /// </summary>
-        public string JMSXGroupID
-        {
-            get {
-                return GroupID;
-            }
-            set {
-                GroupID = value;
-            }
-        }
-        /// <summary>
-        /// The Message Group Sequence counter to indicate the position in a group
-        /// </summary>
-        public int JMSXGroupSeq
-        {
-            get {
-                return GroupSequence;
-            }
-            set {
-                GroupSequence = value;
-            }
-        }
-        
-        /// <summary>
-        /// Returns the ID of the producers transaction
-        /// </summary>
-        public string JMSXProducerTXID
-        {
-            get {
-                TransactionId txnId = OriginalTransactionId;
-                if (txnId == null)
-                {
-                    txnId = TransactionId;
-                }
-                if (txnId != null)
-                {
-                    return BaseDataStreamMarshaller.ToString(txnId);
-                }
-                return null;
-            }
-        }
-        
-        public object GetObjectProperty(string name)
-        {
-            return propertyHelper.GetObjectProperty(this, name);
-        }
-        
-        public void SetObjectProperty(string name, object value)
-        {
-            propertyHelper.SetObjectProperty(this, name, value);
-        }
-        
-        // MarshallAware interface
-        
-        public override bool IsMarshallAware()
-        {
-            return true;
-        }
-        
-        public virtual void BeforeMarshall(OpenWireFormat wireFormat)
-        {
-            MarshalledProperties = null;
-            if (properties != null)
-            {
-                MarshalledProperties = properties.Marshal();
-            }
-        }
-        
-        public virtual void AfterMarshall(OpenWireFormat wireFormat)
-        {
-        }
-        
-        public virtual void BeforeUnmarshall(OpenWireFormat wireFormat)
-        {
-        }
-        
-        public virtual void AfterUnmarshall(OpenWireFormat wireFormat)
-        {
-        }
-        
-        public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data)
-        {
-        }
-        
-        public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat)
-        {
-            return null;
-        }
-        
-    }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using ActiveMQ.OpenWire;
+using JMS;
+
+
+namespace ActiveMQ.Commands
+{
+	public delegate void AcknowledgeHandler(ActiveMQMessage message);
+}
+
+namespace ActiveMQ.Commands
+{
+	public class ActiveMQMessage : Message, IMessage, MarshallAware
+    {
+        public const byte ID_ActiveMQMessage = 23;
+        
+        protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
+        
+        private PrimitiveMap properties;
+        
+        public event AcknowledgeHandler Acknowledger;
+        
+        public static ActiveMQMessage Transform(IMessage message)
+        {
+            return (ActiveMQMessage) message;
+        }
+        
+        // TODO generate Equals method
+        // TODO generate GetHashCode method
+        
+        
+        public override byte GetDataStructureType()
+        {
+            return ID_ActiveMQMessage;
+        }
+        
+        public void Acknowledge()
+        {
+            if (Acknowledger == null)
+			{
+                throw new JMSException("No Acknowledger has been associated with this message: " + this);
+			}
+            else
+			{
+                Acknowledger(this);
+            }
+        }
+        
+        
+        // Properties
+        
+        public IPrimitiveMap Properties
+        {
+            get {
+                if (properties == null)
+                {
+                    properties = PrimitiveMap.Unmarshal(MarshalledProperties);
+                }
+                return properties;
+            }
+        }
+        
+        public IDestination FromDestination
+        {
+            get { return Destination; }
+            set { this.Destination = ActiveMQDestination.Transform(value); }
+        }
+        
+        
+        // IMessage interface
+        
+        // JMS headers
+        
+        /// <summary>
+        /// The correlation ID used to correlate messages with conversations or long running business processes
+        /// </summary>
+        public string JMSCorrelationID
+        {
+            get {
+                return CorrelationId;
+            }
+            set {
+                CorrelationId = value;
+            }
+        }
+        
+        /// <summary>
+        /// The destination of the message
+        /// </summary>
+        public IDestination JMSDestination
+        {
+            get {
+                return OriginalDestination;
+            }
+        }
+        
+        /// <summary>
+        /// The time in milliseconds that this message should expire in
+        /// </summary>
+        public long JMSExpiration
+        {
+            get {
+                return Expiration;
+            }
+            set {
+                Expiration = value;
+            }
+        }
+        
+        /// <summary>
+        /// The message ID which is set by the provider
+        /// </summary>
+        public string JMSMessageId
+        {
+            get {
+                return BaseDataStreamMarshaller.ToString(MessageId);
+            }
+        }
+        
+        /// <summary>
+        /// Whether or not this message is persistent
+        /// </summary>
+        public bool JMSPersistent
+        {
+            get {
+                return Persistent;
+            }
+            set {
+                Persistent = value;
+            }
+        }
+        
+        /// <summary>
+        /// The Priority on this message
+        /// </summary>
+        public byte JMSPriority
+        {
+            get {
+                return Priority;
+            }
+            set {
+                Priority = value;
+            }
+        }
+        
+        /// <summary>
+        /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
+        /// </summary>
+        public bool JMSRedelivered
+        {
+            get {
+                return RedeliveryCounter > 0;
+            }
+        }
+        
+        
+        /// <summary>
+        /// The destination that the consumer of this message should send replies to
+        /// </summary>
+        public IDestination JMSReplyTo
+        {
+            get {
+                return ReplyTo;
+            }
+            set {
+                ReplyTo = ActiveMQDestination.Transform(value);
+            }
+        }
+        
+        
+        /// <summary>
+        /// The timestamp the broker added to the message
+        /// </summary>
+        public long JMSTimestamp
+        {
+            get {
+                return Timestamp;
+            }
+        }
+        
+        /// <summary>
+        /// The type name of this message
+        /// </summary>
+        public string JMSType
+        {
+            get {
+                return Type;
+            }
+            set {
+                Type = value;
+            }
+        }
+        
+        
+        // JMS Extension headers
+        
+        /// <summary>
+        /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
+        /// </summary>
+        public int JMSXDeliveryCount
+        {
+            get {
+                return RedeliveryCounter + 1;
+            }
+        }
+        
+        
+        /// <summary>
+        /// The Message Group ID used to group messages together to the same consumer for the same group ID value
+        /// </summary>
+        public string JMSXGroupID
+        {
+            get {
+                return GroupID;
+            }
+            set {
+                GroupID = value;
+            }
+        }
+        /// <summary>
+        /// The Message Group Sequence counter to indicate the position in a group
+        /// </summary>
+        public int JMSXGroupSeq
+        {
+            get {
+                return GroupSequence;
+            }
+            set {
+                GroupSequence = value;
+            }
+        }
+        
+        /// <summary>
+        /// Returns the ID of the producers transaction
+        /// </summary>
+        public string JMSXProducerTXID
+        {
+            get {
+                TransactionId txnId = OriginalTransactionId;
+                if (txnId == null)
+                {
+                    txnId = TransactionId;
+                }
+                if (txnId != null)
+                {
+                    return BaseDataStreamMarshaller.ToString(txnId);
+                }
+                return null;
+            }
+        }
+        
+        public object GetObjectProperty(string name)
+        {
+            return propertyHelper.GetObjectProperty(this, name);
+        }
+        
+        public void SetObjectProperty(string name, object value)
+        {
+            propertyHelper.SetObjectProperty(this, name, value);
+        }
+        
+        // MarshallAware interface
+        public override bool IsMarshallAware()
+        {
+            return true;
+        }
+        
+        public override void BeforeMarshall(OpenWireFormat wireFormat)
+        {
+            MarshalledProperties = null;
+            if (properties != null)
+            {
+                MarshalledProperties = properties.Marshal();
+            }
+        }
+        
+        
+    }
+}
+

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

@@ -1,55 +1,56 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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 ActiveMQObjectMessage
-    //
-    //
-    //  NOTE!: 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 ActiveMQObjectMessage : ActiveMQMessage
-    {
-        public const byte ID_ActiveMQObjectMessage = 26;
-    			
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_ActiveMQObjectMessage;
-        }
-
-
-        // 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;
+using JMS;
+
+namespace ActiveMQ.Commands
+{
+    //
+    //  Marshalling code for Open Wire Format for ActiveMQObjectMessage
+    //
+    //
+    //  NOTE!: 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 ActiveMQObjectMessage : ActiveMQMessage
+    {
+        public const byte ID_ActiveMQObjectMessage = 26;
+    			
+
+		public override string ToString() {
+            return GetType().Name + "["
+                + " ]";
+
+		}
+	
+
+
+        public override byte GetDataStructureType() {
+            return ID_ActiveMQObjectMessage;
+        }
+
+
+        // Properties
+
+    }
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace ActiveMQ.Commands
+{
+	public interface BooleanExpression
+	{
+	}
+}

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

@@ -1,85 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,95 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,85 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,95 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,105 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,167 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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;
-        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
-                + " 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 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,63 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,63 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,63 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,95 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,63 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,55 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,63 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,103 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,63 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,79 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,55 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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
-    {
-        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,95 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT 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; }            
        }

    }
}