You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2007/01/29 12:05:22 UTC
svn commit: r501006 - in /incubator/qpid/trunk/qpid/dotnet: Qpid.Buffer/
Qpid.Client.Tests/Common/ Qpid.Client.Tests/connection/
Qpid.Client.Tests/failover/ Qpid.Client.Tests/url/ Qpid.Client/Client/
Qpid.Client/qms/ Qpid.Client/qms/failover/
Author: rgreig
Date: Mon Jan 29 03:05:20 2007
New Revision: 501006
URL: http://svn.apache.org/viewvc?view=rev&rev=501006
Log:
(Patch supplied by Tomas Restrepo) QPID-312.diff applied. This converts Javadoc copied accross from the orignal Java code to .Net format. Renames some files/classes/methods to use .Net conventions.
Added:
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
Removed:
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBufferAllocator.cs
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BaseByteBuffer.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferDataException.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BaseByteBuffer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BaseByteBuffer.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BaseByteBuffer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BaseByteBuffer.cs Mon Jan 29 03:05:20 2007
@@ -33,23 +33,21 @@
namespace Qpid.Buffer
{
- /**
- * A base implementation of {@link ByteBuffer}. This implementation
- * assumes that {@link ByteBuffer#buf()} always returns a correct NIO
- * {@link FixedByteBuffer} instance. Most implementations could
- * extend this class and implement their own buffer management mechanism.
- *
- * @noinspection StaticNonFinalField
- * @see ByteBufferAllocator
- */
+ /// <summary>
+ /// A base implementation of <see cref="ByteBuffer"/>. This implementation
+ /// assumes that <see cref="ByteBuffer.Buf"/> always returns a correct NIO
+ /// <see cref="FixedByteBuffer"/> instance. Most implementations could
+ /// extend this class and implement their own buffer management mechanism.
+ /// </summary>
+ /// <seealso cref="ByteBufferAllocator"/>
public abstract class BaseByteBuffer : ByteBuffer
{
private bool _autoExpand;
- /**
- * We don't have any access to Buffer.markValue(), so we need to track it down,
- * which will cause small extra overhead.
- */
+ /// <summary>
+ /// We don't have any access to Buffer.markValue(),
+ /// so we need to track it down, which will cause small extra overhead.
+ /// </summary>
private int _mark = -1;
protected BaseByteBuffer()
@@ -94,10 +92,11 @@
return this;
}
- /**
- * Implement this method to increase the capacity of this buffer.
- * <tt>newCapacity</tt> is always greater than the current capacity.
- */
+
+ /// <summary>
+ /// Implement this method to increase the capacity of this buffer.
+ /// </summary>
+ /// <param name="newCapacity">is always greater than the current capacity.</param>
protected abstract void capacity0( int newCapacity );
public override bool isAutoExpand()
@@ -458,4 +457,4 @@
// return buf().asDoubleBuffer();
// }
}
-}
\ No newline at end of file
+}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferDataException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferDataException.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferDataException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/BufferDataException.cs Mon Jan 29 03:05:20 2007
@@ -23,10 +23,10 @@
namespace Qpid.Buffer
{
- /**
- * A {@link RuntimeException} which is thrown when the data the {@link ByteBuffer}
- * contains is corrupt.
- */
+ /// <summary>
+ /// An exception thrown when the data the <see cref="ByteBuffer"/>
+ /// contains is corrupt
+ /// </summary>
[Serializable]
public class BufferDataException : Exception
{
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs Mon Jan 29 03:05:20 2007
@@ -604,7 +604,7 @@
public abstract class ByteBuffer : IComparable
{
//private static ByteBufferAllocator allocator = new PooledByteBufferAllocator();
- private static ByteBufferAllocator allocator = new SimpleByteBufferAllocator();
+ private static IByteBufferAllocator allocator = new SimpleByteBufferAllocator();
private static bool _useDirectBuffers = false;
@@ -619,7 +619,7 @@
/**
* Returns the current allocator which manages the allocated buffers.
*/
- public static ByteBufferAllocator getAllocator()
+ public static IByteBufferAllocator getAllocator()
{
return allocator;
}
@@ -628,20 +628,20 @@
* Changes the current allocator with the specified one to manage
* the allocated buffers from now.
*/
- public static void setAllocator( ByteBufferAllocator newAllocator )
+ public static void setAllocator( IByteBufferAllocator newAllocator )
{
if( newAllocator == null )
{
throw new NullReferenceException("allocator cannot be null");
}
- ByteBufferAllocator oldAllocator = allocator;
+ IByteBufferAllocator oldAllocator = allocator;
allocator = newAllocator;
if( null != oldAllocator )
{
- oldAllocator.dispose();
+ oldAllocator.Dispose();
}
}
@@ -690,7 +690,7 @@
*/
public static ByteBuffer allocate( int capacity, bool direct )
{
- return allocator.allocate( capacity, direct );
+ return allocator.Allocate( capacity, direct );
}
/**
@@ -698,7 +698,7 @@
*/
public static ByteBuffer wrap( FixedByteBuffer nioBuffer )
{
- return allocator.wrap( nioBuffer );
+ return allocator.Wrap( nioBuffer );
}
/**
Added: 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=auto&rev=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs (added)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs Mon Jan 29 03:05:20 2007
@@ -0,0 +1,29 @@
+namespace Qpid.Buffer
+{
+ /// <summary>
+ /// Allocates <see cref="ByteBuffer"/>'s and manages them. Please
+ /// implement this interface if you need more advanced memory management scheme
+ /// </summary>
+ public interface IByteBufferAllocator
+ {
+ /// <summary>
+ /// Returns the buffer which is capable of the specified size.
+ /// </summary>
+ /// <param name="capacity">The capacity of the buffer</param>
+ /// <param name="direct">true to get a direct buffer, false to get a heap buffer</param>
+ ByteBuffer Allocate(int capacity, bool direct);
+
+ /// <summary>
+ /// Wraps the specified buffer
+ /// </summary>
+ /// <param name="nioBuffer">fixed byte buffer</param>
+ /// <returns>The wrapped buffer</returns>
+ ByteBuffer Wrap(FixedByteBuffer nioBuffer);
+
+
+ /// <summary>
+ /// Dispose of this allocator.
+ /// </summary>
+ void Dispose();
+ }
+}
\ No newline at end of file
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj Mon Jan 29 03:05:20 2007
@@ -41,11 +41,11 @@
<Compile Include="BufferOverflowException.cs" />
<Compile Include="BufferUnderflowException.cs" />
<Compile Include="ByteBuffer.cs" />
- <Compile Include="ByteBufferAllocator.cs" />
<Compile Include="ByteBufferHexDumper.cs" />
<Compile Include="ByteBufferProxy.cs" />
<Compile Include="FixedByteBuffer.cs" />
<Compile Include="HeapByteBuffer.cs" />
+ <Compile Include="IByteBufferAllocator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SimpleByteBufferAllocator.cs" />
</ItemGroup>
@@ -57,4 +57,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file
+</Project>
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs Mon Jan 29 03:05:20 2007
@@ -23,11 +23,11 @@
namespace Qpid.Buffer
{
- /**
- * A simplistic {@link ByteBufferAllocator} which simply allocates a new
- * buffer every time.
- */
- public class SimpleByteBufferAllocator : ByteBufferAllocator
+ /// <summary>
+ /// A simplistic <see cref="ByteBufferAllocator"/> which simply allocates a new
+ /// buffer every time
+ /// </summary>
+ public class SimpleByteBufferAllocator : IByteBufferAllocator
{
private const int MINIMUM_CAPACITY = 1;
@@ -35,7 +35,7 @@
{
}
- public ByteBuffer allocate( int capacity, bool direct )
+ public ByteBuffer Allocate( int capacity, bool direct )
{
FixedByteBuffer nioBuffer;
if( direct )
@@ -49,12 +49,12 @@
return new SimpleByteBuffer( nioBuffer );
}
- public ByteBuffer wrap( FixedByteBuffer nioBuffer )
+ public ByteBuffer Wrap( FixedByteBuffer nioBuffer )
{
return new SimpleByteBuffer( nioBuffer );
}
- public void dispose()
+ public void Dispose()
{
}
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs Mon Jan 29 03:05:20 2007
@@ -22,7 +22,7 @@
using log4net;
using NUnit.Framework;
using Qpid.Messaging;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
namespace Qpid.Client.Tests
{
@@ -54,7 +54,7 @@
try
{
- ConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);
+ IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);
_connection = new AMQConnection(connectionInfo);
_channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 1);
}
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs Mon Jan 29 03:05:20 2007
@@ -20,7 +20,7 @@
*/
using System;
using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
using Qpid.Messaging;
namespace Qpid.Client.Tests.Connection
@@ -31,7 +31,7 @@
[Test]
public void SimpleConnection()
{
- ConnectionInfo connectionInfo = new QpidConnectionInfo();
+ IConnectionInfo connectionInfo = new QpidConnectionInfo();
connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5672, false));
using (IConnection connection = new AMQConnection(connectionInfo))
{
@@ -42,8 +42,8 @@
[Test]
public void PasswordFailureConnection()
{
- ConnectionInfo connectionInfo = new QpidConnectionInfo();
- connectionInfo.SetPassword("rubbish");
+ IConnectionInfo connectionInfo = new QpidConnectionInfo();
+ connectionInfo.Password = "rubbish";
connectionInfo.AddBrokerInfo(new AmqBrokerInfo());
try
{
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs Mon Jan 29 03:05:20 2007
@@ -22,7 +22,7 @@
using System.Threading;
using log4net;
using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
using Qpid.Messaging;
namespace Qpid.Client.Tests.failover
@@ -39,7 +39,7 @@
private IMessageConsumer _consumerOfResponse;
- void DoFailoverTest(ConnectionInfo info)
+ void DoFailoverTest(IConnectionInfo info)
{
DoFailoverTest(new AMQConnection(info));
}
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs Mon Jan 29 03:05:20 2007
@@ -23,7 +23,7 @@
using System.Threading;
using log4net;
using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
using Qpid.Messaging;
namespace Qpid.Client.Tests.failover
@@ -97,7 +97,7 @@
}
}
- void DoFailoverTxTest(ConnectionInfo connectionInfo)
+ void DoFailoverTxTest(IConnectionInfo connectionInfo)
{
_connection = new AMQConnection(connectionInfo);
_connection.ConnectionListener = this;
@@ -237,7 +237,7 @@
_log.Info("url = [" + defaultUrl + "]");
- ConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(defaultUrl);
+ IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(defaultUrl);
_log.Info("connection url = [" + connectionInfo + "]");
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs Mon Jan 29 03:05:20 2007
@@ -21,7 +21,7 @@
using System;
using System.Net;
using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
namespace Qpid.Client.Tests.url
{
@@ -34,26 +34,26 @@
//String url = "amqp://ritchiem:bob@/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.AreEqual("roundrobin", connectionurl.GetFailoverMethod());
- Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.AreEqual("roundrobin", connectionurl.FailoverMethod);
+ Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+ Assert.IsTrue(connectionurl.Password.Equals("bob"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 2);
+ Assert.IsTrue(connectionurl.BrokerCount == 2);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Transport.Equals("tcp"));
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
service = connectionurl.GetBrokerInfo(1);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("fancyserver"));
- Assert.IsTrue(service.getPort() == 3000);
+ Assert.IsTrue(service.Transport.Equals("tcp"));
+ Assert.IsTrue(service.Host.Equals("fancyserver"));
+ Assert.IsTrue(service.Port == 3000);
}
@@ -62,20 +62,20 @@
{
String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+ Assert.IsTrue(connectionurl.Password.Equals("bob"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Transport.Equals("tcp"));
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
}
[Test]
@@ -83,20 +83,20 @@
{
String url = "amqp://ritchiem:@default/temp?brokerlist='tcp://localhost:5672'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
- Assert.IsTrue(connectionurl.GetPassword().Equals(""));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+ Assert.IsTrue(connectionurl.Password.Equals(""));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Transport.Equals("tcp"));
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
}
[Test]
@@ -121,23 +121,23 @@
{
String url = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/test"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("guest"));
+ Assert.IsTrue(connectionurl.Password.Equals("guest"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/test"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Transport.Equals("tcp"));
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
}
[Test]
@@ -145,24 +145,24 @@
{
String url = "amqp://guest:guest@clientname/temp?brokerlist='tcp://localhost:5672'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
- Assert.IsTrue(connectionurl.GetClientName().Equals("clientname"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("guest"));
+ Assert.IsTrue(connectionurl.Password.Equals("guest"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
+ Assert.IsTrue(connectionurl.ClientName.Equals("clientname"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Transport.Equals("tcp"));
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
}
[Test]
@@ -170,22 +170,22 @@
{
String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("guest"));
+ Assert.IsTrue(connectionurl.Password.Equals("guest"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
+ Assert.IsTrue(service.Transport.Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
}
@@ -194,22 +194,22 @@
{
String url = "amqp://guest:guest@default/temp?brokerlist='localhost:'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("guest"));
+ Assert.IsTrue(connectionurl.Password.Equals("guest"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
+ Assert.IsTrue(service.Transport.Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
}
[Test]
@@ -217,21 +217,21 @@
{
String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim',timeout='200',immediatedelivery='true'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("guest"));
+ Assert.IsTrue(connectionurl.Password.Equals("guest"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("tcp"));
+ Assert.IsTrue(service.Transport.Equals("tcp"));
- Assert.IsTrue(service.getHost().Equals("localhost"));
- Assert.IsTrue(service.getPort() == 5672);
+ Assert.IsTrue(service.Host.Equals("localhost"));
+ Assert.IsTrue(service.Port == 5672);
Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
Assert.IsTrue(connectionurl.GetOption("timeout").Equals("200"));
@@ -243,20 +243,20 @@
{
String url = "amqp://guest:guest@default/messages?brokerlist='vm://default:2'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
- Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/messages"));
+ Assert.IsTrue(connectionurl.FailoverMethod == null);
+ Assert.IsTrue(connectionurl.Username.Equals("guest"));
+ Assert.IsTrue(connectionurl.Password.Equals("guest"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/messages"));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("vm"));
- Assert.AreEqual("localhost", service.getHost());
- Assert.AreEqual(2, service.getPort());
+ Assert.IsTrue(service.Transport.Equals("vm"));
+ Assert.AreEqual("localhost", service.Host);
+ Assert.AreEqual(2, service.Port);
}
[Test]
@@ -264,25 +264,25 @@
{
String url = "amqp://ritchiem:bob@default/temp?brokerlist='vm://default:2;vm://default:3',failover='roundrobin'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetFailoverMethod().Equals("roundrobin"));
- Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
- Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+ Assert.IsTrue(connectionurl.FailoverMethod.Equals("roundrobin"));
+ Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+ Assert.IsTrue(connectionurl.Password.Equals("bob"));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
- Assert.AreEqual(2, connectionurl.GetBrokerCount());
+ Assert.AreEqual(2, connectionurl.BrokerCount);
- BrokerInfo service = connectionurl.GetBrokerInfo(0);
+ IBrokerInfo service = connectionurl.GetBrokerInfo(0);
- Assert.IsTrue(service.getTransport().Equals("vm"));
- Assert.AreEqual("localhost", service.getHost());
- Assert.IsTrue(service.getPort() == 2);
+ Assert.IsTrue(service.Transport.Equals("vm"));
+ Assert.AreEqual("localhost", service.Host);
+ Assert.IsTrue(service.Port == 2);
service = connectionurl.GetBrokerInfo(1);
- Assert.IsTrue(service.getTransport().Equals("vm"));
- Assert.AreEqual("localhost", service.getHost());
- Assert.IsTrue(service.getPort() == 3);
+ Assert.IsTrue(service.Transport.Equals("vm"));
+ Assert.AreEqual("localhost", service.Host);
+ Assert.IsTrue(service.Port == 3);
}
[Test]
@@ -306,14 +306,14 @@
{
String url = "amqp://user:@default/test?brokerlist='tcp://localhost:5672'";
- ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connectionurl.GetUsername().Equals("user"));
- Assert.IsTrue(connectionurl.GetPassword().Equals(""));
- Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/test"));
- Assert.IsTrue(connectionurl.GetClientName().StartsWith(Dns.GetHostName()));
+ Assert.IsTrue(connectionurl.Username.Equals("user"));
+ Assert.IsTrue(connectionurl.Password.Equals(""));
+ Assert.IsTrue(connectionurl.VirtualHost.Equals("/test"));
+ Assert.IsTrue(connectionurl.ClientName.StartsWith(Dns.GetHostName()));
- Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+ Assert.IsTrue(connectionurl.BrokerCount == 1);
}
[Test]
@@ -372,8 +372,8 @@
{
String url = "amqp://guest:guest@default/t.-_+!=:?brokerlist='tcp://localhost:5672'";
- ConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
- Assert.IsTrue(connection.GetVirtualHost().Equals("/t.-_+!=:"));
+ IConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
+ Assert.IsTrue(connection.VirtualHost.Equals("/t.-_+!=:"));
}
[Test]
@@ -381,10 +381,10 @@
{
String url = "amqp://guest:guest@default/test=:?brokerlist='tcp://localhost'";
- ConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
+ IConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
- BrokerInfo broker = connection.GetBrokerInfo(0);
- Assert.IsTrue(broker.getPort() == BrokerInfoConstants.DEFAULT_PORT);
+ IBrokerInfo broker = connection.GetBrokerInfo(0);
+ Assert.IsTrue(broker.Port == BrokerInfoConstants.DEFAULT_PORT);
}
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs Mon Jan 29 03:05:20 2007
@@ -26,7 +26,7 @@
using log4net;
using Qpid.Client.Failover;
using Qpid.Client.Protocol;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
using Qpid.Client.State;
using Qpid.Client.Transport;
using Qpid.Client.Transport.Socket.Blocking;
@@ -40,7 +40,7 @@
{
private static readonly ILog _log = LogManager.GetLogger(typeof(AMQConnection));
- ConnectionInfo _connectionInfo;
+ IConnectionInfo _connectionInfo;
private int _nextChannelId = 0;
// _Connected should be refactored with a suitable wait object.
@@ -121,7 +121,7 @@
get { return _protocolWriter; }
}
- public AMQConnection(ConnectionInfo connectionInfo)
+ public AMQConnection(IConnectionInfo connectionInfo)
{
if (connectionInfo == null)
{
@@ -129,7 +129,7 @@
}
_log.Info("ConnectionInfo: " + connectionInfo);
_connectionInfo = connectionInfo;
- _log.Info("password = " + _connectionInfo.GetPassword());
+ _log.Info("password = " + _connectionInfo.Password);
_failoverPolicy = new FailoverPolicy(connectionInfo);
// We are not currently connected.
@@ -140,7 +140,7 @@
{
try
{
- BrokerInfo brokerInfo = _failoverPolicy.GetNextBrokerInfo();
+ IBrokerInfo brokerInfo = _failoverPolicy.GetNextBrokerInfo();
_log.Info("Connecting to " + brokerInfo);
MakeBrokerConnection(brokerInfo);
break;
@@ -220,12 +220,12 @@
get
{
CheckNotClosed();
- return _connectionInfo.GetClientName();
+ return _connectionInfo.ClientName;
}
set
{
CheckNotClosed();
- _connectionInfo.SetClientName(value);
+ _connectionInfo.ClientName = value;
}
}
@@ -505,7 +505,7 @@
{
get
{
- return _failoverPolicy.GetCurrentBrokerInfo().getHost();
+ return _failoverPolicy.GetCurrentBrokerInfo().Host;
}
}
@@ -513,7 +513,7 @@
{
get
{
- return _failoverPolicy.GetCurrentBrokerInfo().getPort();
+ return _failoverPolicy.GetCurrentBrokerInfo().Port;
}
}
@@ -521,7 +521,7 @@
{
get
{
- return _connectionInfo.GetUsername();
+ return _connectionInfo.Username;
}
}
@@ -529,7 +529,7 @@
{
get
{
- return _connectionInfo.GetPassword();
+ return _connectionInfo.Password;
}
}
@@ -537,7 +537,7 @@
{
get
{
- return _connectionInfo.GetVirtualHost();
+ return _connectionInfo.VirtualHost;
}
}
@@ -674,7 +674,7 @@
public bool AttemptReconnection(String host, int port, bool useSSL)
{
- BrokerInfo bd = new AmqBrokerInfo("amqp", host, port, useSSL);
+ IBrokerInfo bd = new AmqBrokerInfo("amqp", host, port, useSSL);
_failoverPolicy.setBroker(bd);
@@ -691,7 +691,7 @@
return false;
}
- private void MakeBrokerConnection(BrokerInfo brokerDetail)
+ private void MakeBrokerConnection(IBrokerInfo brokerDetail)
{
try
{
@@ -708,7 +708,7 @@
_transport = LoadTransportFromAssembly(brokerDetail.getHost(), brokerDetail.getPort(), assemblyName, transportType);
*/
- _transport = new BlockingSocketTransport(brokerDetail.getHost(), brokerDetail.getPort(), this);
+ _transport = new BlockingSocketTransport(brokerDetail.Host, brokerDetail.Port, this);
// Connect.
_transport.Open();
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=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs Mon Jan 29 03:05:20 2007
@@ -21,11 +21,11 @@
using System;
using System.Collections;
using System.Text;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
namespace Qpid.Client
{
- public class AmqBrokerInfo : BrokerInfo
+ public class AmqBrokerInfo : IBrokerInfo
{
public readonly string URL_FORMAT_EXAMPLE =
"<transport>://<hostname>[:<port Default=\""+BrokerInfoConstants.DEFAULT_PORT+"\">][?<option>='<value>'[,<option>='<value>']]";
@@ -90,10 +90,10 @@
" In broker URL:'" + url + "' Format: " + URL_FORMAT_EXAMPLE, "");
}
- setTransport(transport);
+ Transport = transport;
String host = connection.Host;
- if (!host.Equals("default")) setHost(host);
+ if (!host.Equals("default")) Host = host;
int port = connection.Port;
@@ -130,7 +130,7 @@
}
if (found)
{
- setPort(int.Parse(auth.Substring(start, end-start+1)));
+ Port = int.Parse(auth.Substring(start, end-start+1));
}
else
{
@@ -140,12 +140,12 @@
}
else
{
- setPort(BrokerInfoConstants.DEFAULT_PORT);
+ Port = BrokerInfoConstants.DEFAULT_PORT;
}
}
else
{
- setPort(port);
+ Port = port;
}
String queryString = connection.Query;
@@ -178,70 +178,58 @@
if (useSSL)
{
- setOption(BrokerInfoConstants.OPTIONS_SSL, "true");
+ SetOption(BrokerInfoConstants.OPTIONS_SSL, "true");
}
}
- public string getHost()
+ public string Host
{
- return _host;
+ get { return _host; }
+ set { _host = value; }
}
- public void setHost(string _host)
+ public int Port
{
- this._host = _host;
+ get { return _port; }
+ set { _port = value; }
}
- public int getPort()
+ public string Transport
{
- return _port;
+ get { return _transport; }
+ set { _transport = value; }
}
- public void setPort(int _port)
- {
- this._port = _port;
- }
-
- public string getTransport()
- {
- return _transport;
- }
-
- public void setTransport(string _transport)
- {
- this._transport = _transport;
- }
-
- public string getOption(string key)
+ public string GetOption(string key)
{
return (string)_options[key];
}
- public void setOption(string key, string value)
+ public void SetOption(string key, string value)
{
_options[key] = value;
}
- public long getTimeout()
+ public long Timeout
{
- if (_options.ContainsKey(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT))
+ get
{
- try
- {
- return long.Parse((string)_options[BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT]);
- }
- catch (FormatException)
+ if ( _options.ContainsKey(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT) )
{
- //Do nothing as we will use the default below.
+ try
+ {
+ return long.Parse(GetOption(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT));
+ } catch ( FormatException )
+ {
+ //Do nothing as we will use the default below.
+ }
}
+ return BrokerInfoConstants.DEFAULT_CONNECT_TIMEOUT;
+ }
+ set
+ {
+ SetOption(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT, value.ToString());
}
-
- return BrokerInfoConstants.DEFAULT_CONNECT_TIMEOUT;
- }
-
- public void setTimeout(long timeout)
- {
- setOption(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT, timeout.ToString());
}
public override string ToString()
@@ -267,15 +255,15 @@
public override bool Equals(object obj)
{
- if (!(obj is BrokerInfo))
+ if (!(obj is IBrokerInfo))
{
return false;
}
- BrokerInfo bd = (BrokerInfo) obj;
- return StringEqualsIgnoreCase(_host, bd.getHost()) &&
- _port == bd.getPort() &&
- _transport == bd.getTransport();
+ IBrokerInfo bd = (IBrokerInfo) obj;
+ return StringEqualsIgnoreCase(_host, bd.Host) &&
+ _port == bd.Port &&
+ _transport == bd.Transport;
}
public override int GetHashCode()
@@ -318,23 +306,25 @@
// return optionsURL.tostring();
// }
- public bool useSSL()
+ public bool UseSSL
{
- // To be friendly to users we should be case insensitive.
- // or simply force users to conform to OPTIONS_SSL
- // todo make case insensitive by trying ssl Ssl sSl ssL SSl SsL sSL SSL
-
- if (_options.ContainsKey(BrokerInfoConstants.OPTIONS_SSL))
+ get
{
- return StringEqualsIgnoreCase((string)_options[BrokerInfoConstants.OPTIONS_SSL], "true");
- }
+ // To be friendly to users we should be case insensitive.
+ // or simply force users to conform to OPTIONS_SSL
+ // todo make case insensitive by trying ssl Ssl sSl ssL SSl SsL sSL SSL
- return false;
- }
+ if ( _options.ContainsKey(BrokerInfoConstants.OPTIONS_SSL) )
+ {
+ return StringEqualsIgnoreCase(GetOption(BrokerInfoConstants.OPTIONS_SSL), "true");
+ }
- public void useSSL(bool ssl)
- {
- setOption(BrokerInfoConstants.OPTIONS_SSL, ssl.ToString());
+ return false;
+ }
+ set
+ {
+ SetOption(BrokerInfoConstants.OPTIONS_SSL, value.ToString());
+ }
}
}
}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs Mon Jan 29 03:05:20 2007
@@ -24,7 +24,7 @@
using System.Text;
using System.Text.RegularExpressions;
using log4net;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
namespace Qpid.Client
{
@@ -192,10 +192,10 @@
public class QpidConnectionUrl
{
- internal static ConnectionInfo FromUrl(string fullURL)
+ internal static IConnectionInfo FromUrl(string fullURL)
{
//_url = fullURL;
- ConnectionInfo connectionInfo = new QpidConnectionInfo();
+ IConnectionInfo connectionInfo = new QpidConnectionInfo();
// _options = new HashMap<String, String>();
@@ -216,7 +216,7 @@
if (connection.Host != null && connection.Host.Length > 0 && !connection.Host.Equals("default"))
{
- connectionInfo.SetClientName(connection.Host);
+ connectionInfo.ClientName = connection.Host;
}
String userInfo = connection.UserInfo;
@@ -231,9 +231,9 @@
}
String virtualHost = connection.AbsolutePath; // XXX: is AbsolutePath corrrect?
- if (virtualHost != null && (!virtualHost.Equals("")))
+ if (virtualHost != null && virtualHost.Length > 0)
{
- connectionInfo.SetVirtualHost(virtualHost);
+ connectionInfo.VirtualHost = virtualHost;
}
else
{
@@ -290,7 +290,7 @@
}
}
- private static void parseUserInfo(String userinfo, string fullUrl, ConnectionInfo connectionInfo)
+ private static void parseUserInfo(String userinfo, string fullUrl, IConnectionInfo connectionInfo)
{
//user info = user:pass
@@ -303,12 +303,12 @@
}
else
{
- connectionInfo.setUsername(userinfo.Substring(0, colonIndex));
- connectionInfo.SetPassword(userinfo.Substring(colonIndex + 1));
+ connectionInfo.Username = userinfo.Substring(0, colonIndex);
+ connectionInfo.Password = userinfo.Substring(colonIndex + 1);
}
}
- private static void processOptions(ConnectionInfo connectionInfo)
+ private static void processOptions(IConnectionInfo connectionInfo)
{
string brokerlist = connectionInfo.GetOption(ConnectionUrlConstants.OPTIONS_BROKERLIST);
if (brokerlist != null)
@@ -334,14 +334,14 @@
if (methodIndex > -1)
{
- connectionInfo.SetFailoverMethod(failover.Substring(0, methodIndex));
+ connectionInfo.FailoverMethod = failover.Substring(0, methodIndex);
QpidConnectionInfo qpidConnectionInfo = (QpidConnectionInfo)connectionInfo;
URLHelper.parseOptions(qpidConnectionInfo.GetFailoverOptions(),
failover.Substring(methodIndex + 1));
}
else
{
- connectionInfo.SetFailoverMethod(failover);
+ connectionInfo.FailoverMethod = failover;
}
connectionInfo.SetOption(ConnectionUrlConstants.OPTIONS_FAILOVER, null);
@@ -349,14 +349,14 @@
}
}
- internal static ConnectionInfo FromUri(Uri uri)
+ internal static IConnectionInfo FromUri(Uri uri)
{
return null; // FIXME
}
}
- public class QpidConnectionInfo : ConnectionInfo
+ public class QpidConnectionInfo : IConnectionInfo
{
string _username = "guest";
string _password = "guest";
@@ -378,7 +378,7 @@
return _options;
}
- public static ConnectionInfo FromUrl(String url)
+ public static IConnectionInfo FromUrl(String url)
{
return QpidConnectionUrl.FromUrl(url);
}
@@ -386,7 +386,7 @@
public string AsUrl()
{
string result = "amqp://";
- foreach (BrokerInfo info in _brokerInfos)
+ foreach (IBrokerInfo info in _brokerInfos)
{
result += info.ToString();
}
@@ -394,14 +394,10 @@
}
- public string GetFailoverMethod()
+ public string FailoverMethod
{
- return _failoverMethod;
- }
-
- public void SetFailoverMethod(string failoverMethod)
- {
- _failoverMethod = failoverMethod;
+ get { return _failoverMethod; }
+ set { _failoverMethod = value; }
}
public string GetFailoverOption(string key)
@@ -409,17 +405,17 @@
return (string)_failoverOptions[key];
}
- public int GetBrokerCount()
+ public int BrokerCount
{
- return _brokerInfos.Count;
+ get { return _brokerInfos.Count; }
}
- public BrokerInfo GetBrokerInfo(int index)
+ public IBrokerInfo GetBrokerInfo(int index)
{
- return (BrokerInfo)_brokerInfos[index];
+ return (IBrokerInfo)_brokerInfos[index];
}
- public void AddBrokerInfo(BrokerInfo brokerInfo)
+ public void AddBrokerInfo(IBrokerInfo brokerInfo)
{
if (!_brokerInfos.Contains(brokerInfo))
{
@@ -432,44 +428,28 @@
return _brokerInfos;
}
- public string GetClientName()
- {
- return _clientName;
- }
-
- public void SetClientName(string clientName)
- {
- _clientName = clientName;
- }
-
- public string GetUsername()
- {
- return _username;
- }
-
- public void setUsername(string username)
- {
- _username = username;
- }
-
- public string GetPassword()
+ public string ClientName
{
- return _password;
+ get { return _clientName; }
+ set { _clientName = value; }
}
- public void SetPassword(string password)
+ public string Username
{
- _password = password;
+ get { return _username; }
+ set { _username = value; }
}
- public string GetVirtualHost()
+ public string Password
{
- return _virtualHost;
+ get { return _password; }
+ set { _password = value; }
}
- public void SetVirtualHost(string virtualHost)
+ public string VirtualHost
{
- _virtualHost = virtualHost;
+ get { return _virtualHost; }
+ set { _virtualHost = value; }
}
public string GetOption(string key)
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs Mon Jan 29 03:05:20 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Client.qms
+namespace Qpid.Client.Qms
{
/// <summary>
/// Know URL option names.
@@ -40,24 +40,15 @@
public const long DEFAULT_CONNECT_TIMEOUT = 30000L;
}
- public interface BrokerInfo
+ public interface IBrokerInfo
{
- String getHost();
- void setHost(string host);
-
- int getPort();
- void setPort(int port);
-
- String getTransport();
- void setTransport(string transport);
-
- bool useSSL();
- void useSSL(bool ssl);
-
- String getOption(string key);
- void setOption(string key, string value);
-
- long getTimeout();
- void setTimeout(long timeout);
+ string Host { get; set; }
+ int Port { get; set; }
+ string Transport { get; set; }
+ bool UseSSL { get; set; }
+ long Timeout { get; set; }
+
+ String GetOption(string key);
+ void SetOption(string key, string value);
}
-}
\ No newline at end of file
+}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs Mon Jan 29 03:05:20 2007
@@ -20,7 +20,7 @@
*/
using System.Collections;
-namespace Qpid.Client.qms
+namespace Qpid.Client.Qms
{
class ConnectionUrlConstants
{
@@ -31,44 +31,30 @@
public const string OPTIONS_SSL = "ssl";
}
- /**
- Connection URL format
- amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\'&option=\'value\';vm://:3/virtualpath?option=\'value\''&failover='method?option=\'value\'&option='value''"
- Options are of course optional except for requiring a single broker in the broker list.
- The option seperator is defined to be either '&' or ','
- */
- public interface ConnectionInfo
+ /// <summary>
+ /// Connection URL format
+ /// amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\'&option=\'value\';vm://:3/virtualpath?option=\'value\''&failover='method?option=\'value\'&option='value''"
+ /// Options are of course optional except for requiring a single broker in the broker list.
+ /// The option seperator is defined to be either '&' or ','
+ /// </summary>
+ public interface IConnectionInfo
{
string AsUrl();
- string GetFailoverMethod();
- void SetFailoverMethod(string failoverMethod);
-
+ string FailoverMethod { get; set; }
+ string ClientName { get; set; }
+ string Username { get; set; }
+ string Password { get; set; }
+ string VirtualHost { get; set; }
string GetFailoverOption(string key);
+
+ int BrokerCount { get; }
- int GetBrokerCount();
-
- BrokerInfo GetBrokerInfo(int index);
+ IBrokerInfo GetBrokerInfo(int index);
- void AddBrokerInfo(BrokerInfo broker);
+ void AddBrokerInfo(IBrokerInfo broker);
IList GetAllBrokerInfos();
-
- string GetClientName();
-
- void SetClientName(string clientName);
-
- string GetUsername();
-
- void setUsername(string username);
-
- string GetPassword();
-
- void SetPassword(string password);
-
- string GetVirtualHost();
-
- void SetVirtualHost(string virtualHost);
string GetOption(string key);
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs Mon Jan 29 03:05:20 2007
@@ -21,9 +21,9 @@
using System;
using System.Text;
using log4net;
-using Qpid.Client.qms.failover;
+using Qpid.Client.Qms.Failover;
-namespace Qpid.Client.qms
+namespace Qpid.Client.Qms
{
public class FailoverPolicy
{
@@ -34,7 +34,7 @@
private const long DEFAULT_METHOD_TIMEOUT = 1 * MINUTE;
private const long DEFAULT_FAILOVER_TIMEOUT = 4 * MINUTE;
- private FailoverMethod[] _methods = new FailoverMethod[1];
+ private IFailoverMethod[] _methods = new IFailoverMethod[1];
private int _currentMethod;
@@ -47,18 +47,18 @@
private long _lastMethodTime;
private long _lastFailTime;
- public FailoverPolicy(ConnectionInfo connectionInfo)
+ public FailoverPolicy(IConnectionInfo connectionInfo)
{
- FailoverMethod method;
+ IFailoverMethod method;
//todo This should be integrated in to the connection url when it supports
// multiple strategies.
_methodsRetries = 0;
- if (connectionInfo.GetFailoverMethod() == null)
+ if (connectionInfo.FailoverMethod == null)
{
- if (connectionInfo.GetBrokerCount() > 1)
+ if (connectionInfo.BrokerCount > 1)
{
method = new FailoverRoundRobin(connectionInfo);
}
@@ -69,7 +69,7 @@
}
else
{
- string failoverMethod = connectionInfo.GetFailoverMethod();
+ string failoverMethod = connectionInfo.FailoverMethod;
/*
if (failoverMethod.equals(FailoverMethod.RANDOM))
@@ -110,11 +110,11 @@
_methods[_currentMethod] = method;
}
- public FailoverPolicy(FailoverMethod method) : this(method, 0)
+ public FailoverPolicy(IFailoverMethod method) : this(method, 0)
{
}
- public FailoverPolicy(FailoverMethod method, int retries)
+ public FailoverPolicy(IFailoverMethod method, int retries)
{
_methodsRetries = retries;
@@ -169,7 +169,7 @@
}
- if (_methods[_currentMethod].failoverAllowed())
+ if (_methods[_currentMethod].FailoverAllowed())
{
failoverAllowed = true;
}
@@ -178,7 +178,7 @@
if (_currentMethod < (_methods.Length - 1))
{
nextMethod();
- _logger.Info("Changing method to " + _methods[_currentMethod].methodName());
+ _logger.Info("Changing method to " + _methods[_currentMethod].MethodName);
return FailoverAllowed();
}
else
@@ -200,7 +200,7 @@
if (_currentMethod < (_methods.Length - 1))
{
_currentMethod++;
- _methods[_currentMethod].reset();
+ _methods[_currentMethod].Reset();
return true;
}
else
@@ -217,8 +217,8 @@
_currentMethod = 0;
- _logger.Info("Retrying methods starting with " + _methods[_currentMethod].methodName());
- _methods[_currentMethod].reset();
+ _logger.Info("Retrying methods starting with " + _methods[_currentMethod].MethodName);
+ _methods[_currentMethod].Reset();
return FailoverAllowed();
}
else
@@ -235,30 +235,30 @@
{
_currentRetry = 0;
- _methods[_currentMethod].attainedConnection();
+ _methods[_currentMethod].AttainedConnection();
_timing = false;
}
- public BrokerInfo GetCurrentBrokerInfo()
+ public IBrokerInfo GetCurrentBrokerInfo()
{
return _methods[_currentMethod].GetCurrentBrokerInfo();
}
- public BrokerInfo GetNextBrokerInfo()
+ public IBrokerInfo GetNextBrokerInfo()
{
- return _methods[_currentMethod].getNextBrokerDetails();
+ return _methods[_currentMethod].GetNextBrokerDetails();
}
- public void setBroker(BrokerInfo broker)
+ public void setBroker(IBrokerInfo broker)
{
- _methods[_currentMethod].setBroker(broker);
+ _methods[_currentMethod].SetBroker(broker);
}
- public void addMethod(FailoverMethod method)
+ public void addMethod(IFailoverMethod method)
{
int len = _methods.Length + 1;
- FailoverMethod[] newMethods = new FailoverMethod[len];
+ IFailoverMethod[] newMethods = new IFailoverMethod[len];
_methods.CopyTo(newMethods, 0);
// System.arraycopy(_methods, 0, newMethods, 0, _methods.length);
int index = len - 1;
@@ -271,7 +271,7 @@
_methodsRetries = retries;
}
- public FailoverMethod getCurrentMethod()
+ public IFailoverMethod getCurrentMethod()
{
if (_currentMethod >= 0 && _currentMethod < (_methods.Length - 1))
{
@@ -312,4 +312,4 @@
return sb.ToString();
}
}
-}
\ No newline at end of file
+}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs Mon Jan 29 03:05:20 2007
@@ -22,7 +22,7 @@
using System.Runtime.Serialization;
using System.Text;
-namespace Qpid.Client.qms
+namespace Qpid.Client.Qms
{
[Serializable]
public class UrlSyntaxException : UriFormatException
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs Mon Jan 29 03:05:20 2007
@@ -20,7 +20,7 @@
*/
using System;
-namespace Qpid.Client.qms.failover
+namespace Qpid.Client.Qms.Failover
{
public class FailoverMethodConstants
{
@@ -28,52 +28,51 @@
public const String RANDOM = "random";
}
- public interface FailoverMethod
+ public interface IFailoverMethod
{
- /**
- * Reset the Failover to initial conditions
- */
- void reset();
-
- /**
- * Check if failover is possible for this method
- *
- * @return true if failover is allowed
- */
- bool failoverAllowed();
-
- /**
- * Notification to the Failover method that a connection has been attained.
- */
- void attainedConnection();
-
- /**
- * If there is no current BrokerInfo the null will be returned.
- * @return The current BrokerDetail value to use
- */
- BrokerInfo GetCurrentBrokerInfo();
-
- /**
- * Move to the next BrokerInfo if one is available.
- * @return the next BrokerDetail or null if there is none.
- */
- BrokerInfo getNextBrokerDetails();
-
- /**
- * Set the currently active broker to be the new value.
- * @param broker The new BrokerDetail value
- */
- void setBroker(BrokerInfo broker);
-
- /**
- * Set the retries for this method
- * @param maxRetries the maximum number of time to retry this Method
- */
- void setRetries(int maxRetries);
-
- /**
- * @return The name of this method for display purposes.
- */
- String methodName();
+ /// <summary>
+ /// The name of this method for display purposes.
+ /// </summary>
+ String MethodName { get; }
+
+ /// <summary>
+ /// Reset the Failover to initial conditions
+ /// </summary>
+ void Reset();
+
+ /// <summary>
+ /// Check if failover is possible for this method
+ /// </summary>
+ /// <returns>true if failover is allowed</returns>
+ bool FailoverAllowed();
+
+ /// <summary>
+ /// Notification to the Failover method that a connection has been attained.
+ /// </summary>
+ void AttainedConnection();
+
+ /// <summary>
+ /// If there is no current BrokerInfo the null will be returned.
+ /// </summary>
+ /// <returns>The current BrokerDetail value to use</returns>
+ IBrokerInfo GetCurrentBrokerInfo();
+
+ /// <summary>
+ /// Move to the next BrokerInfo if one is available.
+ /// </summary>
+ /// <returns>the next BrokerDetail or null if there is none.</returns>
+ IBrokerInfo GetNextBrokerDetails();
+
+ /// <summary>
+ /// Set the currently active broker to be the new value.
+ /// </summary>
+ /// <param name="broker">The new BrokerDetail value</param>
+ void SetBroker(IBrokerInfo broker);
+
+ /// <summary>
+ /// Set the retries for this method
+ /// </summary>
+ /// <param name="maxRetries">the maximum number of time to retry this Method</param>
+ void SetRetries(int maxRetries);
}
}
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs Mon Jan 29 03:05:20 2007
@@ -22,9 +22,9 @@
using System.Text;
using log4net;
-namespace Qpid.Client.qms.failover
+namespace Qpid.Client.Qms.Failover
{
- public class FailoverRoundRobin : FailoverMethod
+ public class FailoverRoundRobin : IFailoverMethod
{
private static readonly ILog _logger = LogManager.GetLogger(typeof(FailoverRoundRobin));
@@ -61,11 +61,11 @@
/**
* Array of BrokerDetail used to make connections.
*/
- private ConnectionInfo _connectionDetails;
+ private IConnectionInfo _connectionDetails;
- public FailoverRoundRobin(ConnectionInfo connectionDetails)
+ public FailoverRoundRobin(IConnectionInfo connectionDetails)
{
- if (!(connectionDetails.GetBrokerCount() > 0))
+ if (!(connectionDetails.BrokerCount > 0))
{
throw new ArgumentException("At least one broker details must be specified.");
}
@@ -95,27 +95,27 @@
_currentServerRetry = -1;
}
- public void reset()
+ public void Reset()
{
_currentBrokerIndex = 0;
_currentCycleRetries = 0;
_currentServerRetry = -1;
}
- public bool failoverAllowed()
+ public bool FailoverAllowed()
{
return ((_currentCycleRetries < _cycleRetries)
|| (_currentServerRetry < _serverRetries)
- || (_currentBrokerIndex < (_connectionDetails.GetBrokerCount() - 1)));
+ || (_currentBrokerIndex < (_connectionDetails.BrokerCount - 1)));
}
- public void attainedConnection()
+ public void AttainedConnection()
{
_currentCycleRetries = 0;
_currentServerRetry = -1;
}
- public BrokerInfo GetCurrentBrokerInfo()
+ public IBrokerInfo GetCurrentBrokerInfo()
{
if (_currentBrokerIndex == -1)
{
@@ -125,9 +125,9 @@
return _connectionDetails.GetBrokerInfo(_currentBrokerIndex);
}
- public BrokerInfo getNextBrokerDetails()
+ public IBrokerInfo GetNextBrokerDetails()
{
- if (_currentBrokerIndex == (_connectionDetails.GetBrokerCount() - 1))
+ if (_currentBrokerIndex == (_connectionDetails.BrokerCount - 1))
{
if (_currentServerRetry < _serverRetries)
{
@@ -135,7 +135,7 @@
{
_currentBrokerIndex = 0;
- setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
+ SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
_logger.Info("First Run using " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
}
@@ -152,7 +152,7 @@
//failed to connect to first broker
_currentBrokerIndex = 0;
- setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
+ SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
// This is zero rather than -1 as we are already retrieving the details.
_currentServerRetry = 0;
@@ -167,7 +167,7 @@
{
_currentBrokerIndex = 0;
- setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
+ SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
_logger.Info("First Run using " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
}
@@ -181,7 +181,7 @@
{
_currentBrokerIndex++;
- setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
+ SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
// This is zero rather than -1 as we are already retrieving the details.
_currentServerRetry = 0;
}
@@ -190,13 +190,13 @@
return _connectionDetails.GetBrokerInfo(_currentBrokerIndex);
}
- public void setBroker(BrokerInfo broker)
+ public void SetBroker(IBrokerInfo broker)
{
_connectionDetails.AddBrokerInfo(broker);
int index = _connectionDetails.GetAllBrokerInfos().IndexOf(broker);
- String serverRetries = broker.getOption(BrokerInfoConstants.OPTIONS_RETRY);
+ String serverRetries = broker.GetOption(BrokerInfoConstants.OPTIONS_RETRY);
if (serverRetries != null)
{
@@ -214,14 +214,14 @@
_currentBrokerIndex = index;
}
- public void setRetries(int maxRetries)
+ public void SetRetries(int maxRetries)
{
_cycleRetries = maxRetries;
}
- public String methodName()
+ public String MethodName
{
- return "Cycle Servers";
+ get { return "Cycle Servers"; }
}
public override string ToString()
@@ -230,7 +230,7 @@
sb.Append(GetType().Name).Append("\n");
- sb.Append("Broker count: ").Append(_connectionDetails.GetBrokerCount());
+ sb.Append("Broker count: ").Append(_connectionDetails.BrokerCount);
sb.Append("\ncurrent broker index: ").Append(_currentBrokerIndex);
sb.Append("\nCycle Retries: ").Append(_cycleRetries);
@@ -239,7 +239,7 @@
sb.Append("\nCurrent Retry:").Append(_currentServerRetry);
sb.Append("\n");
- for(int i=0; i < _connectionDetails.GetBrokerCount() ; i++)
+ for(int i=0; i < _connectionDetails.BrokerCount ; i++)
{
if (i == _currentBrokerIndex)
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs?view=diff&rev=501006&r1=501005&r2=501006
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs Mon Jan 29 03:05:20 2007
@@ -20,9 +20,9 @@
*/
using System;
-namespace Qpid.Client.qms.failover
+namespace Qpid.Client.Qms.Failover
{
- public class FailoverSingleServer : FailoverMethod
+ public class FailoverSingleServer : IFailoverMethod
{
/** The default number of times to rety a conection to this server */
public const int DEFAULT_SERVER_RETRIES = 1;
@@ -30,7 +30,7 @@
/**
* The details of the Single Server
*/
- private BrokerInfo _brokerDetail;
+ private IBrokerInfo _brokerDetail;
/**
* The number of times to retry connecting to the sever
@@ -43,11 +43,11 @@
private int _currentRetries;
- public FailoverSingleServer(ConnectionInfo connectionDetails)
+ public FailoverSingleServer(IConnectionInfo connectionDetails)
{
- if (connectionDetails.GetBrokerCount() > 0)
+ if (connectionDetails.BrokerCount > 0)
{
- setBroker(connectionDetails.GetBrokerInfo(0));
+ SetBroker(connectionDetails.GetBrokerInfo(0));
}
else
{
@@ -55,32 +55,32 @@
}
}
- public FailoverSingleServer(BrokerInfo brokerDetail)
+ public FailoverSingleServer(IBrokerInfo brokerDetail)
{
- setBroker(brokerDetail);
+ SetBroker(brokerDetail);
}
- public void reset()
+ public void Reset()
{
_currentRetries = -1;
}
- public bool failoverAllowed()
+ public bool FailoverAllowed()
{
return _currentRetries < _retries;
}
- public void attainedConnection()
+ public void AttainedConnection()
{
- reset();
+ Reset();
}
- public BrokerInfo GetCurrentBrokerInfo()
+ public IBrokerInfo GetCurrentBrokerInfo()
{
return _brokerDetail;
}
- public BrokerInfo getNextBrokerDetails()
+ public IBrokerInfo GetNextBrokerDetails()
{
if (_currentRetries == _retries)
{
@@ -97,7 +97,7 @@
}
}
- public void setBroker(BrokerInfo broker)
+ public void SetBroker(IBrokerInfo broker)
{
if (broker == null)
{
@@ -105,7 +105,7 @@
}
_brokerDetail = broker;
- String retries = broker.getOption(BrokerInfoConstants.OPTIONS_RETRY);
+ String retries = broker.GetOption(BrokerInfoConstants.OPTIONS_RETRY);
if (retries != null)
{
try
@@ -122,17 +122,17 @@
_retries = DEFAULT_SERVER_RETRIES;
}
- reset();
+ Reset();
}
- public void setRetries(int retries)
+ public void SetRetries(int retries)
{
_retries = retries;
}
- public String methodName()
+ public String MethodName
{
- return "Single Server";
+ get { return "Single Server"; }
}
public String toString()