You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/07/31 17:54:49 UTC
svn commit: r561365 [2/10] - in /incubator/qpid/trunk/qpid: ./ cpp/ dotnet/
dotnet/Qpid.Buffer.Tests/ dotnet/Qpid.Buffer.Tests/Properties/
dotnet/Qpid.Buffer/ dotnet/Qpid.Buffer/Properties/
dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/BrokerDetai...
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -5,11 +5,11 @@
// 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("")]
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj Tue Jul 31 08:53:37 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs Tue Jul 31 08:53:37 2007
@@ -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
@@ -329,4 +329,5 @@
} // class SimpleByteBufferTests
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/default.build Tue Jul 31 08:53:37 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
using System;
using System.Runtime.Serialization;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
[Serializable]
public class BufferOverflowException : Exception
@@ -36,5 +36,6 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
using System;
using System.Runtime.Serialization;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
[Serializable]
public class BufferUnderflowException : Exception
@@ -37,5 +37,6 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
/// <summary>
/// Abstract class implementing a byte buffer
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using System.Text;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
public class ByteBufferHexDumper
{
@@ -74,5 +74,6 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
/// <summary>
/// Allocates <see cref="ByteBuffer"/>'s and manages them. Please
@@ -45,5 +45,6 @@
} // interface IByteBufferAllocator
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -23,11 +23,11 @@
// 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("")]
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj Tue Jul 31 08:53:37 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
internal sealed class SimpleByteBuffer : ByteBuffer
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs Tue Jul 31 08:53:37 2007
@@ -19,7 +19,7 @@
*
*/
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
/// <summary>
/// Allocates <see cref="ByteBuffer"/>'s and manages them.
@@ -53,5 +53,6 @@
} // class SimpleByteBufferAllocator
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
internal sealed class SlicedByteBuffer : ByteBuffer
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/default.build Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/App.config
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/App.config?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/App.config (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/App.config Tue Jul 31 08:53:37 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs Tue Jul 31 08:53:37 2007
@@ -23,11 +23,11 @@
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 @@
Assert.IsInstanceOfType(typeof(ITextMessage), msg);
}
}
-} // namespace Qpid.Client.Tests.Channel
+} // namespace Apache.Qpid.Client.Tests.Channel
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs Tue Jul 31 08:53:37 2007
@@ -22,11 +22,11 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs Tue Jul 31 08:53:37 2007
@@ -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
@@ -56,7 +56,7 @@
{
IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);
_connection = new AMQConnection(connectionInfo);
- _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 1);
+ _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 500, 300);
}
catch (QpidException e)
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs Tue Jul 31 08:53:37 2007
@@ -22,10 +22,10 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs Tue Jul 31 08:53:37 2007
@@ -23,10 +23,10 @@
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 Apache.Qpid.Client.Tests.Messages
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs Tue Jul 31 08:53:37 2007
@@ -23,9 +23,9 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -26,11 +26,11 @@
// 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("")]
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj Tue Jul 31 08:53:37 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs Tue Jul 31 08:53:37 2007
@@ -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 @@
} // class TestCallbackHandler
-} // namespace Qpid.Client.Tests.Connection
+} // namespace Apache.Qpid.Client.Tests.Connection
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs Tue Jul 31 08:53:37 2007
@@ -23,9 +23,9 @@
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
@@ -96,7 +96,7 @@
_publisher.Send(msg);
}
- _logger.Error("All messages sent");
+ _logger.Debug("All messages sent");
// receive all messages
for ( int i = 0; i < MESSAGE_COUNT; i++ )
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs Tue Jul 31 08:53:37 2007
@@ -23,10 +23,10 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs Tue Jul 31 08:53:37 2007
@@ -22,10 +22,10 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs Tue Jul 31 08:53:37 2007
@@ -23,10 +23,10 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs Tue Jul 31 08:53:37 2007
@@ -1,9 +1,8 @@
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 };
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs Tue Jul 31 08:53:37 2007
@@ -1,10 +1,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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs Tue Jul 31 08:53:37 2007
@@ -1,10 +1,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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs Tue Jul 31 08:53:37 2007
@@ -1,10 +1,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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs Tue Jul 31 08:53:37 2007
@@ -1,13 +1,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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs Tue Jul 31 08:53:37 2007
@@ -22,9 +22,9 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs Tue Jul 31 08:53:37 2007
@@ -22,9 +22,9 @@
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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs Tue Jul 31 08:53:37 2007
@@ -22,9 +22,9 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs Tue Jul 31 08:53:37 2007
@@ -22,10 +22,10 @@
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
{
@@ -113,4 +113,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs Tue Jul 31 08:53:37 2007
@@ -22,8 +22,8 @@
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
{
@@ -117,4 +117,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs Tue Jul 31 08:53:37 2007
@@ -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 @@
processor.Write(buffer);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs Tue Jul 31 08:53:37 2007
@@ -23,11 +23,11 @@
// 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("")]
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj Tue Jul 31 08:53:37 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
using System;
using System.Runtime.Serialization;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQAuthenticationException : AMQException
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs Tue Jul 31 08:53:37 2007
@@ -24,17 +24,17 @@
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;
+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 Qpid.Client
+namespace Apache.Qpid.Client
{
public class AMQConnection : Closeable, IConnection
{
@@ -273,15 +273,17 @@
private bool _transacted;
private AcknowledgeMode _acknowledgeMode;
- int _prefetch;
+ int _prefetchHigh;
+ int _prefetchLow;
AMQConnection _connection;
- public CreateChannelFailoverSupport(AMQConnection connection, bool transacted, AcknowledgeMode acknowledgeMode, int prefetch)
+ public CreateChannelFailoverSupport(AMQConnection connection, bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow)
{
_connection = connection;
_transacted = transacted;
_acknowledgeMode = acknowledgeMode;
- _prefetch = prefetch;
+ _prefetchHigh = prefetchHigh;
+ _prefetchLow = prefetchLow;
}
protected override object operation()
@@ -297,14 +299,14 @@
// open it, so that there is no window where we could receive data on the channel and not be set
// up to handle it appropriately.
AmqChannel channel = new AmqChannel(_connection,
- channelId, _transacted, _acknowledgeMode, _prefetch);
+ channelId, _transacted, _acknowledgeMode, _prefetchHigh, _prefetchLow);
_connection.ProtocolSession.AddSessionByChannel(channelId, channel);
_connection.RegisterSession(channelId, channel);
bool success = false;
try
{
- _connection.createChannelOverWire(channelId, (ushort)_prefetch, _transacted);
+ _connection.CreateChannelOverWire(channelId, _prefetchHigh, _prefetchLow, _transacted);
success = true;
}
catch (AMQException e)
@@ -334,11 +336,16 @@
public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode)
{
- return CreateChannel(transacted, acknowledgeMode, AmqChannel.DEFAULT_PREFETCH);
+ return CreateChannel(transacted, acknowledgeMode, AmqChannel.DEFAULT_PREFETCH_HIGH_MARK);
}
public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch)
{
+ return CreateChannel(transacted, acknowledgeMode, prefetch, prefetch);
+ }
+
+ public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow)
+ {
CheckNotClosed();
if (ChannelLimitReached())
{
@@ -347,7 +354,7 @@
else
{
CreateChannelFailoverSupport operation =
- new CreateChannelFailoverSupport(this, transacted, acknowledgeMode, prefetch);
+ new CreateChannelFailoverSupport(this, transacted, acknowledgeMode, prefetchHigh, prefetchLow);
return (IChannel)operation.execute(this);
}
}
@@ -704,8 +711,8 @@
/*
// 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);
@@ -774,18 +781,23 @@
foreach (AmqChannel channel in channels)
{
_protocolSession.AddSessionByChannel(channel.ChannelId, channel);
- ReopenChannel(channel.ChannelId, (ushort)channel.DefaultPrefetch, channel.Transacted);
+ ReopenChannel(
+ channel.ChannelId,
+ channel.DefaultPrefetchHigh,
+ channel.DefaultPrefetchLow,
+ channel.Transacted
+ );
channel.ReplayOnFailOver();
}
}
- private void ReopenChannel(ushort channelId, ushort prefetch, bool transacted)
+ private void ReopenChannel(ushort channelId, int prefetchHigh, int prefetchLow, bool transacted)
{
- _log.Debug(string.Format("Reopening channel id={0} prefetch={1} transacted={2}",
- channelId, prefetch, transacted));
+ _log.Debug(string.Format("Reopening channel id={0} prefetchHigh={1} prefetchLow={2} transacted={3}",
+ channelId, prefetchHigh, prefetchLow, transacted));
try
{
- createChannelOverWire(channelId, prefetch, transacted);
+ CreateChannelOverWire(channelId, prefetchHigh, prefetchLow, transacted);
}
catch (AMQException e)
{
@@ -795,7 +807,7 @@
}
}
- void createChannelOverWire(ushort channelId, ushort prefetch, bool transacted)
+ void CreateChannelOverWire(ushort channelId, int prefetchHigh, int prefetchLow, bool transacted)
{
_protocolWriter.SyncWrite(ChannelOpenBody.CreateAMQFrame(channelId, null), typeof (ChannelOpenOkBody));
@@ -805,7 +817,8 @@
{
// Basic.Qos frame appears to not be supported by OpenAMQ 1.0d.
_protocolWriter.SyncWrite(
- BasicQosBody.CreateAMQFrame(channelId, 0, prefetch, false),
+ BasicQosBody.CreateAMQFrame(
+ channelId, (uint)prefetchHigh, 0, false),
typeof (BasicQosOkBody));
}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs Tue Jul 31 08:53:37 2007
@@ -21,7 +21,7 @@
using System;
using System.Runtime.Serialization;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQConnectionException : AMQException
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
public abstract class AMQDestination
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs Tue Jul 31 08:53:37 2007
@@ -23,14 +23,15 @@
using System.Text.RegularExpressions;
using System.Threading;
using log4net;
-using Qpid.Buffer;
-using Qpid.Client.Message;
-using Qpid.Collections;
-using Qpid.Framing;
-using Qpid.Messaging;
-using Qpid.Protocol;
+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 Qpid.Client
+namespace Apache.Qpid.Client
{
public class AmqChannel : Closeable, IChannel
{
@@ -41,11 +42,14 @@
private static int _nextSessionNumber = 0;
private int _sessionNumber;
+ private bool _suspended;
+ private object _suspensionLock = new object();
// Used in the consume method. We generate the consume tag on the client so that we can use the nowait feature.
private int _nextConsumerNumber = 1;
- internal const int DEFAULT_PREFETCH = MessageConsumerBuilder.DEFAULT_PREFETCH_HIGH;
+ public const int DEFAULT_PREFETCH_HIGH_MARK = 5000;
+ public const int DEFAULT_PREFETCH_LOW_MARK = 2500;
private AMQConnection _connection;
@@ -55,9 +59,10 @@
private ushort _channelId;
- private int _defaultPrefetch = DEFAULT_PREFETCH;
+ private int _defaultPrefetchHighMark = DEFAULT_PREFETCH_HIGH_MARK;
+ private int _defaultPrefetchLowMark = DEFAULT_PREFETCH_LOW_MARK;
- private BlockingQueue _queue = new LinkedBlockingQueue();
+ private FlowControlQueue _queue;
private Dispatcher _dispatcher;
@@ -105,7 +110,7 @@
{
UnprocessedMessage message;
- while (_stopped == 0 && (message = (UnprocessedMessage)_containingChannel._queue.DequeueBlocking()) != null)
+ while (_stopped == 0 && (message = (UnprocessedMessage)_containingChannel._queue.Dequeue()) != null)
{
//_queue.size()
DispatchMessage(message);
@@ -163,8 +168,9 @@
/// <param name="channelId">The channel id.</param>
/// <param name="transacted">if set to <c>true</c> [transacted].</param>
/// <param name="acknowledgeMode">The acknowledge mode.</param>
- /// <param name="defaultPrefetch">Default prefetch value</param>
- internal AmqChannel(AMQConnection con, ushort channelId, bool transacted, AcknowledgeMode acknowledgeMode, int defaultPrefetch)
+ /// <param name="defaultPrefetchHigh">Default prefetch high value</param>
+ /// <param name="defaultPrefetchLow">Default prefetch low value</param>
+ internal AmqChannel(AMQConnection con, ushort channelId, bool transacted, AcknowledgeMode acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow)
: this()
{
_sessionNumber = Interlocked.Increment(ref _nextSessionNumber);
@@ -178,8 +184,26 @@
_acknowledgeMode = acknowledgeMode;
}
_channelId = channelId;
+ _defaultPrefetchHighMark = defaultPrefetchHigh;
+ _defaultPrefetchLowMark = defaultPrefetchLow;
+
+ if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge )
+ {
+ _queue = new FlowControlQueue(
+ _defaultPrefetchLowMark, _defaultPrefetchHighMark,
+ new ThresholdMethod(OnPrefetchLowMark),
+ new ThresholdMethod(OnPrefetchHighMark)
+ );
+ } else
+ {
+ // low and upper are the same
+ _queue = new FlowControlQueue(
+ _defaultPrefetchHighMark, _defaultPrefetchHighMark,
+ null, null
+ );
+ }
}
-
+
private AmqChannel()
{
_messageFactoryRegistry = MessageFactoryRegistry.NewDefaultRegistry();
@@ -269,19 +293,30 @@
public void Rollback()
{
- // FIXME: Fail over safety. Needs FailoverSupport?
- CheckNotClosed();
- CheckTransacted(); // throws IllegalOperationException if not a transacted session
+ lock ( _suspensionLock )
+ {
+ CheckTransacted(); // throws IllegalOperationException if not a transacted session
- try
- {
- _connection.ConvenientProtocolWriter.SyncWrite(
- TxRollbackBody.CreateAMQFrame(_channelId), typeof(TxRollbackOkBody));
- }
- catch (AMQException e)
- {
- throw new QpidException("Failed to rollback", e);
- }
+ try
+ {
+ bool suspended = IsSuspended;
+ if ( !suspended )
+ Suspend(true);
+
+ // todo: rollback dispatcher when TX support is added
+ //if ( _dispatcher != null )
+ // _dispatcher.Rollback();
+
+ _connection.ConvenientProtocolWriter.SyncWrite(
+ TxRollbackBody.CreateAMQFrame(_channelId), typeof(TxRollbackOkBody));
+
+ if ( !suspended )
+ Suspend(false);
+ } catch ( AMQException e )
+ {
+ throw new QpidException("Failed to rollback", e);
+ }
+ }
}
public override void Close()
@@ -539,21 +574,26 @@
ReturnBouncedMessage(message);
} else
{
- _queue.EnqueueBlocking(message);
+ _queue.Enqueue(message);
}
}
public int DefaultPrefetch
{
- get
- {
- return _defaultPrefetch;
- }
- set
- {
- _defaultPrefetch = value;
- }
- }
+ get { return DefaultPrefetchHigh; }
+ }
+ public int DefaultPrefetchLow
+ {
+ get { return _defaultPrefetchLowMark; }
+ }
+ public int DefaultPrefetchHigh
+ {
+ get { return _defaultPrefetchHighMark; }
+ }
+ public bool IsSuspended
+ {
+ get { return _suspended; }
+ }
public ushort ChannelId
{
@@ -581,6 +621,7 @@
internal void Stop()
{
+ Suspend(true);
if (_dispatcher != null)
{
_dispatcher.StopDispatcher();
@@ -883,7 +924,7 @@
* @param multiple if true will acknowledge all messages up to and including the one specified by the
* delivery tag
*/
- public void AcknowledgeMessage(ulong deliveryTag, bool multiple)
+ internal void AcknowledgeMessage(ulong deliveryTag, bool multiple)
{
AMQFrame ackFrame = BasicAckBody.CreateAMQFrame(_channelId, deliveryTag, multiple);
if (_logger.IsDebugEnabled)
@@ -930,5 +971,39 @@
}
}
+
+ private void OnPrefetchLowMark(int count)
+ {
+ if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge )
+ {
+ _logger.Warn("Below threshold(" + _defaultPrefetchLowMark + ") so unsuspending channel. Current value is " + count);
+ Suspend(false);
+ }
+ }
+ private void OnPrefetchHighMark(int count)
+ {
+ if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge )
+ {
+ _logger.Warn("Above threshold(" + _defaultPrefetchHighMark + ") so suspending channel. Current value is " + count);
+ Suspend(true);
+ }
+ }
+
+ private void Suspend(bool suspend)
+ {
+ lock ( _suspensionLock )
+ {
+ if ( _logger.IsDebugEnabled )
+ {
+ _logger.Debug("Setting channel flow : " + (suspend ? "suspended" : "unsuspended"));
+ }
+
+ _suspended = suspend;
+ AMQFrame frame = ChannelFlowBody.CreateAMQFrame(_channelId, !suspend);
+
+ Connection.ConvenientProtocolWriter.SyncWrite(frame, typeof(ChannelFlowOkBody));
+ }
+ }
+
}
}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Closeable.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Closeable.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Closeable.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Closeable.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
public abstract class Closeable
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs Tue Jul 31 08:53:37 2007
@@ -25,10 +25,10 @@
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 @@
_keys.Remove(key);
}
}
-} // namespace Qpid.Client.Configuration
+} // namespace Apache.Qpid.Client.Configuration
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs Tue Jul 31 08:53:37 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
public class ConnectionTuneParameters
{
@@ -79,4 +79,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
@@ -171,4 +171,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs Tue Jul 31 08:53:37 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs Tue Jul 31 08:53:37 2007
@@ -20,7 +20,7 @@
*/
using log4net;
-namespace Qpid.Client.Failover
+namespace Apache.Qpid.Client.Failover
{
public abstract class FailoverSupport
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
@@ -63,5 +63,6 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
@@ -37,4 +37,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
@@ -31,4 +31,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
@@ -64,4 +64,5 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
@@ -55,5 +55,6 @@
}
}
}
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -22,14 +22,14 @@
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 @@
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(
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs Tue Jul 31 08:53:37 2007
@@ -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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs Tue Jul 31 08:53:37 2007
@@ -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
{