Converted namespaces from Qpid.* to Apache.Qpid.*

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

45 files changed, 91 insertions, 89 deletions

diff --git a/dotnet/Qpid.Common/AMQChannelClosedException.cs b/dotnet/Qpid.Common/AMQChannelClosedException.cs
index 77d8c06802..98c6966cd1 100644
--- a/dotnet/Qpid.Common/AMQChannelClosedException.cs
+++ b/dotnet/Qpid.Common/AMQChannelClosedException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid
+namespace Apache.Qpid
 {
     [Serializable]
     public class AMQChannelClosedException : AMQException
diff --git a/dotnet/Qpid.Common/AMQConnectionClosedException.cs b/dotnet/Qpid.Common/AMQConnectionClosedException.cs
index 977dcee73a..f3bc387a5c 100644
--- a/dotnet/Qpid.Common/AMQConnectionClosedException.cs
+++ b/dotnet/Qpid.Common/AMQConnectionClosedException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid
+namespace Apache.Qpid
 {
     [Serializable]
     public class AMQConnectionClosedException : AMQException
diff --git a/dotnet/Qpid.Common/AMQDisconnectedException.cs b/dotnet/Qpid.Common/AMQDisconnectedException.cs
index 5ea9672839..b5c4d544cd 100644
--- a/dotnet/Qpid.Common/AMQDisconnectedException.cs
+++ b/dotnet/Qpid.Common/AMQDisconnectedException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid
+namespace Apache.Qpid
 {
     [Serializable]
     public class AMQDisconnectedException : AMQException
diff --git a/dotnet/Qpid.Common/AMQException.cs b/dotnet/Qpid.Common/AMQException.cs
index 4c9c46946e..f9f7158a26 100644
--- a/dotnet/Qpid.Common/AMQException.cs
+++ b/dotnet/Qpid.Common/AMQException.cs
@@ -22,7 +22,7 @@ using System;
 using System.Runtime.Serialization;
 using log4net;
 
-namespace Qpid
+namespace Apache.Qpid
 {
     /// <summary>
     /// The generic AMQ exception.
diff --git a/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
index 2220c3152a..0fb4ddae99 100644
--- a/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
+++ b/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
@@ -22,9 +22,9 @@
 using System;

 using System.Runtime.Serialization;

 

-using Qpid.Protocol;

+using Apache.Qpid.Protocol;

 

-namespace Qpid

+namespace Apache.Qpid

 {

    /// <summary>

    /// Thrown when an invalid argument was supplied to the broker

diff --git a/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
index 962211de04..3f8dead94d 100644
--- a/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
+++ b/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
@@ -22,9 +22,9 @@
 using System;

 using System.Runtime.Serialization;

 

-using Qpid.Protocol;

+using Apache.Qpid.Protocol;

 

-namespace Qpid

+namespace Apache.Qpid

 {

    /// <summary>

    /// Thrown when an invalid routing key was sent to the broker

diff --git a/dotnet/Qpid.Common/AMQUndeliveredException.cs b/dotnet/Qpid.Common/AMQUndeliveredException.cs
index 225a94e9b8..70ad86c8a3 100644
--- a/dotnet/Qpid.Common/AMQUndeliveredException.cs
+++ b/dotnet/Qpid.Common/AMQUndeliveredException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid
+namespace Apache.Qpid
 {
     /// <summary>
     /// Thrown when a message has been bounced by the broker, indicating it could not be delivered.
diff --git a/dotnet/Qpid.Common/AssemblySettings.cs b/dotnet/Qpid.Common/AssemblySettings.cs
index ee07c88659..888de692e8 100644
--- a/dotnet/Qpid.Common/AssemblySettings.cs
+++ b/dotnet/Qpid.Common/AssemblySettings.cs
@@ -27,7 +27,7 @@ using System.Runtime.CompilerServices;
 using System.Xml;
 using log4net;
 
-namespace Qpid.Common
+namespace Apache.Qpid.Common
 {
     /// <summary>
     ///
diff --git a/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/dotnet/Qpid.Common/Collections/BlockingQueue.cs
index 71fc9bf518..dcfacf8474 100644
--- a/dotnet/Qpid.Common/Collections/BlockingQueue.cs
+++ b/dotnet/Qpid.Common/Collections/BlockingQueue.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections;
 
-namespace Qpid.Collections
+namespace Apache.Qpid.Collections
 {
     public abstract class BlockingQueue : Queue
     {
@@ -92,3 +92,4 @@ namespace Qpid.Collections
     }
 }
 
+
diff --git a/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs b/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
index 1e21284608..ea4526faaf 100644
--- a/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
+++ b/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
@@ -23,7 +23,7 @@ using System.Collections;
 using System.Threading;

 

 

-namespace Qpid.Collections

+namespace Apache.Qpid.Collections

 {

    /// <summary>

    /// Simple FIFO queue to support multi-threaded consumer

diff --git a/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs b/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
index 9678464989..be92576951 100644
--- a/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
+++ b/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Threading;
 
-namespace Qpid.Collections
+namespace Apache.Qpid.Collections
 {
     public class LinkedBlockingQueue : BlockingQueue
     {             
@@ -381,3 +381,4 @@ namespace Qpid.Collections
     }
 }
 
+
diff --git a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
index c08d4a9197..10ab5c674d 100644
--- a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
+++ b/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections;
 
-namespace Qpid.Collections
+namespace Apache.Qpid.Collections
 {
     public class LinkedHashtable : IDictionary
     {
diff --git a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
index c559a37b44..3c12df6067 100644
--- a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
+++ b/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Threading;
 
-namespace Qpid.Collections
+namespace Apache.Qpid.Collections
 {
     public class SynchronousQueue : BlockingQueue
     {
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
index 1c1080bdcb..7867650e50 100644
--- a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
+++ b/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
@@ -21,11 +21,11 @@
 using System;
 using System.Collections;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Codec;
-using Qpid.Codec.Demux;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Codec.Demux;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class AMQDataBlockDecoder : IMessageDecoder
     {
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs b/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
index b180e1ac95..e2645c630e 100644
--- a/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
+++ b/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
@@ -20,11 +20,11 @@
  */
 using System.Collections;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Codec;
-using Qpid.Codec.Demux;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Codec.Demux;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class AMQDataBlockEncoder : IMessageEncoder
     {
diff --git a/dotnet/Qpid.Common/Framing/AMQFrame.cs b/dotnet/Qpid.Common/Framing/AMQFrame.cs
index 2708c331b3..912be72d30 100644
--- a/dotnet/Qpid.Common/Framing/AMQFrame.cs
+++ b/dotnet/Qpid.Common/Framing/AMQFrame.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class AMQFrame : IDataBlock
     {
diff --git a/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs b/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
index 82891b5986..cda8c84ecf 100644
--- a/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
+++ b/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
@@ -22,7 +22,7 @@ using System;
 using System.Runtime.Serialization;
 using log4net;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// Thrown when a frame cannot be decoded. This generally indicates a mismatch between the broker and the
diff --git a/dotnet/Qpid.Common/Framing/AMQMethodBody.cs b/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
index 804e6a4039..a3c4337147 100644
--- a/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
+++ b/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
@@ -19,9 +19,9 @@
  *
  */
 using System;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public abstract class AMQMethodBody : IBody
     {
diff --git a/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs b/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
index a5c90f0fdd..c1fd3f887a 100644
--- a/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
+++ b/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class AMQMethodBodyFactory : IBodyFactory
     {
diff --git a/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs b/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
index 555cf1e6af..379e5d00ba 100644
--- a/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
+++ b/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     [Serializable]
     public class AMQProtocolHeaderException : AMQException
diff --git a/dotnet/Qpid.Common/Framing/AMQType.cs b/dotnet/Qpid.Common/Framing/AMQType.cs
index 8743ea0ea5..618ab31d32 100644
--- a/dotnet/Qpid.Common/Framing/AMQType.cs
+++ b/dotnet/Qpid.Common/Framing/AMQType.cs
@@ -20,9 +20,9 @@
  */

 using System;

 using System.Text;

-using Qpid.Buffer;

+using Apache.Qpid.Buffer;

 

-namespace Qpid.Framing

+namespace Apache.Qpid.Framing

 {

    /// <summary>

    /// Base class for the Field Table Type system.

diff --git a/dotnet/Qpid.Common/Framing/AMQTypeMap.cs b/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
index 56d0119a16..ed38c203a9 100644
--- a/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
+++ b/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
@@ -21,7 +21,7 @@
 using System;

 using System.Collections;

 

-namespace Qpid.Framing

+namespace Apache.Qpid.Framing

 {

    public sealed class AMQTypeMap

    {

diff --git a/dotnet/Qpid.Common/Framing/AMQTypedValue.cs b/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
index 7fdabbaf6c..8d21a60831 100644
--- a/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
+++ b/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
@@ -19,9 +19,9 @@
  *

  */

 using System;

-using Qpid.Buffer;

+using Apache.Qpid.Buffer;

 

-namespace Qpid.Framing

+namespace Apache.Qpid.Framing

 {

    public class AMQTypedValue

    {

diff --git a/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs b/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
index 0c06a01eb4..47db7b0887 100644
--- a/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
+++ b/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
@@ -20,10 +20,10 @@
  */
 using System;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Messaging;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    public class BasicContentHeaderProperties : IContentHeaderProperties
    {
diff --git a/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs b/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
index 19d12b8039..d2b7f606b2 100644
--- a/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
+++ b/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
@@ -19,9 +19,9 @@
  *
  */
 using System.Text;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class CompositeAMQDataBlock : IDataBlock, IEncodableAMQDataBlock
     {
diff --git a/dotnet/Qpid.Common/Framing/ContentBody.cs b/dotnet/Qpid.Common/Framing/ContentBody.cs
index 617086f2e8..7a2142985d 100644
--- a/dotnet/Qpid.Common/Framing/ContentBody.cs
+++ b/dotnet/Qpid.Common/Framing/ContentBody.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentBody : IBody
     {
diff --git a/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs b/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
index ec0e89b421..400b2aec08 100644
--- a/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
+++ b/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
@@ -19,9 +19,9 @@
  *
  */
 using log4net;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentBodyFactory : IBodyFactory
     {
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs b/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
index 29ec46c0fb..82889c23c8 100644
--- a/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
+++ b/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
@@ -19,9 +19,9 @@
  *
  */
 using System;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentHeaderBody : IBody
     {
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs b/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
index 27cc5aeb04..c95a10871d 100644
--- a/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
+++ b/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
@@ -19,9 +19,9 @@
  *
  */
 using log4net;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentHeaderBodyFactory : IBodyFactory
     {
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs b/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
index 16a24d6b92..bac5d10fd4 100644
--- a/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
+++ b/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ContentHeaderPropertiesFactory
     {
diff --git a/dotnet/Qpid.Common/Framing/EncodingUtils.cs b/dotnet/Qpid.Common/Framing/EncodingUtils.cs
index 6dc973a672..4d424656f9 100644
--- a/dotnet/Qpid.Common/Framing/EncodingUtils.cs
+++ b/dotnet/Qpid.Common/Framing/EncodingUtils.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Globalization;
 using System.Text;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
    public class EncodingUtils
    {
diff --git a/dotnet/Qpid.Common/Framing/FieldTable.cs b/dotnet/Qpid.Common/Framing/FieldTable.cs
index adff817923..6567bf58ab 100644
--- a/dotnet/Qpid.Common/Framing/FieldTable.cs
+++ b/dotnet/Qpid.Common/Framing/FieldTable.cs
@@ -22,11 +22,11 @@ using System;
 using System.Collections;
 using System.Text;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Collections;
-using Qpid.Messaging;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Collections;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class FieldTable : IFieldTable, IEnumerable
     {
diff --git a/dotnet/Qpid.Common/Framing/HeartbeatBody.cs b/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
index 3fdaa7e850..a8906f5ba8 100644
--- a/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
+++ b/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class HeartbeatBody : IBody
 {
diff --git a/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs b/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
index 1e62f26c0d..90e5c7768e 100644
--- a/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
+++ b/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class HeartbeatBodyFactory : IBodyFactory
     {
diff --git a/dotnet/Qpid.Common/Framing/IBody.cs b/dotnet/Qpid.Common/Framing/IBody.cs
index cc0dbd9b59..97b4459e5c 100644
--- a/dotnet/Qpid.Common/Framing/IBody.cs
+++ b/dotnet/Qpid.Common/Framing/IBody.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// An IBody is contained within a top level frame. As such, it is not en/decodable on its own but
diff --git a/dotnet/Qpid.Common/Framing/IBodyFactory.cs b/dotnet/Qpid.Common/Framing/IBodyFactory.cs
index 4f6bc7155e..dd7960ddbe 100644
--- a/dotnet/Qpid.Common/Framing/IBodyFactory.cs
+++ b/dotnet/Qpid.Common/Framing/IBodyFactory.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// Any class that is capable of turning a stream of bytes into an AMQ structure must implement this interface.
diff --git a/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs b/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
index df38738f1d..676d0910d4 100644
--- a/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
+++ b/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// There will be an implementation of this interface for each content type. All content types have associated
diff --git a/dotnet/Qpid.Common/Framing/IDataBlock.cs b/dotnet/Qpid.Common/Framing/IDataBlock.cs
index 57b2a8ed37..c61ed90d10 100644
--- a/dotnet/Qpid.Common/Framing/IDataBlock.cs
+++ b/dotnet/Qpid.Common/Framing/IDataBlock.cs
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     /// <summary>
     /// A data block represents something that has a size in bytes and the ability to write itself to a byte
diff --git a/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs b/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
index 1d81d5ea82..da8bf9fef9 100644
--- a/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
+++ b/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     
     /// <summary>
diff --git a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
index 280242513c..a9f5697144 100644
--- a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
+++ b/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
@@ -24,12 +24,12 @@ using System.Configuration;
 using System.Reflection;
 using System.Xml;
 using log4net;
-using Qpid.Buffer;
-using Qpid.Codec;
-using Qpid.Codec.Demux;
-using Qpid.Common;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Codec.Demux;
+using Apache.Qpid.Common;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
     public class ProtocolInitiation : IDataBlock, IEncodableAMQDataBlock
     {
diff --git a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
index 3fea400217..e876015bc3 100644
--- a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
@@ -23,11 +23,11 @@ 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("Qpid.Common")]
+[assembly: AssemblyTitle("Apache.Qpid.Common")]
 [assembly: AssemblyDescription("Common AMQ Framing Code")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("Apache.Qpid.Common")]
 [assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2006")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/dotnet/Qpid.Common/Protocol/AMQConstant.cs
index 04b4011567..fcf94c29f4 100644
--- a/dotnet/Qpid.Common/Protocol/AMQConstant.cs
+++ b/dotnet/Qpid.Common/Protocol/AMQConstant.cs
@@ -21,7 +21,7 @@
 using System;

 using System.Collections;

 

-namespace Qpid.Protocol

+namespace Apache.Qpid.Protocol

 {

    public sealed class AMQConstant

    {

diff --git a/dotnet/Qpid.Common/Qpid.Common.csproj b/dotnet/Qpid.Common/Qpid.Common.csproj
index 9cce677d66..d15c1887b7 100644
--- a/dotnet/Qpid.Common/Qpid.Common.csproj
+++ b/dotnet/Qpid.Common/Qpid.Common.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</ProjectGuid>

     <OutputType>Library</OutputType>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Qpid</RootNamespace>

-    <AssemblyName>Qpid.Common</AssemblyName>

+    <RootNamespace>Apache.Qpid</RootNamespace>

+    <AssemblyName>Apache.Qpid.Common</AssemblyName>

     <SignAssembly>false</SignAssembly>

     <AssemblyOriginatorKeyFile>

     </AssemblyOriginatorKeyFile>

@@ -210,4 +210,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>
\ No newline at end of file
+</Project>

diff --git a/dotnet/Qpid.Common/default.build b/dotnet/Qpid.Common/default.build
index dd9ad20f62..36055b9ca9 100644
--- a/dotnet/Qpid.Common/default.build
+++ b/dotnet/Qpid.Common/default.build
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Qpid.Common" default="build">
+<project name="Apache.Qpid.Common" default="build">
     <!--
 		Properties that come from master build file
 		- build.dir: root directory for build
@@ -18,9 +18,9 @@
          </sources>
          <references>
             <include name="${build.dir}/log4net.dll" />	
-            <include name="${build.dir}/Qpid.Buffer.dll" />	
-            <include name="${build.dir}/Qpid.Messaging.dll" />	
-            <include name="${build.dir}/Qpid.Codec.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Messaging.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Codec.dll" />	
          </references>
         </csc>
     </target>
diff --git a/dotnet/Qpid.Common/stylesheets/csharp.xsl b/dotnet/Qpid.Common/stylesheets/csharp.xsl
index 588ac3145f..674c971559 100644
--- a/dotnet/Qpid.Common/stylesheets/csharp.xsl
+++ b/dotnet/Qpid.Common/stylesheets/csharp.xsl
@@ -34,10 +34,10 @@
 <!-- main class generation template -->
 <xsl:template name="generate-class"> 
     <xsl:param name="f"/>
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
 using System.Text;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
   ///
   /// <summary>This class is autogenerated
@@ -147,7 +147,7 @@ using System;
 using System.Collections;
 using log4net;
 
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
 
 
@@ -202,7 +202,7 @@ namespace Qpid.Framing
     <xsl:result-document href="{$file}" format="textFormat">
 
 using System.Collections;
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
 {
   /**
    * This class is autogenerated, do not modify. [From <xsl:value-of select="@protocol"/>]