activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r379827 [4/5] - in /incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client: Commands/ Core/ IO/
Date Wed, 22 Feb 2006 17:45:20 GMT
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for IntegerResponse
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,28 +26,61 @@
 
 namespace OpenWire.Client.IO
 {
-    public class IntegerResponseMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for IntegerResponse
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class IntegerResponseMarshaller : ResponseMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new IntegerResponse();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return IntegerResponse.ID_IntegerResponse;
+    }
 
-        public override Command CreateCommand() {
-            return new IntegerResponse();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        IntegerResponse info = (IntegerResponse)o;
+        info.Result = dataIn.ReadInt32();
 
-            IntegerResponse info = (IntegerResponse) command;
-            info.Result = dataIn.ReadInt32();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        IntegerResponse info = (IntegerResponse)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        
+        return rc + 1;
+    }
+
+    // 
+    // 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);
 
-            IntegerResponse info = (IntegerResponse) command;
-            dataOut.Write(info.Result);
+        IntegerResponse info = (IntegerResponse)o;
+        dataOut.Write((int) info.Result);
 
-        }
     }
+  }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for JournalQueueAck
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,30 +26,65 @@
 
 namespace OpenWire.Client.IO
 {
-    public class JournalQueueAckMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for JournalQueueAck
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class JournalQueueAckMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new JournalQueueAck();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return JournalQueueAck.ID_JournalQueueAck;
+    }
 
-        public override Command CreateCommand() {
-            return new JournalQueueAck();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        JournalQueueAck info = (JournalQueueAck)o;
+        info.Destination = (ActiveMQDestination) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageAck = (MessageAck) UnmarshalNestedObject(wireFormat, dataIn, bs);
 
-            JournalQueueAck info = (JournalQueueAck) command;
-            info.Destination = ReadDestination(dataIn);
-            info.MessageAck = (MessageAck) CommandMarshallerRegistry.MessageAckMarshaller.ReadCommand(dataIn);
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        JournalQueueAck info = (JournalQueueAck)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += Marshal1NestedObject(wireFormat, info.Destination, bs);
+        rc += Marshal1NestedObject(wireFormat, info.MessageAck, bs);
+
+        return rc + 0;
+    }
 
-            JournalQueueAck info = (JournalQueueAck) command;
-            WriteDestination(info.Destination, dataOut);
-            CommandMarshallerRegistry.MessageAckMarshaller.WriteCommand(info.MessageAck, dataOut);
+    // 
+    // 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);
+
+        JournalQueueAck info = (JournalQueueAck)o;
+        Marshal2NestedObject(wireFormat, info.Destination, dataOut, bs);
+        Marshal2NestedObject(wireFormat, info.MessageAck, dataOut, bs);
 
-        }
     }
+  }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for JournalTopicAck
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,38 +26,77 @@
 
 namespace OpenWire.Client.IO
 {
-    public class JournalTopicAckMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for JournalTopicAck
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class JournalTopicAckMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
+    {
+        return new JournalTopicAck();
+    }
+
+    public override byte GetDataStructureType() 
+    {
+        return JournalTopicAck.ID_JournalTopicAck;
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
+
+        JournalTopicAck info = (JournalTopicAck)o;
+        info.Destination = (ActiveMQDestination) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageSequenceId = UnmarshalLong(wireFormat, dataIn, bs);
+        info.SubscritionName = ReadString(dataIn, bs);
+        info.ClientId = ReadString(dataIn, bs);
+        info.TransactionId = (TransactionId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+
+    }
+
 
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        JournalTopicAck info = (JournalTopicAck)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += Marshal1NestedObject(wireFormat, info.Destination, bs);
+        rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
+        rc += Marshal1Long(wireFormat, info.MessageSequenceId, bs);
+        rc += WriteString(info.SubscritionName, bs);
+        rc += WriteString(info.ClientId, bs);
+        rc += Marshal1NestedObject(wireFormat, info.TransactionId, bs);
+
+        return rc + 0;
+    }
 
-        public override Command CreateCommand() {
-            return new JournalTopicAck();
-        }
-
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
-
-            JournalTopicAck info = (JournalTopicAck) command;
-            info.Destination = ReadDestination(dataIn);
-            info.MessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
-            info.MessageSequenceId = dataIn.ReadInt64();
-            info.SubscritionName = dataIn.ReadString();
-            info.ClientId = dataIn.ReadString();
-            info.TransactionId = (TransactionId) CommandMarshallerRegistry.ReadCommand(dataIn);
-
-        }
-
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
-
-            JournalTopicAck info = (JournalTopicAck) command;
-            WriteDestination(info.Destination, dataOut);
-            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.MessageId, dataOut);
-            dataOut.Write(info.MessageSequenceId);
-            dataOut.Write(info.SubscritionName);
-            dataOut.Write(info.ClientId);
-            CommandMarshallerRegistry.WriteCommand(info.TransactionId, dataOut);
+    // 
+    // 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);
+
+        JournalTopicAck info = (JournalTopicAck)o;
+        Marshal2NestedObject(wireFormat, info.Destination, dataOut, bs);
+        Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
+        Marshal2Long(wireFormat, info.MessageSequenceId, dataOut, bs);
+        WriteString(info.SubscritionName, dataOut, bs);
+        WriteString(info.ClientId, dataOut, bs);
+        Marshal2NestedObject(wireFormat, info.TransactionId, dataOut, bs);
 
-        }
     }
+  }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for JournalTrace
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,28 +26,62 @@
 
 namespace OpenWire.Client.IO
 {
-    public class JournalTraceMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for JournalTrace
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class JournalTraceMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new JournalTrace();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return JournalTrace.ID_JournalTrace;
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
+
+        JournalTrace info = (JournalTrace)o;
+        info.Message = ReadString(dataIn, bs);
+
+    }
 
-        public override Command CreateCommand() {
-            return new JournalTrace();
-        }
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        JournalTrace info = (JournalTrace)o;
 
-            JournalTrace info = (JournalTrace) command;
-            info.Message = dataIn.ReadString();
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += WriteString(info.Message, bs);
 
-        }
+        return rc + 0;
+    }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    // 
+    // 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);
 
-            JournalTrace info = (JournalTrace) command;
-            dataOut.Write(info.Message);
+        JournalTrace info = (JournalTrace)o;
+        WriteString(info.Message, dataOut, bs);
 
-        }
     }
+  }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for JournalTransaction
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,32 +26,67 @@
 
 namespace OpenWire.Client.IO
 {
-    public class JournalTransactionMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for JournalTransaction
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class JournalTransactionMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new JournalTransaction();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return JournalTransaction.ID_JournalTransaction;
+    }
 
-        public override Command CreateCommand() {
-            return new JournalTransaction();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        JournalTransaction info = (JournalTransaction)o;
+        info.TransactionId = (TransactionId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Type = dataIn.ReadByte();
+        info.WasPrepared = bs.ReadBoolean();
 
-            JournalTransaction info = (JournalTransaction) command;
-            info.TransactionId = (TransactionId) CommandMarshallerRegistry.ReadCommand(dataIn);
-            info.Type = dataIn.ReadByte();
-            info.WasPrepared = dataIn.ReadBoolean();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        JournalTransaction info = (JournalTransaction)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += Marshal1NestedObject(wireFormat, info.TransactionId, bs);
+                bs.WriteBoolean(info.WasPrepared);
+
+        return rc + 1;
+    }
 
-            JournalTransaction info = (JournalTransaction) command;
-            CommandMarshallerRegistry.WriteCommand(info.TransactionId, dataOut);
-            dataOut.Write(info.Type);
-            dataOut.Write(info.WasPrepared);
+    // 
+    // 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);
+
+        JournalTransaction info = (JournalTransaction)o;
+        Marshal2NestedObject(wireFormat, info.TransactionId, dataOut, bs);
+        dataOut.Write((byte) info.Type);
+        bs.ReadBoolean();
 
-        }
     }
+  }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for KeepAliveInfo
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,22 +26,55 @@
 
 namespace OpenWire.Client.IO
 {
-    public class KeepAliveInfoMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for KeepAliveInfo
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class KeepAliveInfoMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new KeepAliveInfo();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return KeepAliveInfo.ID_KeepAliveInfo;
+    }
 
-        public override Command CreateCommand() {
-            return new KeepAliveInfo();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
+
+    }
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
 
-        }
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        KeepAliveInfo info = (KeepAliveInfo)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+
+        return rc + 0;
+    }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    // 
+    // 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);
 
-        }
     }
+  }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for LocalTransactionId
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,30 +26,65 @@
 
 namespace OpenWire.Client.IO
 {
-    public class LocalTransactionIdMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for LocalTransactionId
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class LocalTransactionIdMarshaller : TransactionIdMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new LocalTransactionId();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return LocalTransactionId.ID_LocalTransactionId;
+    }
 
-        public override Command CreateCommand() {
-            return new LocalTransactionId();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        LocalTransactionId info = (LocalTransactionId)o;
+        info.Value = UnmarshalLong(wireFormat, dataIn, bs);
+        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
 
-            LocalTransactionId info = (LocalTransactionId) command;
-            info.Value = dataIn.ReadInt64();
-            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        LocalTransactionId info = (LocalTransactionId)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += Marshal1Long(wireFormat, info.Value, bs);
+        rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
+
+        return rc + 0;
+    }
 
-            LocalTransactionId info = (LocalTransactionId) command;
-            dataOut.Write(info.Value);
-            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
+    // 
+    // 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);
+
+        LocalTransactionId info = (LocalTransactionId)o;
+        Marshal2Long(wireFormat, info.Value, dataOut, bs);
+        Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
 
-        }
     }
+  }
 }

Added: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MarshallerFactory.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MarshallerFactory.cs?rev=379827&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MarshallerFactory.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MarshallerFactory.cs Wed Feb 22 09:45:12 2006
@@ -0,0 +1,91 @@
+//
+//
+// Copyright 2005-2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Marshalling code for Open Wire Format for ExceptionResponse
+//
+//
+// NOTE!: This file is autogenerated - do not modify!
+//        if you need to make a change, please see the Groovy scripts in the
+//        activemq-openwire module
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using OpenWire.Client;
+using OpenWire.Client.Commands;
+using OpenWire.Client.Core;
+using OpenWire.Client.IO;
+
+namespace OpenWire.Client.IO
+{
+    public class MarshallerFactory
+    {
+        public void configure(OpenWireFormat format) 
+        {
+
+            format.addMarshaller(new MessageIdMarshaller());
+            format.addMarshaller(new BrokerInfoMarshaller());
+            format.addMarshaller(new ActiveMQTempQueueMarshaller());
+            format.addMarshaller(new LocalTransactionIdMarshaller());
+            format.addMarshaller(new RemoveSubscriptionInfoMarshaller());
+            format.addMarshaller(new IntegerResponseMarshaller());
+            format.addMarshaller(new ActiveMQQueueMarshaller());
+            format.addMarshaller(new DestinationInfoMarshaller());
+            format.addMarshaller(new ActiveMQBytesMessageMarshaller());
+            format.addMarshaller(new ShutdownInfoMarshaller());
+            format.addMarshaller(new DataResponseMarshaller());
+            format.addMarshaller(new SessionIdMarshaller());
+            format.addMarshaller(new DataArrayResponseMarshaller());
+            format.addMarshaller(new JournalQueueAckMarshaller());
+            format.addMarshaller(new WireFormatInfoMarshaller());
+            format.addMarshaller(new ResponseMarshaller());
+            format.addMarshaller(new ConnectionErrorMarshaller());
+            format.addMarshaller(new ActiveMQObjectMessageMarshaller());
+            format.addMarshaller(new ConsumerInfoMarshaller());
+            format.addMarshaller(new ActiveMQTempTopicMarshaller());
+            format.addMarshaller(new ConnectionIdMarshaller());
+            format.addMarshaller(new DiscoveryEventMarshaller());
+            format.addMarshaller(new ConnectionInfoMarshaller());
+            format.addMarshaller(new KeepAliveInfoMarshaller());
+            format.addMarshaller(new XATransactionIdMarshaller());
+            format.addMarshaller(new JournalTraceMarshaller());
+            format.addMarshaller(new FlushCommandMarshaller());
+            format.addMarshaller(new ConsumerIdMarshaller());
+            format.addMarshaller(new JournalTopicAckMarshaller());
+            format.addMarshaller(new ActiveMQTextMessageMarshaller());
+            format.addMarshaller(new BrokerIdMarshaller());
+            format.addMarshaller(new MessageDispatchMarshaller());
+            format.addMarshaller(new ProducerInfoMarshaller());
+            format.addMarshaller(new SubscriptionInfoMarshaller());
+            format.addMarshaller(new ActiveMQMapMessageMarshaller());
+            format.addMarshaller(new MessageDispatchNotificationMarshaller());
+            format.addMarshaller(new SessionInfoMarshaller());
+            format.addMarshaller(new ActiveMQMessageMarshaller());
+            format.addMarshaller(new TransactionInfoMarshaller());
+            format.addMarshaller(new ActiveMQStreamMessageMarshaller());
+            format.addMarshaller(new MessageAckMarshaller());
+            format.addMarshaller(new ProducerIdMarshaller());
+            format.addMarshaller(new ActiveMQTopicMarshaller());
+            format.addMarshaller(new JournalTransactionMarshaller());
+            format.addMarshaller(new RemoveInfoMarshaller());
+            format.addMarshaller(new ControlCommandMarshaller());
+            format.addMarshaller(new ExceptionResponseMarshaller());
+    	}
+    }
+}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs?rev=379827&r1=379826&r2=379827&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for MessageAck
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,40 +26,78 @@
 
 namespace OpenWire.Client.IO
 {
-    public class MessageAckMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for MessageAck
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class MessageAckMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new MessageAck();
+    }
+
+    public override byte GetDataStructureType() 
+    {
+        return MessageAck.ID_MessageAck;
+    }
 
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
+
+        MessageAck info = (MessageAck)o;
+        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.TransactionId = (TransactionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ConsumerId = (ConsumerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.AckType = dataIn.ReadByte();
+        info.FirstMessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.LastMessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageCount = dataIn.ReadInt32();
+
+    }
+
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        MessageAck info = (MessageAck)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+        rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
+        rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
+                rc += Marshal1NestedObject(wireFormat, info.FirstMessageId, bs);
+        rc += Marshal1NestedObject(wireFormat, info.LastMessageId, bs);
+        
+        return rc + 2;
+    }
 
-        public override Command CreateCommand() {
-            return new MessageAck();
-        }
-
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
-
-            MessageAck info = (MessageAck) command;
-            info.Destination = ReadDestination(dataIn);
-            info.TransactionId = (TransactionId) CommandMarshallerRegistry.ReadCommand(dataIn);
-            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
-            info.AckType = dataIn.ReadByte();
-            info.FirstMessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
-            info.LastMessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
-            info.MessageCount = dataIn.ReadInt32();
-
-        }
-
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
-
-            MessageAck info = (MessageAck) command;
-            WriteDestination(info.Destination, dataOut);
-            CommandMarshallerRegistry.WriteCommand(info.TransactionId, dataOut);
-            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId, dataOut);
-            dataOut.Write(info.AckType);
-            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.FirstMessageId, dataOut);
-            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.LastMessageId, dataOut);
-            dataOut.Write(info.MessageCount);
+    // 
+    // 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);
+
+        MessageAck info = (MessageAck)o;
+        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+        Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
+        Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
+        dataOut.Write((byte) info.AckType);
+        Marshal2NestedObject(wireFormat, info.FirstMessageId, dataOut, bs);
+        Marshal2NestedObject(wireFormat, info.LastMessageId, dataOut, bs);
+        dataOut.Write((int) info.MessageCount);
 
-        }
     }
+  }
 }

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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for MessageDispatch
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,34 +26,70 @@
 
 namespace OpenWire.Client.IO
 {
-    public class MessageDispatchMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for MessageDispatch
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class MessageDispatchMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new MessageDispatch();
+    }
+
+    public override byte GetDataStructureType() 
+    {
+        return MessageDispatch.ID_MessageDispatch;
+    }
 
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(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 = dataIn.ReadInt32();
+
+    }
+
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
+        
+        return rc + 1;
+    }
 
-        public override Command CreateCommand() {
-            return new MessageDispatch();
-        }
-
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
-
-            MessageDispatch info = (MessageDispatch) command;
-            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
-            info.Destination = ReadDestination(dataIn);
-            info.Message = (Message) CommandMarshallerRegistry.ReadCommand(dataIn);
-            info.RedeliveryCounter = dataIn.ReadInt32();
-
-        }
-
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
-
-            MessageDispatch info = (MessageDispatch) command;
-            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId, dataOut);
-            WriteDestination(info.Destination, dataOut);
-            CommandMarshallerRegistry.WriteCommand(info.Message, dataOut);
-            dataOut.Write(info.RedeliveryCounter);
+    // 
+    // 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);
+
+        MessageDispatch info = (MessageDispatch)o;
+        Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
+        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+        Marshal2NestedObject(wireFormat, info.Message, dataOut, bs);
+        dataOut.Write((int) info.RedeliveryCounter);
 
-        }
     }
+  }
 }

Added: 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=379827&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs Wed Feb 22 09:45:12 2006
@@ -0,0 +1,96 @@
+//
+//
+// Copyright 2005-2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using OpenWire.Client;
+using OpenWire.Client.Commands;
+using OpenWire.Client.Core;
+using OpenWire.Client.IO;
+
+namespace OpenWire.Client.IO
+{
+  //
+  //  Marshalling code for Open Wire Format for MessageDispatchNotification
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
+    {
+        return new MessageDispatchNotification();
+    }
+
+    public override byte GetDataStructureType() 
+    {
+        return MessageDispatchNotification.ID_MessageDispatchNotification;
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(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);
+
+    }
+
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
+
+        return rc + 0;
+    }
+
+    // 
+    // 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);
+
+        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);
+
+    }
+  }
+}

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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for MessageId
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,32 +26,68 @@
 
 namespace OpenWire.Client.IO
 {
-    public class MessageIdMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for MessageId
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class MessageIdMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new MessageId();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return MessageId.ID_MessageId;
+    }
 
-        public override Command CreateCommand() {
-            return new MessageId();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        MessageId info = (MessageId)o;
+        info.ProducerId = (ProducerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ProducerSequenceId = UnmarshalLong(wireFormat, dataIn, bs);
+        info.BrokerSequenceId = UnmarshalLong(wireFormat, dataIn, bs);
 
-            MessageId info = (MessageId) command;
-            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
-            info.ProducerSequenceId = dataIn.ReadInt64();
-            info.BrokerSequenceId = dataIn.ReadInt64();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
+
+        return rc + 0;
+    }
 
-            MessageId info = (MessageId) command;
-            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId, dataOut);
-            dataOut.Write(info.ProducerSequenceId);
-            dataOut.Write(info.BrokerSequenceId);
+    // 
+    // 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);
+
+        MessageId info = (MessageId)o;
+        Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
+        Marshal2Long(wireFormat, info.ProducerSequenceId, dataOut, bs);
+        Marshal2Long(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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for Message
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,72 +26,139 @@
 
 namespace OpenWire.Client.IO
 {
-    public abstract class MessageMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for Message
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public abstract class MessageMarshaller : BaseCommandMarshaller
+  {
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
+        base.Unmarshal(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 = dataIn.ReadInt32();
+        info.CorrelationId = ReadString(dataIn, bs);
+        info.Persistent = bs.ReadBoolean();
+        info.Expiration = UnmarshalLong(wireFormat, dataIn, bs);
+        info.Priority = dataIn.ReadByte();
+        info.ReplyTo = (ActiveMQDestination) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Timestamp = UnmarshalLong(wireFormat, dataIn, bs);
+        info.Type = ReadString(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.Compressed = bs.ReadBoolean();
+        info.RedeliveryCounter = dataIn.ReadInt32();
+
+        if (bs.ReadBoolean()) {
+            short size = dataIn.ReadInt16();
+            BrokerId[] value = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.BrokerPath = value;
+        }
+        else {
+            info.BrokerPath = null;
+        }
+        info.Arrival = UnmarshalLong(wireFormat, dataIn, bs);
+        info.UserID = ReadString(dataIn, bs);
+        info.RecievedByDFBridge = bs.ReadBoolean();
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
-
-            Message info = (Message) command;
-            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
-            info.Destination = ReadDestination(dataIn);
-            info.TransactionId = (TransactionId) CommandMarshallerRegistry.ReadCommand(dataIn);
-            info.OriginalDestination = ReadDestination(dataIn);
-            info.MessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
-            info.OriginalTransactionId = (TransactionId) CommandMarshallerRegistry.ReadCommand(dataIn);
-            info.GroupID = dataIn.ReadString();
-            info.GroupSequence = dataIn.ReadInt32();
-            info.CorrelationId = dataIn.ReadString();
-            info.Persistent = dataIn.ReadBoolean();
-            info.Expiration = dataIn.ReadInt64();
-            info.Priority = dataIn.ReadByte();
-            info.ReplyTo = ReadDestination(dataIn);
-            info.Timestamp = dataIn.ReadInt64();
-            info.Type = dataIn.ReadString();
-            info.Content = ReadBytes(dataIn);
-            info.MarshalledProperties = ReadBytes(dataIn);
-            info.DataStructure = CommandMarshallerRegistry.ReadCommand(dataIn);
-            info.TargetConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
-            info.Compressed = dataIn.ReadBoolean();
-            info.RedeliveryCounter = dataIn.ReadInt32();
-            info.BrokerPath = ReadBrokerIds(dataIn);
-            info.Arrival = dataIn.ReadInt64();
-            info.UserID = dataIn.ReadString();
-            info.RecievedByDFBridge = dataIn.ReadBoolean();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
+        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);
+        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);
+        bs.WriteBoolean(info.Compressed);
+                rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+        rc += Marshal1Long(wireFormat, info.Arrival, bs);
+        rc += WriteString(info.UserID, bs);
+        bs.WriteBoolean(info.RecievedByDFBridge);
 
-            Message info = (Message) command;
-            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId, dataOut);
-            WriteDestination(info.Destination, dataOut);
-            CommandMarshallerRegistry.WriteCommand(info.TransactionId, dataOut);
-            WriteDestination(info.OriginalDestination, dataOut);
-            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.MessageId, dataOut);
-            CommandMarshallerRegistry.WriteCommand(info.OriginalTransactionId, dataOut);
-            dataOut.Write(info.GroupID);
-            dataOut.Write(info.GroupSequence);
-            dataOut.Write(info.CorrelationId);
-            dataOut.Write(info.Persistent);
-            dataOut.Write(info.Expiration);
-            dataOut.Write(info.Priority);
-            WriteDestination(info.ReplyTo, dataOut);
-            dataOut.Write(info.Timestamp);
-            dataOut.Write(info.Type);
-            WriteBytes(info.Content, dataOut);
-            WriteBytes(info.MarshalledProperties, dataOut);
-            CommandMarshallerRegistry.WriteCommand((Command) info.DataStructure, dataOut);
-            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.TargetConsumerId, dataOut);
-            dataOut.Write(info.Compressed);
-            dataOut.Write(info.RedeliveryCounter);
-            WriteBrokerIds(info.BrokerPath, dataOut);
-            dataOut.Write(info.Arrival);
-            dataOut.Write(info.UserID);
-            dataOut.Write(info.RecievedByDFBridge);
+        return rc + 3;
+    }
 
+    // 
+    // 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);
+
+        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);
+        dataOut.Write((int) info.GroupSequence);
+        WriteString(info.CorrelationId, dataOut, bs);
+        bs.ReadBoolean();
+        Marshal2Long(wireFormat, info.Expiration, dataOut, bs);
+        dataOut.Write((byte) info.Priority);
+        Marshal2NestedObject(wireFormat, info.ReplyTo, dataOut, bs);
+        Marshal2Long(wireFormat, info.Timestamp, dataOut, bs);
+        WriteString(info.Type, dataOut, bs);
+        if(bs.ReadBoolean()) {
+           dataOut.Write((int)info.Content.Length);
+           dataOut.Write(info.Content);
         }
+        if(bs.ReadBoolean()) {
+           dataOut.Write((int)info.MarshalledProperties.Length);
+           dataOut.Write(info.MarshalledProperties);
+        }
+        Marshal2NestedObject(wireFormat, info.DataStructure, dataOut, bs);
+        Marshal2CachedObject(wireFormat, info.TargetConsumerId, dataOut, bs);
+        bs.ReadBoolean();
+        dataOut.Write((int) info.RedeliveryCounter);
+        MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+        Marshal2Long(wireFormat, info.Arrival, dataOut, bs);
+        WriteString(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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for ProducerId
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,32 +26,68 @@
 
 namespace OpenWire.Client.IO
 {
-    public class ProducerIdMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for ProducerId
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class ProducerIdMarshaller : DataStreamMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new ProducerId();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return ProducerId.ID_ProducerId;
+    }
 
-        public override Command CreateCommand() {
-            return new ProducerId();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        ProducerId info = (ProducerId)o;
+        info.ConnectionId = ReadString(dataIn, bs);
+        info.Value = UnmarshalLong(wireFormat, dataIn, bs);
+        info.SessionId = UnmarshalLong(wireFormat, dataIn, bs);
 
-            ProducerId info = (ProducerId) command;
-            info.ConnectionId = dataIn.ReadString();
-            info.Value = dataIn.ReadInt64();
-            info.SessionId = dataIn.ReadInt64();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
+
+        return rc + 0;
+    }
 
-            ProducerId info = (ProducerId) command;
-            dataOut.Write(info.ConnectionId);
-            dataOut.Write(info.Value);
-            dataOut.Write(info.SessionId);
+    // 
+    // 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);
+
+        ProducerId info = (ProducerId)o;
+        WriteString(info.ConnectionId, dataOut, bs);
+        Marshal2Long(wireFormat, info.Value, dataOut, bs);
+        Marshal2Long(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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for ProducerInfo
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,32 +26,79 @@
 
 namespace OpenWire.Client.IO
 {
-    public class ProducerInfoMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for ProducerInfo
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class ProducerInfoMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
+    {
+        return new ProducerInfo();
+    }
+
+    public override byte GetDataStructureType() 
     {
+        return ProducerInfo.ID_ProducerInfo;
+    }
 
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override Command CreateCommand() {
-            return new ProducerInfo();
+        ProducerInfo info = (ProducerInfo)o;
+        info.ProducerId = (ProducerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
+
+        if (bs.ReadBoolean()) {
+            short size = dataIn.ReadInt16();
+            BrokerId[] value = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.BrokerPath = value;
+        }
+        else {
+            info.BrokerPath = null;
         }
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+    }
 
-            ProducerInfo info = (ProducerInfo) command;
-            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
-            info.Destination = ReadDestination(dataIn);
-            info.BrokerPath = ReadBrokerIds(dataIn);
 
-        }
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+        return rc + 0;
+    }
 
-            ProducerInfo info = (ProducerInfo) command;
-            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId, dataOut);
-            WriteDestination(info.Destination, dataOut);
-            WriteBrokerIds(info.BrokerPath, dataOut);
+    // 
+    // 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);
+
+        ProducerInfo info = (ProducerInfo)o;
+        Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
+        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+        MarshalObjectArray(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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for RemoveInfo
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,28 +26,62 @@
 
 namespace OpenWire.Client.IO
 {
-    public class RemoveInfoMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for RemoveInfo
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class RemoveInfoMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new RemoveInfo();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return RemoveInfo.ID_RemoveInfo;
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
+
+        RemoveInfo info = (RemoveInfo)o;
+        info.ObjectId = (DataStructure) UnmarshalCachedObject(wireFormat, dataIn, bs);
+
+    }
 
-        public override Command CreateCommand() {
-            return new RemoveInfo();
-        }
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        RemoveInfo info = (RemoveInfo)o;
 
-            RemoveInfo info = (RemoveInfo) command;
-            info.ObjectId = CommandMarshallerRegistry.ReadCommand(dataIn);
+        int rc = base.Marshal1(wireFormat, info, bs);
+        rc += Marshal1CachedObject(wireFormat, info.ObjectId, bs);
 
-        }
+        return rc + 0;
+    }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    // 
+    // 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);
 
-            RemoveInfo info = (RemoveInfo) command;
-            CommandMarshallerRegistry.WriteCommand((Command) info.ObjectId, dataOut);
+        RemoveInfo info = (RemoveInfo)o;
+        Marshal2CachedObject(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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for RemoveSubscriptionInfo
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,32 +26,68 @@
 
 namespace OpenWire.Client.IO
 {
-    public class RemoveSubscriptionInfoMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for RemoveSubscriptionInfo
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class RemoveSubscriptionInfoMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new RemoveSubscriptionInfo();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return RemoveSubscriptionInfo.ID_RemoveSubscriptionInfo;
+    }
 
-        public override Command CreateCommand() {
-            return new RemoveSubscriptionInfo();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
+        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.SubcriptionName = ReadString(dataIn, bs);
+        info.ClientId = ReadString(dataIn, bs);
 
-            RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) command;
-            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
-            info.SubcriptionName = dataIn.ReadString();
-            info.ClientId = dataIn.ReadString();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(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);
+
+        return rc + 0;
+    }
 
-            RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) command;
-            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
-            dataOut.Write(info.SubcriptionName);
-            dataOut.Write(info.ClientId);
+    // 
+    // 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);
+
+        RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
+        Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
+        WriteString(info.SubcriptionName, dataOut, bs);
+        WriteString(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=379827&r1=379826&r2=379827&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 Wed Feb 22 09:45:12 2006
@@ -1,10 +1,18 @@
 //
-// Marshalling code for Open Wire Format for Response
 //
+// Copyright 2005-2006 The Apache Software Foundation
 //
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 using System;
@@ -18,28 +26,61 @@
 
 namespace OpenWire.Client.IO
 {
-    public class ResponseMarshaller : AbstractCommandMarshaller
+  //
+  //  Marshalling code for Open Wire Format for Response
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public class ResponseMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
     {
+        return new Response();
+    }
 
+    public override byte GetDataStructureType() 
+    {
+        return Response.ID_Response;
+    }
 
-        public override Command CreateCommand() {
-            return new Response();
-        }
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.Unmarshal(wireFormat, o, dataIn, bs);
 
-        public override void BuildCommand(Command command, BinaryReader dataIn) {
-            base.BuildCommand(command, dataIn);
+        Response info = (Response)o;
+        info.CorrelationId = dataIn.ReadInt16();
 
-            Response info = (Response) command;
-            info.CorrelationId = dataIn.ReadInt16();
+    }
 
-        }
 
-        public override void WriteCommand(Command command, BinaryWriter dataOut) {
-            base.WriteCommand(command, dataOut);
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        Response info = (Response)o;
+
+        int rc = base.Marshal1(wireFormat, info, bs);
+        
+        return rc + 1;
+    }
+
+    // 
+    // 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);
 
-            Response info = (Response) command;
-            dataOut.Write(info.CorrelationId);
+        Response info = (Response)o;
+        dataOut.Write((short)info.CorrelationId);
 
-        }
     }
+  }
 }



Mime
View raw message