1 files changed, 17 insertions, 31 deletions

diff --git a/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/dotnet/Qpid.Client/qms/ConnectionInfo.cs
index 8ac11ec1ab..4bdf8f4d7c 100644
--- a/dotnet/Qpid.Client/qms/ConnectionInfo.cs
+++ b/dotnet/Qpid.Client/qms/ConnectionInfo.cs
@@ -20,7 +20,7 @@
  */
 using System.Collections;
 
-namespace Qpid.Client.qms
+namespace Qpid.Client.Qms
 {
     class ConnectionUrlConstants 
     {
@@ -31,45 +31,31 @@ namespace Qpid.Client.qms
         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\'&amp;option=\'value\';vm://:3/virtualpath?option=\'value\''&amp;failover='method?option=\'value\'&amp;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 '&amp;' 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);
 
         void SetOption(string key, string value);