Reverting changeset erroneously commited on wrong branch

Matthew Sackman · Matthew Sackman · commit a2ad6a2d35cd · 2009-12-16T18:00:38.000Z
diff --git a/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs b/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs
@@ -75,9 +75,9 @@ namespace RabbitMQ.Client
     ///     ConnectionFactory factory = new ConnectionFactory();
     ///     //
     ///     // The next three lines are optional:
-    ///     factory.Parameters.UserName = AMQPParameters.DefaultUser;
-    ///     factory.Parameters.Password = AMQPParameters.DefaultPass;
-    ///     factory.Parameters.VirtualHost = AMQPParameters.DefaultVHost;
+    ///     factory.Parameters.UserName = ConnectionParameters.DefaultUser;
+    ///     factory.Parameters.Password = ConnectionParameters.DefaultPass;
+    ///     factory.Parameters.VirtualHost = ConnectionParameters.DefaultVHost;
     ///     //
     ///     IProtocol protocol = Protocols.DefaultProtocol;
     ///     IConnection conn = factory.CreateConnection(protocol, hostName, portNumber);
@@ -103,10 +103,10 @@ namespace RabbitMQ.Client
     ///</remarks>
     public class ConnectionFactory
     {
-        private AMQPParameters m_parameters = new AMQPParameters();
+        private ConnectionParameters m_parameters = new ConnectionParameters();
         ///<summary>Retrieve the parameters this factory uses to
         ///construct IConnection instances.</summary>
-        public AMQPParameters Parameters
+        public ConnectionParameters Parameters
         {
             get
             {
diff --git a/projects/client/RabbitMQ.Client/src/client/api/ConnectionParameters.cs b/projects/client/RabbitMQ.Client/src/client/api/ConnectionParameters.cs
@@ -60,7 +60,7 @@ namespace RabbitMQ.Client
 {
     ///<summary>Supplies values to ConnectionFactory for use in
     ///constructing IConnection instances.</summary>
-    public class AMQPParameters : ICloneable
+    public class ConnectionParameters : ICloneable
     {
         /// <summary>Default user name (value: "guest")</summary>
         public const string DefaultUser = "guest"; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
@@ -93,7 +93,7 @@ public class AMQPParameters : ICloneable
 
         ///<summary>Construct a fresh instance, with all fields set to
         ///their respective defaults.</summary>
-        public AMQPParameters() { }
+        public ConnectionParameters() { }
 
         /// <summary>Username to use when authenticating to the server</summary>
         public string UserName
@@ -147,13 +147,13 @@ public SslOption Ssl
         ///<summary>Implement ICloneable.Clone by delegating to our type-safe variant.</summary>
         object ICloneable.Clone()
         {
-            return ((AMQPParameters)this).Clone();
+            return ((ConnectionParameters)this).Clone();
         }
 
-        ///<summary>Returns a fresh AMQPParameters with the same values as this.</summary>
-        public AMQPParameters Clone()
+        ///<summary>Returns a fresh ConnectionParameters with the same values as this.</summary>
+        public ConnectionParameters Clone()
         {
-            AMQPParameters n = this.MemberwiseClone() as AMQPParameters;
+            ConnectionParameters n = this.MemberwiseClone() as ConnectionParameters;
             return n;
         }
     }
diff --git a/projects/client/RabbitMQ.Client/src/client/api/IConnection.cs b/projects/client/RabbitMQ.Client/src/client/api/IConnection.cs
@@ -105,7 +105,7 @@ public interface IConnection: IDisposable
 
         ///<summary>The connection parameters used during construction
         ///of this connection.</summary>
-        AMQPParameters Parameters { get; }
+        ConnectionParameters Parameters { get; }
 
         ///<summary>The maximum channel number this connection
         ///supports (0 if unlimited). Usable channel numbers
diff --git a/projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs b/projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs
@@ -78,7 +78,7 @@ public interface IProtocol
         ///<summary>Construct a connection from a given set of
         ///parameters and a frame handler. The "insist" parameter is
         ///passed on to the AMQP connection.open method.</summary>
-        IConnection CreateConnection(AMQPParameters parameters,
+        IConnection CreateConnection(ConnectionParameters parameters,
                                      bool insist,
                                      IFrameHandler frameHandler);
         ///<summary>Construct a protocol model atop a given session.</summary>
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs
@@ -66,7 +66,7 @@ public abstract class AbstractProtocolBase: IProtocol {
         public abstract int DefaultPort { get; }
 
         public abstract IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint);
-        public abstract IConnection CreateConnection(AMQPParameters parameters,
+        public abstract IConnection CreateConnection(ConnectionParameters parameters,
                                                      bool insist,
                                                      IFrameHandler frameHandler);
         public abstract IModel CreateModel(ISession session);
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -89,7 +89,7 @@ public abstract class ConnectionBase : IConnection
         ///(milliseconds)</summary>
         public static int ConnectionCloseTimeout = 10000;
 
-        public AMQPParameters m_parameters;
+        public ConnectionParameters m_parameters;
         public IFrameHandler m_frameHandler;
         public uint m_frameMax = 0;
         public ushort m_heartbeat = 0;
@@ -119,7 +119,7 @@ public abstract class ConnectionBase : IConnection
         
         public IList m_shutdownReport = ArrayList.Synchronized(new ArrayList());
 
-        public ConnectionBase(AMQPParameters parameters,
+        public ConnectionBase(ConnectionParameters parameters,
                               bool insist,
                               IFrameHandler frameHandler)
         {
@@ -214,7 +214,7 @@ public void WriteFrame(Frame f)
             m_heartbeatWrite.Set();
         }
 
-        public AMQPParameters Parameters
+        public ConnectionParameters Parameters
         {
             get
             {
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8/Connection.cs
@@ -59,7 +59,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl.v0_8 {
     public class Connection: ConnectionBase {
-        public Connection(AMQPParameters parameters, bool insist, IFrameHandler frameHandler)
+        public Connection(ConnectionParameters parameters, bool insist, IFrameHandler frameHandler)
             : base(parameters, insist, frameHandler) {}
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8/ProtocolBase.cs
@@ -69,7 +69,7 @@ public override IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(AMQPParameters parameters,
+        public override IConnection CreateConnection(ConnectionParameters parameters,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/Connection.cs
@@ -59,7 +59,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl.v0_8qpid {
     public class Connection: ConnectionBase {
-        public Connection(AMQPParameters parameters, bool insist, IFrameHandler frameHandler)
+        public Connection(ConnectionParameters parameters, bool insist, IFrameHandler frameHandler)
             : base(parameters, insist, frameHandler) {}
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_8qpid/ProtocolBase.cs
@@ -69,7 +69,7 @@ public override IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(AMQPParameters parameters,
+        public override IConnection CreateConnection(ConnectionParameters parameters,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_9/Connection.cs
@@ -59,7 +59,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl.v0_9 {
     public class Connection: ConnectionBase {
-        public Connection(AMQPParameters parameters, bool insist, IFrameHandler frameHandler)
+        public Connection(ConnectionParameters parameters, bool insist, IFrameHandler frameHandler)
             : base(parameters, insist, frameHandler) {}
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/v0_9/ProtocolBase.cs
@@ -69,7 +69,7 @@ public override IModel CreateModel(ISession session) {
             return new Model(session);
         }
 
-        public override IConnection CreateConnection(AMQPParameters parameters,
+        public override IConnection CreateConnection(ConnectionParameters parameters,
                                                      bool insist,
                                                      IFrameHandler frameHandler)
         {
diff --git a/projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQBindingConfigurationElement.cs b/projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQBindingConfigurationElement.cs
@@ -103,9 +103,9 @@ protected override void InitializeFrom(Binding binding)
                 this.Broker = rabbind.Broker;
                 this.OneWayOnly = rabbind.OneWayOnly;
                 this.TransactionFlowEnabled = rabbind.TransactionFlow;
-                this.VirtualHost = rabbind.Transport.AMQPParameters.VirtualHost;
-                this.Username = rabbind.Transport.AMQPParameters.UserName;
-                this.Password = rabbind.Transport.AMQPParameters.Password;
+                this.VirtualHost = rabbind.Transport.ConnectionParameters.VirtualHost;
+                this.Username = rabbind.Transport.ConnectionParameters.UserName;
+                this.Password = rabbind.Transport.ConnectionParameters.Password;
             }
         }
 
@@ -127,9 +127,9 @@ protected override void OnApplyConfiguration(Binding binding)
             rabbind.BrokerProtocol = this.Protocol;
             rabbind.OneWayOnly = this.OneWayOnly;
             rabbind.TransactionFlow = this.TransactionFlowEnabled;
-            rabbind.Transport.AMQPParameters.Password = this.Password;
-            rabbind.Transport.AMQPParameters.UserName = this.Username;
-            rabbind.Transport.AMQPParameters.VirtualHost = this.VirtualHost;
+            rabbind.Transport.ConnectionParameters.Password = this.Password;
+            rabbind.Transport.ConnectionParameters.UserName = this.Username;
+            rabbind.Transport.ConnectionParameters.VirtualHost = this.VirtualHost;
         }
 
         /// <summary>
@@ -156,7 +156,7 @@ public bool OneWayOnly
         /// <summary>
         /// Password to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("password", DefaultValue = AMQPParameters.DefaultPass)]
+        [ConfigurationProperty("password", DefaultValue = ConnectionParameters.DefaultPass)]
         public string Password
         {
             get { return ((string)base["password"]); }
@@ -176,7 +176,7 @@ public bool TransactionFlowEnabled
         /// <summary>
         /// The username  to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("username", DefaultValue = AMQPParameters.DefaultUser)]
+        [ConfigurationProperty("username", DefaultValue = ConnectionParameters.DefaultUser)]
         public string Username
         {
             get { return ((string)base["username"]); }
@@ -220,7 +220,7 @@ public IProtocol Protocol
         /// <summary>
         /// The virtual host to access.
         /// </summary>
-        [ConfigurationProperty("virtualHost", DefaultValue = AMQPParameters.DefaultVHost)]
+        [ConfigurationProperty("virtualHost", DefaultValue = ConnectionParameters.DefaultVHost)]
         public string VirtualHost
         {
             get { return ((string)base["virtualHost"]); }
diff --git a/projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQTransportBindingElement.cs b/projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQTransportBindingElement.cs
@@ -198,7 +198,7 @@ public IProtocol BrokerProtocol
             set { m_brokerProtocol = value; }
         }
 
-        public AMQPParameters AMQPParameters
+        public ConnectionParameters ConnectionParameters
         {
             get { return m_connectionFactory.Parameters; }
         }
diff --git a/projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQTransportElement.cs b/projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQTransportElement.cs
@@ -83,9 +83,9 @@ public override void ApplyConfiguration(BindingElement bindingElement)
 
             rabbind.Broker = this.Broker;
             rabbind.BrokerProtocol = this.Protocol;
-            rabbind.AMQPParameters.Password = this.Password;
-            rabbind.AMQPParameters.UserName = this.Username;
-            rabbind.AMQPParameters.VirtualHost = this.VirtualHost;
+            rabbind.ConnectionParameters.Password = this.Password;
+            rabbind.ConnectionParameters.UserName = this.Username;
+            rabbind.ConnectionParameters.VirtualHost = this.VirtualHost;
         }
 
         public override void CopyFrom(ServiceModelExtensionElement from)
@@ -132,9 +132,9 @@ protected override void InitializeFrom(System.ServiceModel.Channels.BindingEleme
 
             this.Broker = rabbind.Broker;
             this.ProtocolVersion = rabbind.BrokerProtocol.ApiName;
-            this.Password = rabbind.AMQPParameters.Password;
-            this.Username = rabbind.AMQPParameters.UserName;
-            this.VirtualHost = rabbind.AMQPParameters.VirtualHost;
+            this.Password = rabbind.ConnectionParameters.Password;
+            this.Username = rabbind.ConnectionParameters.UserName;
+            this.VirtualHost = rabbind.ConnectionParameters.VirtualHost;
         }
 
         public override System.Type BindingElementType
@@ -155,7 +155,7 @@ public Uri Broker
         /// <summary>
         /// Password to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("password", DefaultValue = AMQPParameters.DefaultPass)]
+        [ConfigurationProperty("password", DefaultValue = ConnectionParameters.DefaultPass)]
         public string Password
         {
             get { return ((string)base["password"]); }
@@ -165,7 +165,7 @@ public string Password
         /// <summary>
         /// The username  to use when authenticating with the broker
         /// </summary>
-        [ConfigurationProperty("username", DefaultValue = AMQPParameters.DefaultUser)]
+        [ConfigurationProperty("username", DefaultValue = ConnectionParameters.DefaultUser)]
         public string Username
         {
             get { return ((string)base["username"]); }
@@ -208,7 +208,7 @@ private IProtocol GetProtocol()
         /// <summary>
         /// The virtual host to access.
         /// </summary>
-        [ConfigurationProperty("virtualHost", DefaultValue = AMQPParameters.DefaultVHost)]
+        [ConfigurationProperty("virtualHost", DefaultValue = ConnectionParameters.DefaultVHost)]
         public string VirtualHost
         {
             get { return ((string)base["virtualHost"]); }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ namespace RabbitMQ.Client`
`60`	`60`	`{`
`61`	`61`	`///<summary>Supplies values to ConnectionFactory for use in`
`62`	`62`	`///constructing IConnection instances.</summary>`
`63`		`- public class AMQPParameters : ICloneable`
	`63`	`+ public class ConnectionParameters : ICloneable`
`64`	`64`	`{`
`65`	`65`	`/// <summary>Default user name (value: "guest")</summary>`
`66`	`66`	`public const string DefaultUser = "guest"; // PLEASE KEEP THIS MATCHING THE DOC ABOVE`
`@@ -93,7 +93,7 @@ public class AMQPParameters : ICloneable`
`93`	`93`
`94`	`94`	`///<summary>Construct a fresh instance, with all fields set to`
`95`	`95`	`///their respective defaults.</summary>`
`96`		`- public AMQPParameters() { }`
	`96`	`+ public ConnectionParameters() { }`
`97`	`97`
`98`	`98`	`/// <summary>Username to use when authenticating to the server</summary>`
`99`	`99`	`public string UserName`
`@@ -147,13 +147,13 @@ public SslOption Ssl`
`147`	`147`	`///<summary>Implement ICloneable.Clone by delegating to our type-safe variant.</summary>`
`148`	`148`	`object ICloneable.Clone()`
`149`	`149`	`{`
`150`		`- return ((AMQPParameters)this).Clone();`
	`150`	`+ return ((ConnectionParameters)this).Clone();`
`151`	`151`	`}`
`152`	`152`
`153`		`- ///<summary>Returns a fresh AMQPParameters with the same values as this.</summary>`
`154`		`- public AMQPParameters Clone()`
	`153`	`+ ///<summary>Returns a fresh ConnectionParameters with the same values as this.</summary>`
	`154`	`+ public ConnectionParameters Clone()`
`155`	`155`	`{`
`156`		`- AMQPParameters n = this.MemberwiseClone() as AMQPParameters;`
	`156`	`+ ConnectionParameters n = this.MemberwiseClone() as ConnectionParameters;`
`157`	`157`	`return n;`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public abstract class ConnectionBase : IConnection`
`89`	`89`	`///(milliseconds)</summary>`
`90`	`90`	`public static int ConnectionCloseTimeout = 10000;`
`91`	`91`
`92`		`- public AMQPParameters m_parameters;`
	`92`	`+ public ConnectionParameters m_parameters;`
`93`	`93`	`public IFrameHandler m_frameHandler;`
`94`	`94`	`public uint m_frameMax = 0;`
`95`	`95`	`public ushort m_heartbeat = 0;`
`@@ -119,7 +119,7 @@ public abstract class ConnectionBase : IConnection`
`119`	`119`
`120`	`120`	`public IList m_shutdownReport = ArrayList.Synchronized(new ArrayList());`
`121`	`121`
`122`		`- public ConnectionBase(AMQPParameters parameters,`
	`122`	`+ public ConnectionBase(ConnectionParameters parameters,`
`123`	`123`	`bool insist,`
`124`	`124`	`IFrameHandler frameHandler)`
`125`	`125`	`{`
`@@ -214,7 +214,7 @@ public void WriteFrame(Frame f)`
`214`	`214`	`m_heartbeatWrite.Set();`
`215`	`215`	`}`
`216`	`216`
`217`		`- public AMQPParameters Parameters`
	`217`	`+ public ConnectionParameters Parameters`
`218`	`218`	`{`
`219`	`219`	`get`
`220`	`220`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`
`60`	`60`	`namespace RabbitMQ.Client.Framing.Impl.v0_8 {`
`61`	`61`	`public class Connection: ConnectionBase {`
`62`		`- public Connection(AMQPParameters parameters, bool insist, IFrameHandler frameHandler)`
	`62`	`+ public Connection(ConnectionParameters parameters, bool insist, IFrameHandler frameHandler)`
`63`	`63`	`: base(parameters, insist, frameHandler) {}`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public override IModel CreateModel(ISession session) {`
`69`	`69`	`return new Model(session);`
`70`	`70`	`}`
`71`	`71`
`72`		`- public override IConnection CreateConnection(AMQPParameters parameters,`
	`72`	`+ public override IConnection CreateConnection(ConnectionParameters parameters,`
`73`	`73`	`bool insist,`
`74`	`74`	`IFrameHandler frameHandler)`
`75`	`75`	`{`