activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r366724 [2/2] - in /incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core: ./ Commands/ IO/
Date Sat, 07 Jan 2006 13:48:13 GMT
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataResponseMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataResponseMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataResponseMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             DataResponse info = (DataResponse) command;
-            info.Data = ReadDataStructure(dataIn);
+            info.Data = (DataStructure) CommandMarshallerRegistry.DataStructureMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@
             base.WriteCommand(command, dataOut);
 
             DataResponse info = (DataResponse) command;
-            WriteDataStructure(info.Data, dataOut);
+            CommandMarshallerRegistry.DataStructureMarshaller.WriteCommand(info.Data, dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DestinationInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DestinationInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DestinationInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DestinationInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             DestinationInfo info = (DestinationInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
             info.OperationType = dataIn.ReadByte();
             info.Timeout = dataIn.ReadInt64();
@@ -41,11 +41,11 @@
             base.WriteCommand(command, dataOut);
 
             DestinationInfo info = (DestinationInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId,
dataOut);
             WriteDestination(info.Destination, dataOut);
             dataOut.Write(info.OperationType);
             dataOut.Write(info.Timeout);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ExceptionResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ExceptionResponseMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ExceptionResponseMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ExceptionResponseMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             ExceptionResponse info = (ExceptionResponse) command;
-            info.Exception = ReadThrowable(dataIn);
+            info.Exception = (Throwable) CommandMarshallerRegistry.ThrowableMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@
             base.WriteCommand(command, dataOut);
 
             ExceptionResponse info = (ExceptionResponse) command;
-            WriteThrowable(info.Exception, dataOut);
+            CommandMarshallerRegistry.ThrowableMarshaller.WriteCommand(info.Exception, dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalQueueAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalQueueAckMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalQueueAckMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalQueueAckMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -30,7 +30,7 @@
 
             JournalQueueAck info = (JournalQueueAck) command;
             info.Destination = ReadDestination(dataIn);
-            info.MessageAck = ReadMessageAck(dataIn);
+            info.MessageAck = (MessageAck) CommandMarshallerRegistry.MessageAckMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -39,7 +39,7 @@
 
             JournalQueueAck info = (JournalQueueAck) command;
             WriteDestination(info.Destination, dataOut);
-            WriteMessageAck(info.MessageAck, dataOut);
+            CommandMarshallerRegistry.MessageAckMarshaller.WriteCommand(info.MessageAck,
dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTopicAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTopicAckMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTopicAckMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTopicAckMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -30,11 +30,11 @@
 
             JournalTopicAck info = (JournalTopicAck) command;
             info.Destination = ReadDestination(dataIn);
-            info.MessageId = ReadMessageId(dataIn);
+            info.MessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
             info.MessageSequenceId = dataIn.ReadInt64();
             info.SubscritionName = dataIn.ReadString();
             info.ClientId = dataIn.ReadString();
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -43,11 +43,11 @@
 
             JournalTopicAck info = (JournalTopicAck) command;
             WriteDestination(info.Destination, dataOut);
-            WriteMessageId(info.MessageId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.MessageId, dataOut);
             dataOut.Write(info.MessageSequenceId);
             dataOut.Write(info.SubscritionName);
             dataOut.Write(info.ClientId);
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId,
dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTransactionMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTransactionMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTransactionMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTransactionMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             JournalTransaction info = (JournalTransaction) command;
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.Type = dataIn.ReadByte();
             info.WasPrepared = dataIn.ReadBoolean();
 
@@ -39,7 +39,7 @@
             base.WriteCommand(command, dataOut);
 
             JournalTransaction info = (JournalTransaction) command;
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId,
dataOut);
             dataOut.Write(info.Type);
             dataOut.Write(info.WasPrepared);
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/LocalTransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/LocalTransactionIdMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/LocalTransactionIdMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/LocalTransactionIdMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -30,7 +30,7 @@
 
             LocalTransactionId info = (LocalTransactionId) command;
             info.TransactionId = dataIn.ReadInt64();
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -39,7 +39,7 @@
 
             LocalTransactionId info = (LocalTransactionId) command;
             dataOut.Write(info.TransactionId);
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId,
dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageAckMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageAckMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageAckMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -30,11 +30,11 @@
 
             MessageAck info = (MessageAck) command;
             info.Destination = ReadDestination(dataIn);
-            info.TransactionId = ReadTransactionId(dataIn);
-            info.ConsumerId = ReadConsumerId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
+            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.AckType = dataIn.ReadByte();
-            info.FirstMessageId = ReadMessageId(dataIn);
-            info.LastMessageId = ReadMessageId(dataIn);
+            info.FirstMessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
+            info.LastMessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
             info.MessageCount = dataIn.ReadInt32();
 
         }
@@ -44,11 +44,11 @@
 
             MessageAck info = (MessageAck) command;
             WriteDestination(info.Destination, dataOut);
-            WriteTransactionId(info.TransactionId, dataOut);
-            WriteConsumerId(info.ConsumerId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId,
dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId,
dataOut);
             dataOut.Write(info.AckType);
-            WriteMessageId(info.FirstMessageId, dataOut);
-            WriteMessageId(info.LastMessageId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.FirstMessageId,
dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.LastMessageId,
dataOut);
             dataOut.Write(info.MessageCount);
 
         }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageDispatchMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageDispatchMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageDispatchMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageDispatchMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,9 +29,9 @@
             base.BuildCommand(command, dataIn);
 
             MessageDispatch info = (MessageDispatch) command;
-            info.ConsumerId = ReadConsumerId(dataIn);
+            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
-            info.Message = ReadMessage(dataIn);
+            info.Message = (Message) CommandMarshallerRegistry.MessageMarshaller.ReadCommand(dataIn);
             info.RedeliveryCounter = dataIn.ReadInt32();
 
         }
@@ -40,9 +40,9 @@
             base.WriteCommand(command, dataOut);
 
             MessageDispatch info = (MessageDispatch) command;
-            WriteConsumerId(info.ConsumerId, dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId,
dataOut);
             WriteDestination(info.Destination, dataOut);
-            WriteMessage(info.Message, dataOut);
+            CommandMarshallerRegistry.MessageMarshaller.WriteCommand(info.Message, dataOut);
             dataOut.Write(info.RedeliveryCounter);
 
         }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageIdMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageIdMarshaller.cs Sat
Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             MessageId info = (MessageId) command;
-            info.ProducerId = ReadProducerId(dataIn);
+            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
             info.ProducerSequenceId = dataIn.ReadInt64();
             info.BrokerSequenceId = dataIn.ReadInt64();
 
@@ -39,7 +39,7 @@
             base.WriteCommand(command, dataOut);
 
             MessageId info = (MessageId) command;
-            WriteProducerId(info.ProducerId, dataOut);
+            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId,
dataOut);
             dataOut.Write(info.ProducerSequenceId);
             dataOut.Write(info.BrokerSequenceId);
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageMarshaller.cs Sat
Jan  7 05:47:39 2006
@@ -29,12 +29,12 @@
             base.BuildCommand(command, dataIn);
 
             Message info = (Message) command;
-            info.ProducerId = ReadProducerId(dataIn);
+            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.OriginalDestination = ReadDestination(dataIn);
-            info.MessageId = ReadMessageId(dataIn);
-            info.OriginalTransactionId = ReadTransactionId(dataIn);
+            info.MessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
+            info.OriginalTransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.GroupID = dataIn.ReadString();
             info.GroupSequence = dataIn.ReadInt32();
             info.CorrelationId = dataIn.ReadString();
@@ -44,10 +44,10 @@
             info.ReplyTo = ReadDestination(dataIn);
             info.Timestamp = dataIn.ReadInt64();
             info.Type = dataIn.ReadString();
-            info.Content = ReadByteSequence(dataIn);
-            info.MarshalledProperties = ReadByteSequence(dataIn);
-            info.DataStructure = ReadDataStructure(dataIn);
-            info.TargetConsumerId = ReadConsumerId(dataIn);
+            info.Content = (ByteSequence) CommandMarshallerRegistry.ByteSequenceMarshaller.ReadCommand(dataIn);
+            info.MarshalledProperties = (ByteSequence) CommandMarshallerRegistry.ByteSequenceMarshaller.ReadCommand(dataIn);
+            info.DataStructure = (DataStructure) CommandMarshallerRegistry.DataStructureMarshaller.ReadCommand(dataIn);
+            info.TargetConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.Compressed = dataIn.ReadBoolean();
             info.RedeliveryCounter = dataIn.ReadInt32();
             info.BrokerPath = ReadBrokerIds(dataIn);
@@ -61,12 +61,12 @@
             base.WriteCommand(command, dataOut);
 
             Message info = (Message) command;
-            WriteProducerId(info.ProducerId, dataOut);
+            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId,
dataOut);
             WriteDestination(info.Destination, dataOut);
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId,
dataOut);
             WriteDestination(info.OriginalDestination, dataOut);
-            WriteMessageId(info.MessageId, dataOut);
-            WriteTransactionId(info.OriginalTransactionId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.MessageId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.OriginalTransactionId,
dataOut);
             dataOut.Write(info.GroupID);
             dataOut.Write(info.GroupSequence);
             dataOut.Write(info.CorrelationId);
@@ -76,13 +76,13 @@
             WriteDestination(info.ReplyTo, dataOut);
             dataOut.Write(info.Timestamp);
             dataOut.Write(info.Type);
-            WriteByteSequence(info.Content, dataOut);
-            WriteByteSequence(info.MarshalledProperties, dataOut);
-            WriteDataStructure(info.DataStructure, dataOut);
-            WriteConsumerId(info.TargetConsumerId, dataOut);
+            CommandMarshallerRegistry.ByteSequenceMarshaller.WriteCommand(info.Content, dataOut);
+            CommandMarshallerRegistry.ByteSequenceMarshaller.WriteCommand(info.MarshalledProperties,
dataOut);
+            CommandMarshallerRegistry.DataStructureMarshaller.WriteCommand(info.DataStructure,
dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.TargetConsumerId,
dataOut);
             dataOut.Write(info.Compressed);
             dataOut.Write(info.RedeliveryCounter);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
             dataOut.Write(info.Arrival);
             dataOut.Write(info.UserID);
             dataOut.Write(info.RecievedByDFBridge);

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ProducerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ProducerInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ProducerInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ProducerInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             ProducerInfo info = (ProducerInfo) command;
-            info.ProducerId = ReadProducerId(dataIn);
+            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
             info.BrokerPath = ReadBrokerIds(dataIn);
 
@@ -39,9 +39,9 @@
             base.WriteCommand(command, dataOut);
 
             ProducerInfo info = (ProducerInfo) command;
-            WriteProducerId(info.ProducerId, dataOut);
+            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId,
dataOut);
             WriteDestination(info.Destination, dataOut);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             RemoveInfo info = (RemoveInfo) command;
-            info.ObjectId = ReadDataStructure(dataIn);
+            info.ObjectId = (DataStructure) CommandMarshallerRegistry.DataStructureMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@
             base.WriteCommand(command, dataOut);
 
             RemoveInfo info = (RemoveInfo) command;
-            WriteDataStructure(info.ObjectId, dataOut);
+            CommandMarshallerRegistry.DataStructureMarshaller.WriteCommand(info.ObjectId,
dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveSubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveSubscriptionInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveSubscriptionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveSubscriptionInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
             info.SubcriptionName = dataIn.ReadString();
             info.ClientId = dataIn.ReadString();
 
@@ -39,7 +39,7 @@
             base.WriteCommand(command, dataOut);
 
             RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId,
dataOut);
             dataOut.Write(info.SubcriptionName);
             dataOut.Write(info.ClientId);
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/SessionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/SessionInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/SessionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/SessionInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             SessionInfo info = (SessionInfo) command;
-            info.SessionId = ReadSessionId(dataIn);
+            info.SessionId = (SessionId) CommandMarshallerRegistry.SessionIdMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@
             base.WriteCommand(command, dataOut);
 
             SessionInfo info = (SessionInfo) command;
-            WriteSessionId(info.SessionId, dataOut);
+            CommandMarshallerRegistry.SessionIdMarshaller.WriteCommand(info.SessionId, dataOut);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,8 +29,8 @@
             base.BuildCommand(command, dataIn);
 
             TransactionInfo info = (TransactionInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.Type = dataIn.ReadByte();
 
         }
@@ -39,8 +39,8 @@
             base.WriteCommand(command, dataOut);
 
             TransactionInfo info = (TransactionInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId,
dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId,
dataOut);
             dataOut.Write(info.Type);
 
         }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/WireFormatInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/WireFormatInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/WireFormatInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/WireFormatInfoMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             WireFormatInfo info = (WireFormatInfo) command;
-            info.Magic = Readbyte[](dataIn);
+            info.Magic = ReadBytes(dataIn);
             info.Version = dataIn.ReadInt32();
             info.Options = dataIn.ReadInt32();
 
@@ -39,7 +39,7 @@
             base.WriteCommand(command, dataOut);
 
             WireFormatInfo info = (WireFormatInfo) command;
-            Writebyte[](info.Magic, dataOut);
+            WriteBytes(info.Magic, dataOut);
             dataOut.Write(info.Version);
             dataOut.Write(info.Options);
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/XATransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/XATransactionIdMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/XATransactionIdMarshaller.cs
(original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/XATransactionIdMarshaller.cs
Sat Jan  7 05:47:39 2006
@@ -30,8 +30,8 @@
 
             XATransactionId info = (XATransactionId) command;
             info.FormatId = dataIn.ReadInt32();
-            info.GlobalTransactionId = Readbyte[](dataIn);
-            info.BranchQualifier = Readbyte[](dataIn);
+            info.GlobalTransactionId = ReadBytes(dataIn);
+            info.BranchQualifier = ReadBytes(dataIn);
 
         }
 
@@ -40,8 +40,8 @@
 
             XATransactionId info = (XATransactionId) command;
             dataOut.Write(info.FormatId);
-            Writebyte[](info.GlobalTransactionId, dataOut);
-            Writebyte[](info.BranchQualifier, dataOut);
+            WriteBytes(info.GlobalTransactionId, dataOut);
+            WriteBytes(info.BranchQualifier, dataOut);
 
         }
     }



Mime
View raw message