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 [14/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/FlushCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/FlushCommandMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/FlushCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/FlushCommandMarshaller.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 FlushCommand
+ *
+ *  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,67 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for FlushCommand
-  /// </summary>
-  class FlushCommandMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new FlushCommand();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return FlushCommand.ID_FlushCommand;
-    }
-
-    // 
-    // 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) {
-        FlushCommand info = (FlushCommand)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for FlushCommand
+    /// </summary>
+    class FlushCommandMarshaller : BaseCommandMarshaller
     {
-        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);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new FlushCommand();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return FlushCommand.ID_FLUSHCOMMAND;
+        }
+
+        // 
+        // 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/IntegerResponseMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/IntegerResponseMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/IntegerResponseMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/IntegerResponseMarshaller.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 IntegerResponse
+ *
+ *  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,79 +35,81 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for IntegerResponse
-  /// </summary>
-  class IntegerResponseMarshaller : ResponseMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new IntegerResponse();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for IntegerResponse
+    /// </summary>
+    class IntegerResponseMarshaller : ResponseMarshaller
     {
-        return IntegerResponse.ID_IntegerResponse;
-    }
-
-    // 
-    // 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);
-
-        IntegerResponse info = (IntegerResponse)o;
-        info.Result = dataIn.ReadInt32();
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        IntegerResponse info = (IntegerResponse)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, 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);
-
-        IntegerResponse info = (IntegerResponse)o;
-        dataOut.Write(info.Result);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        IntegerResponse info = (IntegerResponse)o;
-        info.Result = dataIn.ReadInt32();
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        IntegerResponse info = (IntegerResponse)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        dataOut.Write(info.Result);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new IntegerResponse();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return IntegerResponse.ID_INTEGERRESPONSE;
+        }
+
+        // 
+        // 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);
+
+            IntegerResponse info = (IntegerResponse)o;
+            info.Result = dataIn.ReadInt32();
+        }
+
+        //
+        // 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 + 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);
+
+            IntegerResponse info = (IntegerResponse)o;
+            dataOut.Write(info.Result);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            IntegerResponse info = (IntegerResponse)o;
+            info.Result = dataIn.ReadInt32();
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            IntegerResponse info = (IntegerResponse)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            dataOut.Write(info.Result);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalQueueAckMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalQueueAckMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalQueueAckMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalQueueAckMarshaller.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 JournalQueueAck
+ *
+ *  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,85 +35,88 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for JournalQueueAck
-  /// </summary>
-  class JournalQueueAckMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new JournalQueueAck();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for JournalQueueAck
+    /// </summary>
+    class JournalQueueAckMarshaller : BaseDataStreamMarshaller
     {
-        return JournalQueueAck.ID_JournalQueueAck;
-    }
-
-    // 
-    // 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);
-
-        JournalQueueAck info = (JournalQueueAck)o;
-        info.Destination = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageAck = (MessageAck) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-
-    }
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new JournalQueueAck();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return JournalQueueAck.ID_JOURNALQUEUEACK;
+        }
+
+        // 
+        // 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);
+
+            JournalQueueAck info = (JournalQueueAck)o;
+            info.Destination = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.MessageAck = (MessageAck) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            JournalQueueAck info = (JournalQueueAck)o;
 
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        JournalQueueAck info = (JournalQueueAck)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
+            int rc = base.TightMarshal1(wireFormat, o, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Destination, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageAck, 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);
-
-        JournalQueueAck info = (JournalQueueAck)o;
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageAck, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        JournalQueueAck info = (JournalQueueAck)o;
-        info.Destination = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.MessageAck = (MessageAck) LooseUnmarshalNestedObject(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        JournalQueueAck info = (JournalQueueAck)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageAck, dataOut);
+            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);
+
+            JournalQueueAck info = (JournalQueueAck)o;
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageAck, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            JournalQueueAck info = (JournalQueueAck)o;
+            info.Destination = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.MessageAck = (MessageAck) LooseUnmarshalNestedObject(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            JournalQueueAck info = (JournalQueueAck)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageAck, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTopicAckMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTopicAckMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTopicAckMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTopicAckMarshaller.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 JournalTopicAck
+ *
+ *  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,105 +35,108 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for JournalTopicAck
-  /// </summary>
-  class JournalTopicAckMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new JournalTopicAck();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for JournalTopicAck
+    /// </summary>
+    class JournalTopicAckMarshaller : BaseDataStreamMarshaller
     {
-        return JournalTopicAck.ID_JournalTopicAck;
-    }
-
-    // 
-    // 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);
-
-        JournalTopicAck info = (JournalTopicAck)o;
-        info.Destination = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.SubscritionName = TightUnmarshalString(dataIn, bs);
-        info.ClientId = TightUnmarshalString(dataIn, bs);
-        info.TransactionId = (TransactionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-
-    }
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new JournalTopicAck();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return JournalTopicAck.ID_JOURNALTOPICACK;
+        }
+
+        // 
+        // 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);
+
+            JournalTopicAck info = (JournalTopicAck)o;
+            info.Destination = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.MessageSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.SubscritionName = TightUnmarshalString(dataIn, bs);
+            info.ClientId = TightUnmarshalString(dataIn, bs);
+            info.TransactionId = (TransactionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            JournalTopicAck info = (JournalTopicAck)o;
 
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        JournalTopicAck info = (JournalTopicAck)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
+            int rc = base.TightMarshal1(wireFormat, o, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Destination, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
-        rc += TightMarshalLong1(wireFormat, info.MessageSequenceId, bs);
-        rc += TightMarshalString1(info.SubscritionName, bs);
-        rc += TightMarshalString1(info.ClientId, bs);
+            rc += TightMarshalLong1(wireFormat, info.MessageSequenceId, bs);
+            rc += TightMarshalString1(info.SubscritionName, bs);
+            rc += TightMarshalString1(info.ClientId, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.TransactionId, 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);
-
-        JournalTopicAck info = (JournalTopicAck)o;
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
-        TightMarshalLong2(wireFormat, info.MessageSequenceId, dataOut, bs);
-        TightMarshalString2(info.SubscritionName, dataOut, bs);
-        TightMarshalString2(info.ClientId, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        JournalTopicAck info = (JournalTopicAck)o;
-        info.Destination = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.MessageSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
-        info.SubscritionName = LooseUnmarshalString(dataIn);
-        info.ClientId = LooseUnmarshalString(dataIn);
-        info.TransactionId = (TransactionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        JournalTopicAck info = (JournalTopicAck)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
-        LooseMarshalLong(wireFormat, info.MessageSequenceId, dataOut);
-        LooseMarshalString(info.SubscritionName, dataOut);
-        LooseMarshalString(info.ClientId, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+            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);
+
+            JournalTopicAck info = (JournalTopicAck)o;
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
+            TightMarshalLong2(wireFormat, info.MessageSequenceId, dataOut, bs);
+            TightMarshalString2(info.SubscritionName, dataOut, bs);
+            TightMarshalString2(info.ClientId, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            JournalTopicAck info = (JournalTopicAck)o;
+            info.Destination = (ActiveMQDestination) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.MessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.MessageSequenceId = LooseUnmarshalLong(wireFormat, dataIn);
+            info.SubscritionName = LooseUnmarshalString(dataIn);
+            info.ClientId = LooseUnmarshalString(dataIn);
+            info.TransactionId = (TransactionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            JournalTopicAck info = (JournalTopicAck)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.MessageId, dataOut);
+            LooseMarshalLong(wireFormat, info.MessageSequenceId, dataOut);
+            LooseMarshalString(info.SubscritionName, dataOut);
+            LooseMarshalString(info.ClientId, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTraceMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTraceMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTraceMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTraceMarshaller.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 JournalTrace
+ *
+ *  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,80 +35,83 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for JournalTrace
-  /// </summary>
-  class JournalTraceMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new JournalTrace();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for JournalTrace
+    /// </summary>
+    class JournalTraceMarshaller : BaseDataStreamMarshaller
     {
-        return JournalTrace.ID_JournalTrace;
-    }
-
-    // 
-    // 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);
-
-        JournalTrace info = (JournalTrace)o;
-        info.Message = TightUnmarshalString(dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        JournalTrace info = (JournalTrace)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalString1(info.Message, 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);
-
-        JournalTrace info = (JournalTrace)o;
-        TightMarshalString2(info.Message, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        JournalTrace info = (JournalTrace)o;
-        info.Message = LooseUnmarshalString(dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        JournalTrace info = (JournalTrace)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalString(info.Message, dataOut);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new JournalTrace();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return JournalTrace.ID_JOURNALTRACE;
+        }
+
+        // 
+        // 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);
+
+            JournalTrace info = (JournalTrace)o;
+            info.Message = TightUnmarshalString(dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            JournalTrace info = (JournalTrace)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalString1(info.Message, 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);
+
+            JournalTrace info = (JournalTrace)o;
+            TightMarshalString2(info.Message, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            JournalTrace info = (JournalTrace)o;
+            info.Message = LooseUnmarshalString(dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            JournalTrace info = (JournalTrace)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalString(info.Message, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTransactionMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTransactionMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTransactionMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/JournalTransactionMarshaller.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 JournalTransaction
+ *
+ *  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,89 +35,92 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for JournalTransaction
-  /// </summary>
-  class JournalTransactionMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new JournalTransaction();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for JournalTransaction
+    /// </summary>
+    class JournalTransactionMarshaller : BaseDataStreamMarshaller
     {
-        return JournalTransaction.ID_JournalTransaction;
-    }
-
-    // 
-    // 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);
-
-        JournalTransaction info = (JournalTransaction)o;
-        info.TransactionId = (TransactionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.Type = dataIn.ReadByte();
-        info.WasPrepared = bs.ReadBoolean();
-
-    }
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new JournalTransaction();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return JournalTransaction.ID_JOURNALTRANSACTION;
+        }
+
+        // 
+        // 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);
+
+            JournalTransaction info = (JournalTransaction)o;
+            info.TransactionId = (TransactionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.Type = dataIn.ReadByte();
+            info.WasPrepared = bs.ReadBoolean();
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            JournalTransaction info = (JournalTransaction)o;
 
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        JournalTransaction info = (JournalTransaction)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
+            int rc = base.TightMarshal1(wireFormat, o, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
-        bs.WriteBoolean(info.WasPrepared);
-
-        return rc + 1;
-    }
-
-    // 
-    // 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);
-
-        JournalTransaction info = (JournalTransaction)o;
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
-        dataOut.Write(info.Type);
-        bs.ReadBoolean();
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        JournalTransaction info = (JournalTransaction)o;
-        info.TransactionId = (TransactionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.Type = dataIn.ReadByte();
-        info.WasPrepared = dataIn.ReadBoolean();
-
-    }
+            bs.WriteBoolean(info.WasPrepared);
 
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        JournalTransaction info = (JournalTransaction)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
-        dataOut.Write(info.Type);
-        dataOut.Write(info.WasPrepared);
+            return rc + 1;
+        }
 
+        // 
+        // 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);
+
+            JournalTransaction info = (JournalTransaction)o;
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
+            dataOut.Write(info.Type);
+            bs.ReadBoolean();
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            JournalTransaction info = (JournalTransaction)o;
+            info.TransactionId = (TransactionId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.Type = dataIn.ReadByte();
+            info.WasPrepared = dataIn.ReadBoolean();
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            JournalTransaction info = (JournalTransaction)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+            dataOut.Write(info.Type);
+            dataOut.Write(info.WasPrepared);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/KeepAliveInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/KeepAliveInfoMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/KeepAliveInfoMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/KeepAliveInfoMarshaller.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 KeepAliveInfo
+ *
+ *  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,67 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for KeepAliveInfo
-  /// </summary>
-  class KeepAliveInfoMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new KeepAliveInfo();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return KeepAliveInfo.ID_KeepAliveInfo;
-    }
-
-    // 
-    // 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) {
-        KeepAliveInfo info = (KeepAliveInfo)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for KeepAliveInfo
+    /// </summary>
+    class KeepAliveInfoMarshaller : BaseCommandMarshaller
     {
-        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);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new KeepAliveInfo();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return KeepAliveInfo.ID_KEEPALIVEINFO;
+        }
+
+        // 
+        // 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/LastPartialCommandMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/LastPartialCommandMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/LastPartialCommandMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/LastPartialCommandMarshaller.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 LastPartialCommand
+ *
+ *  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,67 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for LastPartialCommand
-  /// </summary>
-  class LastPartialCommandMarshaller : PartialCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new LastPartialCommand();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return LastPartialCommand.ID_LastPartialCommand;
-    }
-
-    // 
-    // 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) {
-        LastPartialCommand info = (LastPartialCommand)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for LastPartialCommand
+    /// </summary>
+    class LastPartialCommandMarshaller : PartialCommandMarshaller
     {
-        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);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new LastPartialCommand();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return LastPartialCommand.ID_LASTPARTIALCOMMAND;
+        }
+
+        // 
+        // 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/LocalTransactionIdMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/LocalTransactionIdMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/LocalTransactionIdMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/LocalTransactionIdMarshaller.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 LocalTransactionId
+ *
+ *  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,85 +35,88 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for LocalTransactionId
-  /// </summary>
-  class LocalTransactionIdMarshaller : TransactionIdMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for LocalTransactionId
+    /// </summary>
+    class LocalTransactionIdMarshaller : TransactionIdMarshaller
     {
-        return new LocalTransactionId();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return LocalTransactionId.ID_LocalTransactionId;
-    }
-
-    // 
-    // 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);
-
-        LocalTransactionId info = (LocalTransactionId)o;
-        info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        LocalTransactionId info = (LocalTransactionId)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalLong1(wireFormat, info.Value, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, 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);
-
-        LocalTransactionId info = (LocalTransactionId)o;
-        TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        LocalTransactionId info = (LocalTransactionId)o;
-        info.Value = LooseUnmarshalLong(wireFormat, dataIn);
-        info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        LocalTransactionId info = (LocalTransactionId)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalLong(wireFormat, info.Value, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
-
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new LocalTransactionId();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return LocalTransactionId.ID_LOCALTRANSACTIONID;
+        }
+
+        // 
+        // 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);
+
+            LocalTransactionId info = (LocalTransactionId)o;
+            info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
+            info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            LocalTransactionId info = (LocalTransactionId)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalLong1(wireFormat, info.Value, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, 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);
+
+            LocalTransactionId info = (LocalTransactionId)o;
+            TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            LocalTransactionId info = (LocalTransactionId)o;
+            info.Value = LooseUnmarshalLong(wireFormat, dataIn);
+            info.ConnectionId = (ConnectionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            LocalTransactionId info = (LocalTransactionId)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalLong(wireFormat, info.Value, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConnectionId, dataOut);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MarshallerFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MarshallerFactory.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MarshallerFactory.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MarshallerFactory.cs Thu Jul 30 19:06:34 2009
@@ -14,12 +14,15 @@
  * See the License for the specific language governing permissions and
  * 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
-//
+/*
+ *
+ *  MarshallerFactory code for OpenWire Protocol Version 2
+ *
+ *  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,14 +34,21 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-	/// <summary>
-	/// Used to create marshallers for a specific version of the wire protocol
-	/// </summary>
+    /// <summary>
+    ///  Used to create marshallers for a specific version of the OpenWire protocol.
+    ///  Each non-abstract DataStructure object has a registered Marshaller that is
+    ///  created and added to the OpenWireFormat objects format collection.
+    /// </summary>
     public class MarshallerFactory : IMarshallerFactory
     {
+        /// <summery>
+        ///  Adds the Marshallers for this version of the OpenWire protocol to the 
+        ///  Collection of Marshallers stored in the OpenWireFormat class.
+        /// </summery>
         public void configure(OpenWireFormat format) 
         {
             format.clearMarshallers();
+            format.addMarshaller(new ActiveMQBlobMessageMarshaller());
             format.addMarshaller(new ActiveMQBytesMessageMarshaller());
             format.addMarshaller(new ActiveMQMapMessageMarshaller());
             format.addMarshaller(new ActiveMQMessageMarshaller());
@@ -80,6 +90,7 @@
             format.addMarshaller(new MessagePullMarshaller());
             format.addMarshaller(new NetworkBridgeFilterMarshaller());
             format.addMarshaller(new PartialCommandMarshaller());
+            format.addMarshaller(new ProducerAckMarshaller());
             format.addMarshaller(new ProducerIdMarshaller());
             format.addMarshaller(new ProducerInfoMarshaller());
             format.addMarshaller(new RemoveInfoMarshaller());
@@ -93,7 +104,6 @@
             format.addMarshaller(new TransactionInfoMarshaller());
             format.addMarshaller(new WireFormatInfoMarshaller());
             format.addMarshaller(new XATransactionIdMarshaller());
-
-    	}
+        }
     }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageAckMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageAckMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageAckMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageAckMarshaller.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 MessageAck
+ *
+ *  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,108 +35,111 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for MessageAck
-  /// </summary>
-  class MessageAckMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new MessageAck();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for MessageAck
+    /// </summary>
+    class MessageAckMarshaller : BaseCommandMarshaller
     {
-        return MessageAck.ID_MessageAck;
-    }
-
-    // 
-    // 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);
-
-        MessageAck info = (MessageAck)o;
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.TransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.AckType = dataIn.ReadByte();
-        info.FirstMessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.LastMessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageCount = dataIn.ReadInt32();
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        MessageAck info = (MessageAck)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new MessageAck();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return MessageAck.ID_MESSAGEACK;
+        }
+
+        // 
+        // 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);
+
+            MessageAck info = (MessageAck)o;
+            info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.TransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.AckType = dataIn.ReadByte();
+            info.FirstMessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.LastMessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.MessageCount = dataIn.ReadInt32();
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            MessageAck info = (MessageAck)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.FirstMessageId, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.LastMessageId, bs);
 
-        return rc + 5;
-    }
-
-    // 
-    // 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);
-
-        MessageAck info = (MessageAck)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
-        dataOut.Write(info.AckType);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.FirstMessageId, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.LastMessageId, dataOut, bs);
-        dataOut.Write(info.MessageCount);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        MessageAck info = (MessageAck)o;
-        info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.AckType = dataIn.ReadByte();
-        info.FirstMessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.LastMessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.MessageCount = dataIn.ReadInt32();
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        MessageAck info = (MessageAck)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
-        dataOut.Write(info.AckType);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.FirstMessageId, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.LastMessageId, dataOut);
-        dataOut.Write(info.MessageCount);
+            return rc + 5;
+        }
 
+        // 
+        // 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);
+
+            MessageAck info = (MessageAck)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+            dataOut.Write(info.AckType);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.FirstMessageId, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.LastMessageId, dataOut, bs);
+            dataOut.Write(info.MessageCount);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            MessageAck info = (MessageAck)o;
+            info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.TransactionId = (TransactionId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.AckType = dataIn.ReadByte();
+            info.FirstMessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.LastMessageId = (MessageId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.MessageCount = dataIn.ReadInt32();
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            MessageAck info = (MessageAck)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.TransactionId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+            dataOut.Write(info.AckType);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.FirstMessageId, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.LastMessageId, dataOut);
+            dataOut.Write(info.MessageCount);
+        }
     }
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V2/MessageDispatchMarshaller.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 MessageDispatch
+ *
+ *  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,94 +35,97 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V2
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for MessageDispatch
-  /// </summary>
-  class MessageDispatchMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new MessageDispatch();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for MessageDispatch
+    /// </summary>
+    class MessageDispatchMarshaller : BaseCommandMarshaller
     {
-        return MessageDispatch.ID_MessageDispatch;
-    }
-
-    // 
-    // 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);
-
-        MessageDispatch info = (MessageDispatch)o;
-        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Message = (Message) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.RedeliveryCounter = dataIn.ReadInt32();
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        MessageDispatch info = (MessageDispatch)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new MessageDispatch();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return MessageDispatch.ID_MESSAGEDISPATCH;
+        }
+
+        // 
+        // 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);
+
+            MessageDispatch info = (MessageDispatch)o;
+            info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+            info.Message = (Message) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+            info.RedeliveryCounter = dataIn.ReadInt32();
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            MessageDispatch info = (MessageDispatch)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+            rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Message, 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);
-
-        MessageDispatch info = (MessageDispatch)o;
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
-        TightMarshalNestedObject2(wireFormat, (DataStructure)info.Message, dataOut, bs);
-        dataOut.Write(info.RedeliveryCounter);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        MessageDispatch info = (MessageDispatch)o;
-        info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
-        info.Message = (Message) LooseUnmarshalNestedObject(wireFormat, dataIn);
-        info.RedeliveryCounter = dataIn.ReadInt32();
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        MessageDispatch info = (MessageDispatch)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
-        LooseMarshalNestedObject(wireFormat, (DataStructure)info.Message, dataOut);
-        dataOut.Write(info.RedeliveryCounter);
+            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);
+
+            MessageDispatch info = (MessageDispatch)o;
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+            TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+            TightMarshalNestedObject2(wireFormat, (DataStructure)info.Message, dataOut, bs);
+            dataOut.Write(info.RedeliveryCounter);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            MessageDispatch info = (MessageDispatch)o;
+            info.ConsumerId = (ConsumerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Destination = (ActiveMQDestination) LooseUnmarshalCachedObject(wireFormat, dataIn);
+            info.Message = (Message) LooseUnmarshalNestedObject(wireFormat, dataIn);
+            info.RedeliveryCounter = dataIn.ReadInt32();
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            MessageDispatch info = (MessageDispatch)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+            LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut);
+            LooseMarshalNestedObject(wireFormat, (DataStructure)info.Message, dataOut);
+            dataOut.Write(info.RedeliveryCounter);
+        }
     }
-  }
 }