You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/02/08 11:10:11 UTC

svn commit: r619823 [3/19] - in /incubator/qpid/branches/thegreatmerge/qpid: ./ cpp/ dotnet/ dotnet/Qpid.Buffer.Tests/Properties/ dotnet/Qpid.Buffer/Properties/ dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/Channel/ dotnet/Qpid.Client.Tests/Common...

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,11 +24,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Codec")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Codec")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -49,5 +49,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,14 +1,14 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs Fri Feb  8 02:09:37 2008
@@ -52,12 +52,15 @@
         static ProtocolInitiation()
         {
             AssemblySettings settings = new AssemblySettings();
+
+            /*
             string openAMQ = settings["OpenAMQ1d4Compatibility"];
             if (openAMQ.Equals("true"))
             {
                 _log.Warn("Starting in OpenAMQ-1.0d4 compatibility mode. ProtocolMajorVersion is 7 and Basic.Qos will not be sent.");                
                 CURRENT_PROTOCOL_VERSION_MAJOR = 7;                
-            }            
+            }
+            */
         }
 
         public uint Size

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,11 +24,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Common")]
-[assembly: AssemblyDescription("Common AMQ Framing Code")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Common")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2006")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -49,4 +49,4 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.*")]
+[assembly: AssemblyVersion("2.1.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IChannel.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IChannel.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IChannel.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IChannel.cs Fri Feb  8 02:09:37 2008
@@ -25,20 +25,35 @@
     public delegate void MessageReceivedDelegate(IMessage msg);
     
     /// <summary>
-    /// Interface used to manipulate an AMQP channel. 
-    /// </summary>
-    /// <remarks>
-    /// You can create a channel by using the CreateChannel() method
+    /// IChannel provides methods to access the commands in AMQP that operate at the channel level. This can be summarized as
+    /// the ability to declare queues and exchanges, bind queues to exchanges, create messages of various types, declare transaction
+    /// boundaries (commit and rollback), and to set up producers and consumers on the channel.
+    ///
+    /// <p/>You can create a channel by using the CreateChannel() method
     /// of the connection object.
-    /// </remarks>
-    public interface IChannel : IDisposable
+    ///
+    /// <p/><table id="crc"><caption>CRC Card</caption>
+    /// <tr><th> Responsibilities
+    /// <tr><td> Declare queues.
+    /// <tr><td> Declare exchanges.
+    /// <tr><td> Bind queues to exchanges.
+    /// <tr><td> Create messages.
+    /// <tr><td> Set up message consumers on the channel.
+    /// <tr><td> Set up message producers on the channel.
+    /// <tr><td> Commit the current transaction.
+    /// <tr><td> Roll-back the current transaction.
+    /// <tr><td> Close the channel.
+    /// </table>
+    /// </summary>
+    public interface IChannel : IDisposable, ICloseable
     {
         /// <summary>
-        /// Acknowledge mode for messages received
+        /// Acknowledge mode for messages received.
         /// </summary>
         AcknowledgeMode AcknowledgeMode { get; }
+
         /// <summary>
-        /// True if the channel should use transactions
+        /// True if the channel should use transactions.
         /// </summary>
         bool Transacted { get; }
 
@@ -61,55 +76,59 @@
         int DefaultPrefetchHigh { get; }
 
         /// <summary>
-        /// Declare a new exchange
+        /// Declare a new exchange.
         /// </summary>
         /// <param name="exchangeName">Name of the exchange</param>
         /// <param name="exchangeClass">Class of the exchange, from <see cref="ExchangeClassConstants"/></param>
         void DeclareExchange(string exchangeName, string exchangeClass);
+
         /// <summary>
-        /// Declare a new exchange using the default exchange class
+        /// Declare a new exchange using the default exchange class.
         /// </summary>
         /// <param name="exchangeName">Name of the exchange</param>
         void DeleteExchange(string exchangeName);
 
         /// <summary>
-        /// Declare a new queue with the specified set of arguments
+        /// Declare a new queue with the specified set of arguments.
         /// </summary>
         /// <param name="queueName">Name of the queue</param>
         /// <param name="isDurable">True if the queue should be durable</param>
         /// <param name="isExclusive">True if the queue should be exclusive to this channel</param>
         /// <param name="isAutoDelete">True if the queue should be deleted when the channel closes</param>
         void DeclareQueue(string queueName, bool isDurable, bool isExclusive, bool isAutoDelete);
+
         /// <summary>
-        /// Delete a queue with the specifies arguments
+        /// Delete a queue with the specifies arguments.
         /// </summary>
         /// <param name="queueName">Name of the queue to delete</param>
         /// <param name="ifUnused">If true, the queue will not deleted if it has no consumers</param>
         /// <param name="ifEmpty">If true, the queue will not deleted if it has no messages</param>
         /// <param name="noWait">If true, the server will not respond to the method</param>
         void DeleteQueue(string queueName, bool ifUnused, bool ifEmpty, bool noWait);
+
         /// <summary>
-        /// Generate a new Unique name to use for a queue
+        /// Generate a new Unique name to use for a queue.
         /// </summary>
         /// <returns>A unique name to this channel</returns>
         string GenerateUniqueName();
 
         /// <summary>
-        /// Removes all messages from a queue
+        /// Removes all messages from a queue.
         /// </summary>
         /// <param name="queueName">Name of the queue to delete</param>
         /// <param name="noWait">If true, the server will not respond to the method</param>
         void PurgeQueue(string queueName, bool noWait);
         
         /// <summary>
-        /// Bind a queue to the specified exchange
+        /// Bind a queue to the specified exchange.
         /// </summary>
         /// <param name="queueName">Name of queue to bind</param>
         /// <param name="exchangeName">Name of exchange to bind to</param>
         /// <param name="routingKey">Routing key</param>
         void Bind(string queueName, string exchangeName, string routingKey);
+
         /// <summary>
-        /// Bind a queue to the specified exchange
+        /// Bind a queue to the specified exchange.
         /// </summary>
         /// <param name="queueName">Name of queue to bind</param>
         /// <param name="exchangeName">Name of exchange to bind to</param>
@@ -118,28 +137,32 @@
         void Bind(string queueName, string exchangeName, string routingKey, IFieldTable args);
 
         /// <summary>
-        /// Create a new empty message with no body
+        /// Create a new empty message with no body.
         /// </summary>
         /// <returns>The new message</returns>
         IMessage CreateMessage();
+
         /// <summary>
-        /// Create a new message of the specified MIME type
+        /// Create a new message of the specified MIME type.
         /// </summary>
         /// <param name="mimeType">The mime type to create</param>
         /// <returns>The new message</returns>
         IMessage CreateMessage(string mimeType);
+
         /// <summary>
-        /// Creates a new message for bytes (application/octet-stream)
+        /// Creates a new message for bytes (application/octet-stream).
         /// </summary>
         /// <returns>The new message</returns>
         IBytesMessage CreateBytesMessage();
+
         /// <summary>
-        /// Creates a new text message (text/plain) with empty content
+        /// Creates a new text message (text/plain) with empty content.
         /// </summary>
         /// <returns>The new message</returns>
         ITextMessage CreateTextMessage();
+
         /// <summary>
-        /// Creates a new text message (text/plain) with a body
+        /// Creates a new text message (text/plain) with a body.
         /// </summary>
         /// <param name="initialValue">Initial body of the message</param>
         /// <returns>The new message</returns>
@@ -148,33 +171,29 @@
         #region Consuming
         
         /// <summary>
-        /// Creates a new Consumer using the builder pattern
+        /// Creates a new Consumer using the builder pattern.
         /// </summary>
         /// <param name="queueName">Name of queue to receive messages from</param>
         /// <returns>The builder object</returns>
         MessageConsumerBuilder CreateConsumerBuilder(string queueName);
 
         /// <summary>
-        /// Creates a new consumer
+        /// Creates a new consumer.
         /// </summary>
         /// <param name="queueName">Name of queue to receive messages from</param>
         /// <param name="prefetchLow">Low prefetch value</param>
         /// <param name="prefetchHigh">High prefetch value</param>
         /// <param name="noLocal">If true, messages sent on this channel will not be received by this consumer</param>
         /// <param name="exclusive">If true, the consumer opens the queue in exclusive mode</param>
-        /// <param name="durable">If true, create a durable subscription</param>
-        /// <param name="subscriptionName">Subscription name</param>
         /// <returns>The new consumer</returns>
         IMessageConsumer CreateConsumer(string queueName,
                                         int prefetchLow, 
                                         int prefetchHigh,
                                         bool noLocal,
-                                        bool exclusive,
-                                        bool durable,
-                                        string subscriptionName);
+                                        bool exclusive);
         
         /// <summary>
-        /// Unsubscribe from a queue
+        /// Unsubscribe from a queue.
         /// </summary>
         /// <param name="subscriptionName">Subscription name</param>
         void Unsubscribe(string subscriptionName);
@@ -184,13 +203,13 @@
         #region Publishing
 
         /// <summary>
-        /// Create a new message publisher using the builder pattern
+        /// Create a new message publisher using the builder pattern.
         /// </summary>
         /// <returns>The builder object</returns>
         MessagePublisherBuilder CreatePublisherBuilder();
         
         /// <summary>
-        /// Create a new message publisher
+        /// Create a new message publisher.
         /// </summary>
         /// <param name="exchangeName">Name of exchange to publish to</param>
         /// <param name="routingKey">Routing key</param>
@@ -214,15 +233,17 @@
         #region Transactions
         
         /// <summary>
-        /// Recover after transaction failure
+        /// Recover after transaction failure.
         /// </summary>
         void Recover();
+
         /// <summary>
-        /// Commit the transaction
+        /// Commit the transaction.
         /// </summary>
         void Commit();
+
         /// <summary>
-        /// Rollback the transaction
+        /// Rollback the transaction.
         /// </summary>
         void Rollback();
 

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IConnection.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IConnection.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IConnection.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IConnection.cs Fri Feb  8 02:09:37 2008
@@ -24,7 +24,7 @@
 {
     public delegate void ExceptionListenerDelegate(Exception ex);
 
-    public interface IConnection : IDisposable
+  public interface IConnection : IDisposable, ICloseable
     {
         /// <summary>
         /// The connection listener that has been registered with this connection.

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs Fri Feb  8 02:09:37 2008
@@ -22,35 +22,35 @@
 
 namespace Apache.Qpid.Messaging
 {
-   /// <summary>
-   /// Describes an object that can be used to receive (consume)
-   /// messages from an AMQP queue.
-   /// </summary>
-   /// <remarks>
-   /// Consumers are created using either 
-   /// <see cref="IChannel.CreateConsumer"/> or using 
-   /// the builder pattern (preferred) with 
-   /// <see cref="IChannel.CreateConsumerBuilder"/>.
-   /// 
-   /// <para>
-   /// Consumers offer two different ways of receiving messages:
-   /// You can attach a delegate to the <see cref="OnMessage"/>
-   /// event and be notified when a message arrives, or you can
-   /// use the <see cref="Receive"/> and <see cref="ReceiveNoWait"/>
-   /// methods to control when you receive messages. Be aware that you can use 
-   /// one or the other, but not both at the same time.
-   /// </para>
-   /// <para>
-   /// Regardless of which method you choose, the prefetch settings
-   /// specified when creating the channel will still control when messages
-   /// are actually received from the AMQP broker. Any messages that arrive
-   /// between the prefetch window will be queued by the channel
-   /// until they can be delivered to the consumer (either though the event
-   /// or until the consumer actively calls <see cref="Receive"/>).
-   /// </para>
-   /// </remarks>
-   public interface IMessageConsumer : IDisposable
-   {
+    /// <summary>
+    /// Describes an object that can be used to receive (consume)
+    /// messages from an AMQP queue.
+    /// </summary>
+    /// <remarks>
+    /// Consumers are created using either 
+    /// <see cref="IChannel.CreateConsumer"/> or using 
+    /// the builder pattern (preferred) with 
+    /// <see cref="IChannel.CreateConsumerBuilder"/>.
+    /// 
+    /// <para>
+    /// Consumers offer two different ways of receiving messages:
+    /// You can attach a delegate to the <see cref="OnMessage"/>
+    /// event and be notified when a message arrives, or you can
+    /// use the <see cref="Receive"/> and <see cref="ReceiveNoWait"/>
+    /// methods to control when you receive messages. Be aware that you can use 
+    /// one or the other, but not both at the same time.
+    /// </para>
+    /// <para>
+    /// Regardless of which method you choose, the prefetch settings
+    /// specified when creating the channel will still control when messages
+    /// are actually received from the AMQP broker. Any messages that arrive
+    /// between the prefetch window will be queued by the channel
+    /// until they can be delivered to the consumer (either though the event
+    /// or until the consumer actively calls <see cref="Receive"/>).
+    /// </para>
+    /// </remarks>
+    public interface IMessageConsumer : IDisposable, ICloseable
+    {
       /// <summary>
       /// Fired when a message is received from the broker by the consumer
       /// </summary>
@@ -61,12 +61,14 @@
       /// </summary>
       /// <returns>The message received</returns>
       IMessage Receive();
+
       /// <summary>
       /// Wait the specified time until a message is receive from the broker
       /// </summary>
       /// <param name="delay">Maximum number of milliseconds to wait for a message</param>
       /// <returns>The message received, or null if the timeout expires</returns>
       IMessage Receive(long delay);
+
       /// <summary>
       /// Return a message if one is already available in the channel. 
       /// Does not wait for one to be received from the broker.

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs Fri Feb  8 02:09:37 2008
@@ -32,7 +32,7 @@
    /// using the builder pattern (preferred) with 
    /// <see cref="IChannel.CreatePublisherBuilder"/>
    /// </remarks>
-   public interface IMessagePublisher : IDisposable
+  public interface IMessagePublisher : IDisposable, ICloseable
    {
       /// <summary>
       /// Default delivery mode to use with this publisher

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs Fri Feb  8 02:09:37 2008
@@ -20,17 +20,35 @@
  */
 namespace Apache.Qpid.Messaging
 {
+    /// <summary>
+    /// MessageConsumerBuilder provides a builder with a fluent interface to assist with creating message consumers on a channel.
+    ///
+    /// <p/><table id="crc"><caption>CRC Card</caption>
+    /// <tr><th> Responsibilities <th> Collaborations
+    /// <tr><td> Create message consumers from consume parameters. <td> <see cref="IChannel">
+    /// </table>
+    /// </summary>
+    ///
+    /// <remarks>It may be better to replace the Create method with a DeclareBindAndCreate method, that declares and binds the consumers queue,
+    /// as well as creating the consumer. This is a common use case, so the method will generally be usefull. Need to consider situations where
+    /// the declare and bind is not to be done, for example when resubscribing to a durable subscription. There may be others too.</remarks>
     public class MessageConsumerBuilder
     {
         private bool _noLocal = false;
+
         private bool _exclusive = false;
-        private bool _durable = false;
-        private string _subscriptionName = null;
+
+        //private bool _durable = false;
+        //private string _subscriptionName = null;
+
         private IChannel _channel;
+
         private readonly string _queueName;
+
         private int _prefetchLow;
-        private int _prefetchHigh;
 
+        private int _prefetchHigh;
+        
         public MessageConsumerBuilder(IChannel channel, string queueName)
         {
             _channel = channel;
@@ -38,46 +56,50 @@
             _prefetchHigh = _channel.DefaultPrefetchHigh;
             _prefetchLow = _channel.DefaultPrefetchLow;
         }
-
+        
         public MessageConsumerBuilder WithPrefetchLow(int prefetchLow)
         {
             _prefetchLow = prefetchLow;
             return this;
         }
-
+        
         public MessageConsumerBuilder WithPrefetchHigh(int prefetchHigh)
         {
             _prefetchHigh = prefetchHigh;
             return this;
         }
-
+        
         public MessageConsumerBuilder WithNoLocal(bool noLocal)
         {
             _noLocal = noLocal;
             return this;
         }
-
+        
         public MessageConsumerBuilder WithExclusive(bool exclusive)
         {
             _exclusive = exclusive;
             return this;
         }
-
+        
+        /*
         public MessageConsumerBuilder WithDurable(bool durable)
         {
             _durable = durable;
             return this;
         }
-
+        */
+        
+        /*
         public MessageConsumerBuilder WithSubscriptionName(string subscriptionName)
         {
             _subscriptionName = subscriptionName;
             return this;
         }
-
+        */
+        
         public IMessageConsumer Create()
         {
-            return _channel.CreateConsumer(_queueName, _prefetchLow, _prefetchHigh, _noLocal, _exclusive, _durable, _subscriptionName);
+            return _channel.CreateConsumer(_queueName, _prefetchLow, _prefetchHigh, _noLocal, _exclusive);
         }
     }
 }

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -25,11 +25,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Messaging")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Messaging")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -50,7 +50,7 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: CLSCompliant(true)]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -7,11 +7,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Sasl")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Sasl")]
-[assembly: AssemblyCopyright("Copyright © 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: CLSCompliant(true)]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Program.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Program.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Program.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Program.cs Fri Feb  8 02:09:37 2008
@@ -4,7 +4,7 @@
     {
         static void Main(string[] args)
         {
-            Apache.Qpid.Client.Tests.interop.TestClient.Main(args);
+            Apache.Qpid.Integration.Tests.interop.TestClient.Main(args);
         }
     }
 }

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("TestClient")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("TestClient")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/default.build?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/default.build (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/default.build Fri Feb  8 02:09:37 2008
@@ -18,7 +18,7 @@
 			   <include name="**/*.cs" />
          </sources>
          <references>
-            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
+            <include name="${build.dir}\Apache.Qpid.Integration.Tests.dll"/>
          </references>
         </csc>
     </target>

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("TopicListener")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("TopicListener")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs Fri Feb  8 02:09:37 2008
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("TopicPublisher")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("TopicPublisher")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]
+[assembly: AssemblyCopyright("Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Modified: incubator/qpid/branches/thegreatmerge/qpid/dotnet/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/dotnet/default.build?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/dotnet/default.build (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/dotnet/default.build Fri Feb  8 02:09:37 2008
@@ -1,127 +1,224 @@
 <?xml version="1.0"?>
 <project name="Qpid.NET" default="build">
-   <property name="nant.formatter" value="Plain" />
-   <!-- 
-      Build debug or release build?
-   -->
-   <property name="build.config" value="debug" />
-
-   <!--
-      Fileset with build files for each core assembly
-   -->
-   <fileset id="src.builds">
-      <include name="Qpid.Buffer/default.build" />
-      <include name="Qpid.Sasl/default.build" />
-      <include name="Qpid.Messaging/default.build" />
-      <include name="Qpid.Codec/default.build" />
-      <include name="Qpid.Common/default.build" />        
-      <include name="Qpid.Client/default.build" />	
-   </fileset>
+
+    <!-- Determines the formatter to use to format output of test results. -->
+    <property name="nant.formatter" value="Plain" />
+
+    <!-- Determines whether a 'debug' or 'release' build is to be done. Defaults to 'debug' -->
+    <property name="build.config" value="debug" />
+    <!-- Sets build properties consistently accross all assemblies in the project. -->
+    <property name="build.version.major" value="2"/>
+    <property name="build.version.minor" value="1"/>
+    <property name="build.version.build" value="0"/>
+    <property name="build.version.revision" value="0"/>
+    <property name="build.company" value="Apache Software Foundation"/>
+    <property name="build.copyright" value="Apache Software Foundation"/>
+    <property name="build.description" value="Built from svn revision number: "/>
+
+    <!-- Fileset with build files for each 'core' assembly. -->
+    <fileset id="src.builds">
+        <include name="Qpid.Buffer/default.build" />
+        <include name="Qpid.Sasl/default.build" />
+        <include name="Qpid.Messaging/default.build" />
+        <include name="Qpid.Codec/default.build" />
+        <include name="Qpid.Common/default.build" />        
+        <include name="Qpid.Client/default.build" />	
+    </fileset>
+    <!-- Fileset with build files for 'pure unit' test assemblies. -->
+    <fileset id="tests.pure.builds">
+        <include name="Qpid.Buffer.Tests/default.build" />
+        <include name="Qpid.Sasl.Tests/default.build" />
+        <include name="Qpid.Common.Tests/default.build" />        
+        <include name="Qpid.Client.Tests/default.build" />	
+    </fileset>
+    <!-- Fileset with build files for 'integration' test assemblies. -->
+    <fileset id="tests.integration.builds">
+        <include name="Qpid.Integration.Tests/default.build" />	
+    </fileset>
+
+    <!-- Other test or utility assemblies. -->
+    <fileset id='other.builds'>
+        <include name="TopicListener/default.build" />	
+        <include name="TopicPublisher/default.build" />	
+        <include name="TestClient/default.build" />	
+    </fileset>
+
+    <!-- Prepare environment for a debug build. -->
+    <target name="debug">
+        <property name="build.debug" value="true" />
+        <property name="build.defines" value="DEBUG;TRACE"/>
+    </target>
+
+    <!-- Prepare environment for a release build. -->
+    <target name="release">
+        <property name="build.debug" value="false" />
+        <property name="build.defines" value=""/>
+    </target>
+    <!-- Prepare environment for build. -->
+    <target name="init">
+        <property name="base.dir" value="${project::get-base-directory()}" />
+        <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />
+        <call target="${build.config}" />	
+    </target>   
+    
+    <!-- Cleans up the build output directory. -->
+    <target name="clean" depends="init">
+        <delete dir="${build.dir}" failonerror="false" />
+    </target>
+
+    <!-- Runs 'svnversion' to get the repository revision into the build property 'build.svnversion'. -->
+    <target name="svnversion" description="Runs svnversion to get the current repository version into a build script property.">
+        <exec program="svnversion.exe" output="svnversion_tmp.txt">
+            <arg value="-n"/>
+        </exec>
+
+        <loadfile file="svnversion_tmp.txt" property="build.svnversion"/>
+        <delete file="svnversion_tmp.txt"/>       
+
+        <!-- For some competely retarted reason the '-n' parameter to svnversion doesn't really work under windows... 
+             Here is some code to strip the unwanted newlines. -->
+        <script language="C#">
+            <code><![CDATA[
+            public static void ScriptMain(Project project)
+            {
+                project.Properties["build.svnversion"] = project.Properties["build.svnversion"].Trim("\n\r".ToCharArray());
+            }
+            ]]>
+            </code>
+        </script>
+
+    </target>
+
+    <!-- Performs a regex find-and-replace on assembly info files, substituting fields defined as build properties. -->
+    <target name="setversion" description="Stamp the version info onto assemblyinfo.cs files" depends="svnversion">
+
+        <echo>build.svnversion = ${build.svnversion}</echo>
+
+        <foreach item="File" property="filename">
+            <in>
+                <items basedir=".">
+                    <include name="**\AssemblyInfo.cs"></include>
+                </items>
+            </in>
+            <do>
+                <script language="C#">
+                    <code><![CDATA[
+                    public static void ScriptMain(Project project)
+                    {
+                        // Read in the entire file to perform the substitution in.
+                        StreamReader reader = new StreamReader(project.Properties["filename"]);
+                        string contents = reader.ReadToEnd();
+                        reader.Close();
+
+                        // Substitute the version numbers.
+                        string replacement = string.Format("[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",
+                                                           project.Properties["build.version.major"],
+                                                           project.Properties["build.version.minor"],
+                                                           project.Properties["build.version.build"],
+                                                           project.Properties["build.version.revision"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);
+
+                        // Substitute the company name and copyright.
+                        replacement = string.Format("[assembly: AssemblyCompany(\"{0}\")]",
+                                                    project.Properties["build.company"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);
+
+                        replacement = string.Format("[assembly: AssemblyCopyright(\"{0}\")]",
+                                                    project.Properties["build.copyright"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);
+
+                        // Update the description.
+                        //replacement = string.Format("[assembly: AssemblyDescription(\"{0} {1}\")]",
+                        //                            project.Properties["build.description"],
+                        //                            project.Properties["build.svnversion"]);
+                        replacement = string.Format("[assembly: AssemblyDescription(\"{0}\")]",
+                                                    project.Properties["build.description"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);
+
+                        // Write out the file with the substituted version.
+                        StreamWriter writer = new StreamWriter(project.Properties["filename"], false);
+                        writer.Write(contents);
+                        writer.Close();
+                    }
+                    ]]>
+                    </code>
+                </script>
+            </do>
+        </foreach>
+    </target>
+
+    <!-- Do the build. -->
+    <target name="build" depends="init, setversion">
+        <echo message="Building all modules including tests."/>
+
+        <!-- Make sure output folder exists. -->
+        <mkdir dir="${build.dir}" />
+
+        <!-- copy reference assemblies over to the output dir -->
+        <copy todir="${build.dir}" file="Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll"/>
+        <copy todir="${build.dir}" file="Qpid.Common/lib/log4net/log4net.dll"/>
+        <copy todir="${build.dir}" file="Qpid.Client.Tests/lib/nunit/nunit.framework.dll"/>
+
+        <!-- Compile assemblies. -->
+        <nant target="build">
+            <buildfiles refid="src.builds" />
+        </nant>
+
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+            <buildfiles refid="tests.pure.builds" />
+        </nant>
+        <nant target="build">
+            <buildfiles refid="tests.integration.builds" />
+        </nant>
+
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+            <buildfiles refid="other.builds" />
+        </nant>
+    </target>
     
-   <!--
-      Fileset with build files for test assemblies
-   -->
-   <fileset id="tests.builds">
-      <include name="Qpid.Buffer.Tests/default.build" />
-      <include name="Qpid.Sasl.Tests/default.build" />
-      <include name="Qpid.Common.Tests/default.build" />        
-      <include name="Qpid.Client.Tests/default.build" />	
-   </fileset>
-
-   <!--
-      Other test or utility assemblies
-   -->
-   <fileset id='other.builds'>
-      <include name="TopicListener/default.build" />	
-      <include name="TopicPublisher/default.build" />	
-   </fileset>
-   <!--
-      Prepare environment for a debug build
-   -->
-   <target name="debug">
-      <property name="build.debug" value="true" />
-      <property name="build.defines" value="DEBUG;TRACE"/>
-   </target>
-   <!--
-      Prepare environment for a release build
-   -->
-   <target name="release">
-      <property name="build.debug" value="false" />
-      <property name="build.defines" value=""/>
-   </target>
+    <!-- Runs all 'pure unit' tests. -->
+    <target name="test" depends="build">
+        <echo message="Running all pure unit tests."/>
+        <nant target="test">
+            <buildfiles refid="tests.pure.builds" />
+        </nant>
+    </target>
+    <!-- Runs all 'integration' tests. -->
+    <target name="integrationtest" depends="build">
+        <echo message="Running all integration tests."/>
+        <nant target="test">
+            <buildfiles refid="tests.integration.builds" />
+        </nant>
+    </target>
+
+    <!-- Creates a release package. -->
+    <target name="release-pkg">
+        <echo message="Building and packaging a release."/>
+
+        <call target="clean"/>
+        <call target="build"/>
+
+        <property name="build.date" value="${datetime::now()}"/>
+        <zip zipfile="${build.dir}/Qpid.NET-${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}.zip">
+            <fileset basedir="${build.dir}">
+                <include name="**/*.*"/>
+                <exclude name="**/*.Tests.*"/>
+                <exclude name="**/nunit.framework.dll"/>
+                <exclude name="**/*.exe"/>            
+            </fileset>
+            
+            <fileset basedir="${base.dir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+                <include name="README.txt"/>
+                <include name="RELEASE_NOTES.txt"/>
+                <include name="DISCLAIMER"/>                    
+            </fileset>
+        </zip>
+    </target>
     
-   <!--
-      prepare environment for build
-   -->
-   <target name="init">
-      <property name="base.dir" value="${project::get-base-directory()}" />
-      <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />
-      <call target="${build.config}" />	
-   </target>
-	
-	<target name="clean" depends="init">
-      <delete dir="${build.dir}" failonerror="false" />
-	</target>
-	
-   <!--
-      Do the build
-	-->
-	<target name="build" depends="init">
-      <!-- make sure output folder exists -->
-      <mkdir dir="${build.dir}" />
-      <!-- copy reference assemblies over to the output dir -->
-      <copy todir="${build.dir}" file="Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll"/>
-      <copy todir="${build.dir}" file="Qpid.Common/lib/log4net/log4net.dll"/>
-      <copy todir="${build.dir}" file="Qpid.Client.Tests/lib/nunit/nunit.framework.dll"/>
-		<!-- 
-			Compile assemblies
-		-->
-		<nant target="build">
-			<buildfiles refid="src.builds" />
-		</nant>
-		<!-- 
-         Compile test assemblies
-      -->
-		<nant target="build">
-			<buildfiles refid="tests.builds" />
-		</nant>
-		<!-- 
-         Compile test assemblies
-      -->
-		<nant target="build">
-			<buildfiles refid="other.builds" />
-		</nant>
-	</target>
-	
-	<!--
-		Execute unit tests
-	-->
-	<target name="test" depends="build">
-      <echo message="Running unit tests for the project." />
-      <nant target="test">
-         <buildfiles refid="tests.builds" />
-      </nant>
-   </target>
-
-   <!-- 
-      Make a release package
-   -->
-   <target name="release-pkg">
-      <echo message="building and packing a release"/>
-      <call target="clean"/>
-      <call target="build"/>
-      <property name="build.date" value="${datetime::now()}"/>
-
-      <zip zipfile="${build.dir}/Qpid.NET-${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}.zip">
-         <fileset basedir="${build.dir}">
-            <include name="**/*.*"/>
-            <exclude name="**/*.Tests.*"/>
-            <exclude name="**/nunit.framework.dll"/>
-            <exclude name="**/*.exe"/>
-         </fileset>
-      </zip>
-   </target>
-	
 </project>
 
 

Modified: incubator/qpid/branches/thegreatmerge/qpid/gentools/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/gentools/build.xml?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/gentools/build.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/gentools/build.xml Fri Feb  8 02:09:37 2008
@@ -28,6 +28,7 @@
 					<include name="**/*.jar"/>
 				</fileset>
 			</classpath>
+
 		</javac>
     </target>
     

Modified: incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java Fri Feb  8 02:09:37 2008
@@ -24,6 +24,7 @@
 import org.w3c.dom.NodeList;
 
 import java.io.PrintStream;
+import java.util.Collection;
 
 public class AmqpClass implements Printable, NodeAware
 {
@@ -169,6 +170,11 @@
     public AmqpMethodMap getMethodMap()
     {
         return _methodMap;
+    }
+
+    public Collection<AmqpMethod> getMethods()
+    {
+        return getMethodMap().values();
     }
 
 

Modified: incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java Fri Feb  8 02:09:37 2008
@@ -198,6 +198,24 @@
         return true;
     }
 
+
+    public boolean isVersionInterfaceConsistent(AmqpVersionSet globalVersionSet)
+    {
+        if (!_versionSet.equals(globalVersionSet))
+        {
+            return false;
+        }
+        if (!_domainMap.isVersionConsistent(globalVersionSet))
+        {
+            return false;
+        }
+        if (!_ordinalMap.isVersionConsistent(globalVersionSet))
+        {
+            return false;
+        }
+        return true;
+    }
+
     public String getDomain(AmqpVersion version)
     {
         return _versionToDomainMap.get(version);
@@ -247,4 +265,5 @@
     {
         return _versionToOrdinalMap;
     }
+
 }

Modified: incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java Fri Feb  8 02:09:37 2008
@@ -411,6 +411,20 @@
         return true;
     }
 
+    public boolean isVersionInterfaceConsistent(AmqpVersionSet globalVersionSet)
+    {
+        for (String thisFieldName : _map.keySet())
+        {
+            AmqpField field = _map.get(thisFieldName);
+            if (!field.isVersionInterfaceConsistent(globalVersionSet))
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
     public AmqpVersionSet getVersionSet()
     {
         return _versionSet;

Modified: incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java Fri Feb  8 02:09:37 2008
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class AmqpMethod implements Printable, NodeAware, VersionConsistencyCheck
 {
@@ -39,6 +40,8 @@
 
     private final Map<AmqpVersion, AmqpFieldMap> _versionToFieldsMap = new HashMap<AmqpVersion, AmqpFieldMap>();
 
+    private final Map<AmqpVersion, AtomicInteger> _versionToFieldCount = new HashMap<AmqpVersion, AtomicInteger>();
+
     private final String _name;
     private final Generator _generator;
 
@@ -68,7 +71,12 @@
             _indexMap.put(index, indexVersionSet);
         }
         NodeList nList = methodNode.getChildNodes();
-        int fieldCntr = _fieldMap.size();
+        AtomicInteger fieldCntr = _versionToFieldCount.get(version);
+        if(fieldCntr == null)
+        {
+            fieldCntr = new AtomicInteger(0);
+            _versionToFieldCount.put(version, fieldCntr);
+        }
         for (int i = 0; i < nList.getLength(); i++)
         {
             Node child = nList.item(i);
@@ -94,9 +102,9 @@
                 AmqpField versionSpecificField = new AmqpField(fieldName, _generator);
                 versionSpecificFieldMap.add(fieldName, versionSpecificField);
 
-                versionSpecificField.addFromNode(child, fieldCntr, version);
+                versionSpecificField.addFromNode(child, fieldCntr.intValue(), version);
 
-                if (!thisField.addFromNode(child, fieldCntr++, version))
+                if (!thisField.addFromNode(child, fieldCntr.getAndIncrement(), version))
                 {
                     String className = _generator.prepareClassName(Utils.getNamedAttribute(methodNode.getParentNode(),
                                                                                            Utils.ATTRIBUTE_NAME));
@@ -216,9 +224,14 @@
         return parameterVersionMap;
     }
 
-    public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
+    public boolean isVersionInterfaceConsistent()
     {
-        if (!_versionSet.equals(globalVersionSet))
+        return isVersionInterfaceConsistent(_generator.getVersionSet());
+    }
+
+    public boolean isVersionInterfaceConsistent(AmqpVersionSet globalVersionSet)
+    {
+         if (!_versionSet.equals(globalVersionSet))
         {
             return false;
         }
@@ -230,17 +243,26 @@
         {
             return false;
         }
-        if (!_indexMap.isVersionConsistent(globalVersionSet))
-        {
-            return false;
-        }
-        if (!_fieldMap.isVersionConsistent(globalVersionSet))
+        if (!_fieldMap.isVersionInterfaceConsistent(globalVersionSet))
         {
             return false;
         }
         return true;
     }
 
+    public boolean isVersionConsistent()
+    {
+        return isVersionConsistent(_generator.getVersionSet());
+    }
+
+
+    public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
+    {
+        return isVersionInterfaceConsistent(globalVersionSet)
+               && _indexMap.isVersionConsistent(globalVersionSet)
+               && _fieldMap.isVersionConsistent(globalVersionSet);
+    }
+
     public AmqpVersionSet getVersionSet()
     {
         return _versionSet;
@@ -294,5 +316,36 @@
     public boolean isCommon(AmqpField field)
     {
         return field.getVersionSet().equals(getVersionSet()) && field.isTypeAndNameConsistent(_generator);
+    }
+
+    public boolean isConsistentServerMethod()
+    {
+        AmqpVersionSet serverVersions = _serverMethodFlagMap.get(true);
+        return (serverVersions != null) && serverVersions.containsAll(_generator.getVersionSet());
+    }
+
+
+    public boolean isConsistentClientMethod()
+    {
+        AmqpVersionSet clientVersions = _clientMethodFlagMap.get(true);
+        return (clientVersions != null) && clientVersions.containsAll(_generator.getVersionSet());
+    }
+
+    public boolean isServerMethod(AmqpVersion version)
+    {
+        AmqpVersionSet serverVersions = _serverMethodFlagMap.get(true);
+        return (serverVersions != null) && serverVersions.contains(version);
+    }
+
+
+    public boolean isClientMethod(AmqpVersion version)
+    {
+        AmqpVersionSet clientVersions = _clientMethodFlagMap.get(true);
+        return (clientVersions != null) && clientVersions.contains(version);
+    }
+
+    public boolean inAllVersions()
+    {
+        return _versionSet.containsAll(_generator.getVersionSet());
     }
 }

Modified: incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java Fri Feb  8 02:09:37 2008
@@ -26,6 +26,7 @@
 import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Collection;
 
 public class AmqpModel implements Printable, NodeAware
 {
@@ -116,6 +117,12 @@
     public AmqpClassMap getClassMap()
     {
         return classMap;
+    }
+
+
+    public Collection<AmqpClass> getClasses()
+    {
+        return classMap.values();
     }
 
     public SingleVersionModel asSingleVersionModel()