You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/07/30 21:06:44 UTC

svn commit: r799407 [15/29] - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp: ./ Commands/ OpenWire/ OpenWire/V1/ OpenWire/V2/ OpenWire/V3/ OpenWire/V4/ OpenWire/V5/ State/ Transport/

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchNotificationMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchNotificationMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchNotificationMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchNotificationMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for MessageDispatchNotification
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,95 +35,98 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for MessageDispatchNotification
-  /// </summary>
-  class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new MessageDispatchNotification();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for MessageDispatchNotification
+    /// </summary>
+    class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
     {
-        return MessageDispatchNotification.ID_MessageDispatchNotification;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
-        rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new MessageDispatchNotification();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return MessageDispatchNotification.ID_MESSAGEDISPATCHNOTIFICATION;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            MessageDispatchNotification info = (MessageDispatchNotification)o;
+            info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            MessageDispatchNotification info = (MessageDispatchNotification)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+            rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
 
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.DeliverySequenceId = LooseUnmarshalLong(wireFormat, dataIn);
-        info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalLong(wireFormat, info.DeliverySequenceId, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+            return rc + 0;
+        }
 
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            MessageDispatchNotification info = (MessageDispatchNotification)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            MessageDispatchNotification info = (MessageDispatchNotification)o;
+            info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.DeliverySequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+            info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            MessageDispatchNotification info = (MessageDispatchNotification)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalLong(wireFormat, info.DeliverySequenceId, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageIdMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageIdMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for MessageId
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,90 +35,93 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for MessageId
-  /// </summary>
-  class MessageIdMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for MessageId
+    /// </summary>
+    class MessageIdMarshaller : BaseDataStreamMarshaller
     {
-        return new MessageId();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return MessageId.ID_MessageId;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        MessageId info = (MessageId)o;
-        info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.ProducerSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.BrokerSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        MessageId info = (MessageId)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
-        rc += TightMarshalLong1(wireFormat, info.ProducerSequenceId, bs);
-        rc += TightMarshalLong1(wireFormat, info.BrokerSequenceId, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        MessageId info = (MessageId)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.ProducerSequenceId, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.BrokerSequenceId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        MessageId info = (MessageId)o;
-        info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.ProducerSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
-        info.BrokerSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        MessageId info = (MessageId)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
-        LooseMarshalLong(wireFormat, info.ProducerSequenceId, dataOut);
-        LooseMarshalLong(wireFormat, info.BrokerSequenceId, dataOut);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new MessageId();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return MessageId.ID_MESSAGEID;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            MessageId info = (MessageId)o;
+            info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.ProducerSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.BrokerSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            MessageId info = (MessageId)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
+            rc += TightMarshalLong1(wireFormat, info.ProducerSequenceId, bs);
+            rc += TightMarshalLong1(wireFormat, info.BrokerSequenceId, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            MessageId info = (MessageId)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.ProducerSequenceId, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.BrokerSequenceId, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            MessageId info = (MessageId)o;
+            info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.ProducerSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+            info.BrokerSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            MessageId info = (MessageId)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
+            LooseMarshalLong(wireFormat, info.ProducerSequenceId, dataOut);
+            LooseMarshalLong(wireFormat, info.BrokerSequenceId, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for Message
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,229 +35,228 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for Message
-  /// </summary>
-  abstract class MessageMarshaller : BaseCommandMarshaller
-  {
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for Message
+    /// </summary>
+    abstract class MessageMarshaller : BaseCommandMarshaller
     {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
-        Message info = (Message)o;
-        info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.TransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.OriginalDestination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.OriginalTransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.GroupID = TightUnmarshalString(dataIn, bs);
-        info.GroupSequence = dataIn.ReadInt32();
-        info.CorrelationId = TightUnmarshalString(dataIn, bs);
-        info.Persistent = bs.ReadBoolean();
-        info.Expiration = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.Priority = dataIn.ReadByte();
-        info.ReplyTo = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.Timestamp = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.Type = TightUnmarshalString(dataIn, bs);
-        info.Content = ReadBytes(dataIn, bs.ReadBoolean());
-        info.MarshalledProperties = ReadBytes(dataIn, bs.ReadBoolean());
-        info.DataStructure = (DataStructure) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.TargetConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Compressed = bs.ReadBoolean();
-        info.RedeliveryCounter = dataIn.ReadInt32();
-
-        if (bs.ReadBoolean()) {
-            short size = dataIn.ReadInt16();
-            BrokerId[] value = new BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            Message info = (Message)o;
+            info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.TransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.OriginalDestination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.OriginalTransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.GroupID = TightUnmarshalString(dataIn, bs);
+            info.GroupSequence = dataIn.ReadInt32();
+            info.CorrelationId = TightUnmarshalString(dataIn, bs);
+            info.Persistent = bs.ReadBoolean();
+            info.Expiration = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.Priority = dataIn.ReadByte();
+            info.ReplyTo = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.Timestamp = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.Type = TightUnmarshalString(dataIn, bs);
+            info.Content = ReadBytes(dataIn, bs.ReadBoolean());
+            info.MarshalledProperties = ReadBytes(dataIn, bs.ReadBoolean());
+            info.DataStructure = (DataStructure) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.TargetConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Compressed = bs.ReadBoolean();
+            info.RedeliveryCounter = dataIn.ReadInt32();
+
+            if (bs.ReadBoolean()) {
+                short size = dataIn.ReadInt16();
+                BrokerId[] value = new BrokerId[size];
+                for( int i=0; i < size; i++ ) {
+                    value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
+                }
+                info.BrokerPath = value;
             }
-            info.BrokerPath = value;
-        }
-        else {
-            info.BrokerPath = null;
-        }
-        info.Arrival = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.UserID = TightUnmarshalString(dataIn, bs);
-        info.RecievedByDFBridge = bs.ReadBoolean();
-        info.Droppable = bs.ReadBoolean();
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        Message info = (Message)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalDestination, bs);
+            else {
+                info.BrokerPath = null;
+            }
+            info.Arrival = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.UserID = TightUnmarshalString(dataIn, bs);
+            info.RecievedByDFBridge = bs.ReadBoolean();
+            info.Droppable = bs.ReadBoolean();
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            Message info = (Message)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalDestination, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalTransactionId, bs);
-        rc += TightMarshalString1(info.GroupID, bs);
-        rc += TightMarshalString1(info.CorrelationId, bs);
-        bs.WriteBoolean(info.Persistent);
-        rc += TightMarshalLong1(wireFormat, info.Expiration, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalTransactionId, bs);
+            rc += TightMarshalString1(info.GroupID, bs);
+            rc += TightMarshalString1(info.CorrelationId, bs);
+            bs.WriteBoolean(info.Persistent);
+            rc += TightMarshalLong1(wireFormat, info.Expiration, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ReplyTo, bs);
-        rc += TightMarshalLong1(wireFormat, info.Timestamp, bs);
-        rc += TightMarshalString1(info.Type, bs);
-        bs.WriteBoolean(info.Content!=null);
-        rc += info.Content==null ? 0 : info.Content.Length+4;
-        bs.WriteBoolean(info.MarshalledProperties!=null);
-        rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4;
+            rc += TightMarshalLong1(wireFormat, info.Timestamp, bs);
+            rc += TightMarshalString1(info.Type, bs);
+            bs.WriteBoolean(info.Content!=null);
+            rc += info.Content==null ? 0 : info.Content.Length+4;
+            bs.WriteBoolean(info.MarshalledProperties!=null);
+            rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4;
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.DataStructure, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TargetConsumerId, bs);
-        bs.WriteBoolean(info.Compressed);
-        rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
-        rc += TightMarshalLong1(wireFormat, info.Arrival, bs);
-        rc += TightMarshalString1(info.UserID, bs);
-        bs.WriteBoolean(info.RecievedByDFBridge);
-        bs.WriteBoolean(info.Droppable);
-
-        return rc + 9;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        Message info = (Message)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalDestination, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut, bs);
-        TightMarshalString2(info.GroupID, dataOut, bs);
-        dataOut.Write(info.GroupSequence);
-        TightMarshalString2(info.CorrelationId, dataOut, bs);
-        bs.ReadBoolean();
-        TightMarshalLong2(wireFormat, info.Expiration, dataOut, bs);
-        dataOut.Write(info.Priority);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.ReplyTo, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.Timestamp, dataOut, bs);
-        TightMarshalString2(info.Type, dataOut, bs);
-        if(bs.ReadBoolean()) {
-           dataOut.Write(info.Content.Length);
-           dataOut.Write(info.Content);
-        }
-        if(bs.ReadBoolean()) {
-           dataOut.Write(info.MarshalledProperties.Length);
-           dataOut.Write(info.MarshalledProperties);
-        }
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.DataStructure, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.TargetConsumerId, dataOut, bs);
-        bs.ReadBoolean();
-        dataOut.Write(info.RedeliveryCounter);
-        TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.Arrival, dataOut, bs);
-        TightMarshalString2(info.UserID, dataOut, bs);
-        bs.ReadBoolean();
-        bs.ReadBoolean();
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        Message info = (Message)o;
-        info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.OriginalDestination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.OriginalTransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.GroupID = LooseUnmarshalString(dataIn);
-        info.GroupSequence = dataIn.ReadInt32();
-        info.CorrelationId = LooseUnmarshalString(dataIn);
-        info.Persistent = dataIn.ReadBoolean();
-        info.Expiration = LooseUnmarshalLong(wireFormat, dataIn);
-        info.Priority = dataIn.ReadByte();
-        info.ReplyTo = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.Timestamp = LooseUnmarshalLong(wireFormat, dataIn);
-        info.Type = LooseUnmarshalString(dataIn);
-        info.Content = ReadBytes(dataIn, dataIn.ReadBoolean());
-        info.MarshalledProperties = ReadBytes(dataIn, dataIn.ReadBoolean());
-        info.DataStructure = (DataStructure) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.TargetConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Compressed = dataIn.ReadBoolean();
-        info.RedeliveryCounter = dataIn.ReadInt32();
-
-        if (dataIn.ReadBoolean()) {
-            short size = dataIn.ReadInt16();
-            BrokerId[] value = new BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TargetConsumerId, bs);
+            bs.WriteBoolean(info.Compressed);
+            rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
+            rc += TightMarshalLong1(wireFormat, info.Arrival, bs);
+            rc += TightMarshalString1(info.UserID, bs);
+            bs.WriteBoolean(info.RecievedByDFBridge);
+            bs.WriteBoolean(info.Droppable);
+
+            return rc + 9;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            Message info = (Message)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalDestination, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut, bs);
+            TightMarshalString2(info.GroupID, dataOut, bs);
+            dataOut.Write(info.GroupSequence);
+            TightMarshalString2(info.CorrelationId, dataOut, bs);
+            bs.ReadBoolean();
+            TightMarshalLong2(wireFormat, info.Expiration, dataOut, bs);
+            dataOut.Write(info.Priority);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.ReplyTo, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.Timestamp, dataOut, bs);
+            TightMarshalString2(info.Type, dataOut, bs);
+            if(bs.ReadBoolean()) {
+                dataOut.Write(info.Content.Length);
+                dataOut.Write(info.Content);
             }
-            info.BrokerPath = value;
-        }
-        else {
-            info.BrokerPath = null;
-        }
-        info.Arrival = LooseUnmarshalLong(wireFormat, dataIn);
-        info.UserID = LooseUnmarshalString(dataIn);
-        info.RecievedByDFBridge = dataIn.ReadBoolean();
-        info.Droppable = dataIn.ReadBoolean();
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        Message info = (Message)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.OriginalDestination, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut);
-        LooseMarshalString(info.GroupID, dataOut);
-        dataOut.Write(info.GroupSequence);
-        LooseMarshalString(info.CorrelationId, dataOut);
-        dataOut.Write(info.Persistent);
-        LooseMarshalLong(wireFormat, info.Expiration, dataOut);
-        dataOut.Write(info.Priority);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.ReplyTo, dataOut);
-        LooseMarshalLong(wireFormat, info.Timestamp, dataOut);
-        LooseMarshalString(info.Type, dataOut);
-        dataOut.Write(info.Content!=null);
-        if(info.Content!=null) {
-           dataOut.Write(info.Content.Length);
-           dataOut.Write(info.Content);
-        }
-        dataOut.Write(info.MarshalledProperties!=null);
-        if(info.MarshalledProperties!=null) {
-           dataOut.Write(info.MarshalledProperties.Length);
-           dataOut.Write(info.MarshalledProperties);
+            if(bs.ReadBoolean()) {
+                dataOut.Write(info.MarshalledProperties.Length);
+                dataOut.Write(info.MarshalledProperties);
+            }
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.DataStructure, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.TargetConsumerId, dataOut, bs);
+            bs.ReadBoolean();
+            dataOut.Write(info.RedeliveryCounter);
+            TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.Arrival, dataOut, bs);
+            TightMarshalString2(info.UserID, dataOut, bs);
+            bs.ReadBoolean();
+            bs.ReadBoolean();
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            Message info = (Message)o;
+            info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.OriginalDestination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.OriginalTransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.GroupID = LooseUnmarshalString(dataIn);
+            info.GroupSequence = dataIn.ReadInt32();
+            info.CorrelationId = LooseUnmarshalString(dataIn);
+            info.Persistent = dataIn.ReadBoolean();
+            info.Expiration = LooseUnmarshalLong(wireFormat, dataIn);
+            info.Priority = dataIn.ReadByte();
+            info.ReplyTo = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.Timestamp = LooseUnmarshalLong(wireFormat, dataIn);
+            info.Type = LooseUnmarshalString(dataIn);
+            info.Content = ReadBytes(dataIn, dataIn.ReadBoolean());
+            info.MarshalledProperties = ReadBytes(dataIn, dataIn.ReadBoolean());
+            info.DataStructure = (DataStructure) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.TargetConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Compressed = dataIn.ReadBoolean();
+            info.RedeliveryCounter = dataIn.ReadInt32();
+
+            if (dataIn.ReadBoolean()) {
+                short size = dataIn.ReadInt16();
+                BrokerId[] value = new BrokerId[size];
+                for( int i=0; i < size; i++ ) {
+                    value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+                }
+                info.BrokerPath = value;
+            }
+            else {
+                info.BrokerPath = null;
+            }
+            info.Arrival = LooseUnmarshalLong(wireFormat, dataIn);
+            info.UserID = LooseUnmarshalString(dataIn);
+            info.RecievedByDFBridge = dataIn.ReadBoolean();
+            info.Droppable = dataIn.ReadBoolean();
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            Message info = (Message)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.OriginalDestination, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut);
+            LooseMarshalString(info.GroupID, dataOut);
+            dataOut.Write(info.GroupSequence);
+            LooseMarshalString(info.CorrelationId, dataOut);
+            dataOut.Write(info.Persistent);
+            LooseMarshalLong(wireFormat, info.Expiration, dataOut);
+            dataOut.Write(info.Priority);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.ReplyTo, dataOut);
+            LooseMarshalLong(wireFormat, info.Timestamp, dataOut);
+            LooseMarshalString(info.Type, dataOut);
+            dataOut.Write(info.Content!=null);
+            if(info.Content!=null) {
+               dataOut.Write(info.Content.Length);
+               dataOut.Write(info.Content);
+            }
+            dataOut.Write(info.MarshalledProperties!=null);
+            if(info.MarshalledProperties!=null) {
+               dataOut.Write(info.MarshalledProperties.Length);
+               dataOut.Write(info.MarshalledProperties);
+            }
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.DataStructure, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.TargetConsumerId, dataOut);
+            dataOut.Write(info.Compressed);
+            dataOut.Write(info.RedeliveryCounter);
+            LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+            LooseMarshalLong(wireFormat, info.Arrival, dataOut);
+            LooseMarshalString(info.UserID, dataOut);
+            dataOut.Write(info.RecievedByDFBridge);
+            dataOut.Write(info.Droppable);
         }
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.DataStructure, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.TargetConsumerId, dataOut);
-        dataOut.Write(info.Compressed);
-        dataOut.Write(info.RedeliveryCounter);
-        LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
-        LooseMarshalLong(wireFormat, info.Arrival, dataOut);
-        LooseMarshalString(info.UserID, dataOut);
-        dataOut.Write(info.RecievedByDFBridge);
-        dataOut.Write(info.Droppable);
-
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessagePullMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessagePullMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessagePullMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessagePullMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for MessagePull
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,90 +35,93 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for MessagePull
-  /// </summary>
-  class MessagePullMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for MessagePull
+    /// </summary>
+    class MessagePullMarshaller : BaseCommandMarshaller
     {
-        return new MessagePull();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return MessagePull.ID_MessagePull;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        MessagePull info = (MessagePull)o;
-        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Timeout = TightUnmarshalLong(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        MessagePull info = (MessagePull)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
-        rc += TightMarshalLong1(wireFormat, info.Timeout, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        MessagePull info = (MessagePull)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.Timeout, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        MessagePull info = (MessagePull)o;
-        info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Timeout = LooseUnmarshalLong(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        MessagePull info = (MessagePull)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalLong(wireFormat, info.Timeout, dataOut);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new MessagePull();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return MessagePull.ID_MESSAGEPULL;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            MessagePull info = (MessagePull)o;
+            info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Timeout = TightUnmarshalLong(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            MessagePull info = (MessagePull)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+            rc += TightMarshalLong1(wireFormat, info.Timeout, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            MessagePull info = (MessagePull)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.Timeout, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            MessagePull info = (MessagePull)o;
+            info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Timeout = LooseUnmarshalLong(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            MessagePull info = (MessagePull)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalLong(wireFormat, info.Timeout, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/NetworkBridgeFilterMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for NetworkBridgeFilter
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,84 +35,87 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for NetworkBridgeFilter
-  /// </summary>
-  class NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new NetworkBridgeFilter();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return NetworkBridgeFilter.ID_NetworkBridgeFilter;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-        info.NetworkTTL = dataIn.ReadInt32();
-        info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
-
-        return rc + 4;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-        dataOut.Write(info.NetworkTTL);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for NetworkBridgeFilter
+    /// </summary>
+    class NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller
     {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-        info.NetworkTTL = dataIn.ReadInt32();
-        info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        dataOut.Write(info.NetworkTTL);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new NetworkBridgeFilter();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return NetworkBridgeFilter.ID_NETWORKBRIDGEFILTER;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+            info.NetworkTTL = dataIn.ReadInt32();
+            info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
+
+            return rc + 4;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+            dataOut.Write(info.NetworkTTL);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+            info.NetworkTTL = dataIn.ReadInt32();
+            info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            NetworkBridgeFilter info = (NetworkBridgeFilter)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            dataOut.Write(info.NetworkTTL);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/PartialCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/PartialCommandMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/PartialCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/PartialCommandMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for PartialCommand
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,92 +35,95 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for PartialCommand
-  /// </summary>
-  class PartialCommandMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new PartialCommand();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for PartialCommand
+    /// </summary>
+    class PartialCommandMarshaller : BaseDataStreamMarshaller
     {
-        return PartialCommand.ID_PartialCommand;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        PartialCommand info = (PartialCommand)o;
-        info.CommandId = dataIn.ReadInt32();
-        info.Data = ReadBytes(dataIn, bs.ReadBoolean());
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        PartialCommand info = (PartialCommand)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        bs.WriteBoolean(info.Data!=null);
-        rc += info.Data==null ? 0 : info.Data.Length+4;
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new PartialCommand();
+        }
 
-        return rc + 4;
-    }
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return PartialCommand.ID_PARTIALCOMMAND;
+        }
 
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        PartialCommand info = (PartialCommand)o;
-        dataOut.Write(info.CommandId);
-        if(bs.ReadBoolean()) {
-           dataOut.Write(info.Data.Length);
-           dataOut.Write(info.Data);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            PartialCommand info = (PartialCommand)o;
+            info.CommandId = dataIn.ReadInt32();
+            info.Data = ReadBytes(dataIn, bs.ReadBoolean());
         }
 
-    }
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            PartialCommand info = (PartialCommand)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            bs.WriteBoolean(info.Data!=null);
+            rc += info.Data==null ? 0 : info.Data.Length+4;
 
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        PartialCommand info = (PartialCommand)o;
-        info.CommandId = dataIn.ReadInt32();
-        info.Data = ReadBytes(dataIn, dataIn.ReadBoolean());
+            return rc + 4;
+        }
 
-    }
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            PartialCommand info = (PartialCommand)o;
+            dataOut.Write(info.CommandId);
+            if(bs.ReadBoolean()) {
+                dataOut.Write(info.Data.Length);
+                dataOut.Write(info.Data);
+            }
+        }
 
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        PartialCommand info = (PartialCommand)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        dataOut.Write(info.CommandId);
-        dataOut.Write(info.Data!=null);
-        if(info.Data!=null) {
-           dataOut.Write(info.Data.Length);
-           dataOut.Write(info.Data);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            PartialCommand info = (PartialCommand)o;
+            info.CommandId = dataIn.ReadInt32();
+            info.Data = ReadBytes(dataIn, dataIn.ReadBoolean());
         }
 
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            PartialCommand info = (PartialCommand)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            dataOut.Write(info.CommandId);
+            dataOut.Write(info.Data!=null);
+            if(info.Data!=null) {
+               dataOut.Write(info.Data.Length);
+               dataOut.Write(info.Data);
+            }
+        }
     }
-  }
 }

Added: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerAckMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerAckMarshaller.cs?rev=799407&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerAckMarshaller.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerAckMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ProducerAck
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
+
+using System;
+using System.Collections;
+using System.IO;
+
+using Apache.NMS.ActiveMQ.Commands;
+using Apache.NMS.ActiveMQ.OpenWire;
+using Apache.NMS.ActiveMQ.OpenWire.V2;
+
+namespace Apache.NMS.ActiveMQ.OpenWire.V2
+{
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ProducerAck
+    /// </summary>
+    class ProducerAckMarshaller : BaseCommandMarshaller
+    {
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ProducerAck();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ProducerAck.ID_PRODUCERACK;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
+    }
+}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerIdMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerIdMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for ProducerId
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,90 +35,93 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ProducerId
-  /// </summary>
-  class ProducerIdMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ProducerId
+    /// </summary>
+    class ProducerIdMarshaller : BaseDataStreamMarshaller
     {
-        return new ProducerId();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return ProducerId.ID_ProducerId;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        ProducerId info = (ProducerId)o;
-        info.ConnectionId = TightUnmarshalString(dataIn, bs);
-        info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.SessionId = TightUnmarshalLong(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ProducerId info = (ProducerId)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalString1(info.ConnectionId, bs);
-        rc += TightMarshalLong1(wireFormat, info.Value, bs);
-        rc += TightMarshalLong1(wireFormat, info.SessionId, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        ProducerId info = (ProducerId)o;
-        TightMarshalString2(info.ConnectionId, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.SessionId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        ProducerId info = (ProducerId)o;
-        info.ConnectionId = LooseUnmarshalString(dataIn);
-        info.Value = LooseUnmarshalLong(wireFormat, dataIn);
-        info.SessionId = LooseUnmarshalLong(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        ProducerId info = (ProducerId)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalString(info.ConnectionId, dataOut);
-        LooseMarshalLong(wireFormat, info.Value, dataOut);
-        LooseMarshalLong(wireFormat, info.SessionId, dataOut);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ProducerId();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ProducerId.ID_PRODUCERID;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            ProducerId info = (ProducerId)o;
+            info.ConnectionId = TightUnmarshalString(dataIn, bs);
+            info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.SessionId = TightUnmarshalLong(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            ProducerId info = (ProducerId)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalString1(info.ConnectionId, bs);
+            rc += TightMarshalLong1(wireFormat, info.Value, bs);
+            rc += TightMarshalLong1(wireFormat, info.SessionId, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            ProducerId info = (ProducerId)o;
+            TightMarshalString2(info.ConnectionId, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.SessionId, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            ProducerId info = (ProducerId)o;
+            info.ConnectionId = LooseUnmarshalString(dataIn);
+            info.Value = LooseUnmarshalLong(wireFormat, dataIn);
+            info.SessionId = LooseUnmarshalLong(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            ProducerId info = (ProducerId)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalString(info.ConnectionId, dataOut);
+            LooseMarshalLong(wireFormat, info.Value, dataOut);
+            LooseMarshalLong(wireFormat, info.SessionId, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerInfoMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/ProducerInfoMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -15,11 +15,15 @@
  * limitations under the License.
  */
 
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
+/*
+ *
+ *  Marshaler code for OpenWire format for ProducerInfo
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,117 +35,120 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ProducerInfo
-  /// </summary>
-  class ProducerInfoMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ProducerInfo
+    /// </summary>
+    class ProducerInfoMarshaller : BaseCommandMarshaller
     {
-        return new ProducerInfo();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return ProducerInfo.ID_ProducerInfo;
-    }
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ProducerInfo();
+        }
 
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ProducerInfo.ID_PRODUCERINFO;
+        }
 
-        ProducerInfo info = (ProducerInfo)o;
-        info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-
-        if (bs.ReadBoolean()) {
-            short size = dataIn.ReadInt16();
-            BrokerId[] value = new BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            ProducerInfo info = (ProducerInfo)o;
+            info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+
+            if (bs.ReadBoolean()) {
+                short size = dataIn.ReadInt16();
+                BrokerId[] value = new BrokerId[size];
+                for( int i=0; i < size; i++ ) {
+                    value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
+                }
+                info.BrokerPath = value;
             }
-            info.BrokerPath = value;
-        }
-        else {
-            info.BrokerPath = null;
+            else {
+                info.BrokerPath = null;
+            }
+            info.DispatchAsync = bs.ReadBoolean();
         }
-        info.DispatchAsync = bs.ReadBoolean();
-
-    }
 
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ProducerInfo info = (ProducerInfo)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
-        rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
-        bs.WriteBoolean(info.DispatchAsync);
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            ProducerInfo info = (ProducerInfo)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+            rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
+            bs.WriteBoolean(info.DispatchAsync);
 
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        ProducerInfo info = (ProducerInfo)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
-        bs.ReadBoolean();
-
-    }
+            return rc + 0;
+        }
 
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            ProducerInfo info = (ProducerInfo)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
+            bs.ReadBoolean();
+        }
 
-        ProducerInfo info = (ProducerInfo)o;
-        info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-
-        if (dataIn.ReadBoolean()) {
-            short size = dataIn.ReadInt16();
-            BrokerId[] value = new BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            ProducerInfo info = (ProducerInfo)o;
+            info.ProducerId = (ProducerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+
+            if (dataIn.ReadBoolean()) {
+                short size = dataIn.ReadInt16();
+                BrokerId[] value = new BrokerId[size];
+                for( int i=0; i < size; i++ ) {
+                    value[i] = (BrokerId) LooseUnmarshalNestedObject(wireFormat,dataIn);
+                }
+                info.BrokerPath = value;
             }
-            info.BrokerPath = value;
-        }
-        else {
-            info.BrokerPath = null;
+            else {
+                info.BrokerPath = null;
+            }
+            info.DispatchAsync = dataIn.ReadBoolean();
         }
-        info.DispatchAsync = dataIn.ReadBoolean();
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        ProducerInfo info = (ProducerInfo)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
-        dataOut.Write(info.DispatchAsync);
 
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            ProducerInfo info = (ProducerInfo)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
+            dataOut.Write(info.DispatchAsync);
+        }
     }
-  }
 }