Merging default into amqp_0_9_1

1 files changed, 82 insertions, 46 deletions

diff --git a/amqp-0.8.json b/amqp-0.8.json
index 60ddbd1..e6ecd18 100644
--- a/amqp-0.8.json
+++ b/amqp-0.8.json
@@ -110,7 +110,8 @@
 				       {"domain": "peer-properties", "name": "server properties"},
 				       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
 				       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
-			 "name": "start"},
+			 "name": "start",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [{"domain": "peer-properties", "name": "client-properties"},
 				       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
@@ -119,7 +120,8 @@
 			 "name": "start-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "longstr", "name": "challenge"}],
-			 "name": "secure"},
+			 "name": "secure",
+ 			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "longstr", "name": "response"}],
 			 "name": "secure-ok"},
@@ -127,7 +129,8 @@
 			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
 				       {"type": "long", "name": "frame-max", "default-value": 0},
 				       {"type": "short", "name": "heartbeat", "default-value": 0}],
-			 "name": "tune"},
+			 "name": "tune",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
 				       {"type": "long", "name": "frame-max", "default-value": 0},
@@ -137,7 +140,8 @@
 			 "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
 				       {"type": "shortstr", "name": "capabilities", "default-value": ""},
 				       {"type": "bit", "name": "insist", "default-value": false}],
-			 "name": "open"},
+			 "name": "open",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
 			 "name": "open-ok"},
@@ -150,7 +154,8 @@
 				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
 				       {"type": "short", "name": "class-id"},
 				       {"type": "short", "name": "method-id"}],
-			 "name": "close"},
+			 "name": "close",
+			 "synchronous" : "true"},
 			{"id": 61,
 			 "arguments": [],
 			 "name": "close-ok"}],
@@ -161,13 +166,15 @@
 	    "id": 20,
 	    "methods": [{"id": 10,
 			 "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
-			 "name": "open"},
+			 "name": "open",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "open-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "bit", "name": "active"}],
-			 "name": "flow"},
+			 "name": "flow",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "bit", "name": "active"}],
 			 "name": "flow-ok"},
@@ -181,7 +188,8 @@
 				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
 				       {"type": "short", "name": "class-id"},
 				       {"type": "short", "name": "method-id"}],
-			 "name": "close"},
+			 "name": "close",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [],
 			 "name": "close-ok"}],
@@ -196,7 +204,8 @@
 				       {"type": "bit", "name": "active", "default-value": true},
 				       {"type": "bit", "name": "write", "default-value": true},
 				       {"type": "bit", "name": "read", "default-value": true}],
-			 "name": "request"},
+			 "name": "request",
+			 "synchronous" : "true"},
 			{"id": 11,
                     "arguments": [{"type": "short", "name": "ticket", "default-value": 1}],
 			 "name": "request-ok"}],
@@ -214,7 +223,8 @@
 				       {"type": "bit", "name": "internal", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare"},
+			 "name": "declare",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "declare-ok"},
@@ -223,7 +233,8 @@
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "bit", "name": "if-unused", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete"},
+			 "name": "delete",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "delete-ok"}],
@@ -240,7 +251,8 @@
 				       {"type": "bit", "name": "auto-delete", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare"},
+			 "name": "declare",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [{"type": "shortstr", "name": "queue"},
 				       {"type": "long", "name": "message-count"},
@@ -250,10 +262,11 @@
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "bind"},
+			 "name": "bind",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "bind-ok"},
@@ -261,7 +274,8 @@
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "purge"},
+			 "name": "purge",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "purge-ok"},
@@ -271,7 +285,8 @@
 				       {"type": "bit", "name": "if-unused", "default-value": false},
 				       {"type": "bit", "name": "if-empty", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete"},
+			 "name": "delete",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "delete-ok"},
@@ -279,9 +294,10 @@
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "table", "name": "arguments"}],
-			 "name": "unbind"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+				       {"type": "table", "name": "arguments", "default-value": {}}],
+			 "name": "unbind",
+			 "synchronous" : "true"},
 			{"id": 51,
 			 "arguments": [],
 			 "name": "unbind-ok"}
@@ -294,26 +310,29 @@
 			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
 				       {"type": "short", "name": "prefetch-count", "default-value": 0},
 				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos"},
+			 "name": "qos",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
 			 "arguments": [{"domain": "access-ticket", "name": "ticket", "default-value": 1},
 				       {"domain": "queue-name", "name": "queue"},
-				       {"type": "shortstr", "name": "consumer-tag"},
+				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
 				       {"type": "bit", "name": "no-local", "default-value": false},
 				       {"type": "bit", "name": "no-ack", "default-value": false},
 				       {"type": "bit", "name": "exclusive", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "consume"},
+			 "name": "consume",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel"},
+			 "name": "cancel",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "cancel-ok"},
@@ -321,7 +340,7 @@
 			 "id": 40,
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "mandatory", "default-value": false},
 				       {"type": "bit", "name": "immediate", "default-value": false}],
 			 "name": "publish"},
@@ -344,7 +363,8 @@
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "no-ack", "default-value": false}],
-			 "name": "get"},
+			 "name": "get",
+			 "synchronous" : "true"},
 			{"content": true,
 			 "id": 71,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
@@ -358,7 +378,7 @@
 			 "name": "get-empty"},
 			{"id": 80,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
-				       {"type": "bit", "name": "multiple", "default-value": true}],
+				       {"type": "bit", "name": "multiple", "default-value": false}],
 			 "name": "ack"},
 			{"id": 90,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
@@ -389,33 +409,37 @@
 			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
 				       {"type": "short", "name": "prefetch-count", "default-value": 0},
 				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos"},
+			 "name": "qos",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "queue"},
-				       {"type": "shortstr", "name": "consumer-tag"},
+				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
 				       {"type": "bit", "name": "no-local", "default-value": false},
 				       {"type": "bit", "name": "no-ack", "default-value": false},
 				       {"type": "bit", "name": "exclusive", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "consume"},
+			 "name": "consume",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel"},
+			 "name": "cancel",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "cancel-ok"},
 			{"id": 40,
 			 "arguments": [{"type": "shortstr", "name": "identifier"},
 				       {"type": "longlong", "name": "content-size"}],
-			 "name": "open"},
+			 "name": "open",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [{"type": "longlong", "name": "staged-size"}],
 			 "name": "open-ok"},
@@ -426,7 +450,7 @@
 			{"id": 60,
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "mandatory", "default-value": false},
 				       {"type": "bit", "name": "immediate", "default-value": false},
 				       {"type": "shortstr", "name": "identifier"}],
@@ -448,7 +472,7 @@
 			 "name": "deliver"},
 			{"id": 90,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
-                           {"type": "bit", "name": "multiple", "default-value": true}],
+                           {"type": "bit", "name": "multiple", "default-value": false}],
 			 "name": "ack"},
 			{"id": 100,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
@@ -472,7 +496,8 @@
 				       {"type": "short", "name": "prefetch-count", "default-value": 0},
 				       {"type": "long", "name": "consume-rate", "default-value": 0},
 				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos"},
+			 "name": "qos",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
@@ -483,14 +508,16 @@
 				       {"type": "bit", "name": "no-local", "default-value": false},
 				       {"type": "bit", "name": "exclusive", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "consume"},
+			 "name": "consume",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel"},
+			 "name": "cancel",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "cancel-ok"},
@@ -498,7 +525,7 @@
 			 "id": 40,
 			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
 				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "mandatory", "default-value": false},
 				       {"type": "bit", "name": "immediate", "default-value": false}],
 			 "name": "publish"},
@@ -527,19 +554,22 @@
 	    "id": 90,
 	    "methods": [{"id": 10,
 			 "arguments": [],
-			 "name": "select"},
+			 "name": "select",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "select-ok"},
 			{"id": 20,
 			 "arguments": [],
-			 "name": "commit"},
+			 "name": "commit",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "commit-ok"},
 			{"id": 30,
 			 "arguments": [],
-			 "name": "rollback"},
+			 "name": "rollback",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [],
 			 "name": "rollback-ok"}],
@@ -549,13 +579,15 @@
 	    "id": 100,
 	    "methods": [{"id": 10,
 			 "arguments": [],
-			 "name": "select"},
+			 "name": "select",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "select-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "shortstr", "name": "dtx-identifier"}],
-			 "name": "start"},
+			 "name": "start",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [], "name": "start-ok"}],
 	    "name": "dtx"
@@ -581,7 +613,8 @@
 				       {"type": "long", "name": "integer-3"},
 				       {"type": "longlong", "name": "integer-4"},
 				       {"type": "octet", "name": "operation"}],
-			 "name": "integer"},
+			 "name": "integer",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [{"type": "longlong", "name": "result"}],
 			 "name": "integer-ok"},
@@ -589,7 +622,8 @@
 			 "arguments": [{"type": "shortstr", "name": "string-1"},
 				       {"type": "longstr", "name": "string-2"},
 				       {"type": "octet", "name": "operation"}],
-			 "name": "string"},
+			 "name": "string",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "longstr", "name": "result"}],
 			 "name": "string-ok"},
@@ -597,7 +631,8 @@
 			 "arguments": [{"type": "table", "name": "table"},
 				       {"type": "octet", "name": "integer-op"},
 				       {"type": "octet", "name": "string-op"}],
-			 "name": "table"},
+			 "name": "table",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "longlong", "name": "integer-result"},
 				       {"type": "longstr", "name": "string-result"}],
@@ -605,7 +640,8 @@
 			{"content": true,
 			 "id": 40,
 			 "arguments": [],
-			 "name": "content"},
+			 "name": "content",
+			 "synchronous" : "true"},
 			{"content": true,
 			 "id": 41,
 			 "arguments": [{"type": "long", "name": "content-checksum"}],