Use default IProtocol (0-9-1) in more places

Author: michaelklishin

projects/client/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs

@@ -142,30 +142,29 @@ public AmqpTcpEndpoint(IProtocol protocol) :
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///hostname and port number, using the IProtocol from
-        ///Protocols.FromEnvironment(). If the port number is
+        ///hostname and port number, using Protocols.DefaultProtocol. If the port number is
         ///-1, the default port number for the IProtocol will be
         ///used.</summary>
         public AmqpTcpEndpoint(string hostName, int portOrMinusOne) :
-            this(Protocols.FromEnvironment(), hostName, portOrMinusOne)
+            this(Protocols.DefaultProtocol, hostName, portOrMinusOne)
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
         ///hostname, using the IProtocol from
-        ///Protocols.FromEnvironment(), and the default port number of
+        ///Protocols.DefaultProtocol, and the default port number of
         ///that IProtocol.</summary>
         public AmqpTcpEndpoint(string hostName) :
-            this(Protocols.FromEnvironment(), hostName)
+            this(Protocols.DefaultProtocol, hostName)
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with a hostname of
         ///"localhost", using the IProtocol from
-        ///Protocols.FromEnvironment(), and the default port number of
+        ///Protocols.DefaultProtocol, and the default port number of
         ///that IProtocol.</summary>
         public AmqpTcpEndpoint() :
-            this(Protocols.FromEnvironment())
+            this(Protocols.DefaultProtocol)
         {
         }
 
@@ -193,13 +192,13 @@ public AmqpTcpEndpoint(IProtocol protocol, Uri uri) :
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
         ///Uri, using the IProtocol from
-        ///Protocols.FromEnvironment().</summary>
+        ///Protocols.DefaultProtocol.</summary>
         ///<remarks>
         /// Please see the class overview documentation for
         /// information about the Uri format in use.
         ///</remarks>
         public AmqpTcpEndpoint(Uri uri) :
-            this(Protocols.FromEnvironment(), uri)
+            this(Protocols.DefaultProtocol, uri)
         {
         }
 

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -63,7 +63,6 @@ namespace RabbitMQ.Client
     ///     factory.UserName = ConnectionFactory.DefaultUser;
     ///     factory.Password = ConnectionFactory.DefaultPass;
     ///     factory.VirtualHost = ConnectionFactory.DefaultVHost;
-    ///     factory.Protocol = Protocols.FromEnvironment();
     ///     factory.HostName = hostName;
     ///     factory.Port     = AmqpTcpEndpoint.UseDefaultPort;
     ///     //
@@ -165,8 +164,8 @@ public class ConnectionFactory
         ///<summary> SASL auth mechanisms to use.</summary>
         public AuthMechanismFactory[] AuthMechanisms = DefaultAuthMechanisms;
 
-        ///<summary>The AMQP protocol to be used</summary>
-        public IProtocol Protocol = Protocols.FromEnvironment();
+        ///<summary>The AMQP protocol to be used. Currently 0-9-1.</summary>
+        public IProtocol Protocol = Protocols.DefaultProtocol;
 
         ///<summary>The AMQP connection target</summary>
         public AmqpTcpEndpoint Endpoint

projects/examples/wcf/Test/Program.cs

@@ -56,7 +56,7 @@ public static Binding GetBinding() {
 
             return new RabbitMQBinding(System.Configuration.ConfigurationManager.AppSettings["manual-test-broker-hostname"],
                                        int.Parse(System.Configuration.ConfigurationManager.AppSettings["manual-test-broker-port"]),
-                                       RabbitMQ.Client.Protocols.FromConfiguration("manual-test-broker-protocol"));
+                                       RabbitMQ.Client.Protocols.DefaultProtocol);
         }
 
         static void Main(string[] args)

projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQBindingConfigurationElement.cs

@@ -204,12 +204,7 @@ public long MaxMessageSize
         }
 
         private IProtocol GetProtocol() {
-            IProtocol result = Protocols.Lookup(this.ProtocolVersion);
-            if (result == null) {
-                throw new ConfigurationErrorsException(string.Format("'{0}' is not a valid AMQP protocol name",
-                                                                     this.ProtocolVersion));
-            }
-            return result;
+            return Protocols.DefaultProtocol;
         }
 
         /// <summary>