merge default ingo bug19356

Author: tonyg

.hgignore

@@ -6,8 +6,11 @@ syntax: regexp
 ^releases$
 
 ^src/wcf/.*/(bin|obj)$
+^src/wcf/.*/*.suo$
 
 ^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
 ^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
 ^commit$
 ^diff$
+
+~$

default.build

@@ -80,6 +80,9 @@
 
   <target name="build" description="compiles the source code"
 	      depends="generate-api">
+    <property name="keyfile.ok"
+              value="${(property::exists('keyfile') and file::exists(property::get-value('keyfile')) and property::get-value('config.name') != 'dotnet-1.1')}" />
+    <property name="keyfile" value="" unless="${keyfile.ok}"/>
     <mkdir dir="${bin.dir}" />
     <mkdir dir="${doc.dir}" />
     <property name="gen.assemblyinfo.src" value="${core.assemblyinfo.src}"/>
@@ -97,6 +100,7 @@
       <nowarn>
 	    <warning number="1591"/>
       </nowarn>
+      <arg value="/keyfile:${keyfile}" if="${keyfile.ok}" />
     </csc>
   </target>
 

docs/wikipages/data.ApiGen.txt

@@ -227,7 +227,7 @@ implement. The common interface is in two pieces:
 
 Apigen is linked with these interfaces, and at runtime uses reflection
 to look for the [code IFullModel] interface (see definition of [code
-Apigen.modelType]).
+Apigen.m_modelType]).
 
 The definitions in [code IFullModel], taken together with the class
 and method definitions in the AMQP specification XML, guide the code
@@ -463,9 +463,9 @@ of the [code queue.purge-ok] reply.
 @code java
     public struct ConnectionTuneDetails
     {
-        public ushort channelMax;
-        public uint frameMax;
-        public ushort heartbeat;
+        public ushort m_channelMax;
+        public uint m_frameMax;
+        public ushort m_heartbeat;
     }
 
 The above example extracts the "channel-max", "frame-max" and

src/apigen/AmqpClass.cs

@@ -60,19 +60,19 @@
 
 namespace RabbitMQ.Client.Apigen {
     public class AmqpClass: AmqpEntity {
-        public ArrayList Methods;
-        public ArrayList Fields;
+        public ArrayList m_Methods;
+        public ArrayList m_Fields;
 
         public AmqpClass(XmlNode n)
             : base(n)
         {
-            Methods = new ArrayList();
+            m_Methods = new ArrayList();
             foreach (XmlNode m in n.SelectNodes("method")) {
-                Methods.Add(new AmqpMethod(m));
+                m_Methods.Add(new AmqpMethod(m));
             }
-            Fields = new ArrayList();
+            m_Fields = new ArrayList();
             foreach (XmlNode f in n.SelectNodes("field")) {
-                Fields.Add(new AmqpField(f));
+                m_Fields.Add(new AmqpField(f));
             }
         }
 
@@ -84,15 +84,16 @@ public int Index {
 
         public bool NeedsProperties {
             get {
-                foreach (AmqpMethod m in Methods) {
+                foreach (AmqpMethod m in m_Methods) {
                     if (m.HasContent) return true;
                 }
                 return false;
             }
         }
 
         public AmqpMethod MethodNamed(string name) {
-            foreach (AmqpMethod m in Methods) {
+            foreach (AmqpMethod m in m_Methods)
+            {
                 if (m.Name == name) {
                     return m;
                 }

src/apigen/AmqpEntity.cs

@@ -59,22 +59,22 @@
 
 namespace RabbitMQ.Client.Apigen {
     public class AmqpEntity {
-        public XmlNode node;
+        public XmlNode m_node;
 
         public AmqpEntity(XmlNode n) {
-            this.node = n;
+            m_node = n;
         }
 
         public string GetString(string path) {
-            return Apigen.GetString(node, path);
+            return Apigen.GetString(m_node, path);
         }
 
         public string GetString(string path, string d) {
-            return Apigen.GetString(node, path, d);
+            return Apigen.GetString(m_node, path, d);
         }
 
         public int GetInt(string path) {
-            return Apigen.GetInt(node, path);
+            return Apigen.GetInt(m_node, path);
         }
 
         public string Name {

src/apigen/AmqpMethod.cs

@@ -60,19 +60,19 @@
 
 namespace RabbitMQ.Client.Apigen {
     public class AmqpMethod: AmqpEntity {
-        public ArrayList Fields;
-        public ArrayList ResponseMethods;
+        public ArrayList m_Fields;
+        public ArrayList m_ResponseMethods;
 
         public AmqpMethod(XmlNode n)
             : base(n)
         {
-            Fields = new ArrayList();
+            m_Fields = new ArrayList();
             foreach (XmlNode f in n.SelectNodes("field")) {
-                Fields.Add(new AmqpField(f));
+                m_Fields.Add(new AmqpField(f));
             }
-            ResponseMethods = new ArrayList();
+            m_ResponseMethods = new ArrayList();
             foreach (XmlNode r in n.SelectNodes("response")) {
-                ResponseMethods.Add(Apigen.GetString(r, "@name"));
+                m_ResponseMethods.Add(Apigen.GetString(r, "@name"));
             }
         }
 
@@ -84,7 +84,7 @@ public bool HasContent {
 
         public bool IsSimpleRpcRequest {
             get {
-                return ResponseMethods.Count == 1;
+                return m_ResponseMethods.Count == 1;
             }
         }