Revert bug23887

Author: Emile Joubert

docs/RabbitMQ Service Model.doc

@@ -332,24 +332,5 @@ public AuthMechanismFactory AuthMechanismFactory(string[] mechs) {
 
             return null;
         }
-
-        public static explicit operator ConnectionFactory(Uri uri)
-        {
-            ConnectionFactory connFactory = new ConnectionFactory();
-            if (uri.UserInfo.Length > 0)
-            {
-                String[] userInfo = uri.UserInfo.Split(":".ToCharArray());
-                connFactory.UserName = Uri.UnescapeDataString(userInfo[0]);
-                if (userInfo.Length > 1)
-                {
-                    connFactory.Password = Uri.UnescapeDataString(userInfo[1]);
-                }
-            }
-            connFactory.VirtualHost = Uri.UnescapeDataString(uri.AbsolutePath.Remove(0, 1));
-            connFactory.Port = uri.Port;
-            connFactory.HostName = uri.Host;
-            return connFactory;
-        }
-
     }
 }

docs/RabbitMQ Service Model.docx

@@ -43,14 +43,14 @@
       <rabbitMQBinding>
         <binding 
           name="rabbitMQConfig" 
-          broker="amqp://localhost:5672/%2F"
+          broker="amqp://localhost:5672/"
           protocolversion="AMQP_0_9_1" />
       </rabbitMQBinding>
     </bindings>
   </system.serviceModel>
 
   <appSettings>
-    <add key="manual-test-broker-uri" value="amqp://localhost:5672/%2F"/>
+    <add key="manual-test-broker-uri" value="amqp://localhost:5672/"/>
     <add key="manual-test-broker-protocol" value="AMQP_0_9_1"/>
   </appSettings>
 </configuration>

docs/RabbitMQ Service Model.pdf

@@ -20,7 +20,7 @@
     <bindings>
       <rabbitMQBinding>
         <binding name="rabbitMQConfig"
-		 broker="amqp://localhost:5672/%2F"
+		 broker="amqp://localhost:5672/"
 		 protocolversion="AMQP_0_9_1"
           	 oneWay="false"/>
       </rabbitMQBinding>

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

@@ -57,6 +57,7 @@ public sealed class RabbitMQTransportBindingElement : TransportBindingElement
     {
         private ConnectionFactory m_connectionFactory;
         private IConnection m_connection;
+        private bool m_hasBroker = false;
 
         /// <summary>
         /// Creates a new instance of the RabbitMQTransportBindingElement Class using the default protocol.
@@ -71,8 +72,8 @@ private RabbitMQTransportBindingElement(RabbitMQTransportBindingElement other)
         {
             Broker = other.Broker;
             BrokerProtocol = other.BrokerProtocol;
-            m_connectionFactory = (ConnectionFactory) other.Broker;
         }
+
 
         public override IChannelFactory<TChannel> BuildChannelFactory<TChannel>(BindingContext context)
         {
@@ -154,18 +155,29 @@ public override string Scheme
         }
 
 
-        private Uri m_broker;
         /// <summary>
         /// Specifies the address of the RabbitMQ Server
         /// </summary>
         [ConfigurationProperty("broker")]
         public Uri Broker
         {
-            get { return m_broker; }
+            get 
+            { 
+                if(!m_hasBroker) return null;                
+                UriBuilder build = new UriBuilder();
+                build.Host = m_connectionFactory.HostName;
+                build.Port = m_connectionFactory.Port;
+                return build.Uri; 
+            }
             set 
             { 
-                m_broker = value;
-                m_connectionFactory = (ConnectionFactory) value;
+                if(value == null) m_hasBroker = false;
+                else 
+                {
+                    m_hasBroker = true;	
+                    m_connectionFactory.HostName = value.Host;
+                    m_connectionFactory.Port = value.Port;  
+                }
             }
         }