activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r381926 [8/8] - in /incubator/activemq/trunk: activemq-core/src/gram/java/org/apache/activemq/openwire/tool/ activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/command/ activemq-core/src/main/java/org/apache/acti...
Date Wed, 01 Mar 2006 06:29:57 GMT
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,15 +51,15 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.ConsumerId = (ConsumerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Message = (Message) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.RedeliveryCounter = DataStreamMarshaller.ReadInt(dataIn);
+        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Message = (Message) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.RedeliveryCounter = BaseDataStreamMarshaller.ReadInt(dataIn);
 
     }
 
@@ -67,28 +67,28 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         MessageDispatch info = (MessageDispatch)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-    rc += Marshal1NestedObject(wireFormat, info.Message, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.Message, bs);
     
-        return rc + 1;
+        return rc + 4;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.Message, dataOut, bs);
-    DataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
+    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.Message, dataOut, bs);
+    BaseDataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,15 +51,15 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.ConsumerId = (ConsumerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.DeliverySequenceId = UnmarshalLong(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        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);
 
     }
 
@@ -67,14 +67,14 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         MessageDispatchNotification info = (MessageDispatchNotification)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-    rc += Marshal1Long(wireFormat, info.DeliverySequenceId, bs);
-    rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
 
         return rc + 0;
     }
@@ -82,14 +82,14 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    Marshal2Long(wireFormat, info.DeliverySequenceId, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class MessageIdMarshaller : DataStreamMarshaller
+  public class MessageIdMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,14 +51,14 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.ProducerId = (ProducerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.ProducerSequenceId = UnmarshalLong(wireFormat, dataIn, bs);
-        info.BrokerSequenceId = UnmarshalLong(wireFormat, dataIn, bs);
+        info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ProducerSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.BrokerSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
 
     }
 
@@ -66,13 +66,13 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         MessageId info = (MessageId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
-    rc += Marshal1Long(wireFormat, info.ProducerSequenceId, bs);
-    rc += Marshal1Long(wireFormat, info.BrokerSequenceId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs);
+    rc += TightMarshalLong1(wireFormat, info.ProducerSequenceId, bs);
+    rc += TightMarshalLong1(wireFormat, info.BrokerSequenceId, bs);
 
         return rc + 0;
     }
@@ -80,13 +80,13 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
-    Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
-    Marshal2Long(wireFormat, info.ProducerSequenceId, dataOut, bs);
-    Marshal2Long(wireFormat, info.BrokerSequenceId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.ProducerSequenceId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.BrokerSequenceId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -40,46 +40,46 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         Message info = (Message)o;
-        info.ProducerId = (ProducerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.TransactionId = (TransactionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.OriginalDestination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.OriginalTransactionId = (TransactionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.GroupID = ReadString(dataIn, bs);
-        info.GroupSequence = DataStreamMarshaller.ReadInt(dataIn);
-        info.CorrelationId = ReadString(dataIn, bs);
+        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 = BaseDataStreamMarshaller.ReadInt(dataIn);
+        info.CorrelationId = TightUnmarshalString(dataIn, bs);
         info.Persistent = bs.ReadBoolean();
-        info.Expiration = UnmarshalLong(wireFormat, dataIn, bs);
-        info.Priority = DataStreamMarshaller.ReadByte(dataIn);
-        info.ReplyTo = (ActiveMQDestination) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.Timestamp = UnmarshalLong(wireFormat, dataIn, bs);
-        info.Type = ReadString(dataIn, bs);
+        info.Expiration = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.Priority = BaseDataStreamMarshaller.ReadByte(dataIn);
+        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) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.TargetConsumerId = (ConsumerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.DataStructure = (DataStructure) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.TargetConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
         info.Compressed = bs.ReadBoolean();
-        info.RedeliveryCounter = DataStreamMarshaller.ReadInt(dataIn);
+        info.RedeliveryCounter = BaseDataStreamMarshaller.ReadInt(dataIn);
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             BrokerId[] value = new BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.BrokerPath = value;
         }
         else {
             info.BrokerPath = null;
         }
-        info.Arrival = UnmarshalLong(wireFormat, dataIn, bs);
-        info.UserID = ReadString(dataIn, bs);
+        info.Arrival = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.UserID = TightUnmarshalString(dataIn, bs);
         info.RecievedByDFBridge = bs.ReadBoolean();
 
     }
@@ -88,75 +88,75 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         Message info = (Message)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-    rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.OriginalDestination, bs);
-    rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.OriginalTransactionId, bs);
-    rc += WriteString(info.GroupID, bs);
-        rc += WriteString(info.CorrelationId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.OriginalDestination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.OriginalTransactionId, bs);
+    rc += TightMarshalString1(info.GroupID, bs);
+        rc += TightMarshalString1(info.CorrelationId, bs);
     bs.WriteBoolean(info.Persistent);
-    rc += Marshal1Long(wireFormat, info.Expiration, bs);
-        rc += Marshal1NestedObject(wireFormat, info.ReplyTo, bs);
-    rc += Marshal1Long(wireFormat, info.Timestamp, bs);
-    rc += WriteString(info.Type, bs);
+    rc += TightMarshalLong1(wireFormat, info.Expiration, bs);
+        rc += TightMarshalNestedObject1(wireFormat, 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 += Marshal1NestedObject(wireFormat, info.DataStructure, bs);
-    rc += Marshal1CachedObject(wireFormat, info.TargetConsumerId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.DataStructure, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.TargetConsumerId, bs);
     bs.WriteBoolean(info.Compressed);
-        rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
-    rc += Marshal1Long(wireFormat, info.Arrival, bs);
-    rc += WriteString(info.UserID, bs);
+        rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
+    rc += TightMarshalLong1(wireFormat, info.Arrival, bs);
+    rc += TightMarshalString1(info.UserID, bs);
     bs.WriteBoolean(info.RecievedByDFBridge);
 
-        return rc + 3;
+        return rc + 9;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         Message info = (Message)o;
-    Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.OriginalDestination, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.OriginalTransactionId, dataOut, bs);
-    WriteString(info.GroupID, dataOut, bs);
-    DataStreamMarshaller.WriteInt(info.GroupSequence, dataOut);
-    WriteString(info.CorrelationId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.OriginalDestination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.OriginalTransactionId, dataOut, bs);
+    TightMarshalString2(info.GroupID, dataOut, bs);
+    BaseDataStreamMarshaller.WriteInt(info.GroupSequence, dataOut);
+    TightMarshalString2(info.CorrelationId, dataOut, bs);
     bs.ReadBoolean();
-    Marshal2Long(wireFormat, info.Expiration, dataOut, bs);
-    DataStreamMarshaller.WriteByte(info.Priority, dataOut);
-    Marshal2NestedObject(wireFormat, info.ReplyTo, dataOut, bs);
-    Marshal2Long(wireFormat, info.Timestamp, dataOut, bs);
-    WriteString(info.Type, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Expiration, dataOut, bs);
+    BaseDataStreamMarshaller.WriteByte(info.Priority, dataOut);
+    TightMarshalNestedObject2(wireFormat, info.ReplyTo, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Timestamp, dataOut, bs);
+    TightMarshalString2(info.Type, dataOut, bs);
     if(bs.ReadBoolean()) {
-           DataStreamMarshaller.WriteInt(info.Content.Length, dataOut);
+           BaseDataStreamMarshaller.WriteInt(info.Content.Length, dataOut);
            dataOut.Write(info.Content);
         }
     if(bs.ReadBoolean()) {
-           DataStreamMarshaller.WriteInt(info.MarshalledProperties.Length, dataOut);
+           BaseDataStreamMarshaller.WriteInt(info.MarshalledProperties.Length, dataOut);
            dataOut.Write(info.MarshalledProperties);
         }
-    Marshal2NestedObject(wireFormat, info.DataStructure, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.TargetConsumerId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.DataStructure, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.TargetConsumerId, dataOut, bs);
     bs.ReadBoolean();
-    DataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
-    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
-    Marshal2Long(wireFormat, info.Arrival, dataOut, bs);
-    WriteString(info.UserID, dataOut, bs);
+    BaseDataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
+    TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Arrival, dataOut, bs);
+    TightMarshalString2(info.UserID, dataOut, bs);
     bs.ReadBoolean();
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class ProducerIdMarshaller : DataStreamMarshaller
+  public class ProducerIdMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,14 +51,14 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ProducerId info = (ProducerId)o;
-        info.ConnectionId = ReadString(dataIn, bs);
-        info.Value = UnmarshalLong(wireFormat, dataIn, bs);
-        info.SessionId = UnmarshalLong(wireFormat, dataIn, bs);
+        info.ConnectionId = TightUnmarshalString(dataIn, bs);
+        info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.SessionId = TightUnmarshalLong(wireFormat, dataIn, bs);
 
     }
 
@@ -66,13 +66,13 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ProducerId info = (ProducerId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.ConnectionId, bs);
-    rc += Marshal1Long(wireFormat, info.Value, bs);
-    rc += Marshal1Long(wireFormat, info.SessionId, bs);
+        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;
     }
@@ -80,13 +80,13 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerId info = (ProducerId)o;
-    WriteString(info.ConnectionId, dataOut, bs);
-    Marshal2Long(wireFormat, info.Value, dataOut, bs);
-    Marshal2Long(wireFormat, info.SessionId, dataOut, bs);
+    TightMarshalString2(info.ConnectionId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.SessionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,19 +51,19 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.ProducerId = (ProducerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ProducerId = (ProducerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             BrokerId[] value = new BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.BrokerPath = value;
         }
@@ -77,13 +77,13 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ProducerInfo info = (ProducerInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-    rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
 
         return rc + 0;
     }
@@ -91,13 +91,13 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-    Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.ObjectId = (DataStructure) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ObjectId = (DataStructure) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         RemoveInfo info = (RemoveInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ObjectId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ObjectId, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-    Marshal2CachedObject(wireFormat, info.ObjectId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ObjectId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,14 +51,14 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.SubcriptionName = ReadString(dataIn, bs);
-        info.ClientId = ReadString(dataIn, bs);
+        info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.SubcriptionName = TightUnmarshalString(dataIn, bs);
+        info.ClientId = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -66,13 +66,13 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
-    rc += WriteString(info.SubcriptionName, bs);
-    rc += WriteString(info.ClientId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
+    rc += TightMarshalString1(info.SubcriptionName, bs);
+    rc += TightMarshalString1(info.ClientId, bs);
 
         return rc + 0;
     }
@@ -80,13 +80,13 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
-    WriteString(info.SubcriptionName, dataOut, bs);
-    WriteString(info.ClientId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalString2(info.SubcriptionName, dataOut, bs);
+    TightMarshalString2(info.ClientId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         Response info = (Response)o;
-        info.CorrelationId = DataStreamMarshaller.ReadShort(dataIn);
+        info.CorrelationId = BaseDataStreamMarshaller.ReadShort(dataIn);
 
     }
 
@@ -64,22 +64,22 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         Response info = (Response)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
     
-        return rc + 1;
+        return rc + 2;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         Response info = (Response)o;
-    DataStreamMarshaller.WriteShort(info.CorrelationId, dataOut);
+    BaseDataStreamMarshaller.WriteShort(info.CorrelationId, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class SessionIdMarshaller : DataStreamMarshaller
+  public class SessionIdMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,13 +51,13 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         SessionId info = (SessionId)o;
-        info.ConnectionId = ReadString(dataIn, bs);
-        info.Value = UnmarshalLong(wireFormat, dataIn, bs);
+        info.ConnectionId = TightUnmarshalString(dataIn, bs);
+        info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
 
     }
 
@@ -65,12 +65,12 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         SessionId info = (SessionId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.ConnectionId, bs);
-    rc += Marshal1Long(wireFormat, info.Value, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.ConnectionId, bs);
+    rc += TightMarshalLong1(wireFormat, info.Value, bs);
 
         return rc + 0;
     }
@@ -78,12 +78,12 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionId info = (SessionId)o;
-    WriteString(info.ConnectionId, dataOut, bs);
-    Marshal2Long(wireFormat, info.Value, dataOut, bs);
+    TightMarshalString2(info.ConnectionId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         SessionInfo info = (SessionInfo)o;
-        info.SessionId = (SessionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.SessionId = (SessionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         SessionInfo info = (SessionInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.SessionId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.SessionId, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionInfo info = (SessionInfo)o;
-    Marshal2CachedObject(wireFormat, info.SessionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.SessionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ShutdownInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ShutdownInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ShutdownInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ShutdownInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ShutdownInfo info = (ShutdownInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class SubscriptionInfoMarshaller : DataStreamMarshaller
+  public class SubscriptionInfoMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,15 +51,15 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         SubscriptionInfo info = (SubscriptionInfo)o;
-        info.ClientId = ReadString(dataIn, bs);
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Selector = ReadString(dataIn, bs);
-        info.SubcriptionName = ReadString(dataIn, bs);
+        info.ClientId = TightUnmarshalString(dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Selector = TightUnmarshalString(dataIn, bs);
+        info.SubcriptionName = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -67,14 +67,14 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         SubscriptionInfo info = (SubscriptionInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.ClientId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-    rc += WriteString(info.Selector, bs);
-    rc += WriteString(info.SubcriptionName, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.ClientId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalString1(info.Selector, bs);
+    rc += TightMarshalString1(info.SubcriptionName, bs);
 
         return rc + 0;
     }
@@ -82,14 +82,14 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         SubscriptionInfo info = (SubscriptionInfo)o;
-    WriteString(info.ClientId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    WriteString(info.Selector, dataOut, bs);
-    WriteString(info.SubcriptionName, dataOut, bs);
+    TightMarshalString2(info.ClientId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalString2(info.Selector, dataOut, bs);
+    TightMarshalString2(info.SubcriptionName, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,15 +34,15 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public abstract class TransactionIdMarshaller : DataStreamMarshaller
+  public abstract class TransactionIdMarshaller : BaseDataStreamMarshaller
   {
 
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -50,10 +50,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         TransactionId info = (TransactionId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -61,8 +61,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,14 +51,14 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.TransactionId = (TransactionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Type = DataStreamMarshaller.ReadByte(dataIn);
+        info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.TransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Type = BaseDataStreamMarshaller.ReadByte(dataIn);
 
     }
 
@@ -66,12 +66,12 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         TransactionInfo info = (TransactionInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs);
     
         return rc + 1;
     }
@@ -79,13 +79,13 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
-    DataStreamMarshaller.WriteByte(info.Type, dataOut);
+    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    BaseDataStreamMarshaller.WriteByte(info.Type, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class WireFormatInfoMarshaller : DataStreamMarshaller
+  public class WireFormatInfoMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,17 +51,18 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
         info.Magic = ReadBytes(dataIn, 8);
-        info.Version = DataStreamMarshaller.ReadInt(dataIn);
+        info.Version = BaseDataStreamMarshaller.ReadInt(dataIn);
         info.CacheEnabled = bs.ReadBoolean();
-        info.CompressionEnabled = bs.ReadBoolean();
         info.StackTraceEnabled = bs.ReadBoolean();
         info.TcpNoDelayEnabled = bs.ReadBoolean();
+        info.PrefixPacketSize = bs.ReadBoolean();
+        info.TightEncodingEnabled = bs.ReadBoolean();
 
     }
 
@@ -69,27 +70,29 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         WireFormatInfo info = (WireFormatInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
             bs.WriteBoolean(info.CacheEnabled);
-    bs.WriteBoolean(info.CompressionEnabled);
     bs.WriteBoolean(info.StackTraceEnabled);
     bs.WriteBoolean(info.TcpNoDelayEnabled);
+    bs.WriteBoolean(info.PrefixPacketSize);
+    bs.WriteBoolean(info.TightEncodingEnabled);
 
-        return rc + 9;
+        return rc + 12;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
     dataOut.Write(info.Magic, 0, 8);
-    DataStreamMarshaller.WriteInt(info.Version, dataOut);
+    BaseDataStreamMarshaller.WriteInt(info.Version, dataOut);
+    bs.ReadBoolean();
     bs.ReadBoolean();
     bs.ReadBoolean();
     bs.ReadBoolean();

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         XATransactionId info = (XATransactionId)o;
-        info.FormatId = DataStreamMarshaller.ReadInt(dataIn);
+        info.FormatId = BaseDataStreamMarshaller.ReadInt(dataIn);
         info.GlobalTransactionId = ReadBytes(dataIn, bs.ReadBoolean());
         info.BranchQualifier = ReadBytes(dataIn, bs.ReadBoolean());
 
@@ -66,32 +66,32 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         XATransactionId info = (XATransactionId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
         bs.WriteBoolean(info.GlobalTransactionId!=null);
         rc += info.GlobalTransactionId==null ? 0 : info.GlobalTransactionId.Length+4;
     bs.WriteBoolean(info.BranchQualifier!=null);
         rc += info.BranchQualifier==null ? 0 : info.BranchQualifier.Length+4;
 
-        return rc + 1;
+        return rc + 4;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         XATransactionId info = (XATransactionId)o;
-    DataStreamMarshaller.WriteInt(info.FormatId, dataOut);
+    BaseDataStreamMarshaller.WriteInt(info.FormatId, dataOut);
     if(bs.ReadBoolean()) {
-           DataStreamMarshaller.WriteInt(info.GlobalTransactionId.Length, dataOut);
+           BaseDataStreamMarshaller.WriteInt(info.GlobalTransactionId.Length, dataOut);
            dataOut.Write(info.GlobalTransactionId);
         }
     if(bs.ReadBoolean()) {
-           DataStreamMarshaller.WriteInt(info.BranchQualifier.Length, dataOut);
+           BaseDataStreamMarshaller.WriteInt(info.BranchQualifier.Length, dataOut);
            dataOut.Write(info.BranchQualifier);
         }
 

Modified: incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/EndianTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/EndianTest.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/EndianTest.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/EndianTest.cs Tue Feb 28 22:29:45 2006
@@ -29,13 +29,13 @@
         {
             long value = 0x0102030405060708L;
             
-            long newValue = DataStreamMarshaller.SwitchEndian(value);
+            long newValue = BaseDataStreamMarshaller.SwitchEndian(value);
             
             Console.WriteLine("New value: " + newValue);
             
             Assert.AreEqual(0x0807060504030201L, newValue);
             
-            long actual = DataStreamMarshaller.SwitchEndian(newValue);
+            long actual = BaseDataStreamMarshaller.SwitchEndian(newValue);
             
             Assert.AreEqual(value, actual);
         }
@@ -45,13 +45,13 @@
         {
             int value = 0x12345678;
             
-            int newValue = DataStreamMarshaller.SwitchEndian(value);
+            int newValue = BaseDataStreamMarshaller.SwitchEndian(value);
             
             Console.WriteLine("New value: " + newValue);
             
             Assert.AreEqual(0x78563412, newValue);
             
-            int actual = DataStreamMarshaller.SwitchEndian(newValue);
+            int actual = BaseDataStreamMarshaller.SwitchEndian(newValue);
             
             Assert.AreEqual(value, actual);
         }
@@ -60,13 +60,13 @@
         {
             short value = 0x1234;
             
-            short newValue = DataStreamMarshaller.SwitchEndian(value);
+            short newValue = BaseDataStreamMarshaller.SwitchEndian(value);
             
             Console.WriteLine("New value: " + newValue);
             
             Assert.AreEqual(0x3412, newValue);
             
-            short actual = DataStreamMarshaller.SwitchEndian(newValue);
+            short actual = BaseDataStreamMarshaller.SwitchEndian(newValue);
             
             Assert.AreEqual(value, actual);
         }



Mime
View raw message