activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r383749 [7/13] - in /incubator/activemq/trunk: activemq-core/ activemq-core/src/gram/java/org/apache/activemq/openwire/tool/ activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/command/ activemq-core/src/main/java...
Date Tue, 07 Mar 2006 02:33:12 GMT
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -68,8 +68,8 @@
         JournalQueueAck info = (JournalQueueAck)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.MessageAck, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Destination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageAck, bs);
 
         return rc + 0;
     }
@@ -81,8 +81,8 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-    TightMarshalNestedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.MessageAck, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageAck, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -72,12 +72,12 @@
         JournalTopicAck info = (JournalTopicAck)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Destination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
     rc += TightMarshalLong1(wireFormat, info.MessageSequenceId, bs);
     rc += TightMarshalString1(info.SubscritionName, bs);
     rc += TightMarshalString1(info.ClientId, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.TransactionId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
 
         return rc + 0;
     }
@@ -89,12 +89,12 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-    TightMarshalNestedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
     TightMarshalLong2(wireFormat, info.MessageSequenceId, dataOut, bs);
     TightMarshalString2(info.SubscritionName, dataOut, bs);
     TightMarshalString2(info.ClientId, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -69,7 +69,7 @@
         JournalTransaction info = (JournalTransaction)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.TransactionId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
         bs.WriteBoolean(info.WasPrepared);
 
         return rc + 1;
@@ -82,7 +82,7 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-    TightMarshalNestedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
     dataOut.Write(info.Type);
     bs.ReadBoolean();
 

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -69,7 +69,7 @@
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
     rc += TightMarshalLong1(wireFormat, info.Value, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs);
 
         return rc + 0;
     }
@@ -82,7 +82,7 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
     TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
Mon Mar  6 18:32:50 2006
@@ -15,7 +15,7 @@
 // limitations under the License.
 //
 
-// Marshalling code for Open Wire Format for ExceptionResponse
+// Marshalling code for Open Wire Format for DestinationMap
 //
 //
 // NOTE!: This file is autogenerated - do not modify!
@@ -38,52 +38,53 @@
         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 ActiveMQObjectMessageMarshaller());
+            format.addMarshaller(new ConnectionIdMarshaller());
+            format.addMarshaller(new ConnectionInfoMarshaller());
+            format.addMarshaller(new ProducerInfoMarshaller());
+            format.addMarshaller(new MessageDispatchNotificationMarshaller());
+            format.addMarshaller(new SessionInfoMarshaller());
+            format.addMarshaller(new TransactionInfoMarshaller());
+            format.addMarshaller(new ActiveMQStreamMessageMarshaller());
+            format.addMarshaller(new MessageAckMarshaller());
+            format.addMarshaller(new ProducerIdMarshaller());
+            format.addMarshaller(new MessageIdMarshaller());
+            format.addMarshaller(new ActiveMQTempQueueMarshaller());
+            format.addMarshaller(new RemoveSubscriptionInfoMarshaller());
             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 XATransactionIdMarshaller());
+            format.addMarshaller(new JournalTraceMarshaller());
+            format.addMarshaller(new ConsumerIdMarshaller());
+            format.addMarshaller(new ActiveMQTextMessageMarshaller());
+            format.addMarshaller(new SubscriptionInfoMarshaller());
+            format.addMarshaller(new JournalTransactionMarshaller());
+            format.addMarshaller(new ControlCommandMarshaller());
+            format.addMarshaller(new NetworkBridgeFilterMarshaller());
+            format.addMarshaller(new ActiveMQBytesMessageMarshaller());
+            format.addMarshaller(new WireFormatInfoMarshaller());
             format.addMarshaller(new ActiveMQTempTopicMarshaller());
-            format.addMarshaller(new ConnectionIdMarshaller());
             format.addMarshaller(new DiscoveryEventMarshaller());
-            format.addMarshaller(new ConnectionInfoMarshaller());
+            format.addMarshaller(new ActiveMQTopicMarshaller());
+            format.addMarshaller(new BrokerInfoMarshaller());
+            format.addMarshaller(new DestinationInfoMarshaller());
+            format.addMarshaller(new ShutdownInfoMarshaller());
+            format.addMarshaller(new DataResponseMarshaller());
             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/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -73,11 +73,11 @@
         MessageAck info = (MessageAck)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
-        rc += TightMarshalNestedObject1(wireFormat, info.FirstMessageId, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.LastMessageId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+        rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.FirstMessageId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.LastMessageId, bs);
     
         return rc + 5;
     }
@@ -89,12 +89,12 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageAck info = (MessageAck)o;
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
     dataOut.Write(info.AckType);
-    TightMarshalNestedObject2(wireFormat, info.FirstMessageId, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.LastMessageId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.FirstMessageId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.LastMessageId, dataOut, bs);
     dataOut.Write(info.MessageCount);
 
     }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -70,9 +70,9 @@
         MessageDispatch info = (MessageDispatch)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.Message, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Message, bs);
     
         return rc + 4;
     }
@@ -84,9 +84,9 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.Message, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.Message, dataOut, bs);
     dataOut.Write(info.RedeliveryCounter);
 
     }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -1,95 +1 @@
-//
-//
-// 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 ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
-
-namespace ActiveMQ.OpenWire.V1
-{
-  //
-  //  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 TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader
dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn,
bs);
-        info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-
-    }
-
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream
bs) {
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter
dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
-
-    }
-  }
-}
+//
//
// 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
ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;

namespace ActiveMQ.OpenWire.V1
{
 //
  //  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 TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream
bs) 
    {
        base.TightUnmarshal(wireFormat, o, dataIn, bs);

        MessageDispatchNotification
info = (MessageDispatchNotification)o;
        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat,
dataIn, bs);
        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat,
dataIn, bs);
        info.DeliverySequenceId = TightUnmarshalLong(wireFormat, 
 dataIn, bs);
        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat,
dataIn, bs);

    }


    //
    // Write the booleans that this object uses to a BooleanStream
   //
    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream
bs) {
        MessageDispatchNotification info = (MessageDispatchNotification)o;

       
int rc = base.TightMarshal1(wireFormat, info, bs);
    rc += TightMarshalCachedObject1(wireFormat,
(DataStructure)info.ConsumerId, bs);
    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination,
bs);
    rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
    rc += TightMarshalNestedObject1(wireFormat,
(DataStructure)info.MessageId, bs);

        return rc + 0;
    }

    // 
    // Write a
object instance to data output stream
    //
    public override void TightMarshal2(OpenWireFormat
wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
        base.TightMarshal
 2(wireFormat, o, dataOut, bs);

        MessageDispatchNotification info = (MessageDispatchNotification)o;
   TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
  
 TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
   
TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
    TightMarshalNestedObject2(wireFormat,
(DataStructure)info.MessageId, dataOut, bs);

    }
  }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -69,7 +69,7 @@
         MessageId info = (MessageId)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
     rc += TightMarshalLong1(wireFormat, info.ProducerSequenceId, bs);
     rc += TightMarshalLong1(wireFormat, info.BrokerSequenceId, bs);
 
@@ -83,7 +83,7 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
-    TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
     TightMarshalLong2(wireFormat, info.ProducerSequenceId, dataOut, bs);
     TightMarshalLong2(wireFormat, info.BrokerSequenceId, dataOut, bs);
 

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -91,25 +91,25 @@
         Message info = (Message)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.OriginalDestination, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.OriginalTransactionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalDestination,
bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalTransactionId,
bs);
     rc += TightMarshalString1(info.GroupID, bs);
         rc += TightMarshalString1(info.CorrelationId, bs);
     bs.WriteBoolean(info.Persistent);
     rc += TightMarshalLong1(wireFormat, info.Expiration, bs);
-        rc += TightMarshalNestedObject1(wireFormat, info.ReplyTo, bs);
+        rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ReplyTo, bs);
     rc += TightMarshalLong1(wireFormat, info.Timestamp, bs);
     rc += TightMarshalString1(info.Type, bs);
     bs.WriteBoolean(info.Content!=null);
         rc += info.Content==null ? 0 : info.Content.Length+4;
     bs.WriteBoolean(info.MarshalledProperties!=null);
         rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4;
-    rc += TightMarshalNestedObject1(wireFormat, info.DataStructure, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.TargetConsumerId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.DataStructure, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TargetConsumerId, bs);
     bs.WriteBoolean(info.Compressed);
         rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
     rc += TightMarshalLong1(wireFormat, info.Arrival, bs);
@@ -126,19 +126,19 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         Message info = (Message)o;
-    TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.OriginalDestination, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.OriginalTransactionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalDestination, dataOut,
bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut,
bs);
     TightMarshalString2(info.GroupID, dataOut, bs);
     dataOut.Write(info.GroupSequence);
     TightMarshalString2(info.CorrelationId, dataOut, bs);
     bs.ReadBoolean();
     TightMarshalLong2(wireFormat, info.Expiration, dataOut, bs);
     dataOut.Write(info.Priority);
-    TightMarshalNestedObject2(wireFormat, info.ReplyTo, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.ReplyTo, dataOut, bs);
     TightMarshalLong2(wireFormat, info.Timestamp, dataOut, bs);
     TightMarshalString2(info.Type, dataOut, bs);
     if(bs.ReadBoolean()) {
@@ -149,8 +149,8 @@
            dataOut.Write(info.MarshalledProperties.Length);
            dataOut.Write(info.MarshalledProperties);
         }
-    TightMarshalNestedObject2(wireFormat, info.DataStructure, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.TargetConsumerId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, (DataStructure)info.DataStructure, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.TargetConsumerId, dataOut,
bs);
     bs.ReadBoolean();
     dataOut.Write(info.RedeliveryCounter);
     TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);

Added: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
(added)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -0,0 +1 @@
+//
//
// 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
ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;

namespace ActiveMQ.OpenWire.V1
{
 //
  //  Marshalling code for Open Wire Format for NetworkBridgeFilter
  //
  //
  //  NOTE!:
This file is autogenerated - do not modify!
  //        if you need to make a change, please
see the Groo
 vy scripts in the
  //        activemq-core module
  //
  public class NetworkBridgeFilterMarshaller
: BaseDataStreamMarshaller
  {


    public override DataStructure CreateObject() 
    {
       return new NetworkBridgeFilter();
    }

    public override byte GetDataStructureType()

    {
        return NetworkBridgeFilter.ID_NetworkBridgeFilter;
    }

    // 
    // Un-marshal
an object instance from the data input stream
    // 
    public override void TightUnmarshal(OpenWireFormat
wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
    {
        base.TightUnmarshal(wireFormat,
o, dataIn, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        info.NetworkTTL
= dataIn.ReadInt32();
        info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat,
dataIn, bs);

    }


    //
    // Write the booleans that this object uses to a BooleanStream
   //
    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, Boole
 anStream bs) {
        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        int rc
= base.TightMarshal1(wireFormat, info, bs);
        rc += TightMarshalCachedObject1(wireFormat,
(DataStructure)info.NetworkBrokerId, bs);

        return rc + 4;
    }

    // 
    // Write
a object instance to data output stream
    //
    public override void TightMarshal2(OpenWireFormat
wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
        base.TightMarshal2(wireFormat,
o, dataOut, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
    dataOut.Write(info.NetworkTTL);
   TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);

   }
  }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -80,8 +80,8 @@
         ProducerInfo info = (ProducerInfo)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
     rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
 
         return rc + 0;
@@ -94,8 +94,8 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-    TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
     TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
 
     }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -67,7 +67,7 @@
         RemoveInfo info = (RemoveInfo)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ObjectId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ObjectId, bs);
 
         return rc + 0;
     }
@@ -79,7 +79,7 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-    TightMarshalCachedObject2(wireFormat, info.ObjectId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ObjectId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -69,7 +69,7 @@
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs);
     rc += TightMarshalString1(info.SubcriptionName, bs);
     rc += TightMarshalString1(info.ClientId, bs);
 
@@ -83,7 +83,7 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
     TightMarshalString2(info.SubcriptionName, dataOut, bs);
     TightMarshalString2(info.ClientId, dataOut, bs);
 

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -67,7 +67,7 @@
         SessionInfo info = (SessionInfo)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.SessionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.SessionId, bs);
 
         return rc + 0;
     }
@@ -79,7 +79,7 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionInfo info = (SessionInfo)o;
-    TightMarshalCachedObject2(wireFormat, info.SessionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.SessionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -71,7 +71,7 @@
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
     rc += TightMarshalString1(info.ClientId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs);
     rc += TightMarshalString1(info.Selector, bs);
     rc += TightMarshalString1(info.SubcriptionName, bs);
 
@@ -86,7 +86,7 @@
 
         SubscriptionInfo info = (SubscriptionInfo)o;
     TightMarshalString2(info.ClientId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs);
     TightMarshalString2(info.Selector, dataOut, bs);
     TightMarshalString2(info.SubcriptionName, dataOut, bs);
 

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -69,8 +69,8 @@
         TransactionInfo info = (TransactionInfo)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs);
     
         return rc + 1;
     }
@@ -82,8 +82,8 @@
         base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs);
     dataOut.Write(info.Type);
 
     }

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
(original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
Mon Mar  6 18:32:50 2006
@@ -57,11 +57,7 @@
         WireFormatInfo info = (WireFormatInfo)o;
         info.Magic = ReadBytes(dataIn, 8);
         info.Version = dataIn.ReadInt32();
-        info.CacheEnabled = bs.ReadBoolean();
-        info.StackTraceEnabled = bs.ReadBoolean();
-        info.TcpNoDelayEnabled = bs.ReadBoolean();
-        info.PrefixPacketSize = bs.ReadBoolean();
-        info.TightEncodingEnabled = bs.ReadBoolean();
+        info.MarshalledProperties = ReadBytes(dataIn, bs.ReadBoolean());
 
     }
 
@@ -73,11 +69,8 @@
         WireFormatInfo info = (WireFormatInfo)o;
 
         int rc = base.TightMarshal1(wireFormat, info, bs);
-            bs.WriteBoolean(info.CacheEnabled);
-    bs.WriteBoolean(info.StackTraceEnabled);
-    bs.WriteBoolean(info.TcpNoDelayEnabled);
-    bs.WriteBoolean(info.PrefixPacketSize);
-    bs.WriteBoolean(info.TightEncodingEnabled);
+            bs.WriteBoolean(info.MarshalledProperties!=null);
+        rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4;
 
         return rc + 12;
     }
@@ -91,11 +84,10 @@
         WireFormatInfo info = (WireFormatInfo)o;
     dataOut.Write(info.Magic, 0, 8);
     dataOut.Write(info.Version);
-    bs.ReadBoolean();
-    bs.ReadBoolean();
-    bs.ReadBoolean();
-    bs.ReadBoolean();
-    bs.ReadBoolean();
+    if(bs.ReadBoolean()) {
+           dataOut.Write(info.MarshalledProperties.Length);
+           dataOut.Write(info.MarshalledProperties);
+        }
 
     }
   }

Added: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs (added)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs Mon Mar
 6 18:32:50 2006
@@ -0,0 +1,27 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 1.1.4322.2032
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyTitleAttribute("ActiveMQ .NET")]
+[assembly: AssemblyDescriptionAttribute("A .NET Library for talking to ActiveMQ")]
+[assembly: AssemblyConfigurationAttribute("SNAPSHOT")]
+[assembly: AssemblyCompanyAttribute("http://activemq.org/")]
+[assembly: AssemblyProductAttribute("ActiveMQ")]
+[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")]
+[assembly: AssemblyTrademarkAttribute("")]
+[assembly: AssemblyCultureAttribute("")]
+[assembly: AssemblyVersionAttribute("4.0.2256.0")]
+[assembly: AssemblyInformationalVersionAttribute("4.0")]
+

Added: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs (added)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs Mon Mar
 6 18:32:50 2006
@@ -0,0 +1,27 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 1.1.4322.2032
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyTitleAttribute("ActiveMQ .NET Test")]
+[assembly: AssemblyDescriptionAttribute("A .NET Library for testing the ActiveMQ .NET Library")]
+[assembly: AssemblyConfigurationAttribute("SNAPSHOT")]
+[assembly: AssemblyCompanyAttribute("http://activemq.org/")]
+[assembly: AssemblyProductAttribute("ActiveMQ")]
+[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")]
+[assembly: AssemblyTrademarkAttribute("")]
+[assembly: AssemblyCultureAttribute("")]
+[assembly: AssemblyVersionAttribute("4.0.2256.0")]
+[assembly: AssemblyInformationalVersionAttribute("4.0")]
+



Mime
View raw message