Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionIdMarshaller.cs URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionIdMarshaller.cs?rev=366552&r1=366551&r2=366552&view=diff ============================================================================== --- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionIdMarshaller.cs (original) +++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionIdMarshaller.cs Fri Jan 6 11:20:21 2006 @@ -20,19 +20,18 @@ public class TransactionIdMarshaller : AbstractCommandMarshaller { + public override Command CreateCommand() { return new TransactionId(); } public override void BuildCommand(Command command, BinaryReader dataIn) { base.BuildCommand(command, dataIn); - TransactionId info = (TransactionId) command; } public override void WriteCommand(Command command, BinaryWriter dataOut) { base.WriteCommand(command, dataOut); - TransactionId info = (TransactionId) command; } }
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=366552&r1=366551&r2=366552&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 Fri Jan 6 11:20:21 2006 @@ -20,25 +20,28 @@ public class TransactionInfoMarshaller : AbstractCommandMarshaller { + public override Command CreateCommand() { return new TransactionInfo(); } public override void BuildCommand(Command command, BinaryReader dataIn) { base.BuildCommand(command, dataIn); + TransactionInfo info = (TransactionInfo) command; - info.setConnectionId((org.apache.activemq.command.ConnectionId) readObject(dataIn)); - info.setTransactionId((org.apache.activemq.command.TransactionId) readObject(dataIn)); - info.setType(dataIn.readByte()); + info.ConnectionId = ReadConnectionId(dataIn); + info.TransactionId = ReadTransactionId(dataIn); + info.Type = dataIn.ReadByte(); } public override void WriteCommand(Command command, BinaryWriter dataOut) { base.WriteCommand(command, dataOut); + TransactionInfo info = (TransactionInfo) command; - writeObject(info.getConnectionId(), dataOut); - writeObject(info.getTransactionId(), dataOut); - dataOut.writeByte(info.getType()); + WriteConnectionId(info.ConnectionId, dataOut); + WriteTransactionId(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=366552&r1=366551&r2=366552&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 Fri Jan 6 11:20:21 2006 @@ -20,25 +20,28 @@ public class WireFormatInfoMarshaller : AbstractCommandMarshaller { + public override Command CreateCommand() { return new WireFormatInfo(); } public override void BuildCommand(Command command, BinaryReader dataIn) { base.BuildCommand(command, dataIn); + WireFormatInfo info = (WireFormatInfo) command; - info.setMagic((byte[]) readObject(dataIn)); - info.setVersion(dataIn.readInt()); - info.setOptions(dataIn.readInt()); + info.Magic = Readbyte[](dataIn); + info.Version = dataIn.ReadInt32(); + info.Options = dataIn.ReadInt32(); } public override void WriteCommand(Command command, BinaryWriter dataOut) { base.WriteCommand(command, dataOut); + WireFormatInfo info = (WireFormatInfo) command; - writeObject(info.getMagic(), dataOut); - dataOut.writeInt(info.getVersion()); - dataOut.writeInt(info.getOptions()); + Writebyte[](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=366552&r1=366551&r2=366552&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 Fri Jan 6 11:20:21 2006 @@ -20,25 +20,28 @@ public class XATransactionIdMarshaller : AbstractCommandMarshaller { + public override Command CreateCommand() { return new XATransactionId(); } public override void BuildCommand(Command command, BinaryReader dataIn) { base.BuildCommand(command, dataIn); + XATransactionId info = (XATransactionId) command; - info.setFormatId(dataIn.readInt()); - info.setGlobalTransactionId((byte[]) readObject(dataIn)); - info.setBranchQualifier((byte[]) readObject(dataIn)); + info.FormatId = dataIn.ReadInt32(); + info.GlobalTransactionId = Readbyte[](dataIn); + info.BranchQualifier = Readbyte[](dataIn); } public override void WriteCommand(Command command, BinaryWriter dataOut) { base.WriteCommand(command, dataOut); + XATransactionId info = (XATransactionId) command; - dataOut.writeInt(info.getFormatId()); - writeObject(info.getGlobalTransactionId(), dataOut); - writeObject(info.getBranchQualifier(), dataOut); + dataOut.Write(info.FormatId); + Writebyte[](info.GlobalTransactionId, dataOut); + Writebyte[](info.BranchQualifier, dataOut); } } Copied: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Queue.cs (from r366543, incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Queue.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Queue.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs&r1=366543&r2=366552&rev=366552&view=diff ============================================================================== --- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQQueue.cs (original) +++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Queue.cs Fri Jan 6 11:20:21 2006 @@ -1,13 +1,14 @@ using System; +using OpenWire.Core.Commands; namespace OpenWire.Core { /// <summary> - /// Summary description for ActiveMQQueue. + /// Summary description for Queue. /// </summary> - public class ActiveMQQueue : ActiveMQDestination { - public ActiveMQQueue() : base(){} - public ActiveMQQueue(String name) : base(name){} + public class Queue : Destination { + public Queue() : base(){} + public Queue(String name) : base(name){} public String GetQueueName() { return base.GetPhysicalName(); Copied: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Topic.cs (from r366543, incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Topic.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Topic.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs&r1=366543&r2=366552&rev=366552&view=diff ============================================================================== --- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/ActiveMQTopic.cs (original) +++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Topic.cs Fri Jan 6 11:20:21 2006 @@ -1,14 +1,15 @@ using System; +using OpenWire.Core.Commands; namespace OpenWire.Core { /// <summary> - /// Summary description for ActiveMQTopic. + /// Summary description for Topic. /// </summary> - public class ActiveMQTopic : ActiveMQDestination + public class Topic : Destination { - public ActiveMQTopic(): base() {} - public ActiveMQTopic(String name):base(name){} + public Topic(): base() {} + public Topic(String name):base(name){} public String GetTopicName() {
