merge default into bug21531

Author: Matthias Radestock

.hgignore

@@ -4,14 +4,17 @@ syntax: regexp
 ^local\.build$
 ^TestResult.xml$
 ^releases$
+^commit$
+^diff$
 
 ^src/wcf/.*/(bin|obj)$
 ^src/wcf/.*/*.suo$
 
 ^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
 ^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
+
 ^wix/dotnet-client-merge-module\.wxs$
 ^wix/dotnet-client-product\.wxs$
 ^wix/License\.rtf$
-~$
 
+~$

Makefile

@@ -40,7 +40,7 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}-net-3.0-wcf-htmldoc
 
 ensure-prerequisites: rabbit-vsn
-	dpkg -L htmldoc plotutils transfig graphviz > /dev/null
+	dpkg -L htmldoc plotutils transfig graphviz docbook-utils > /dev/null
 
 ensure-release-dir: rabbit-vsn
 	touch ${RELEASE_DIR}/

configs/dotnet-1.1.build

@@ -3,4 +3,5 @@
   <property name="target.framework" value="net-1.1" />
   <property name="debug" value="true"/>
   <property name="python.exec" value="python.exe"/>
+  <property name="certmgr.exec" value="certmgr.exe"/>
 </project>

configs/dotnet-2.0.build

@@ -3,4 +3,5 @@
   <property name="target.framework" value="net-2.0" />
   <property name="debug" value="true"/>
   <property name="python.exec" value="python.exe"/>
+  <property name="certmgr.exec" value="certmgr.exe"/>
 </project>

configs/mono-1.0.build

@@ -4,4 +4,5 @@
   <property name="debug" value="true"/>
   <property name="msbuild" value="xbuild"/>
   <property name="python.exec" value="python"/>
+  <property name="certmgr.exec" value="certmgr"/>
 </project>

configs/mono-2.0.build

@@ -4,4 +4,5 @@
   <property name="debug" value="true"/>
   <property name="msbuild" value="xbuild"/>
   <property name="python.exec" value="python"/>
+  <property name="certmgr.exec" value="certmgr"/>
 </project>

default.build

@@ -307,8 +307,25 @@
     <copy file="${nunit.dllname}" todir="${bin.dir}"/>
   </target>
 
+  <target name="detect-ssl">
+    <property name="ssl.avail" value="false"/>
+    <property name="ssl.avail" value="true"
+      if="${environment::variable-exists('SSL_CERTS_DIR')}"/>
+    <property name="ssl.certs.dir" value="${environment::get-variable('SSL_CERTS_DIR')}"
+      if="${environment::variable-exists('SSL_CERTS_DIR')}"/>
+  </target>
+
+  <target name="import-ssl" description="import cacert into certmgr" depends="detect-ssl" if="${ssl.avail}">
+    <exec program="${certmgr.exec}">
+      <arg value="-add"/>
+      <arg value="-c"/>
+      <arg value="Trust"/>
+      <arg value="${ssl.certs.dir}/testca/cacert.cer"/>
+    </exec>
+  </target>
+
   <target name="unit" description="run unit tests"
-	      depends="build-unit">
+	      depends="build-unit,import-ssl">
     <exec program="src/unit/nunit/nunit-console.exe" useruntimeengine="true">
       <arg value="${unit-tests.dllname}"/>
     </exec>

src/client/api/AmqpTcpEndpoint.cs

@@ -99,15 +99,35 @@ public int Port
             set { m_port = value; }
         }
 
+
+        private SslOption m_ssl;
+        ///<summary>Retrieve the SSL options for this AmqpTcpEndpoint.
+        ///If not set, null is returned</summary>
+        public SslOption Ssl
+        {
+            get { return m_ssl; }
+            set { m_ssl = value; }
+        }
+
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, hostname, and port number. If the port number is
-        ///-1, the default port number for the IProtocol will be
-        ///used.</summary>
-        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne)
+        ///IProtocol, hostname, port number and ssl option. If the port 
+        ///number is -1, the default port number for the IProtocol 
+        ///will be used.</summary>
+        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne, SslOption ssl)
         {
             m_protocol = protocol;
             m_hostName = hostName;
             m_port = portOrMinusOne;
+            m_ssl = ssl;
+        }
+
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol, hostname, and port number. If the port number is
+        ///-1, the default port number for the IProtocol will be
+        ///used.</summary>
+        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne) :
+            this(protocol, hostName, portOrMinusOne, new SslOption())
+        {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
@@ -154,6 +174,17 @@ public AmqpTcpEndpoint() :
         {
         }
 
+        ///<summary>Construct an AmqpTcpEndpoint with the given
+        ///IProtocol, Uri and ssl options.</summary>
+        ///<remarks>
+        /// Please see the class overview documentation for
+        /// information about the Uri format in use.
+        ///</remarks>
+        public AmqpTcpEndpoint(IProtocol protocol, Uri uri, SslOption ssl) :
+            this(protocol, uri.Host, uri.Port, ssl)
+        {
+        }
+
         ///<summary>Construct an AmqpTcpEndpoint with the given
         ///IProtocol and Uri.</summary>
         ///<remarks>

src/client/api/ConnectionFactory.cs

@@ -261,7 +261,8 @@ public IConnection CreateConnection(IProtocol version,
         {
             return CreateConnection(new AmqpTcpEndpoint(version,
                                                         hostName,
-                                                        portNumber));
+                                                        portNumber,
+                                                        m_parameters.Ssl));
         }
 
         ///<summary>Create a connection to the endpoint specified. The

src/client/api/ConnectionParameters.cs

@@ -80,15 +80,16 @@ public class ConnectionParameters : ICloneable
         public const uint DefaultFrameMax = 0; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
 
         /// <summary>Default value for desired heartbeat interval, in
-        /// seconds, with zero meaning none (value: 3)</summary>
-        public const ushort DefaultHeartbeat = 3; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
+        /// seconds, with zero meaning none (value: 0)</summary>
+        public const ushort DefaultHeartbeat = 0; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
 
         private string m_userName = DefaultUser;
         private string m_password = DefaultPass;
         private string m_virtualHost = DefaultVHost;
         private ushort m_requestedChannelMax = DefaultChannelMax;
         private uint m_requestedFrameMax = DefaultFrameMax;
         private ushort m_requestedHeartbeat = DefaultHeartbeat;
+        private SslOption m_ssl = new SslOption();
 
         ///<summary>Construct a fresh instance, with all fields set to
         ///their respective defaults.</summary>
@@ -136,6 +137,13 @@ public ushort RequestedHeartbeat
             set { m_requestedHeartbeat = value; }
         }
 
+        ///<summary>Ssl options setting</summary>
+        public SslOption Ssl
+        {
+            get { return m_ssl; }
+            set { m_ssl = value; }
+        }
+
         ///<summary>Implement ICloneable.Clone by delegating to our type-safe variant.</summary>
         object ICloneable.Clone()
         {