diff options
272 files changed, 700 insertions, 634 deletions
diff --git a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs index d97f8278b5..1191d49954 100644 --- a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,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.Buffer.Tests")]
+[assembly: AssemblyTitle("Apache.Qpid.Buffer.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Qpid.Buffer.Tests")]
+[assembly: AssemblyProduct("Apache.Qpid.Buffer.Tests")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj index e830782269..c3459aff29 100644 --- a/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj +++ b/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{74640962-99D0-4D06-B57A-9CD66517CF52}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Buffer.Tests</RootNamespace>
- <AssemblyName>Qpid.Buffer.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Buffer.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Buffer.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,4 +56,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs b/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs index aa675e3014..9af8801627 100644 --- a/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs +++ b/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs @@ -20,9 +20,9 @@ */
using NUnit.Framework;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Buffer.Tests
+namespace Apache.Qpid.Buffer.Tests
{
/// <summary>
/// Tests for the SimpleByteBuffer class
@@ -330,3 +330,4 @@ namespace Qpid.Buffer.Tests } // class SimpleByteBufferTests
}
+
diff --git a/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs b/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs index 07c7e14a48..071aa23830 100644 --- a/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs +++ b/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs @@ -21,9 +21,9 @@ using System;
using NUnit.Framework;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Buffer.Tests
+namespace Apache.Qpid.Buffer.Tests
{
/// <summary>
/// Tests for the SlicedByteBuffer class
diff --git a/dotnet/Qpid.Buffer.Tests/default.build b/dotnet/Qpid.Buffer.Tests/default.build index 829f052510..688633fc11 100644 --- a/dotnet/Qpid.Buffer.Tests/default.build +++ b/dotnet/Qpid.Buffer.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Buffer" default="test">
+<project name="Apache.Qpid.Buffer" default="test">
<target name="build">
<csc target="library"
diff --git a/dotnet/Qpid.Buffer/BufferOverflowException.cs b/dotnet/Qpid.Buffer/BufferOverflowException.cs index 2a7ad064d5..5a2fff74a7 100644 --- a/dotnet/Qpid.Buffer/BufferOverflowException.cs +++ b/dotnet/Qpid.Buffer/BufferOverflowException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { [Serializable] public class BufferOverflowException : Exception @@ -38,3 +38,4 @@ namespace Qpid.Buffer } + diff --git a/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/dotnet/Qpid.Buffer/BufferUnderflowException.cs index c0cb850e63..13939b77a8 100644 --- a/dotnet/Qpid.Buffer/BufferUnderflowException.cs +++ b/dotnet/Qpid.Buffer/BufferUnderflowException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { [Serializable] public class BufferUnderflowException : Exception @@ -39,3 +39,4 @@ namespace Qpid.Buffer } + diff --git a/dotnet/Qpid.Buffer/ByteBuffer.cs b/dotnet/Qpid.Buffer/ByteBuffer.cs index b341fa7632..67f0edd440 100644 --- a/dotnet/Qpid.Buffer/ByteBuffer.cs +++ b/dotnet/Qpid.Buffer/ByteBuffer.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { /// <summary> /// Abstract class implementing a byte buffer diff --git a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs index bf7c738041..4c2856c333 100644 --- a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs +++ b/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs @@ -20,7 +20,7 @@ */ using System.Text; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { public class ByteBufferHexDumper { @@ -76,3 +76,4 @@ namespace Qpid.Buffer } + diff --git a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/dotnet/Qpid.Buffer/IByteBufferAllocator.cs index 0cc0811a5c..0f457df065 100644 --- a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs +++ b/dotnet/Qpid.Buffer/IByteBufferAllocator.cs @@ -21,7 +21,7 @@ using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
/// <summary>
/// Allocates <see cref="ByteBuffer"/>'s and manages them. Please
@@ -47,3 +47,4 @@ namespace Qpid.Buffer }
+
diff --git a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs index 971d78b27c..4dd92ccdc2 100644 --- a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Buffer/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.ByteBuffer")] +[assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.ByteBuffer")] +[assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/dotnet/Qpid.Buffer/Qpid.Buffer.csproj index 97346bd9fd..9320438f6f 100644 --- a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj +++ b/dotnet/Qpid.Buffer/Qpid.Buffer.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Buffer</RootNamespace>
- <AssemblyName>Qpid.Buffer</AssemblyName>
+ <RootNamespace>Apache.Qpid.Buffer</RootNamespace>
+ <AssemblyName>Apache.Qpid.Buffer</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
@@ -56,4 +56,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/dotnet/Qpid.Buffer/SimpleByteBuffer.cs index d91f7747d2..d3b7245cb1 100644 --- a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs +++ b/dotnet/Qpid.Buffer/SimpleByteBuffer.cs @@ -20,7 +20,7 @@ */
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
internal sealed class SimpleByteBuffer : ByteBuffer
{
diff --git a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs index 6933480c92..e772e59ae3 100644 --- a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs +++ b/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs @@ -19,7 +19,7 @@ * */ -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { /// <summary> /// Allocates <see cref="ByteBuffer"/>'s and manages them. @@ -55,3 +55,4 @@ namespace Qpid.Buffer } + diff --git a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/dotnet/Qpid.Buffer/SlicedByteBuffer.cs index 414da94a8d..c27b7949b6 100644 --- a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs +++ b/dotnet/Qpid.Buffer/SlicedByteBuffer.cs @@ -20,7 +20,7 @@ */
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
internal sealed class SlicedByteBuffer : ByteBuffer
{
diff --git a/dotnet/Qpid.Buffer/default.build b/dotnet/Qpid.Buffer/default.build index e7002e7eb9..c2d36d15e6 100644 --- a/dotnet/Qpid.Buffer/default.build +++ b/dotnet/Qpid.Buffer/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Buffer" default="build">
+<project name="Apache.Qpid.Buffer" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
diff --git a/dotnet/Qpid.Client.Tests/App.config b/dotnet/Qpid.Client.Tests/App.config index 64c6def5fd..fd7c412a57 100644 --- a/dotnet/Qpid.Client.Tests/App.config +++ b/dotnet/Qpid.Client.Tests/App.config @@ -2,12 +2,12 @@ <configuration>
<configSections>
<sectionGroup name="qpid.client">
- <section name="authentication" type="Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Qpid.Client"/>
+ <section name="authentication" type="Apache.Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Apache.Qpid.Client"/>
</sectionGroup>
</configSections>
<qpid.client>
<authentication>
- <add key="TEST" value="Qpid.Client.Tests.Security.TestCallbackHandler, Qpid.Client.Tests"/>
+ <add key="TEST" value="Apache.Qpid.Client.Tests.Security.TestCallbackHandler, Apache.Qpid.Client.Tests"/>
</authentication>
</qpid.client>
</configuration>
diff --git a/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs b/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs index 8bc615bd20..8e8d8ced3b 100644 --- a/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs +++ b/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs @@ -21,9 +21,9 @@ using System;
using System.Net;
using NUnit.Framework;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Tests.BrokerDetails
+namespace Apache.Qpid.Client.Tests.BrokerDetails
{
[TestFixture]
public class BrokerDetailsTest
diff --git a/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs b/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs index 40ba1dd25a..c27aa9a503 100644 --- a/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs +++ b/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs @@ -23,11 +23,11 @@ using System; using log4net;
using NUnit.Framework;
-using Qpid.Client;
-using Qpid.Client.Message;
-using Qpid.Messaging;
+using Apache.Qpid.Client;
+using Apache.Qpid.Client.Message;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.Channel
+namespace Apache.Qpid.Client.Tests.Channel
{
/// <summary>
/// Test that channels can create messages correctly
@@ -74,5 +74,6 @@ namespace Qpid.Client.Tests.Channel Assert.IsInstanceOfType(typeof(ITextMessage), msg);
}
}
-} // namespace Qpid.Client.Tests.Channel
+} // namespace Apache.Qpid.Client.Tests.Channel
+
diff --git a/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs b/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs index 92f30f8f4d..a9a39f87f8 100644 --- a/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs +++ b/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs @@ -22,11 +22,11 @@ using System; using System.Net;
using System.Threading;
using log4net;
-using Qpid.Client.Qms;
-using Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
using NUnit.Framework;
-namespace Qpid.Client.Tests.Channel
+namespace Apache.Qpid.Client.Tests.Channel
{
/// <summary>
/// Test the queue methods
diff --git a/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs b/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs index c776610596..9f91958028 100644 --- a/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs +++ b/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs @@ -21,10 +21,10 @@ using System; using log4net; using NUnit.Framework; -using Qpid.Messaging; -using Qpid.Client.Qms; +using Apache.Qpid.Messaging; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { /// <summary> /// Provides a basis for writing Unit tests that communicate with an AMQ protocol broker. By default it creates a connection diff --git a/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs b/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs index 2ab8c00388..f3ce695de8 100644 --- a/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs +++ b/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs @@ -22,10 +22,10 @@ using System; using System.Threading;
using log4net;
using NUnit.Framework;
-using Qpid.Framing;
-using Qpid.Messaging;
+using Apache.Qpid.Framing;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests
+namespace Apache.Qpid.Client.Tests
{
/// <summary>
/// Sets up a producer/consumer pair to send test messages through a header exchange. The header exchange matching pattern is tested to
diff --git a/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs b/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs index 421d0d4e02..1211196541 100644 --- a/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs +++ b/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs @@ -23,10 +23,10 @@ using System; using log4net;
using NUnit.Framework;
-using Qpid.Messaging;
-using Qpid.Client.Message;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Message;
-namespace Qpid.Client.Tests.Messages
+namespace Apache.Qpid.Client.Tests.Messages
{
/// <summary>
/// Ensure a factory creates messages correctly
@@ -109,5 +109,6 @@ namespace Qpid.Client.Tests.Messages }
}
-} // namespace Qpid.Client.Tests.Messages
+} // namespace Apache.Qpid.Client.Tests.Messages
+
diff --git a/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs b/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs index fd1400d9d8..dc3b436a41 100644 --- a/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs +++ b/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs @@ -23,9 +23,9 @@ using System.Text; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { [TestFixture] public class ProducerMultiConsumer : BaseMessagingTestFixture diff --git a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs index 3a2842c210..b3648391c1 100644 --- a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs @@ -26,11 +26,11 @@ using log4net.Config; // 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.Client.Tests")] +[assembly: AssemblyTitle("Apache.Qpid.Client.Tests")] [assembly: AssemblyDescription("Test Suite for Qpid Clients")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.Client.Tests")] +[assembly: AssemblyProduct("Apache.Qpid.Client.Tests")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj index d74337b42b..a1a34d480d 100644 --- a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj +++ b/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Client.Tests</RootNamespace>
- <AssemblyName>Qpid.Client.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Client.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Client.Tests</AssemblyName>
<StartupObject>
</StartupObject>
</PropertyGroup>
@@ -71,6 +71,10 @@ <Compile Include="url\ConnectionUrlTest.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
+ <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>
+ <Name>Qpid.Buffer</Name>
+ </ProjectReference>
<ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">
<Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>
<Name>Qpid.Messaging</Name>
@@ -107,4 +111,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs b/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs index 9dac69a483..1345511cbf 100644 --- a/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs +++ b/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs @@ -20,10 +20,10 @@ */
using System;
using NUnit.Framework;
-using Qpid.Client.Security;
+using Apache.Qpid.Client.Security;
-namespace Qpid.Client.Tests.Security
+namespace Apache.Qpid.Client.Tests.Security
{
[TestFixture]
public class CallbackRegistryHandlerTests
@@ -63,4 +63,4 @@ namespace Qpid.Client.Tests.Security } // class TestCallbackHandler
-} // namespace Qpid.Client.Tests.Connection
+} // namespace Apache.Qpid.Client.Tests.Connection
diff --git a/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs b/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs index c90359d4d7..f299812989 100644 --- a/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs +++ b/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs @@ -23,9 +23,9 @@ using System.Text; using System.Threading;
using log4net;
using NUnit.Framework;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests
+namespace Apache.Qpid.Client.Tests
{
[TestFixture]
public class TestSyncConsumer : BaseMessagingTestFixture
diff --git a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs index 4204a42015..165da62828 100644 --- a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs +++ b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs @@ -20,10 +20,10 @@ */ using System; using NUnit.Framework; -using Qpid.Client.Qms; -using Qpid.Messaging; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests.Connection +namespace Apache.Qpid.Client.Tests.Connection { [TestFixture] public class ConnectionTest diff --git a/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs index 8994279da1..e1c61f9059 100644 --- a/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs +++ b/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs @@ -23,10 +23,10 @@ using System.IO; using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using NUnit.Framework;
-using Qpid.Client.Qms;
-using Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.Connection
+namespace Apache.Qpid.Client.Tests.Connection
{
/// <summary>
/// Test SSL/TLS connections to the broker
diff --git a/dotnet/Qpid.Client.Tests/default.build b/dotnet/Qpid.Client.Tests/default.build index 88d06284d7..e7fb81dae5 100644 --- a/dotnet/Qpid.Client.Tests/default.build +++ b/dotnet/Qpid.Client.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<project name="Qpid.Client" default="test"> +<project name="Apache.Qpid.Client" default="test"> <target name="build"> <csc target="library" @@ -14,9 +14,9 @@ <include name="${build.dir}/log4net.dll" /> <include name="${build.dir}/nunit.framework.dll" /> <include name="${build.dir}/${project::get-name()}.dll" /> - <include name="${build.dir}/Qpid.Common.dll" /> - <include name="${build.dir}/Qpid.Messaging.dll" /> - <include name="${build.dir}/Qpid.Sasl.dll" /> + <include name="${build.dir}/Apache.Qpid.Common.dll" /> + <include name="${build.dir}/Apache.Qpid.Messaging.dll" /> + <include name="${build.dir}/Apache.Qpid.Sasl.dll" /> </references> </csc> <copy diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs index 7d7426a6a5..1f1e2f726c 100644 --- a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs +++ b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs @@ -22,10 +22,10 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Client.Qms; -using Qpid.Messaging; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests.failover +namespace Apache.Qpid.Client.Tests.failover { [TestFixture, Category("Failover")] public class FailoverTest : IConnectionListener diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs index 9063149bad..a110891cfc 100644 --- a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs +++ b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs @@ -23,10 +23,10 @@ using System.Runtime.InteropServices; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Client.Qms; -using Qpid.Messaging; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests.failover +namespace Apache.Qpid.Client.Tests.failover { [TestFixture, Category("Failover")] public class FailoverTxTest : IConnectionListener diff --git a/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs b/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs index 8e93bd8fa6..905335132b 100644 --- a/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs +++ b/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs @@ -1,9 +1,9 @@ using System;
using System.Collections.Generic;
using System.Text;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
/// <summary> Defines the possible test case roles that an interop test case can take on. </summary>
public enum Roles { SENDER, RECEIVER };
diff --git a/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs b/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs index 2001d14956..3c096a6306 100644 --- a/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs +++ b/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic;
using System.Text;
using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
{
/// <summary>
/// Implements tet case 1, dummy run. This test case sends no test messages, it exists to confirm that the test harness
diff --git a/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs b/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs index 46c644c243..d4729d88f1 100644 --- a/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs +++ b/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic;
using System.Text;
using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
{
/// <summary>
/// Implements test case 2, basic P2P. Sends/receives a specified number of messages to a specified route on the
diff --git a/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs index 61c02f13d8..e9f2fbdbb6 100644 --- a/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs +++ b/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic;
using System.Text;
using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
{
/// <summary>
/// Implements test case 3, basic pub/sub. Sends/received a specified number of messages to a specified route on the
diff --git a/dotnet/Qpid.Client.Tests/interop/TestClient.cs b/dotnet/Qpid.Client.Tests/interop/TestClient.cs index b502129325..49e122c14c 100644 --- a/dotnet/Qpid.Client.Tests/interop/TestClient.cs +++ b/dotnet/Qpid.Client.Tests/interop/TestClient.cs @@ -2,12 +2,12 @@ using System; using System.Collections.Generic;
using System.Collections;
using System.Text;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
using log4net;
-using Qpid.Client.Tests.interop.TestCases;
+using Apache.Qpid.Client.Tests.interop.TestCases;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
/// <summary>
/// Implements a test client as described in the interop testing spec
diff --git a/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/dotnet/Qpid.Client.Tests/interop/TopicListener.cs index db9b1a4650..13141d52b8 100644 --- a/dotnet/Qpid.Client.Tests/interop/TopicListener.cs +++ b/dotnet/Qpid.Client.Tests/interop/TopicListener.cs @@ -20,10 +20,10 @@ */
using System;
using log4net;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
public class TopicListener
{
diff --git a/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs index 5004bb28d2..ef5d39f0bc 100644 --- a/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs +++ b/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs @@ -1,10 +1,10 @@ using System;
using System.Threading;
using log4net;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
public class TopicPublisher
{
diff --git a/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs b/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs index ad5981a5c5..cbc93ae2fe 100644 --- a/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs +++ b/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs @@ -22,9 +22,9 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { [TestFixture] public class ServiceProvidingClient : BaseMessagingTestFixture diff --git a/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs b/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs index 8264879c1f..f35fb2dac9 100644 --- a/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs +++ b/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs @@ -22,9 +22,9 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { public class ServiceRequestingClient : BaseMessagingTestFixture { diff --git a/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs b/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs index bae5b6d8f9..bcf57e586e 100644 --- a/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs +++ b/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs @@ -22,9 +22,9 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { /// <summary> /// Tests that when sending undeliverable messages with the diff --git a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs index b3ee0272b4..3c9f8dd4e2 100644 --- a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs +++ b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs @@ -21,9 +21,9 @@ using System; using System.Net; using NUnit.Framework; -using Qpid.Client.Qms; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client.Tests.url +namespace Apache.Qpid.Client.Tests.url { [TestFixture] public class connectionUrlTests diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs index d65b5e9e6a..badaa48111 100644 --- a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs +++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs @@ -22,10 +22,10 @@ using System; using System.Net; using System.Net.Sockets; using log4net; -using Qpid.Buffer; -using Qpid.Client.Protocol; +using Apache.Qpid.Buffer; +using Apache.Qpid.Client.Protocol; -namespace Qpid.Client.Transport.Socket.Blocking +namespace Apache.Qpid.Client.Transport.Socket.Blocking { class BlockingSocketProcessor : IConnectionCloser { @@ -114,3 +114,4 @@ namespace Qpid.Client.Transport.Socket.Blocking } } + diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs index e85e42e08c..17f911fb6d 100644 --- a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs +++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs @@ -22,8 +22,8 @@ using System; using System.Collections; using System.Threading; using log4net; -using Qpid.Client.Protocol; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Framing; namespace Qpid.Client.Transport.Socket.Blocking { @@ -118,3 +118,4 @@ namespace Qpid.Client.Transport.Socket.Blocking } } + diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs index 07784b750c..19da2fceb9 100644 --- a/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs +++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs @@ -20,9 +20,9 @@ */ using System; using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Transport.Socket.Blocking +namespace Apache.Qpid.Client.Transport.Socket.Blocking { class ByteChannel : IByteChannel { @@ -60,4 +60,4 @@ namespace Qpid.Client.Transport.Socket.Blocking processor.Write(buffer); } } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs index 54da92a22a..00f366b5a9 100644 --- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/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("BlockingTransport")] +[assembly: AssemblyTitle("Apache.Qpid.Transport.Blocking")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("BlockingTransport")] +[assembly: AssemblyProduct("Apache.Qpid.Transport.Blocking")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj b/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj index a710ef998e..a12b6695e2 100644 --- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj +++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{52AC4940-2077-4104-A753-29A9C8C16957}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Client.Transport.Socket.Blocking</RootNamespace>
- <AssemblyName>Qpid.Client.Transport.Socket.Blocking</AssemblyName>
+ <RootNamespace>Apache.Qpid.Client.Transport.Socket.Blocking</RootNamespace>
+ <AssemblyName>Apache.Qpid.Client.Transport.Socket.Blocking</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs b/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs index 68cacad1ef..6382eaaf39 100644 --- a/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs +++ b/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs @@ -21,7 +21,7 @@ using System;
using System.Runtime.Serialization;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQAuthenticationException : AMQException
diff --git a/dotnet/Qpid.Client/Client/AMQConnection.cs b/dotnet/Qpid.Client/Client/AMQConnection.cs index 6feb72b54f..d74cf6b5e4 100644 --- a/dotnet/Qpid.Client/Client/AMQConnection.cs +++ b/dotnet/Qpid.Client/Client/AMQConnection.cs @@ -24,17 +24,17 @@ using System.IO; using System.Reflection; using System.Threading; using log4net; -using Qpid.Client.Failover; -using Qpid.Client.Protocol; -using Qpid.Client.Qms; -using Qpid.Client.State; -using Qpid.Client.Transport; -using Qpid.Client.Transport.Socket.Blocking; -using Qpid.Collections; -using Qpid.Framing; -using Qpid.Messaging; - -namespace Qpid.Client +using Apache.Qpid.Client.Failover; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Client.State; +using Apache.Qpid.Client.Transport; +using Apache.Qpid.Client.Transport.Socket.Blocking; +using Apache.Qpid.Collections; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; + +namespace Apache.Qpid.Client { public class AMQConnection : Closeable, IConnection { @@ -711,8 +711,8 @@ namespace Qpid.Client /* // Currently there is only one transport option - BlockingSocket. - String assemblyName = "Qpid.Client.Transport.Socket.Blocking.dll"; - String transportType = "Qpid.Client.Transport.Socket.Blocking.BlockingSocketTransport"; + String assemblyName = "Apache.Qpid.Client.Transport.Socket.Blocking.dll"; + String transportType = "Apache.Qpid.Client.Transport.Socket.Blocking.BlockingSocketTransport"; // Load the transport assembly dynamically. _transport = LoadTransportFromAssembly(brokerDetail.getHost(), brokerDetail.getPort(), assemblyName, transportType); diff --git a/dotnet/Qpid.Client/Client/AMQConnectionException.cs b/dotnet/Qpid.Client/Client/AMQConnectionException.cs index a4caf02e2c..c8a48814bb 100644 --- a/dotnet/Qpid.Client/Client/AMQConnectionException.cs +++ b/dotnet/Qpid.Client/Client/AMQConnectionException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Client +namespace Apache.Qpid.Client { [Serializable] public class AMQConnectionException : AMQException diff --git a/dotnet/Qpid.Client/Client/AMQDestination.cs b/dotnet/Qpid.Client/Client/AMQDestination.cs index e2c4778a28..07ce3c2354 100644 --- a/dotnet/Qpid.Client/Client/AMQDestination.cs +++ b/dotnet/Qpid.Client/Client/AMQDestination.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client +namespace Apache.Qpid.Client { public abstract class AMQDestination { diff --git a/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs b/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs index ec5944bdac..0d93176734 100644 --- a/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs +++ b/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs @@ -20,10 +20,10 @@ */
using System;
using System.Runtime.Serialization;
-using Qpid.Common;
-using Qpid.Protocol;
+using Apache.Qpid.Common;
+using Apache.Qpid.Protocol;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQNoConsumersException : AMQUndeliveredException
diff --git a/dotnet/Qpid.Client/Client/AMQNoRouteException.cs b/dotnet/Qpid.Client/Client/AMQNoRouteException.cs index 8f0db1c3d5..bde3cdd989 100644 --- a/dotnet/Qpid.Client/Client/AMQNoRouteException.cs +++ b/dotnet/Qpid.Client/Client/AMQNoRouteException.cs @@ -20,10 +20,10 @@ */
using System;
using System.Runtime.Serialization;
-using Qpid.Common;
-using Qpid.Protocol;
+using Apache.Qpid.Common;
+using Apache.Qpid.Protocol;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQNoRouteException : AMQUndeliveredException
diff --git a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs index 90e3788f5a..591c5b941f 100644 --- a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs +++ b/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs @@ -21,9 +21,9 @@ using System; using System.Collections; using System.Text; -using Qpid.Client.Qms; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class AmqBrokerInfo : IBrokerInfo { diff --git a/dotnet/Qpid.Client/Client/AmqChannel.cs b/dotnet/Qpid.Client/Client/AmqChannel.cs index c0a069abee..84f08729dd 100644 --- a/dotnet/Qpid.Client/Client/AmqChannel.cs +++ b/dotnet/Qpid.Client/Client/AmqChannel.cs @@ -23,15 +23,15 @@ using System.Collections; using System.Text.RegularExpressions; using System.Threading; using log4net; -using Qpid.Buffer; -using Qpid.Client.Message; -using Qpid.Client.Util; -using Qpid.Collections; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Protocol; - -namespace Qpid.Client +using Apache.Qpid.Buffer; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Util; +using Apache.Qpid.Collections; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Protocol; + +namespace Apache.Qpid.Client { public class AmqChannel : Closeable, IChannel { diff --git a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs index 796a878eec..fd4ff79505 100644 --- a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs +++ b/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs @@ -21,12 +21,12 @@ using System; using System.Threading; using log4net; -using Qpid.Client.Message; -using Qpid.Collections; -using Qpid.Framing; -using Qpid.Messaging; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Collections; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class BasicMessageConsumer : Closeable, IMessageConsumer { diff --git a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/dotnet/Qpid.Client/Client/BasicMessageProducer.cs index c1af826102..ca6d2abee5 100644 --- a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs +++ b/dotnet/Qpid.Client/Client/BasicMessageProducer.cs @@ -21,12 +21,12 @@ using System; using System.Threading; using log4net; -using Qpid.Buffer; -using Qpid.Client.Message; -using Qpid.Messaging; -using Qpid.Framing; +using Apache.Qpid.Buffer; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Messaging; +using Apache.Qpid.Framing; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class BasicMessageProducer : Closeable, IMessagePublisher { diff --git a/dotnet/Qpid.Client/Client/Closeable.cs b/dotnet/Qpid.Client/Client/Closeable.cs index 159f71ac08..d70f75ee6b 100644 --- a/dotnet/Qpid.Client/Client/Closeable.cs +++ b/dotnet/Qpid.Client/Client/Closeable.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client +namespace Apache.Qpid.Client { public abstract class Closeable { diff --git a/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs b/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs index 0d1fb73c31..ae9225a53a 100644 --- a/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs +++ b/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs @@ -25,10 +25,10 @@ using System.Collections.Specialized; using System.Configuration;
using System.Text;
-using Qpid.Client.Security;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Client.Security;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Client.Configuration
+namespace Apache.Qpid.Client.Configuration
{
public class AuthenticationConfigurationSectionHandler
: IConfigurationSectionHandler
@@ -81,4 +81,4 @@ namespace Qpid.Client.Configuration _keys.Remove(key);
}
}
-} // namespace Qpid.Client.Configuration
+} // namespace Apache.Qpid.Client.Configuration
diff --git a/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs b/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs index 20f158f0ea..b21486bfa8 100644 --- a/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs +++ b/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client +namespace Apache.Qpid.Client { public class ConnectionTuneParameters { @@ -80,3 +80,4 @@ namespace Qpid.Client } } + diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverException.cs b/dotnet/Qpid.Client/Client/Failover/FailoverException.cs index e2bc5b8a71..7013746414 100644 --- a/dotnet/Qpid.Client/Client/Failover/FailoverException.cs +++ b/dotnet/Qpid.Client/Client/Failover/FailoverException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { /// <summary> /// This exception is thrown when failover is taking place and we need to let other diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs b/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs index dbd09da49c..83c69b7d25 100644 --- a/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs +++ b/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs @@ -21,10 +21,10 @@ using System; using System.Threading; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { public class FailoverHandler { @@ -172,3 +172,4 @@ namespace Qpid.Client.Failover } } + diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverState.cs b/dotnet/Qpid.Client/Client/Failover/FailoverState.cs index 04322eeed4..3058cdcd69 100644 --- a/dotnet/Qpid.Client/Client/Failover/FailoverState.cs +++ b/dotnet/Qpid.Client/Client/Failover/FailoverState.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { /// <summary> /// Enumeration of failover states. Used to handle failover from within AMQProtocolHandler where MINA events need to be diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs b/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs index 591c0b1d4f..afa5301f39 100644 --- a/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs +++ b/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs @@ -20,7 +20,7 @@ */ using log4net; -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { public abstract class FailoverSupport { diff --git a/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs index d6e196c8dd..def1e78e8c 100644 --- a/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs @@ -19,12 +19,12 @@ * */ using log4net; -using Qpid.Client.Message; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class BasicDeliverMethodHandler : IStateAwareMethodListener { diff --git a/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs index 0bd65a1ace..f413dfc9c6 100644 --- a/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs @@ -19,12 +19,12 @@ * */ using log4net; -using Qpid.Client.Message; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class BasicReturnMethodHandler : IStateAwareMethodListener { diff --git a/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs index 7f88dd8219..9ed09a0d01 100644 --- a/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs @@ -19,12 +19,12 @@ * */ using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Protocol; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Protocol; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ChannelCloseMethodHandler : IStateAwareMethodListener { @@ -65,3 +65,4 @@ namespace Qpid.Client.Handler } + diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs index dea5316d25..66cff3bc65 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs @@ -21,12 +21,12 @@ using System; using System.Threading; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; -using Qpid.Protocol; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; +using Apache.Qpid.Protocol; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionCloseMethodHandler : IStateAwareMethodListener { diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs index bd8fac1127..038da15731 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs @@ -19,11 +19,11 @@ * */ using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionCloseOkHandler : IStateAwareMethodListener { @@ -38,3 +38,4 @@ namespace Qpid.Client.Handler } } + diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs index b43e2700f6..a12e4ead60 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs @@ -18,10 +18,10 @@ * under the License. * */ -using Qpid.Client.Protocol; -using Qpid.Client.State; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionOpenOkMethodHandler : IStateAwareMethodListener { @@ -32,3 +32,4 @@ namespace Qpid.Client.Handler } } + diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs index 0639d66028..08cc580b17 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs @@ -19,10 +19,10 @@ * */ using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionRedirectMethodHandler : IStateAwareMethodListener { @@ -65,3 +65,4 @@ namespace Qpid.Client.Handler } } + diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs index fe123e6745..9333d4d0a6 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs @@ -18,12 +18,12 @@ * under the License. * */ -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; -using Qpid.Sasl; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; +using Apache.Qpid.Sasl; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionSecureMethodHandler : IStateAwareMethodListener { @@ -57,3 +57,4 @@ namespace Qpid.Client.Handler } + diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs index 3cb7c76e23..1710c19080 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs @@ -22,14 +22,14 @@ using System; using System.Collections; using System.Text; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.Security; -using Qpid.Client.State; -using Qpid.Framing; -using Qpid.Sasl; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.Security; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; +using Apache.Qpid.Sasl; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionStartMethodHandler : IStateAwareMethodListener { @@ -73,7 +73,7 @@ namespace Qpid.Client.Handler stateManager.ChangeState(AMQState.CONNECTION_NOT_TUNED); FieldTable clientProperties = new FieldTable(); - clientProperties["product"] = "Qpid.NET"; + clientProperties["product"] = "Apache.Qpid.NET"; clientProperties["version"] = "1.0"; clientProperties["platform"] = GetFullSystemInfo(); AMQFrame frame = ConnectionStartOkBody.CreateAMQFrame( diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs index afcbd26781..15a1d908b7 100644 --- a/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs @@ -20,11 +20,11 @@ */ using System; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionTuneMethodHandler : IStateAwareMethodListener { diff --git a/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs index 9a67b69834..7290d758f8 100644 --- a/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs @@ -19,12 +19,12 @@ *
*/
using log4net;
-using Qpid.Client.Message;
-using Qpid.Client.Protocol;
-using Qpid.Client.State;
-using Qpid.Framing;
+using Apache.Qpid.Client.Message;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Client.State;
+using Apache.Qpid.Framing;
-namespace Qpid.Client.Handler
+namespace Apache.Qpid.Client.Handler
{
public class QueueDeleteOkMethodHandler : IStateAwareMethodListener
{
diff --git a/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs b/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs index 59e7db34ab..8bde707b00 100644 --- a/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs +++ b/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs @@ -19,12 +19,12 @@ *
*/
using log4net;
-using Qpid.Client.Message;
-using Qpid.Client.Protocol;
-using Qpid.Client.State;
-using Qpid.Framing;
+using Apache.Qpid.Client.Message;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Client.State;
+using Apache.Qpid.Framing;
-namespace Qpid.Client.Handler
+namespace Apache.Qpid.Client.Handler
{
public class QueuePurgeOkMethodHandler : IStateAwareMethodListener
{
diff --git a/dotnet/Qpid.Client/Client/Message/AMQMessage.cs b/dotnet/Qpid.Client/Client/Message/AMQMessage.cs index a43eb028df..e58de2ab96 100644 --- a/dotnet/Qpid.Client/Client/Message/AMQMessage.cs +++ b/dotnet/Qpid.Client/Client/Message/AMQMessage.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class AMQMessage { diff --git a/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs b/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs index a7ee085a04..f352d62c11 100644 --- a/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs +++ b/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs @@ -19,11 +19,11 @@ * */ using System.Collections; -using Qpid.Framing; +using Apache.Qpid.Framing; using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public abstract class AbstractQmsMessageFactory : IMessageFactory { diff --git a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs index adedb41d8c..19f59a4fc1 100644 --- a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs +++ b/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs @@ -22,11 +22,11 @@ using System; using System.Collections; using System.Text; using log4net; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public abstract class AbstractQmsMessage : AMQMessage, IMessage { diff --git a/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs b/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs index cffc585067..bed379290f 100644 --- a/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs +++ b/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs @@ -19,9 +19,9 @@ * */ using System.Collections; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public interface IMessageFactory { @@ -49,3 +49,4 @@ namespace Qpid.Client.Message } } + diff --git a/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs b/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs index f854a541fc..fdb5e14aa6 100644 --- a/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs +++ b/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs @@ -20,10 +20,10 @@ */ using System; using System.Collections; -using Qpid.Framing; -using Qpid.Messaging; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class MessageFactoryRegistry { @@ -126,3 +126,4 @@ namespace Qpid.Client.Message } } + diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs index cb504d1378..fb3efb1b0f 100644 --- a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs +++ b/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs @@ -22,11 +22,11 @@ using System; using System.IO; using System.Runtime.Serialization; using System.Text; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { [Serializable] class MessageEOFException : QpidException diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs b/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs index e96c38cbac..3cc96cbddc 100644 --- a/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs +++ b/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs @@ -20,10 +20,10 @@ */ using System; using System.Collections; -using Qpid.Framing; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class QpidBytesMessageFactory : AbstractQmsMessageFactory { @@ -72,3 +72,4 @@ namespace Qpid.Client.Message } } + diff --git a/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs b/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs index a258c82d15..d27c1df853 100644 --- a/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs +++ b/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs @@ -1,10 +1,10 @@ using System; using System.Collections; using System.Text; -using Qpid.Framing; -using Qpid.Messaging; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { internal class QpidHeaders : IHeaders { diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs index ae8bdb2074..24aef92aa5 100644 --- a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs +++ b/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs @@ -20,11 +20,11 @@ */ using System; using System.Text; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class QpidTextMessage : AbstractQmsMessage, ITextMessage { diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs b/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs index 4730fa56ad..79871e85ca 100644 --- a/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs +++ b/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs @@ -18,10 +18,10 @@ * under the License. * */ -using Qpid.Buffer; -using Qpid.Framing; +using Apache.Qpid.Buffer; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class QpidTextMessageFactory : AbstractQmsMessageFactory { diff --git a/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs b/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs index a671f608d1..4317ef3474 100644 --- a/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs +++ b/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; using log4net; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { /// <summary> /// Raised when a message body is received unexpectedly by the client. This typically occurs when the @@ -54,3 +54,4 @@ namespace Qpid.Client.Message } + diff --git a/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs b/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs index b64c8e1c27..d329712334 100644 --- a/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs +++ b/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs @@ -19,9 +19,9 @@ * */ using System.Collections; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class UnprocessedMessage { @@ -54,3 +54,4 @@ namespace Qpid.Client.Message } } + diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs b/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs index ab40a83b3e..a7ce808862 100644 --- a/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs +++ b/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs @@ -20,9 +20,9 @@ */ using System; using System.Text; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public class AMQMethodEvent { @@ -73,3 +73,4 @@ namespace Qpid.Client.Protocol } } + diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs b/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs index 2bf9f9a4c1..326afbe613 100644 --- a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs +++ b/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs @@ -22,12 +22,12 @@ using System; using System.Collections; using System.Threading; using log4net; -using Qpid.Client.Failover; -using Qpid.Client.Protocol.Listener; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Failover; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public class AMQProtocolListener : IProtocolListener { diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs b/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs index 0ca443e3bb..e0fa22e7a3 100644 --- a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs +++ b/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs @@ -21,12 +21,12 @@ using System; using System.Collections; using log4net; -using Qpid.Client.Message; -using Qpid.Client.Transport; -using Qpid.Framing; -using Qpid.Sasl; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Transport; +using Apache.Qpid.Framing; +using Apache.Qpid.Sasl; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public class AMQProtocolSession { diff --git a/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs b/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs index 0638bf0704..6841b46f54 100644 --- a/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs +++ b/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Client.Protocol
+namespace Apache.Qpid.Client.Protocol
{
/// <summary>
/// Default timeout values for the protocol
diff --git a/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs b/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs index be8a24a9f4..e3298200c4 100644 --- a/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs +++ b/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs @@ -18,10 +18,10 @@ * under the License. * */ -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public interface IConnectionCloser { void Close(); } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs b/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs index 6ac8a7537e..3b53f015f8 100644 --- a/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs +++ b/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs @@ -19,10 +19,10 @@ * */ using System; -using Qpid.Client.Protocol.Listener; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public interface IProtocolListener { diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs b/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs index a020efbf21..9cc9f8cee5 100644 --- a/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs +++ b/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs @@ -20,9 +20,9 @@ */ using System; using System.Threading; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol.Listener +namespace Apache.Qpid.Client.Protocol.Listener { public abstract class BlockingMethodFrameListener : IAMQMethodListener { diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs b/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs index db82eb1013..b5450d00f7 100644 --- a/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs +++ b/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Protocol.Listener +namespace Apache.Qpid.Client.Protocol.Listener { public interface IAMQMethodListener { @@ -43,3 +43,4 @@ namespace Qpid.Client.Protocol.Listener } } + diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs b/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs index 65460a0c2e..8cdc1dbba9 100644 --- a/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs +++ b/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol.Listener +namespace Apache.Qpid.Client.Protocol.Listener { public class SpecificMethodFrameListener : BlockingMethodFrameListener { @@ -39,3 +39,4 @@ namespace Qpid.Client.Protocol.Listener } } + diff --git a/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs b/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs index 0ef337501e..11918f1ea2 100644 --- a/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs +++ b/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs @@ -19,13 +19,13 @@ * */ using System; -using Qpid.Client.Protocol.Listener; -using Qpid.Client.Transport; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Client.Transport; +using Apache.Qpid.Framing; using log4net; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { /// <summary> /// A convenient interface to writing protocol frames. @@ -104,3 +104,4 @@ namespace Qpid.Client.Protocol } } + diff --git a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs index d88683f7d5..ede8966f37 100644 --- a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs +++ b/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs @@ -24,9 +24,9 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using log4net; -using Qpid.Client.Qms; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class URLHelper diff --git a/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs b/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs index 546bcec35a..85be927ff4 100644 --- a/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs +++ b/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs @@ -23,12 +23,12 @@ using System; using System.Collections;
using System.Configuration;
using System.Text;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-using Qpid.Client.Configuration;
+using Apache.Qpid.Client.Configuration;
-namespace Qpid.Client.Security
+namespace Apache.Qpid.Client.Security
{
/// <summary>
@@ -55,12 +55,12 @@ namespace Qpid.Client.Security /// <configuration>
/// <configSections>
/// <sectionGroup name="qpid.client">
- /// <section name="authentication" type="Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Qpid.Client"/>
+ /// <section name="authentication" type="Apache.Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Apache.Qpid.Client"/>
/// </sectionGroup>
/// </configSections>
/// <qpid.client>
/// <authentication>
- /// <add key="TEST" value="Qpid.Client.Tests.Security.TestCallbackHandler, Qpid.Client.Tests"/>
+ /// <add key="TEST" value="Apache.Qpid.Client.Tests.Security.TestCallbackHandler, Apache.Qpid.Client.Tests"/>
/// </authentication>
/// </qpid.client>
/// </configuration>
diff --git a/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs b/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs index 6802b90cee..2560c1d96b 100644 --- a/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs +++ b/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs @@ -20,10 +20,10 @@ */
using System;
using System.Text;
-using Qpid.Client.Protocol;
-using Qpid.Sasl;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Sasl;
-namespace Qpid.Client.Security
+namespace Apache.Qpid.Client.Security
{
public interface IAMQCallbackHandler : ISaslCallbackHandler
{
@@ -32,3 +32,4 @@ namespace Qpid.Client.Security }
+
diff --git a/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs b/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs index a14139496c..489d4d1665 100644 --- a/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs +++ b/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs @@ -22,10 +22,10 @@ using System;
using System.Collections;
using System.Text;
-using Qpid.Client.Protocol;
-using Qpid.Sasl;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Sasl;
-namespace Qpid.Client.Security
+namespace Apache.Qpid.Client.Security
{
internal class UsernamePasswordCallbackHandler : IAMQCallbackHandler
{
diff --git a/dotnet/Qpid.Client/Client/SslOptions.cs b/dotnet/Qpid.Client/Client/SslOptions.cs index a6488d99ea..d637101000 100644 --- a/dotnet/Qpid.Client/Client/SslOptions.cs +++ b/dotnet/Qpid.Client/Client/SslOptions.cs @@ -21,7 +21,7 @@ using System;
using System.Security.Cryptography.X509Certificates;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
/// <summary>
/// Configures SSL-related options to connect to an AMQP broker.
diff --git a/dotnet/Qpid.Client/Client/State/AMQState.cs b/dotnet/Qpid.Client/Client/State/AMQState.cs index fc71fe647c..67f8427fb2 100644 --- a/dotnet/Qpid.Client/Client/State/AMQState.cs +++ b/dotnet/Qpid.Client/Client/State/AMQState.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public enum AMQState { @@ -32,3 +32,4 @@ namespace Qpid.Client.State } } + diff --git a/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs b/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs index 60d44da824..a464bbb6f5 100644 --- a/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs +++ b/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public class AMQStateChangedEvent { diff --git a/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/dotnet/Qpid.Client/Client/State/AMQStateManager.cs index 9ce6d3c76a..881e01e697 100644 --- a/dotnet/Qpid.Client/Client/State/AMQStateManager.cs +++ b/dotnet/Qpid.Client/Client/State/AMQStateManager.cs @@ -21,12 +21,12 @@ using System; using System.Collections; using log4net; -using Qpid.Client.Handler; -using Qpid.Client.Protocol; -using Qpid.Client.Protocol.Listener; -using Qpid.Framing; +using Apache.Qpid.Client.Handler; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Framing; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public class AMQStateManager : IAMQMethodListener { diff --git a/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs b/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs index ff27cd841e..31e4b5046d 100644 --- a/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs +++ b/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public interface IAMQStateListener { @@ -26,3 +26,4 @@ namespace Qpid.Client.State } } + diff --git a/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs b/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs index 256fe1c3f3..0874f39665 100644 --- a/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs +++ b/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Client.Protocol; +using Apache.Qpid.Client.Protocol; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public interface IStateAwareMethodListener { @@ -28,3 +28,4 @@ namespace Qpid.Client.State } } + diff --git a/dotnet/Qpid.Client/Client/State/IStateListener.cs b/dotnet/Qpid.Client/Client/State/IStateListener.cs index 6073b2bb0c..edd7382f93 100644 --- a/dotnet/Qpid.Client/Client/State/IStateListener.cs +++ b/dotnet/Qpid.Client/Client/State/IStateListener.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public interface IStateListener { @@ -30,3 +30,4 @@ namespace Qpid.Client.State } } + diff --git a/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs b/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs index 86b625951e..81de622617 100644 --- a/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs +++ b/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { [Serializable] public class IllegalStateTransitionException : AMQException @@ -71,3 +71,4 @@ namespace Qpid.Client.State } + diff --git a/dotnet/Qpid.Client/Client/State/StateWaiter.cs b/dotnet/Qpid.Client/Client/State/StateWaiter.cs index 34667da744..e739d0cb44 100644 --- a/dotnet/Qpid.Client/Client/State/StateWaiter.cs +++ b/dotnet/Qpid.Client/Client/State/StateWaiter.cs @@ -20,10 +20,10 @@ */ using System; using System.Threading; -using Qpid.Client.Protocol; +using Apache.Qpid.Client.Protocol; using log4net; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public class StateWaiter : IStateListener { diff --git a/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs b/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs index 1024fa5575..dd0bb404cb 100644 --- a/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs +++ b/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs @@ -18,11 +18,11 @@ * under the License. * */ -using Qpid.Codec; -using Qpid.Codec.Demux; -using Qpid.Framing; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Demux; +using Apache.Qpid.Framing; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public class AMQProtocolProvider { diff --git a/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs b/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs index e23037d1de..dc72846bbe 100644 --- a/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs +++ b/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs @@ -21,12 +21,12 @@ using System; using System.Collections; using log4net; -using Qpid.Buffer; -using Qpid.Codec; -using Qpid.Codec.Support; -using Qpid.Framing; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Support; +using Apache.Qpid.Framing; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public class AmqpChannel : IProtocolChannel { @@ -108,3 +108,4 @@ namespace Qpid.Client.Transport } } + diff --git a/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs b/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs index 0f8f341d48..35806f2a6e 100644 --- a/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs +++ b/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { /// <summary> /// Represents input/output channels that read diff --git a/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs b/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs index e4d4d2ed29..0b59ee8799 100644 --- a/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs +++ b/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs @@ -21,7 +21,7 @@ using System; using System.Collections; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public interface IProtocolChannel : IProtocolWriter { diff --git a/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs b/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs index ac19977927..592dff3a19 100644 --- a/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs +++ b/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs @@ -18,12 +18,12 @@ * under the License. * */ -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public interface IProtocolWriter { void Write(IDataBlock o); } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs b/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs index 409b428c01..7195b3ab04 100644 --- a/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs +++ b/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs @@ -20,7 +20,7 @@ */
using System.IO;
-namespace Qpid.Client.Transport
+namespace Apache.Qpid.Client.Transport
{
/// <summary>
/// Defines a way to introduce an arbitrary filtering
diff --git a/dotnet/Qpid.Client/Client/Transport/ITransport.cs b/dotnet/Qpid.Client/Client/Transport/ITransport.cs index 3d918693bc..693a9a9534 100644 --- a/dotnet/Qpid.Client/Client/Transport/ITransport.cs +++ b/dotnet/Qpid.Client/Client/Transport/ITransport.cs @@ -18,10 +18,10 @@ * under the License. * */ -using Qpid.Client.Qms; -using Qpid.Client.Protocol; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Client.Protocol; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public interface ITransport : IConnectionCloser { diff --git a/dotnet/Qpid.Client/Client/Transport/IoHandler.cs b/dotnet/Qpid.Client/Client/Transport/IoHandler.cs index 8d1f04f662..556f9631b3 100644 --- a/dotnet/Qpid.Client/Client/Transport/IoHandler.cs +++ b/dotnet/Qpid.Client/Client/Transport/IoHandler.cs @@ -22,10 +22,10 @@ using System; using System.IO;
using System.Threading;
using log4net;
-using Qpid.Buffer;
-using Qpid.Client.Protocol;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Client.Protocol;
-namespace Qpid.Client.Transport
+namespace Apache.Qpid.Client.Transport
{
/// <summary>
/// Responsible for reading and writing
diff --git a/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs b/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs index 07df62ea84..357aab0f45 100644 --- a/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs +++ b/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs @@ -20,12 +20,12 @@ */
using System;
using System.Threading;
-using Qpid.Client.Protocol;
-using Qpid.Codec;
-using Qpid.Framing;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Framing;
using log4net;
-namespace Qpid.Client.Transport
+namespace Apache.Qpid.Client.Transport
{
/// <summary>
/// <see cref="IProtocolDecoderOutput"/> implementation that forwards
@@ -55,5 +55,6 @@ namespace Qpid.Client.Transport }
}
}
-} // namespace Qpid.Client.Transport
+} // namespace Apache.Qpid.Client.Transport
+
diff --git a/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs b/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs index 5b5392769a..a1aa889ba0 100644 --- a/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs +++ b/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs @@ -19,10 +19,10 @@ * */ using System; -using Qpid.Buffer; -using Qpid.Codec; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public class SingleProtocolEncoderOutput : IProtocolEncoderOutput { @@ -37,4 +37,4 @@ namespace Qpid.Client.Transport buffer = buf; } } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs index 2895c75431..8a16f9a675 100644 --- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs +++ b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs @@ -22,12 +22,12 @@ using System; using System.Collections;
using System.IO;
using System.Threading;
-using Qpid.Client.Qms;
-using Qpid.Client.Protocol;
-using Qpid.Codec;
-using Qpid.Framing;
+using Apache.Qpid.Client.Qms;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Framing;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
/// <summary>
/// TCP Socket transport supporting both
@@ -147,3 +147,4 @@ namespace Qpid.Client.Transport.Socket.Blocking }
}
+
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs index ff2c301a91..077f69541f 100644 --- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs +++ b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs @@ -20,9 +20,9 @@ */
using System;
using log4net;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
class ByteChannel : IByteChannel
{
@@ -89,4 +89,4 @@ namespace Qpid.Client.Transport.Socket.Blocking _lowerChannel.EndWrite(result);
}
}
-}
\ No newline at end of file +}
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs index ac0dc37a16..3d5d2898cf 100644 --- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs +++ b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs @@ -20,9 +20,9 @@ */
using System;
using System.IO;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
interface ISocketConnector : IDisposable
{
@@ -31,3 +31,4 @@ namespace Qpid.Client.Transport.Socket.Blocking }
}
+
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs index a651413581..83f7287e9b 100644 --- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs +++ b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs @@ -21,9 +21,9 @@ using System.IO;
using System.Net;
using System.Net.Sockets;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
/// <summary>
/// Implements a TCP connection over regular sockets.
@@ -68,3 +68,4 @@ namespace Qpid.Client.Transport.Socket.Blocking }
}
+
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs index 24c3f5bcb8..708edde48c 100644 --- a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs +++ b/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs @@ -21,12 +21,12 @@ using System.IO;
using System.Net;
using log4net;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
using Org.Mentalis.Security.Ssl;
using MCertificate = Org.Mentalis.Security.Certificates.Certificate;
using MCertificateChain = Org.Mentalis.Security.Certificates.CertificateChain;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
/// <summary>
/// Implements a TLS v1.0 connection using the Mentalis.org library
diff --git a/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs b/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs index e8ffc145d3..87bb2a2859 100644 --- a/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs +++ b/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs @@ -22,10 +22,10 @@ using System; using System.Collections;
using System.Text;
using System.Threading;
-using Qpid.Collections;
-using Qpid.Common;
+using Apache.Qpid.Collections;
+using Apache.Qpid.Common;
-namespace Qpid.Client.Util
+namespace Apache.Qpid.Client.Util
{
internal delegate void ThresholdMethod(int currentCount);
diff --git a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client/Properties/AssemblyInfo.cs index 0c7da88839..8722a02db9 100644 --- a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Client/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.Client")] +[assembly: AssemblyTitle("Apache.Qpid.Client")] [assembly: AssemblyDescription("Qpid Client API implementation")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("")] +[assembly: AssemblyProduct("Apache.Qpid.Client")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/dotnet/Qpid.Client/Qpid.Client.csproj b/dotnet/Qpid.Client/Qpid.Client.csproj index 0e92e8f990..9294d76764 100644 --- a/dotnet/Qpid.Client/Qpid.Client.csproj +++ b/dotnet/Qpid.Client/Qpid.Client.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{68987C05-3768-452C-A6FC-6BA1D372852F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Client</RootNamespace>
- <AssemblyName>Qpid.Client</AssemblyName>
+ <RootNamespace>Apache.Qpid.Client</RootNamespace>
+ <AssemblyName>Apache.Qpid.Client</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -160,4 +160,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Client/default.build b/dotnet/Qpid.Client/default.build index ac4c8bfd4e..14e457203e 100644 --- a/dotnet/Qpid.Client/default.build +++ b/dotnet/Qpid.Client/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<project name="Qpid.Client" default="build"> +<project name="Apache.Qpid.Client" default="build"> <!-- Properties that come from master build file - build.dir: root directory for build @@ -18,11 +18,11 @@ </sources> <references> <include name="${build.dir}/log4net.dll" /> - <include name="${build.dir}/Qpid.Buffer.dll" /> - <include name="${build.dir}/Qpid.Sasl.dll" /> - <include name="${build.dir}/Qpid.Codec.dll" /> - <include name="${build.dir}/Qpid.Common.dll" /> - <include name="${build.dir}/Qpid.Messaging.dll" /> + <include name="${build.dir}/Apache.Qpid.Buffer.dll" /> + <include name="${build.dir}/Apache.Qpid.Sasl.dll" /> + <include name="${build.dir}/Apache.Qpid.Codec.dll" /> + <include name="${build.dir}/Apache.Qpid.Common.dll" /> + <include name="${build.dir}/Apache.Qpid.Messaging.dll" /> <include name="${build.dir}/Org.Mentalis.Security.dll" /> </references> </csc> diff --git a/dotnet/Qpid.Client/qms/BrokerInfo.cs b/dotnet/Qpid.Client/qms/BrokerInfo.cs index 3097e01149..93c00af6e0 100644 --- a/dotnet/Qpid.Client/qms/BrokerInfo.cs +++ b/dotnet/Qpid.Client/qms/BrokerInfo.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { /// <summary> /// Know URL option names. diff --git a/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/dotnet/Qpid.Client/qms/ConnectionInfo.cs index 4bdf8f4d7c..4d3f7698b5 100644 --- a/dotnet/Qpid.Client/qms/ConnectionInfo.cs +++ b/dotnet/Qpid.Client/qms/ConnectionInfo.cs @@ -20,7 +20,7 @@ */ using System.Collections; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { class ConnectionUrlConstants { diff --git a/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/dotnet/Qpid.Client/qms/FailoverPolicy.cs index 99ab3dc66e..d5d1e8d8ac 100644 --- a/dotnet/Qpid.Client/qms/FailoverPolicy.cs +++ b/dotnet/Qpid.Client/qms/FailoverPolicy.cs @@ -21,9 +21,9 @@ using System; using System.Text; using log4net; -using Qpid.Client.Qms.Failover; +using Apache.Qpid.Client.Qms.Failover; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { public class FailoverPolicy { diff --git a/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/dotnet/Qpid.Client/qms/UrlSyntaxException.cs index dc0c06c22f..ab3de325d4 100644 --- a/dotnet/Qpid.Client/qms/UrlSyntaxException.cs +++ b/dotnet/Qpid.Client/qms/UrlSyntaxException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; using System.Text; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { [Serializable] public class UrlSyntaxException : UriFormatException diff --git a/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs b/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs index 076c62a6d6..f32b275e84 100644 --- a/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs +++ b/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Qms.Failover +namespace Apache.Qpid.Client.Qms.Failover { public class FailoverMethodConstants { diff --git a/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs index 4e6b23ce86..8103940fb4 100644 --- a/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs +++ b/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs @@ -22,7 +22,7 @@ using System; using System.Text; using log4net; -namespace Qpid.Client.Qms.Failover +namespace Apache.Qpid.Client.Qms.Failover { public class FailoverRoundRobin : IFailoverMethod { diff --git a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs index 18907df3c2..5e502b897e 100644 --- a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs +++ b/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Qms.Failover +namespace Apache.Qpid.Client.Qms.Failover { public class FailoverSingleServer : IFailoverMethod { diff --git a/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs b/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs index 3d454b284b..6cfd75c851 100644 --- a/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs +++ b/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs @@ -20,9 +20,9 @@ */ using System; using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public abstract class CumulativeProtocolDecoder : IProtocolDecoder { diff --git a/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs b/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs index 27095bd32d..78276202d6 100644 --- a/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs +++ b/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs @@ -20,9 +20,9 @@ */ using System; using System.Collections; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public class DemuxingProtocolCodecFactory : IProtocolCodecFactory { @@ -384,3 +384,4 @@ namespace Qpid.Codec.Demux } + diff --git a/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs b/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs index 686544c78b..5892673440 100644 --- a/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs +++ b/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageDecoder { @@ -53,3 +53,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs b/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs index 418b5cf7e4..9e333d670f 100644 --- a/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs +++ b/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageDecoderFactory { @@ -29,3 +29,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs b/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs index 7c1d117ad5..75ae23592b 100644 --- a/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs +++ b/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs @@ -21,7 +21,7 @@ using System; using System.Collections; -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageEncoder { @@ -45,3 +45,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs b/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs index b8996e1853..3001d1a963 100644 --- a/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs +++ b/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageEncoderFactory { @@ -29,3 +29,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs b/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs index 689d305919..ab01864bc0 100644 --- a/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs +++ b/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public enum MessageDecoderResult { @@ -26,3 +26,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/dotnet/Qpid.Codec/IProtocolCodecFactory.cs b/dotnet/Qpid.Codec/IProtocolCodecFactory.cs index fe4ccc7fde..a26b91b16c 100644 --- a/dotnet/Qpid.Codec/IProtocolCodecFactory.cs +++ b/dotnet/Qpid.Codec/IProtocolCodecFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolCodecFactory { @@ -34,3 +34,4 @@ namespace Qpid.Codec } } + diff --git a/dotnet/Qpid.Codec/IProtocolDecoder.cs b/dotnet/Qpid.Codec/IProtocolDecoder.cs index 54317c3d07..3cccb0f7da 100644 --- a/dotnet/Qpid.Codec/IProtocolDecoder.cs +++ b/dotnet/Qpid.Codec/IProtocolDecoder.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolDecoder : IDisposable { @@ -38,3 +38,4 @@ namespace Qpid.Codec } } + diff --git a/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs b/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs index 5862b36aed..77a1aea9db 100644 --- a/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs +++ b/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolDecoderOutput { @@ -32,3 +32,4 @@ namespace Qpid.Codec } } + diff --git a/dotnet/Qpid.Codec/IProtocolEncoder.cs b/dotnet/Qpid.Codec/IProtocolEncoder.cs index aab803d3d6..a16f2ad9d6 100644 --- a/dotnet/Qpid.Codec/IProtocolEncoder.cs +++ b/dotnet/Qpid.Codec/IProtocolEncoder.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolEncoder : IDisposable { @@ -38,3 +38,4 @@ namespace Qpid.Codec } } + diff --git a/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs b/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs index 12b9d68885..70f9be38dc 100644 --- a/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs +++ b/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolEncoderOutput { @@ -34,3 +34,4 @@ namespace Qpid.Codec } } + diff --git a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs index 515e5f2998..aa1d6a662e 100644 --- a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Codec/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("Mina.Codec")] +[assembly: AssemblyTitle("Apache.Qpid.Codec")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Mina.Codec")] +[assembly: AssemblyProduct("Apache.Qpid.Codec")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/dotnet/Qpid.Codec/ProtocolCodecException.cs b/dotnet/Qpid.Codec/ProtocolCodecException.cs index a7d7bd9cb2..49678d2c11 100644 --- a/dotnet/Qpid.Codec/ProtocolCodecException.cs +++ b/dotnet/Qpid.Codec/ProtocolCodecException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { [Serializable] public class ProtocolCodecException : Exception @@ -46,3 +46,4 @@ namespace Qpid.Codec } + diff --git a/dotnet/Qpid.Codec/ProtocolDecoderException.cs b/dotnet/Qpid.Codec/ProtocolDecoderException.cs index 562145288c..8e7e6da145 100644 --- a/dotnet/Qpid.Codec/ProtocolDecoderException.cs +++ b/dotnet/Qpid.Codec/ProtocolDecoderException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { [Serializable] public class ProtocolDecoderException : ProtocolCodecException @@ -67,3 +67,4 @@ namespace Qpid.Codec } + diff --git a/dotnet/Qpid.Codec/ProtocolEncoderException.cs b/dotnet/Qpid.Codec/ProtocolEncoderException.cs index 801cacbd54..ac565a308b 100644 --- a/dotnet/Qpid.Codec/ProtocolEncoderException.cs +++ b/dotnet/Qpid.Codec/ProtocolEncoderException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { [Serializable] public class ProtocolEncoderException : ProtocolCodecException @@ -46,3 +46,4 @@ namespace Qpid.Codec } + diff --git a/dotnet/Qpid.Codec/Qpid.Codec.csproj b/dotnet/Qpid.Codec/Qpid.Codec.csproj index a67d2d6a1b..ebe4681397 100644 --- a/dotnet/Qpid.Codec/Qpid.Codec.csproj +++ b/dotnet/Qpid.Codec/Qpid.Codec.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Codec</RootNamespace>
- <AssemblyName>Qpid.Codec</AssemblyName>
+ <RootNamespace>Apache.Qpid.Codec</RootNamespace>
+ <AssemblyName>Apache.Qpid.Codec</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -70,4 +70,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs b/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs index bb5d377ad9..0a4ff10ff0 100644 --- a/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs +++ b/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs @@ -20,7 +20,7 @@ */ using System.Collections; -namespace Qpid.Codec.Support +namespace Apache.Qpid.Codec.Support { public class SimpleProtocolDecoderOutput : IProtocolDecoderOutput { @@ -41,3 +41,4 @@ namespace Qpid.Codec.Support } } + diff --git a/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs b/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs index 1e4d437d1c..2e4224ef98 100644 --- a/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs +++ b/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs @@ -19,9 +19,9 @@ * */ using System.Collections; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec.Support +namespace Apache.Qpid.Codec.Support { public abstract class SimpleProtocolEncoderOutput : IProtocolEncoderOutput { diff --git a/dotnet/Qpid.Codec/default.build b/dotnet/Qpid.Codec/default.build index 6b4decf1b7..db9e8d1166 100644 --- a/dotnet/Qpid.Codec/default.build +++ b/dotnet/Qpid.Codec/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Codec" default="build">
+<project name="Apache.Qpid.Codec" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
@@ -18,7 +18,7 @@ </sources>
<references>
<include name="${build.dir}/log4net.dll" />
- <include name="${build.dir}/Qpid.Buffer.dll" />
+ <include name="${build.dir}/Apache.Qpid.Buffer.dll" />
</references>
</csc>
</target>
diff --git a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs index 9a602e21b6..32dcae60ae 100644 --- a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs @@ -3,11 +3,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.Tests")] +[assembly: AssemblyTitle("Apache.Qpid.Common.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.Common.Tests")] +[assembly: AssemblyProduct("Apache.Qpid.Common.Tests")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj index 30cb56fba1..b51faf92c7 100644 --- a/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj +++ b/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{F83624B0-762B-4D82-900D-FF4C1B36E36E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Common.Tests</RootNamespace>
- <AssemblyName>Qpid.Common.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Common.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -62,4 +62,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs b/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs index 1a400aab68..03ed999999 100644 --- a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs +++ b/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs @@ -23,9 +23,9 @@ using System.Collections; using System.Text;
using System.Threading;
using NUnit.Framework;
-using Qpid.Collections;
+using Apache.Qpid.Collections;
-namespace Qpid.Collections.Tests
+namespace Apache.Qpid.Collections.Tests
{
[TestFixture]
public class TestConsumerProducerQueue
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs b/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs index cd3f730ab5..dbbc98a2e6 100644 --- a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs +++ b/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs @@ -23,7 +23,7 @@ using System.Collections; using System.Text; using NUnit.Framework; -namespace Qpid.Collections +namespace Apache.Qpid.Collections { [TestFixture] public class TestLinkedHashtable diff --git a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs b/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs index f5ff30182d..ab4cb4409c 100644 --- a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs +++ b/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs @@ -20,10 +20,10 @@ */
using System;
using NUnit.Framework;
-using Qpid.Buffer;
-using Qpid.Framing;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Framing;
-namespace Qpid.Framing.Tests
+namespace Apache.Qpid.Framing.Tests
{
[TestFixture]
public class TestAMQType
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs b/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs index 7c6615ed1e..720d7697d3 100644 --- a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs +++ b/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs @@ -20,10 +20,10 @@ */
using System;
using NUnit.Framework;
-using Qpid.Buffer;
-using Qpid.Framing;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Framing;
-namespace Qpid.Framing.Tests
+namespace Apache.Qpid.Framing.Tests
{
[TestFixture]
public class TestEncodingUtils
diff --git a/dotnet/Qpid.Common.Tests/default.build b/dotnet/Qpid.Common.Tests/default.build index 8a087b3ddb..00658bdbe2 100644 --- a/dotnet/Qpid.Common.Tests/default.build +++ b/dotnet/Qpid.Common.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Common" default="test">
+<project name="Apache.Qpid.Common" default="test">
<target name="build">
<csc target="library"
@@ -14,9 +14,9 @@ <include name="${build.dir}/log4net.dll" />
<include name="${build.dir}/nunit.framework.dll" />
<include name="${build.dir}/${project::get-name()}.dll" />
- <include name="${build.dir}/Qpid.Codec.dll" />
- <include name="${build.dir}/Qpid.Messaging.dll" />
- <include name="${build.dir}/Qpid.Buffer.dll" />
+ <include name="${build.dir}/Apache.Qpid.Codec.dll" />
+ <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
+ <include name="${build.dir}/Apache.Qpid.Buffer.dll" />
</references>
</csc>
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"/>] diff --git a/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/dotnet/Qpid.Messaging/AcknowledgeMode.cs index efd9e8493c..4896b64f68 100644 --- a/dotnet/Qpid.Messaging/AcknowledgeMode.cs +++ b/dotnet/Qpid.Messaging/AcknowledgeMode.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public enum AcknowledgeMode { diff --git a/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs index 0cfd2f24bc..8b43422f5c 100644 --- a/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs +++ b/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { [Serializable] public class ChannelLimitReachedException : ResourceAllocationException diff --git a/dotnet/Qpid.Messaging/DeliveryMode.cs b/dotnet/Qpid.Messaging/DeliveryMode.cs index af706260a5..3c4713ee2a 100644 --- a/dotnet/Qpid.Messaging/DeliveryMode.cs +++ b/dotnet/Qpid.Messaging/DeliveryMode.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public enum DeliveryMode { diff --git a/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/dotnet/Qpid.Messaging/ExchangeClassConstants.cs index 2e36a7b920..984e8b0f17 100644 --- a/dotnet/Qpid.Messaging/ExchangeClassConstants.cs +++ b/dotnet/Qpid.Messaging/ExchangeClassConstants.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public class ExchangeClassConstants { @@ -26,4 +26,4 @@ namespace Qpid.Messaging public readonly static string DIRECT = "direct"; public readonly static string HEADERS = "headers"; } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs index 13d0d73f84..cda92d6b55 100644 --- a/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs +++ b/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public class ExchangeNameDefaults { @@ -26,4 +26,4 @@ namespace Qpid.Messaging public readonly static string DIRECT = "amq.direct"; public readonly static string HEADERS = "amq.match"; } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Messaging/IBytesMessage.cs b/dotnet/Qpid.Messaging/IBytesMessage.cs index 0d19e9c523..5be942423d 100644 --- a/dotnet/Qpid.Messaging/IBytesMessage.cs +++ b/dotnet/Qpid.Messaging/IBytesMessage.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public interface IBytesMessage : IMessage { diff --git a/dotnet/Qpid.Messaging/IChannel.cs b/dotnet/Qpid.Messaging/IChannel.cs index 3d08d00eb8..4da41a773d 100644 --- a/dotnet/Qpid.Messaging/IChannel.cs +++ b/dotnet/Qpid.Messaging/IChannel.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public delegate void MessageReceivedDelegate(IMessage msg); diff --git a/dotnet/Qpid.Messaging/IConnection.cs b/dotnet/Qpid.Messaging/IConnection.cs index 2bf8b9a6c2..420228fa8e 100644 --- a/dotnet/Qpid.Messaging/IConnection.cs +++ b/dotnet/Qpid.Messaging/IConnection.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public delegate void ExceptionListenerDelegate(Exception ex); diff --git a/dotnet/Qpid.Messaging/IConnectionFactory.cs b/dotnet/Qpid.Messaging/IConnectionFactory.cs index 682bd9eb54..f141d509be 100644 --- a/dotnet/Qpid.Messaging/IConnectionFactory.cs +++ b/dotnet/Qpid.Messaging/IConnectionFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public interface IConnectionFactory { diff --git a/dotnet/Qpid.Messaging/IConnectionListener.cs b/dotnet/Qpid.Messaging/IConnectionListener.cs index a8112bd8e9..02d9eb38da 100644 --- a/dotnet/Qpid.Messaging/IConnectionListener.cs +++ b/dotnet/Qpid.Messaging/IConnectionListener.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public interface IConnectionListener { diff --git a/dotnet/Qpid.Messaging/IFieldTable.cs b/dotnet/Qpid.Messaging/IFieldTable.cs index 50d47e6769..730ce399d4 100644 --- a/dotnet/Qpid.Messaging/IFieldTable.cs +++ b/dotnet/Qpid.Messaging/IFieldTable.cs @@ -20,7 +20,7 @@ */ using System.Collections; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public interface IFieldTable : IEnumerable { diff --git a/dotnet/Qpid.Messaging/IHeaders.cs b/dotnet/Qpid.Messaging/IHeaders.cs index edd0ef989b..7fdf26ebda 100644 --- a/dotnet/Qpid.Messaging/IHeaders.cs +++ b/dotnet/Qpid.Messaging/IHeaders.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +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 diff --git a/dotnet/Qpid.Messaging/IMessage.cs b/dotnet/Qpid.Messaging/IMessage.cs index d63662f7e3..20ae5ee130 100644 --- a/dotnet/Qpid.Messaging/IMessage.cs +++ b/dotnet/Qpid.Messaging/IMessage.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public interface IMessage { diff --git a/dotnet/Qpid.Messaging/IMessageConsumer.cs b/dotnet/Qpid.Messaging/IMessageConsumer.cs index 7767fae995..82d697bf61 100644 --- a/dotnet/Qpid.Messaging/IMessageConsumer.cs +++ b/dotnet/Qpid.Messaging/IMessageConsumer.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { /// <summary> /// Describes an object that can be used to receive (consume) diff --git a/dotnet/Qpid.Messaging/IMessagePublisher.cs b/dotnet/Qpid.Messaging/IMessagePublisher.cs index edba868539..fab0df0c2b 100644 --- a/dotnet/Qpid.Messaging/IMessagePublisher.cs +++ b/dotnet/Qpid.Messaging/IMessagePublisher.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { /// <summary> /// Defines an object capable of publishing messages diff --git a/dotnet/Qpid.Messaging/ITextMessage.cs b/dotnet/Qpid.Messaging/ITextMessage.cs index 7b3b5305a6..902beb70f8 100644 --- a/dotnet/Qpid.Messaging/ITextMessage.cs +++ b/dotnet/Qpid.Messaging/ITextMessage.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public interface ITextMessage : IMessage { diff --git a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs index 7d426c384a..2d6f76d639 100644 --- a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs +++ b/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public class MessageConsumerBuilder { diff --git a/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/dotnet/Qpid.Messaging/MessageNotReadableException.cs index 5a919c2ced..2afcffd531 100644 --- a/dotnet/Qpid.Messaging/MessageNotReadableException.cs +++ b/dotnet/Qpid.Messaging/MessageNotReadableException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { [Serializable] public class MessageNotReadableException : QpidException diff --git a/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/dotnet/Qpid.Messaging/MessageNotWritableException.cs index 6d4068c8c4..9b00f01948 100644 --- a/dotnet/Qpid.Messaging/MessageNotWritableException.cs +++ b/dotnet/Qpid.Messaging/MessageNotWritableException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { [Serializable] public class MessageNotWriteableException : QpidException diff --git a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs index ba843049ef..79c7575d0a 100644 --- a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs +++ b/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { public class MessagePublisherBuilder { @@ -88,4 +88,4 @@ namespace Qpid.Messaging return _channel.CreatePublisher(_exchangeName, _routingKey, _deliveryMode, _timeToLive, _immediate, _mandatory, _priority); } } -}
\ No newline at end of file +} diff --git a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs index 8b37576c42..8683ad08b2 100644 --- a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs @@ -24,11 +24,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.Messaging")] +[assembly: AssemblyTitle("Apache.Qpid.Messaging")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.Messaging")] +[assembly: AssemblyProduct("Apache.Qpid.Messaging")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -53,4 +53,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: CLSCompliant(true)]
\ No newline at end of file +[assembly: CLSCompliant(true)] diff --git a/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/dotnet/Qpid.Messaging/Qpid.Messaging.csproj index 207abe994e..90354bece6 100644 --- a/dotnet/Qpid.Messaging/Qpid.Messaging.csproj +++ b/dotnet/Qpid.Messaging/Qpid.Messaging.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Messaging</RootNamespace>
- <AssemblyName>Qpid.Messaging</AssemblyName>
+ <RootNamespace>Apache.Qpid.Messaging</RootNamespace>
+ <AssemblyName>Apache.Qpid.Messaging</AssemblyName>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -66,4 +66,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Messaging/QpidException.cs b/dotnet/Qpid.Messaging/QpidException.cs index dc3391898b..3e39f2293d 100644 --- a/dotnet/Qpid.Messaging/QpidException.cs +++ b/dotnet/Qpid.Messaging/QpidException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { [Serializable] public class QpidException : Exception diff --git a/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/dotnet/Qpid.Messaging/ResourceAllocationException.cs index a208b3cbbb..954dcdd94c 100644 --- a/dotnet/Qpid.Messaging/ResourceAllocationException.cs +++ b/dotnet/Qpid.Messaging/ResourceAllocationException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Messaging +namespace Apache.Qpid.Messaging { [Serializable] public class ResourceAllocationException : QpidException diff --git a/dotnet/Qpid.Messaging/default.build b/dotnet/Qpid.Messaging/default.build index 6a1433ac76..789258bfad 100644 --- a/dotnet/Qpid.Messaging/default.build +++ b/dotnet/Qpid.Messaging/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Messaging" default="build">
+<project name="Apache.Qpid.Messaging" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
diff --git a/dotnet/Qpid.Sasl.Tests/App.config b/dotnet/Qpid.Sasl.Tests/App.config index 0e7e903e02..539f341e7c 100644 --- a/dotnet/Qpid.Sasl.Tests/App.config +++ b/dotnet/Qpid.Sasl.Tests/App.config @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
- <section name="qpid.sasl" type="Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Qpid.Sasl"/>
+ <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>
</configSections>
<qpid.sasl>
<clientFactories>
- <add type="Qpid.Sasl.Tests.TestClientFactory, Qpid.Sasl.Tests"/>
+ <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>
</clientFactories>
</qpid.sasl>
</configuration>
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs b/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs index 6c906d7f1b..09260736f0 100644 --- a/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs +++ b/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class AnonymousSaslClientTests : ISaslCallbackHandler
@@ -69,4 +69,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class AnonymousSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs b/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs index b5c9935d10..e8b0ae5468 100644 --- a/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs +++ b/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class CramMD5SaslClientTests : ISaslCallbackHandler
@@ -87,4 +87,4 @@ namespace Qpid.Sasl.Tests.Mechanisms }
} // class CramMD5SaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs index 58e90c29eb..eb7e7ebbd5 100644 --- a/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs +++ b/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs @@ -25,10 +25,10 @@ using System.Collections.Specialized; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class DigestSaslClientTests : ISaslCallbackHandler
@@ -246,4 +246,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class DigestSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs index 1621f60c06..1864a6c957 100644 --- a/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs +++ b/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class ExternalSaslClientTests : ISaslCallbackHandler
@@ -68,4 +68,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class AnonymousSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs b/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs index 3f39c1980d..4c82f7b126 100644 --- a/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs +++ b/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class PlainSaslClientTests : ISaslCallbackHandler
@@ -85,4 +85,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class PlainSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs index f6728b1d1e..657b15e3ea 100644 --- a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,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.Sasl.Tests")]
+[assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Qpid.Sasl.Tests")]
+[assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj index b33174d2f0..8c807e2385 100644 --- a/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj +++ b/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{587B3520-EBB9-41ED-B019-E96116B651CE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Sasl.Tests</RootNamespace>
- <AssemblyName>Qpid.Sasl.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Sasl.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Sasl.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -64,4 +64,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Sasl.Tests/SaslTests.cs b/dotnet/Qpid.Sasl.Tests/SaslTests.cs index 8d576c175a..5b27949b98 100644 --- a/dotnet/Qpid.Sasl.Tests/SaslTests.cs +++ b/dotnet/Qpid.Sasl.Tests/SaslTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests
+namespace Apache.Qpid.Sasl.Tests
{
[TestFixture]
public class SaslTests : ISaslCallbackHandler
@@ -130,4 +130,4 @@ namespace Qpid.Sasl.Tests } // class SaslTests
-} // namespace Qpid.Sasl.Tests
+} // namespace Apache.Qpid.Sasl.Tests
diff --git a/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs b/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs index f7b68adfcb..73c68ea2b3 100644 --- a/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs +++ b/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests
+namespace Apache.Qpid.Sasl.Tests
{
public class TestClientFactory : ISaslClientFactory
{
@@ -72,4 +72,4 @@ namespace Qpid.Sasl.Tests }
} // class TestSaslClient
-} // namespace Qpid.Sasl.Tests
+} // namespace Apache.Qpid.Sasl.Tests
diff --git a/dotnet/Qpid.Sasl.Tests/default.build b/dotnet/Qpid.Sasl.Tests/default.build index 272ccfe615..eb0514d417 100644 --- a/dotnet/Qpid.Sasl.Tests/default.build +++ b/dotnet/Qpid.Sasl.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Sasl" default="test">
+<project name="Apache.Qpid.Sasl" default="test">
<target name="build">
<csc target="library"
diff --git a/dotnet/Qpid.Sasl/Callbacks.cs b/dotnet/Qpid.Sasl/Callbacks.cs index 13ed6f784e..90e36beeb8 100644 --- a/dotnet/Qpid.Sasl/Callbacks.cs +++ b/dotnet/Qpid.Sasl/Callbacks.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Marker interface for Sasl Callbacks
@@ -101,5 +101,6 @@ namespace Qpid.Sasl }
} // class RealmCallback
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs b/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs index d5f428a52e..3446261724 100644 --- a/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs +++ b/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs @@ -25,7 +25,7 @@ using System.Configuration; using System.Text;
using System.Xml;
-namespace Qpid.Sasl.Configuration
+namespace Apache.Qpid.Sasl.Configuration
{
/// <summary>
/// Represents an Sasl configuration section
@@ -85,5 +85,6 @@ namespace Qpid.Sasl.Configuration } // class SaslConfiguration
-} // namespace Qpid.Sasl.Configuration
+} // namespace Apache.Qpid.Sasl.Configuration
+
diff --git a/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs b/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs index c307c73eb1..21f6b92414 100644 --- a/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs +++ b/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs @@ -25,7 +25,7 @@ using System.Configuration; using System.Text;
using System.Xml;
-namespace Qpid.Sasl.Configuration
+namespace Apache.Qpid.Sasl.Configuration
{
/// <summary>
/// Defines the configuration section to configure extra
@@ -79,5 +79,6 @@ namespace Qpid.Sasl.Configuration }
} // class SaslConfigurationSectionHandler
-} // namespace Qpid.Sasl.Configuration
+} // namespace Apache.Qpid.Sasl.Configuration
+
diff --git a/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/dotnet/Qpid.Sasl/DefaultClientFactory.cs index e6387a1e29..d552aa80c0 100644 --- a/dotnet/Qpid.Sasl/DefaultClientFactory.cs +++ b/dotnet/Qpid.Sasl/DefaultClientFactory.cs @@ -22,9 +22,9 @@ using System;
using System.Collections;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public class DefaultClientFactory : ISaslClientFactory
{
@@ -90,5 +90,6 @@ namespace Qpid.Sasl }
} // class DefaultClientFactory
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs b/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs index ec34755f3e..0dfc482333 100644 --- a/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs +++ b/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public interface ISaslCallbackHandler
{
@@ -30,5 +30,6 @@ namespace Qpid.Sasl } // interface ISaslCallbackHandler
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/dotnet/Qpid.Sasl/ISaslClient.cs b/dotnet/Qpid.Sasl/ISaslClient.cs index 3ecccc0fac..526cc1f43a 100644 --- a/dotnet/Qpid.Sasl/ISaslClient.cs +++ b/dotnet/Qpid.Sasl/ISaslClient.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public interface ISaslClient
{
@@ -37,5 +37,6 @@ namespace Qpid.Sasl } // interface ISaslClient
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/dotnet/Qpid.Sasl/ISaslClientFactory.cs b/dotnet/Qpid.Sasl/ISaslClientFactory.cs index 4a5d4d0da4..fc81057ec4 100644 --- a/dotnet/Qpid.Sasl/ISaslClientFactory.cs +++ b/dotnet/Qpid.Sasl/ISaslClientFactory.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public interface ISaslClientFactory
{
@@ -35,5 +35,6 @@ namespace Qpid.Sasl );
} // interface ISaslClientFactory
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/dotnet/Qpid.Sasl/MD5HMAC.cs b/dotnet/Qpid.Sasl/MD5HMAC.cs index 0696487d10..134332284a 100644 --- a/dotnet/Qpid.Sasl/MD5HMAC.cs +++ b/dotnet/Qpid.Sasl/MD5HMAC.cs @@ -22,7 +22,7 @@ using System;
using System.Security.Cryptography;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Rough HMAC MD5 implementation as presented in
@@ -112,4 +112,4 @@ namespace Qpid.Sasl } // class MD5HMAC
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
diff --git a/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs b/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs index 9adcfd9d13..5e8c56ff51 100644 --- a/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs +++ b/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
/// Implements the ANONYMOUS authentication mechanism
@@ -66,4 +66,4 @@ namespace Qpid.Sasl.Mechanisms } // class AnonymousSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs b/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs index b5190daf0d..672cc64c6a 100644 --- a/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs +++ b/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Security.Cryptography;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
/// Implements the CRAM-MD5 authentication mechanism as outlined
@@ -88,4 +88,4 @@ namespace Qpid.Sasl.Mechanisms } // class CramMD5SaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs b/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs index 1f4b2cebdb..59d3a88991 100644 --- a/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs +++ b/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs @@ -26,7 +26,7 @@ using System.Globalization; using System.Security.Cryptography;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
@@ -573,4 +573,4 @@ namespace Qpid.Sasl.Mechanisms } // class DigestResponse
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs index 127591e2da..5b513bda87 100644 --- a/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs +++ b/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
/// Implements the EXTERNAL authentication mechanism
@@ -66,4 +66,4 @@ namespace Qpid.Sasl.Mechanisms } // class ExternalSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs b/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs index a6813fa825..3addeb2e83 100644 --- a/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs +++ b/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
@@ -78,4 +78,4 @@ namespace Qpid.Sasl.Mechanisms #endregion // ISaslClient Implementation
} // class PlainSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs index 9e422b106e..f38725e53f 100644 --- a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs +++ b/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs @@ -6,11 +6,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.Sasl")]
+[assembly: AssemblyTitle("Apache.Qpid.Sasl")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache Qpid")]
+[assembly: AssemblyProduct("Apache.Qpid.Sasl")]
[assembly: AssemblyCopyright("Copyright © 2007 The Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/dotnet/Qpid.Sasl/Qpid.Sasl.csproj index ae8047fd45..891d710379 100644 --- a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj +++ b/dotnet/Qpid.Sasl/Qpid.Sasl.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Sasl</RootNamespace>
- <AssemblyName>Qpid.Sasl</AssemblyName>
+ <RootNamespace>Apache.Qpid.Sasl</RootNamespace>
+ <AssemblyName>Apache.Qpid.Sasl</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -61,4 +61,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/dotnet/Qpid.Sasl/Sasl.cs b/dotnet/Qpid.Sasl/Sasl.cs index baab5c40e6..5a744a30d9 100644 --- a/dotnet/Qpid.Sasl/Sasl.cs +++ b/dotnet/Qpid.Sasl/Sasl.cs @@ -24,9 +24,9 @@ using System.Collections; using System.Configuration;
using System.Text;
-using Qpid.Sasl.Configuration;
+using Apache.Qpid.Sasl.Configuration;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Static class used to access the SASL functionality.
@@ -42,12 +42,12 @@ namespace Qpid.Sasl /// <example><![CDATA[
/// <configuration>
/// <configSections>
- /// <section name="qpid.sasl" type="Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Qpid.Sasl"/>
+ /// <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>
/// </configSections>
///
/// <qpid.sasl>
/// <clientFactories>
- /// <add type="Qpid.Sasl.Tests.TestClientFactory, Qpid.Sasl.Tests"/>
+ /// <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>
/// </clientFactories>
/// </qpid.sasl>
/// </configuration>
@@ -112,4 +112,4 @@ namespace Qpid.Sasl }
} // class Sasl
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/SaslClient.cs b/dotnet/Qpid.Sasl/SaslClient.cs index 79413e0077..1390b1b352 100644 --- a/dotnet/Qpid.Sasl/SaslClient.cs +++ b/dotnet/Qpid.Sasl/SaslClient.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Globalization;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public abstract class SaslClient : ISaslClient
{
@@ -142,4 +142,4 @@ namespace Qpid.Sasl } // class SaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/SaslException.cs b/dotnet/Qpid.Sasl/SaslException.cs index 203c408c3f..8f6e00a7ba 100644 --- a/dotnet/Qpid.Sasl/SaslException.cs +++ b/dotnet/Qpid.Sasl/SaslException.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Runtime.Serialization;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Reports an exception during the processing of an SASL
@@ -53,4 +53,4 @@ namespace Qpid.Sasl } // class SaslException
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/SaslProperties.cs b/dotnet/Qpid.Sasl/SaslProperties.cs index 0e59ce8f90..0658acda21 100644 --- a/dotnet/Qpid.Sasl/SaslProperties.cs +++ b/dotnet/Qpid.Sasl/SaslProperties.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public sealed class SaslProperties
{
@@ -39,4 +39,4 @@ namespace Qpid.Sasl } // class SaslProperties
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/dotnet/Qpid.Sasl/default.build b/dotnet/Qpid.Sasl/default.build index ed648024d0..5b44d6b9c4 100644 --- a/dotnet/Qpid.Sasl/default.build +++ b/dotnet/Qpid.Sasl/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Sasl" default="build">
+<project name="Apache.Qpid.Sasl" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
diff --git a/dotnet/TopicListener/Program.cs b/dotnet/TopicListener/Program.cs index c969f4d736..0134dca1ba 100644 --- a/dotnet/TopicListener/Program.cs +++ b/dotnet/TopicListener/Program.cs @@ -4,7 +4,7 @@ namespace TopicListener {
static void Main(string[] args)
{
- Qpid.Client.Tests.interop.TopicListener.Main(args);
+ Apache.Qpid.Client.Tests.interop.TopicListener.Main(args);
}
}
}
diff --git a/dotnet/TopicListener/default.build b/dotnet/TopicListener/default.build index 7f49a6de13..afde4d6937 100644 --- a/dotnet/TopicListener/default.build +++ b/dotnet/TopicListener/default.build @@ -18,7 +18,7 @@ <include name="**/*.cs" />
</sources>
<references>
- <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+ <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
</references>
</csc>
</target>
diff --git a/dotnet/TopicPublisher/Program.cs b/dotnet/TopicPublisher/Program.cs index 9206466cf7..a68df14bb3 100644 --- a/dotnet/TopicPublisher/Program.cs +++ b/dotnet/TopicPublisher/Program.cs @@ -4,7 +4,7 @@ namespace TopicPublisher {
static void Main(string[] args)
{
- Qpid.Client.Tests.interop.TopicPublisher.Main(args);
+ Apache.Qpid.Client.Tests.interop.TopicPublisher.Main(args);
}
}
}
diff --git a/dotnet/TopicPublisher/default.build b/dotnet/TopicPublisher/default.build index 38ad896f34..8991aae751 100644 --- a/dotnet/TopicPublisher/default.build +++ b/dotnet/TopicPublisher/default.build @@ -18,7 +18,7 @@ <include name="**/*.cs" />
</sources>
<references>
- <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+ <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
</references>
</csc>
</target>
diff --git a/dotnet/default.build b/dotnet/default.build index b9d0bf2762..e042f38c61 100644 --- a/dotnet/default.build +++ b/dotnet/default.build @@ -22,7 +22,7 @@ Fileset with build files for test assemblies
-->
<fileset id="tests.builds">
- <include name="Qpid.Buffer.Tess/default.build" />
+ <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" />
@@ -124,3 +124,4 @@ </project>
+
|