stable to default

Author: Simon MacMullen

Local.props.example

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PropTargetFramework>v3.5</PropTargetFramework>
+    <PropTargetFramework>v3.0</PropTargetFramework>
     <PropAssemblyVersion>0.0.0.0</PropAssemblyVersion>
     <PropUsingMono>false</PropUsingMono>
 

Makefile

@@ -10,7 +10,7 @@ rabbit-vsn:
 	@echo "RABBIT_VSN is not set"
 	@false
 else
-rabbit-vsn: 
+rabbit-vsn:
 endif
 
 dist: rabbit-vsn ensure-deliverables ensure-universally-readable
@@ -34,7 +34,7 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}.msm
 
 ensure-prerequisites: rabbit-vsn
-	[ -f "/etc/debian_version" ] && dpkg -L htmldoc plotutils transfig graphviz docbook-utils || true > /dev/null
+	[ -f "/etc/debian_version" ] && dpkg -L htmldoc plotutils transfig graphviz docbook-utils xmlstarlet || true > /dev/null
 
 ensure-release-dir: rabbit-vsn
 	touch ${RELEASE_DIR}/

docs/api-guide.sh

@@ -8,7 +8,7 @@ NAMESPACES=$(cd $HTMLPATH; ls namespace-*.html | sed -e 's/namespace-\(.*\)\.htm
 FILES="./api-title-page.html $HTMLPATH/index.html"
 for n in $NAMESPACES
 do
-    FILES="$FILES $HTMLPATH/namespace-$n.html $(cd $XMLPATH; cat namespace-$n.xml | grep '<type name' | sed -e 's:.*name="\([^"]*\)".*:'$HTMLPATH'/type-\1.html:')"
+    FILES="$FILES $HTMLPATH/namespace-$n.html $(cd $XMLPATH; xmlstarlet sel -t -v "/namespace/typedoc/type/@name" namespace-$n.xml | sed -e 's:^\(.*\)$:'$HTMLPATH'/type-\1.html:')"
 done
 
 htmldoc -t pdf --bodyfont serif --book --fontsize 9.0 --color $FILES > api-guide.pdf

docs/specs/amqp0-9-1.stripped.xml

@@ -167,6 +167,15 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
     </method>
+    <method name="blocked" index="60">
+      <chassis name="server" implement="MUST"/>
+      <chassis name="client" implement="MUST"/>
+      <field name="reason" domain="shortstr" />
+    </method>
+    <method name="unblocked" index="61">
+      <chassis name="server" implement="MUST"/>
+      <chassis name="client" implement="MUST"/>
+    </method>
   </class>
   <class name="channel" handler="channel" index="20">
     <chassis name="server" implement="MUST"/>

docs/specs/amqp0-9-1.xml

@@ -7,6 +7,7 @@
      exchange.bind and exchange.bind-ok,
      exchange.unbind and exchange.unbind-ok,
      basic.nack,
+     connection.blocked and connection.unblocked,
      the ability for the Server to send basic.ack, basic.nack and
       basic.cancel to the client, and
      the un-deprecation of exchange.declare{auto-delete} and exchange.declare{internal}
@@ -893,6 +894,31 @@
       <chassis name = "client" implement = "MUST" />
       <chassis name = "server" implement = "MUST" />
     </method>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name = "blocked" index = "60" label = "indicates a connection is blocked">
+      <doc>Notifies client that the connection is blocked</doc>
+
+      <field name = "reason" domain = "shortstr">
+        <doc>
+          Provides an explanation why the connection was blocked.
+        </doc>
+      </field>
+
+      <chassis name = "client" implement = "MUST" />
+      <chassis name = "server" implement = "MUST" />
+    </method>
+  </class>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name = "unblocked" index = "61" label = "indicates a connection is unblocked">
+      <doc>Notifies client that the connection is unblocked</doc>
+
+      <chassis name = "client" implement = "MUST" />
+      <chassis name = "server" implement = "MUST" />
+    </method>
   </class>
 
   <!-- ==  CHANNEL  ========================================================== -->

projects/client/Apigen/properties/AssemblyInfo.cs

@@ -42,7 +42,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ApiGen")]
@@ -54,8 +54,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 

projects/client/Apigen/src/apigen/AmqpClass.cs

@@ -39,22 +39,22 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Xml;
 
 namespace RabbitMQ.Client.Apigen {
     public class AmqpClass: AmqpEntity {
-        public ArrayList m_Methods;
-        public ArrayList m_Fields;
+        public IList<AmqpMethod> m_Methods;
+        public IList<AmqpField> m_Fields;
 
         public AmqpClass(XmlNode n)
             : base(n)
         {
-            m_Methods = new ArrayList();
+            m_Methods = new List<AmqpMethod>();
             foreach (XmlNode m in n.SelectNodes("method")) {
                 m_Methods.Add(new AmqpMethod(m));
             }
-            m_Fields = new ArrayList();
+            m_Fields = new List<AmqpField>();
             foreach (XmlNode f in n.SelectNodes("field")) {
                 m_Fields.Add(new AmqpField(f));
             }

projects/client/Apigen/src/apigen/AmqpMethod.cs

@@ -39,22 +39,22 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Xml;
 
 namespace RabbitMQ.Client.Apigen {
     public class AmqpMethod: AmqpEntity {
-        public ArrayList m_Fields;
-        public ArrayList m_ResponseMethods;
+        public IList<AmqpField> m_Fields;
+        public IList<string> m_ResponseMethods;
 
         public AmqpMethod(XmlNode n)
             : base(n)
         {
-            m_Fields = new ArrayList();
+            m_Fields = new List<AmqpField>();
             foreach (XmlNode f in n.SelectNodes("field")) {
                 m_Fields.Add(new AmqpField(f));
             }
-            m_ResponseMethods = new ArrayList();
+            m_ResponseMethods = new List<string>();
             foreach (XmlNode r in n.SelectNodes("response")) {
                 m_ResponseMethods.Add(Apigen.GetString(r, "@name"));
             }

projects/client/Apigen/src/apigen/Apigen.cs

@@ -39,7 +39,9 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Collections;
+using System.CodeDom;
+using System.CodeDom.Compiler;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -53,7 +55,7 @@ public class Apigen {
         // Entry point
 
         public static void Main(string[] args) {
-            Apigen instance = new Apigen(new ArrayList(args));
+            Apigen instance = new Apigen(new List<string>(args));
             instance.Generate();
         }
 
@@ -118,8 +120,8 @@ public static string MangleConstant(string name) {
             return MangleClass(name);
         }
 
-        public static ArrayList IdentifierParts(string name) {
-            ArrayList result = new ArrayList();
+        public static IList<string> IdentifierParts(string name) {
+            IList<string> result = new List<string>();
             foreach (String s1 in name.Split(new Char[] { '-' })) {
                 foreach (String s2 in s1.Split(new Char[] { ' ' })) {
                     result.Add(s2);
@@ -171,24 +173,27 @@ public static string MangleMethodClass(AmqpClass c, AmqpMethod m) {
         public bool m_emitComments = false;
 
         public Type m_modelType = typeof(RabbitMQ.Client.Impl.IFullModel);
-        public ArrayList m_modelTypes = new ArrayList();
-        public ArrayList m_constants = new ArrayList();
-        public ArrayList m_classes = new ArrayList();
-        public Hashtable m_domains = new Hashtable();
+        public IList<Type> m_modelTypes = new List<Type>();
+        public IList<KeyValuePair<string, int>> m_constants = new List<KeyValuePair<string, int>>();
+        public IList<AmqpClass> m_classes = new List<AmqpClass>();
+        public IDictionary<string, string> m_domains = new Dictionary<string, string>();
+
+        public static IDictionary<string, string> m_primitiveTypeMap;
+        public static IDictionary<string, bool> m_primitiveTypeFlagMap;
+
+        private CodeDomProvider m_csharpProvider;
 
-        public static Hashtable m_primitiveTypeMap;
-        public static Hashtable m_primitiveTypeFlagMap;
         static Apigen() {
-            m_primitiveTypeMap = new Hashtable();
-            m_primitiveTypeFlagMap = new Hashtable();
+            m_primitiveTypeMap = new Dictionary<string, string>();
+            m_primitiveTypeFlagMap = new Dictionary<string, bool>();
             InitPrimitiveType("octet", "byte", false);
             InitPrimitiveType("shortstr", "string", true);
             InitPrimitiveType("longstr", "byte[]", true);
             InitPrimitiveType("short", "ushort", false);
             InitPrimitiveType("long", "uint", false);
             InitPrimitiveType("longlong", "ulong", false);
             InitPrimitiveType("bit", "bool", false);
-            InitPrimitiveType("table", "System.Collections.IDictionary", true);
+            InitPrimitiveType("table", "System.Collections.Generic.IDictionary<string, object>", true);
             InitPrimitiveType("timestamp", "AmqpTimestamp", false);
             InitPrimitiveType("content", "byte[]", true);
         }
@@ -227,7 +232,7 @@ public void Usage() {
             Environment.Exit(1);
         }
 
-        public Apigen(ArrayList args) {
+        public Apigen(IList<string> args) {
             while (args.Count > 0 && ((string) args[0]).StartsWith("/")) {
                 HandleOption((string) args[0]);
                 args.RemoveAt(0);
@@ -239,6 +244,7 @@ public Apigen(ArrayList args) {
             }
             m_inputXmlFilename = (string) args[0];
             m_outputFilename = (string) args[1];
+            this.m_csharpProvider = CodeDomProvider.CreateProvider("C#");
         }
 
         ///////////////////////////////////////////////////////////////////////////
@@ -289,7 +295,7 @@ public void ParseSpec() {
                 }
             }
             foreach (XmlNode n in m_spec.SelectNodes("/amqp/constant")) {
-                m_constants.Add(new DictionaryEntry(GetString(n, "@name"), GetInt(n, "@value")));
+                m_constants.Add(new KeyValuePair<string, int>(GetString(n, "@name"), GetInt(n, "@value")));
             }
             foreach (XmlNode n in m_spec.SelectNodes("/amqp/class")) {
                 m_classes.Add(new AmqpClass(n));
@@ -311,7 +317,7 @@ public void ReflectModel() {
         }
 
         public string ResolveDomain(string d) {
-            while (m_domains[d] != null) {
+            while (m_domains.ContainsKey(d)) {
                 string newD = (string) m_domains[d];
                 if (d.Equals(newD))
                     break;
@@ -418,7 +424,7 @@ public void EmitPublic() {
             EmitContentHeaderReader();
             EmitLine("  }");
             EmitLine("  public class Constants {");
-            foreach (DictionaryEntry de in m_constants) {
+            foreach (KeyValuePair<string, int> de in m_constants) {
                 EmitLine("    ///<summary>(= "+de.Value+")</summary>");
                 EmitLine("    public const int "+MangleConstant((string) de.Key)+" = "+de.Value+";");
             }
@@ -771,7 +777,7 @@ public Attribute Attribute(ICustomAttributeProvider p, Type t) {
             return Attribute(p.GetCustomAttributes(t, false), t);
         }
 
-        public Attribute Attribute(IEnumerable attributes, Type t) {
+        public Attribute Attribute(IEnumerable<object> attributes, Type t) {
             if (t.IsSubclassOf(typeof(AmqpApigenAttribute))) {
                 AmqpApigenAttribute result = null;
                 foreach (AmqpApigenAttribute candidate in attributes) {
@@ -794,7 +800,7 @@ public Attribute Attribute(IEnumerable attributes, Type t) {
         public void EmitModelImplementation() {
             EmitLine("  public class Model: RabbitMQ.Client.Impl.ModelBase {");
             EmitLine("    public Model(RabbitMQ.Client.Impl.ISession session): base(session) {}");
-            ArrayList asynchronousHandlers = new ArrayList();
+            IList<MethodInfo> asynchronousHandlers = new List<MethodInfo>();
             foreach (Type t in m_modelTypes) {
                 foreach (MethodInfo method in t.GetMethods()) {
                     if (method.DeclaringType.Namespace != null &&
@@ -852,11 +858,14 @@ public void MaybeEmitModelMethod(MethodInfo method) {
         }
 
         public string SanitisedFullName(Type t) {
-            if (t == typeof(void)) {
-                return "void";
-            } else {
-                return t.FullName;
+            CodeTypeReferenceExpression tre = new CodeTypeReferenceExpression(t.FullName);
+            StringBuilder sb = new StringBuilder();
+            using (StringWriter writer = new StringWriter(sb))
+            {
+                this.m_csharpProvider.GenerateCodeFromExpression(tre, writer, new CodeGeneratorOptions());
             }
+
+            return sb.ToString().Trim(' ', '\t', '\r', '\n');
         }
 
         public void EmitModelMethodPreamble(MethodInfo method) {
@@ -1086,7 +1095,7 @@ public void EmitModelMethod(MethodInfo method) {
             EmitLine("    }");
         }
 
-        public void EmitAsynchronousHandlers(ArrayList asynchronousHandlers) {
+        public void EmitAsynchronousHandlers(IList<MethodInfo> asynchronousHandlers) {
             EmitLine("    public override bool DispatchAsynchronous(RabbitMQ.Client.Impl.Command cmd) {");
             EmitLine("      RabbitMQ.Client.Impl.MethodBase __method = (RabbitMQ.Client.Impl.MethodBase) cmd.Method;");
             EmitLine("      switch ((__method.ProtocolClassId << 16) | __method.ProtocolMethodId) {");

projects/client/ApigenBootstrap/properties/AssemblyInfo.cs

@@ -42,7 +42,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ApiGenBootstrap")]
@@ -54,8 +54,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]