Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 37057 invoked from network); 5 Feb 2007 20:53:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Feb 2007 20:53:34 -0000 Received: (qmail 17868 invoked by uid 500); 5 Feb 2007 20:53:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 17853 invoked by uid 500); 5 Feb 2007 20:53:40 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 17843 invoked by uid 99); 5 Feb 2007 20:53:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 12:53:40 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 12:53:33 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id CAE501A981A; Mon, 5 Feb 2007 12:53:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r503865 - in /activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ: ./ Commands/ OpenWire/V1/ OpenWire/V2/ Date: Mon, 05 Feb 2007 20:53:12 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070205205312.CAE501A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Mon Feb 5 12:53:11 2007 New Revision: 503865 URL: http://svn.apache.org/viewvc?view=rev&rev=503865 Log: Regenerated the final openwire v2 marshallers using the: mvn antrun:run -Dactivemq-core-dir=.... command and then refactored some code due to renamed fields. Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerInfoMarshaller.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ProducerInfoMarshaller.cs activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Session.cs Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs Mon Feb 5 12:53:11 2007 @@ -44,6 +44,7 @@ bool faultTolerantConfiguration; bool duplexConnection; bool networkConnection; + long connectionId; public override string ToString() { return GetType().Name + "[" @@ -56,6 +57,7 @@ + " FaultTolerantConfiguration=" + FaultTolerantConfiguration + " DuplexConnection=" + DuplexConnection + " NetworkConnection=" + NetworkConnection + + " ConnectionId=" + ConnectionId + " ]"; } @@ -119,6 +121,12 @@ { get { return networkConnection; } set { this.networkConnection = value; } + } + + public long ConnectionId + { + get { return connectionId; } + set { this.connectionId = value; } } } Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs Mon Feb 5 12:53:11 2007 @@ -42,7 +42,7 @@ int maximumPendingMessageLimit; bool dispatchAsync; string selector; - string subcriptionName; + string subscriptionName; bool noLocal; bool exclusive; bool retroactive; @@ -62,7 +62,7 @@ + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit + " DispatchAsync=" + DispatchAsync + " Selector=" + Selector - + " SubcriptionName=" + SubcriptionName + + " SubscriptionName=" + SubscriptionName + " NoLocal=" + NoLocal + " Exclusive=" + Exclusive + " Retroactive=" + Retroactive @@ -125,10 +125,10 @@ set { this.selector = value; } } - public string SubcriptionName + public string SubscriptionName { - get { return subcriptionName; } - set { this.subcriptionName = value; } + get { return subscriptionName; } + set { this.subscriptionName = value; } } public bool NoLocal Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs Mon Feb 5 12:53:11 2007 @@ -38,12 +38,14 @@ ProducerId producerId; ActiveMQDestination destination; BrokerId[] brokerPath; + bool dispatchAsync; public override string ToString() { return GetType().Name + "[" + " ProducerId=" + ProducerId + " Destination=" + Destination + " BrokerPath=" + BrokerPath + + " DispatchAsync=" + DispatchAsync + " ]"; } @@ -71,6 +73,12 @@ { get { return brokerPath; } set { this.brokerPath = value; } + } + + public bool DispatchAsync + { + get { return dispatchAsync; } + set { this.dispatchAsync = value; } } } Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs Mon Feb 5 12:53:11 2007 @@ -63,7 +63,7 @@ info.MaximumPendingMessageLimit = dataIn.ReadInt32(); info.DispatchAsync = bs.ReadBoolean(); info.Selector = TightUnmarshalString(dataIn, bs); - info.SubcriptionName = TightUnmarshalString(dataIn, bs); + info.SubscriptionName = TightUnmarshalString(dataIn, bs); info.NoLocal = bs.ReadBoolean(); info.Exclusive = bs.ReadBoolean(); info.Retroactive = bs.ReadBoolean(); @@ -99,7 +99,7 @@ rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); bs.WriteBoolean(info.DispatchAsync); rc += TightMarshalString1(info.Selector, bs); - rc += TightMarshalString1(info.SubcriptionName, bs); + rc += TightMarshalString1(info.SubscriptionName, bs); bs.WriteBoolean(info.NoLocal); bs.WriteBoolean(info.Exclusive); bs.WriteBoolean(info.Retroactive); @@ -126,7 +126,7 @@ dataOut.Write(info.MaximumPendingMessageLimit); bs.ReadBoolean(); TightMarshalString2(info.Selector, dataOut, bs); - TightMarshalString2(info.SubcriptionName, dataOut, bs); + TightMarshalString2(info.SubscriptionName, dataOut, bs); bs.ReadBoolean(); bs.ReadBoolean(); bs.ReadBoolean(); @@ -154,7 +154,7 @@ info.MaximumPendingMessageLimit = dataIn.ReadInt32(); info.DispatchAsync = dataIn.ReadBoolean(); info.Selector = LooseUnmarshalString(dataIn); - info.SubcriptionName = LooseUnmarshalString(dataIn); + info.SubscriptionName = LooseUnmarshalString(dataIn); info.NoLocal = dataIn.ReadBoolean(); info.Exclusive = dataIn.ReadBoolean(); info.Retroactive = dataIn.ReadBoolean(); @@ -193,7 +193,7 @@ dataOut.Write(info.MaximumPendingMessageLimit); dataOut.Write(info.DispatchAsync); LooseMarshalString(info.Selector, dataOut); - LooseMarshalString(info.SubcriptionName, dataOut); + LooseMarshalString(info.SubscriptionName, dataOut); dataOut.Write(info.NoLocal); dataOut.Write(info.Exclusive); dataOut.Write(info.Retroactive); Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs Mon Feb 5 12:53:11 2007 @@ -76,6 +76,7 @@ info.FaultTolerantConfiguration = bs.ReadBoolean(); info.DuplexConnection = bs.ReadBoolean(); info.NetworkConnection = bs.ReadBoolean(); + info.ConnectionId = TightUnmarshalLong(wireFormat, dataIn, bs); } @@ -95,6 +96,7 @@ bs.WriteBoolean(info.FaultTolerantConfiguration); bs.WriteBoolean(info.DuplexConnection); bs.WriteBoolean(info.NetworkConnection); + rc += TightMarshalLong1(wireFormat, info.ConnectionId, bs); return rc + 0; } @@ -115,6 +117,7 @@ bs.ReadBoolean(); bs.ReadBoolean(); bs.ReadBoolean(); + TightMarshalLong2(wireFormat, info.ConnectionId, dataOut, bs); } @@ -146,6 +149,7 @@ info.FaultTolerantConfiguration = dataIn.ReadBoolean(); info.DuplexConnection = dataIn.ReadBoolean(); info.NetworkConnection = dataIn.ReadBoolean(); + info.ConnectionId = LooseUnmarshalLong(wireFormat, dataIn); } @@ -166,6 +170,7 @@ dataOut.Write(info.FaultTolerantConfiguration); dataOut.Write(info.DuplexConnection); dataOut.Write(info.NetworkConnection); + LooseMarshalLong(wireFormat, info.ConnectionId, dataOut); } } Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerInfoMarshaller.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerInfoMarshaller.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerInfoMarshaller.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerInfoMarshaller.cs Mon Feb 5 12:53:11 2007 @@ -63,7 +63,7 @@ info.MaximumPendingMessageLimit = dataIn.ReadInt32(); info.DispatchAsync = bs.ReadBoolean(); info.Selector = TightUnmarshalString(dataIn, bs); - info.SubcriptionName = TightUnmarshalString(dataIn, bs); + info.SubscriptionName = TightUnmarshalString(dataIn, bs); info.NoLocal = bs.ReadBoolean(); info.Exclusive = bs.ReadBoolean(); info.Retroactive = bs.ReadBoolean(); @@ -99,7 +99,7 @@ rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); bs.WriteBoolean(info.DispatchAsync); rc += TightMarshalString1(info.Selector, bs); - rc += TightMarshalString1(info.SubcriptionName, bs); + rc += TightMarshalString1(info.SubscriptionName, bs); bs.WriteBoolean(info.NoLocal); bs.WriteBoolean(info.Exclusive); bs.WriteBoolean(info.Retroactive); @@ -126,7 +126,7 @@ dataOut.Write(info.MaximumPendingMessageLimit); bs.ReadBoolean(); TightMarshalString2(info.Selector, dataOut, bs); - TightMarshalString2(info.SubcriptionName, dataOut, bs); + TightMarshalString2(info.SubscriptionName, dataOut, bs); bs.ReadBoolean(); bs.ReadBoolean(); bs.ReadBoolean(); @@ -154,7 +154,7 @@ info.MaximumPendingMessageLimit = dataIn.ReadInt32(); info.DispatchAsync = dataIn.ReadBoolean(); info.Selector = LooseUnmarshalString(dataIn); - info.SubcriptionName = LooseUnmarshalString(dataIn); + info.SubscriptionName = LooseUnmarshalString(dataIn); info.NoLocal = dataIn.ReadBoolean(); info.Exclusive = dataIn.ReadBoolean(); info.Retroactive = dataIn.ReadBoolean(); @@ -193,7 +193,7 @@ dataOut.Write(info.MaximumPendingMessageLimit); dataOut.Write(info.DispatchAsync); LooseMarshalString(info.Selector, dataOut); - LooseMarshalString(info.SubcriptionName, dataOut); + LooseMarshalString(info.SubscriptionName, dataOut); dataOut.Write(info.NoLocal); dataOut.Write(info.Exclusive); dataOut.Write(info.Retroactive); Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ProducerInfoMarshaller.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ProducerInfoMarshaller.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ProducerInfoMarshaller.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ProducerInfoMarshaller.cs Mon Feb 5 12:53:11 2007 @@ -70,6 +70,7 @@ else { info.BrokerPath = null; } + info.DispatchAsync = bs.ReadBoolean(); } @@ -83,6 +84,7 @@ rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs); rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs); + bs.WriteBoolean(info.DispatchAsync); return rc + 0; } @@ -97,6 +99,7 @@ TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs); TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs); + bs.ReadBoolean(); } @@ -122,6 +125,7 @@ else { info.BrokerPath = null; } + info.DispatchAsync = dataIn.ReadBoolean(); } @@ -136,6 +140,7 @@ LooseMarshalCachedObject(wireFormat, (DataStructure)info.ProducerId, dataOut); LooseMarshalCachedObject(wireFormat, (DataStructure)info.Destination, dataOut); LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut); + dataOut.Write(info.DispatchAsync); } } Modified: activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Session.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Session.cs?view=diff&rev=503865&r1=503864&r2=503865 ============================================================================== --- activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Session.cs (original) +++ activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Session.cs Mon Feb 5 12:53:11 2007 @@ -164,7 +164,7 @@ { ConsumerInfo command = CreateConsumerInfo(destination, selector); ConsumerId consumerId = command.ConsumerId; - command.SubcriptionName = name; + command.SubscriptionName = name; command.NoLocal = noLocal; try