Delete stuff that's just going to get synced from M2.x

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@651111 13f79535-47bb-0310-9956-ffa450edef68

25 files changed, 0 insertions, 1508 deletions

diff --git a/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
deleted file mode 100644
index 4896b64f68..0000000000
--- a/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public enum AcknowledgeMode
-    {
-        AutoAcknowledge,
-        ClientAcknowledge,
-        DupsOkAcknowledge,
-        SessionTransacted,
-
-        /// <summary>
-        /// Indicates that no client acknowledgements are required. Broker assumes that once it has 
-        /// delivered a message packet successfully it is acknowledged.
-        /// </summary>
-        NoAcknowledge,
-
-        /// <summary>
-        /// Pre acknowledge means that an ack is sent per message but sent before user code has processed
-        /// the message (i.e. before the onMessage() call or the receive() method has returned).
-        /// </summary>
-        PreAcknowledge
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
deleted file mode 100644
index 8b43422f5c..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class ChannelLimitReachedException : ResourceAllocationException
-    {
-        private long _limit;
-
-        public ChannelLimitReachedException(long limit)
-            : base("Unable to create session since maximum number of sessions per connection is " +
-                   limit + ". Either close one or more sessions or increase the " +
-                   "maximum number of sessions per connection (or contact your OpenAMQ administrator.")
-        {            
-            _limit = limit;
-        }
-
-        protected ChannelLimitReachedException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-           _limit = info.GetInt64("Limit");
-        }
-
-        public long Limit
-        {
-            get
-            {
-                return _limit;
-            }
-        }
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-           base.GetObjectData(info, context);
-           info.AddValue("Limit", _limit);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
deleted file mode 100644
index 3c4713ee2a..0000000000
--- a/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public enum DeliveryMode
-    {
-        NonPersistent,
-        Persistent
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
deleted file mode 100644
index 984e8b0f17..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class ExchangeClassConstants
-    {
-        public readonly static string TOPIC = "topic";
-        public readonly static string DIRECT = "direct";
-        public readonly static string HEADERS = "headers";
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
deleted file mode 100644
index cda92d6b55..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class ExchangeNameDefaults
-    {
-        public readonly static string TOPIC = "amq.topic";
-        public readonly static string DIRECT = "amq.direct";
-        public readonly static string HEADERS = "amq.match";        
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
deleted file mode 100644
index 5be942423d..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface IBytesMessage : IMessage
-    {
-        long BodyLength { get; }
-
-        bool ReadBoolean();
-        void WriteBoolean(bool value);
-        
-        byte ReadByte();
-        int ReadBytes(byte[] array);
-        int ReadBytes(byte[] array, int length);
-        void WriteByte(byte value);
-        void WriteBytes(byte[] value);
-        void WriteBytes(byte[] value, int offset, int length);
-
-        char ReadChar();
-        void WriteChar(char value);
-        
-        double ReadDouble();
-        void WriteDouble(double value);
-
-        float ReadFloat();
-        void WriteFloat(float value);
-
-        int ReadInt();
-        void WriteInt(int value);
-
-        long ReadLong();
-        void WriteLong(long value);
-
-        short ReadShort();
-        void WriteShort(short value);
-
-        short ReadSignedByte();
-        void WriteSignedByte(short value);
-
-        string ReadUTF();
-        void WriteUTF(string value);
-
-        void Reset();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IChannel.cs b/qpid/dotnet/Qpid.Messaging/IChannel.cs
deleted file mode 100644
index 4da41a773d..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IChannel.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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;
-
-namespace Apache.Qpid.Messaging
-{
-    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
-    /// of the connection object.
-    /// </remarks>
-    public interface IChannel : IDisposable
-    {
-        /// <summary>
-        /// Acknowledge mode for messages received
-        /// </summary>
-        AcknowledgeMode AcknowledgeMode { get; }
-        /// <summary>
-        /// True if the channel should use transactions
-        /// </summary>
-        bool Transacted { get; }
-
-        /// <summary>
-        /// Prefetch value to be used as the default for 
-        /// consumers created on this channel.
-        /// </summary>
-        int DefaultPrefetch { get; }
-
-        /// <summary>
-        /// Prefetch low value to be used as the default for 
-        /// consumers created on this channel.
-        /// </summary>
-        int DefaultPrefetchLow { get; }
-
-        /// <summary>
-        /// Prefetch high value to be used as the default for 
-        /// consumers created on this channel.
-        /// </summary>
-        int DefaultPrefetchHigh { get; }
-
-        /// <summary>
-        /// 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
-        /// </summary>
-        /// <param name="exchangeName">Name of the exchange</param>
-        void DeleteExchange(string exchangeName);
-
-        /// <summary>
-        /// 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
-        /// </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
-        /// </summary>
-        /// <returns>A unique name to this channel</returns>
-        string GenerateUniqueName();
-
-        /// <summary>
-        /// 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
-        /// </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
-        /// </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>
-        /// <param name="args">Table of arguments for the binding. Used to bind with a Headers Exchange</param>
-        void Bind(string queueName, string exchangeName, string routingKey, IFieldTable args);
-
-        /// <summary>
-        /// 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
-        /// </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)
-        /// </summary>
-        /// <returns>The new message</returns>
-        IBytesMessage CreateBytesMessage();
-        /// <summary>
-        /// 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
-        /// </summary>
-        /// <param name="initialValue">Initial body of the message</param>
-        /// <returns>The new message</returns>
-        ITextMessage CreateTextMessage(string initialValue);
-
-        #region Consuming
-        
-        /// <summary>
-        /// 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
-        /// </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);
-        
-        /// <summary>
-        /// Unsubscribe from a queue
-        /// </summary>
-        /// <param name="subscriptionName">Subscription name</param>
-        void Unsubscribe(string subscriptionName);
-
-        #endregion
-
-        #region Publishing
-
-        /// <summary>
-        /// Create a new message publisher using the builder pattern
-        /// </summary>
-        /// <returns>The builder object</returns>
-        MessagePublisherBuilder CreatePublisherBuilder();
-        
-        /// <summary>
-        /// Create a new message publisher
-        /// </summary>
-        /// <param name="exchangeName">Name of exchange to publish to</param>
-        /// <param name="routingKey">Routing key</param>
-        /// <param name="deliveryMode">Default delivery mode</param>
-        /// <param name="timeToLive">Default TTL time of messages</param>
-        /// <param name="immediate">If true, sent immediately</param>
-        /// <param name="mandatory">If true, the broker will return an error 
-        /// (as a connection exception) if the message cannot be delivered</param>
-        /// <param name="priority">Default message priority</param>
-        /// <returns>The new message publisher</returns>
-        IMessagePublisher CreatePublisher(string exchangeName,
-                                        string routingKey,
-                                        DeliveryMode deliveryMode,
-                                        long timeToLive,
-                                        bool immediate,
-                                        bool mandatory,
-                                        int priority);
-
-        #endregion
-
-        #region Transactions
-        
-        /// <summary>
-        /// Recover after transaction failure
-        /// </summary>
-        void Recover();
-        /// <summary>
-        /// Commit the transaction
-        /// </summary>
-        void Commit();
-        /// <summary>
-        /// Rollback the transaction
-        /// </summary>
-        void Rollback();
-
-        #endregion
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IConnection.cs b/qpid/dotnet/Qpid.Messaging/IConnection.cs
deleted file mode 100644
index 420228fa8e..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IConnection.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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;
-
-namespace Apache.Qpid.Messaging
-{
-    public delegate void ExceptionListenerDelegate(Exception ex);
-
-    public interface IConnection : IDisposable
-    {
-        /// <summary>
-        /// The connection listener that has been registered with this connection.
-        /// </summary>
-        IConnectionListener ConnectionListener
-        {
-            get;
-            set;
-        }
-
-        ExceptionListenerDelegate ExceptionListener { get; set; }
-
-        string ClientID { get; set; }
-
-        /// <return>the maximum number of sessions supported by this Connection</return>     
-        int MaximumChannelCount
-        {
-            get;
-        }
-
-        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode);
-        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch);
-        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow);
-
-        void Start();
-        void Stop();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
deleted file mode 100644
index f141d509be..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface IConnectionFactory
-    {
-        IConnection CreateConnection();
-        IConnection CreateConnection(string userId, string password);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
deleted file mode 100644
index 02d9eb38da..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface IConnectionListener
-    {
-        /// <summary>
-        /// Called when bytes have been transmitted to the server
-        /// </summary>
-        /// <param>count the number of bytes sent in total since the connection was opened</param>     
-        void BytesSent(long count);
-
-        /// <summary>
-        /// Called when some bytes have been received on a connection
-        /// </summary>
-        /// <param>count the number of bytes received in total since the connection was opened</param>         
-        void BytesReceived(long count);
-
-        /// <summary>
-        /// Called after the infrastructure has detected that failover is required but before attempting failover.
-        /// </summary>
-        /// <param>redirect true if the broker requested redirect. false if failover is occurring due to a connection error.</param>
-        /// <return>true to continue failing over, false to veto failover and raise a connection exception</return>         
-        bool PreFailover(bool redirect);
-
-        /// <summary>
-        /// Called after connection has been made to another broker after failover has been started but before
-        /// any resubscription has been done.
-        /// <return> true to continue with resubscription, false to prevent automatic resubscription. This is useful in
-        /// cases where the application wants to handle resubscription. Note that in the latter case all sessions, producers
-        /// and consumers are invalidated.
-        /// </return
-        bool PreResubscribe();
-
-        /// <summary>
-        /// Called once failover has completed successfully. This is called irrespective of whether the client has
-        /// vetoed automatic resubscription.
-        /// </summary>
-        void FailoverComplete();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IFieldTable.cs b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
deleted file mode 100644
index 730ce399d4..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.Collections;
-
-namespace Apache.Qpid.Messaging
-{
-    public interface IFieldTable : IEnumerable
-    {
-        int Count { get; }
-
-        object this[string key] { get; set; }
-
-        /// <summary>
-        /// Adds all the items from another field table in this one. 
-        /// Will overwrite any items in the current table with the same key.
-        /// </summary>
-        /// <param name="source">the source field table</param>
-        void AddAll(IFieldTable source);
-
-        bool Contains(string s);
-        void Clear();
-        void Remove(string key);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IHeaders.cs b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
deleted file mode 100644
index 7fdf26ebda..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IHeaders.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    /// <summary>
-    /// IHeaders represents the header fields of an AMQ message and provides methods to access those fields. There are accessor methods to
-    /// get and set each header field for each supported header field data type.
-    /// 
-    /// <para/><table id="crc"><caption>CRC Card</caption>
-    /// <tr><th>Responsibilities</th></tr>
-    /// <tr><td>Provide accessors for all supported header field types.</td></tr>
-    /// <tr><td>Check if a set of headers contains a named property.</td></tr>
-    /// </table>
-    /// 
-    /// </summary>
-    public interface IHeaders
-    {
-        bool Contains(string name);
-
-        object this[string name] { get; set; }
-        
-        bool GetBoolean(string name);
-        void SetBoolean(string name, bool value);
-
-        byte GetByte(string name);
-        void SetByte(string name, byte value);
-
-        //sbyte GetSByte(string name);
-        //void SetSByte(string name, sbyte value);
-
-        short GetShort(string name);
-        void SetShort(string name, short value);
-
-        int GetInt(string name);
-        void SetInt(string name, int value);
-
-        long GetLong(string name);
-        void SetLong(string name, long value);
-
-        float GetFloat(string name);
-        void SetFloat(string name, float value);
-
-        double GetDouble(string name);
-        void SetDouble(string name, double value);
-
-        string GetString(string name);
-        void SetString(string name, string value);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IMessage.cs b/qpid/dotnet/Qpid.Messaging/IMessage.cs
deleted file mode 100644
index 20ae5ee130..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IMessage.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{   
-    public interface IMessage
-    {
-       /// <summary>
-       /// The MIME Content Type
-       /// </summary>
-       string ContentType { get; set;}
-       /// <summary>
-       /// The MIME Content Encoding
-       /// </summary>
-       string ContentEncoding { get; set; }
-       /// <summary>
-       /// The application correlation identifier
-       /// </summary>
-       string CorrelationId { get; set; }
-       /// <summary>
-       /// The application correlation identifier, as an array of bytes
-       /// </summary>
-       byte[] CorrelationIdAsBytes { get; set; }
-       /// <summary>
-       /// Non-persistent (1) or persistent (2)
-       /// </summary>
-       DeliveryMode DeliveryMode { get; set; }
-       /// <summary>
-       /// Message expiration specification
-       /// </summary>
-       long Expiration { get; set; }
-       /// <summary>
-       /// The application message identifier
-       /// </summary>
-       string MessageId { get; set; }
-       /// <summary>
-       /// The message priority, 0 to 9
-       /// </summary>
-       byte Priority { get; set; }
-       /// <summary>
-       /// True if the message has been redelivered
-       /// </summary>
-        bool Redelivered { get; set; }
-        /// <summary>
-        /// Exchange name of the reply-to address
-        /// </summary>
-        string ReplyToExchangeName { get; set; }
-        /// <summary>
-        /// Routing key of the reply-to address
-        /// </summary>
-        string ReplyToRoutingKey { get; set; }
-        /// <summary>
-        /// The message timestamp
-        /// </summary>
-        long Timestamp { get; set; }
-        /// <summary>
-        /// The message type name
-        /// </summary>
-        string Type { get; set; }
-        /// <summary>
-        /// Message headers
-        /// </summary>
-        IHeaders Headers { get; }
-        /// <summary>
-        /// The creating user id
-        /// </summary>
-        string UserId { get; set; }
-        /// <summary>
-        /// The creating application id
-        /// </summary>
-        string AppId { get; set; }
-        /// <summary>
-        /// Intra-cluster routing identifier
-        /// </summary>
-        string ClusterId { get; set; }
-        
-        void Acknowledge();
-        void ClearBody();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
deleted file mode 100644
index 82d697bf61..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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;
-
-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>
-      /// Fired when a message is received from the broker by the consumer
-      /// </summary>
-      MessageReceivedDelegate OnMessage { get; set; }
-
-      /// <summary>
-      /// Wait infinitely for a message to be received from the broker
-      /// </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.
-      /// </summary>
-      /// <returns>The message, if it was available, otherwise null</returns>
-      IMessage ReceiveNoWait();
-   }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
deleted file mode 100644
index fab0df0c2b..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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;
-
-namespace Apache.Qpid.Messaging
-{
-   /// <summary>
-   /// Defines an object capable of publishing messages
-   /// to an AMQP broker. 
-   /// </summary>
-   /// <remarks>
-   /// A publisher can be created using either 
-   /// <see cref="IChannel.CreatePublisher"/> or 
-   /// using the builder pattern (preferred) with 
-   /// <see cref="IChannel.CreatePublisherBuilder"/>
-   /// </remarks>
-   public interface IMessagePublisher : IDisposable
-   {
-      /// <summary>
-      /// Default delivery mode to use with this publisher
-      /// </summary>
-      DeliveryMode DeliveryMode { get; set; }
-      /// <summary>
-      /// Name of exchange messages are published to
-      /// </summary>
-      string ExchangeName { get; }
-      /// <summary>
-      /// Routing key used when publishing messages
-      /// </summary>
-      string RoutingKey { get; }
-      /// <summary>
-      /// If true, a message ID will not be generated by the publisher
-      /// when sending the message
-      /// </summary>
-      bool DisableMessageID { get; set; }
-      /// <summary>
-      /// If true, no timestamp will be added to the message
-      /// when publishing it
-      /// </summary>
-      bool DisableMessageTimestamp { get; set; }
-      /// <summary>
-      /// Default priority used when publishing messages
-      /// </summary>
-      int Priority { get; set; }
-      /// <summary>
-      /// Default time to live used when publishing messages
-      /// </summary>
-      long TimeToLive { get; set; }
-      /// <summary>
-      /// Set the default MIME type for messages produced by this producer. 
-      /// This reduces the overhead of each message.
-      /// </summary>
-      string MimeType { get; set; }
-      /// <summary>
-      /// Set the default encoding for messages produced by this producer. 
-      /// This reduces the overhead of each message.
-      /// </summary>        
-      string Encoding { get; set; }
-
-      /// <summary>
-      /// Publish a message, using any default values configured
-      /// </summary>
-      /// <param name="msg">Message to publish</param>
-      void Send(IMessage msg);
-      /// <summary>
-      /// Publish a message with the specified options
-      /// </summary>
-      /// <param name="msg">Message to publish</param>
-      /// <param name="deliveryMode">Delivery mode to use</param>
-      /// <param name="priority">Priority of the message</param>
-      /// <param name="timeToLive">Time to live of the message</param>
-      void Send(IMessage msg, DeliveryMode deliveryMode, int priority, long timeToLive);
-   }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ITextMessage.cs b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
deleted file mode 100644
index 902beb70f8..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface ITextMessage : IMessage
-    {
-        string Text { get; set; }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
deleted file mode 100644
index 2d6f76d639..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class MessageConsumerBuilder
-    {
-        private bool _noLocal = false;
-        private bool _exclusive = false;
-        private bool _durable = false;
-        private string _subscriptionName = null;
-        private IChannel _channel;
-        private readonly string _queueName;
-        private int _prefetchLow;
-        private int _prefetchHigh;
-
-        public MessageConsumerBuilder(IChannel channel, string queueName)
-        {
-            _channel = channel;
-            _queueName = queueName;
-            _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);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
deleted file mode 100644
index 2afcffd531..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class MessageNotReadableException : QpidException
-    {
-        public MessageNotReadableException(string reason) : base(reason)
-        {
-        }
-
-        protected MessageNotReadableException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
deleted file mode 100644
index 9b00f01948..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class MessageNotWriteableException : QpidException
-    {
-        public MessageNotWriteableException(string reason) : base(reason)
-        {
-        }
-
-        protected MessageNotWriteableException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
deleted file mode 100644
index 79c7575d0a..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class MessagePublisherBuilder
-    {
-        /// <summary>
-        /// Default value for immediate flag is false, i.e. a consumer does not need to be attached to a queue
-        /// </summary>
-        const bool DEFAULT_IMMEDIATE = false;
-
-        /// <summary>
-        /// Default value for mandatory flag is true, i.e. server will not silently drop messages where no queue is
-        /// connected to the exchange for the message
-        /// </summary>
-        const bool DEFAULT_MANDATORY = true;
-
-        IChannel _channel;
-        string _exchangeName = null;
-        string _routingKey = null;
-        DeliveryMode _deliveryMode = DeliveryMode.Persistent;
-        long _timeToLive;
-        bool _immediate = DEFAULT_IMMEDIATE;
-        bool _mandatory = DEFAULT_MANDATORY;
-        int _priority = 0;
-
-        public MessagePublisherBuilder(IChannel channel)
-        {
-            _channel = channel;
-        }
-
-        public MessagePublisherBuilder WithRoutingKey(string routingKey)
-        {
-            _routingKey = routingKey;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithExchangeName(string exchangeName)
-        {
-            _exchangeName = exchangeName;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithDeliveryMode(DeliveryMode deliveryMode)
-        {
-            _deliveryMode = deliveryMode;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithTimeToLive(long timeToLive)
-        {
-            _timeToLive = timeToLive;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithImmediate(bool immediate)
-        {
-            _immediate = immediate;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithMandatory(bool mandatory)
-        {
-            _mandatory = mandatory;
-            return this;
-        }
-
-        public IMessagePublisher Create()
-        {
-            return _channel.CreatePublisher(_exchangeName, _routingKey, _deliveryMode, _timeToLive, _immediate, _mandatory, _priority);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8683ad08b2..0000000000
--- a/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.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.Messaging")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Messaging")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e74f1805-b355-42e0-ba70-afc7c8570f03")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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: AssemblyFileVersion("1.0.0.0")]
-
-[assembly: CLSCompliant(true)]
diff --git a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
deleted file mode 100644
index 90354bece6..0000000000
--- a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Messaging</RootNamespace>

-    <AssemblyName>Apache.Qpid.Messaging</AssemblyName>

-    <SignAssembly>true</SignAssembly>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="AcknowledgeMode.cs" />

-    <Compile Include="ChannelLimitReachedException.cs" />

-    <Compile Include="DeliveryMode.cs" />

-    <Compile Include="ExchangeClassConstants.cs" />

-    <Compile Include="ExchangeNameDefaults.cs" />

-    <Compile Include="IBytesMessage.cs" />

-    <Compile Include="IConnection.cs" />

-    <Compile Include="IConnectionFactory.cs" />

-    <Compile Include="IConnectionListener.cs" />

-    <Compile Include="IFieldTable.cs" />

-    <Compile Include="IHeaders.cs" />

-    <Compile Include="IMessage.cs" />

-    <Compile Include="IMessageConsumer.cs" />

-    <Compile Include="IMessagePublisher.cs" />

-    <Compile Include="IChannel.cs" />

-    <Compile Include="ITextMessage.cs" />

-    <Compile Include="MessageConsumerBuilder.cs" />

-    <Compile Include="MessageNotReadableException.cs" />

-    <Compile Include="MessageNotWritableException.cs" />

-    <Compile Include="MessagePublisherBuilder.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="QpidException.cs" />

-    <Compile Include="ResourceAllocationException.cs" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Messaging/QpidException.cs b/qpid/dotnet/Qpid.Messaging/QpidException.cs
deleted file mode 100644
index 3e39f2293d..0000000000
--- a/qpid/dotnet/Qpid.Messaging/QpidException.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{   
-    [Serializable]
-    public class QpidException : Exception
-    {
-        public QpidException(string reason) : base(reason)
-        {
-        }
-
-        public QpidException(string reason, Exception e)
-            : base(reason, e)
-        {
-        }
-
-        protected QpidException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
deleted file mode 100644
index 954dcdd94c..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class ResourceAllocationException : QpidException
-    {
-        public ResourceAllocationException(string reason) : base(reason)
-        {
-        }
-
-        protected ResourceAllocationException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build
deleted file mode 100644
index 789258bfad..0000000000
--- a/qpid/dotnet/Qpid.Messaging/default.build
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Messaging" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-            output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-