Remove close08 hack, and remove deprecated- prefix everywhere so it will merge with 0-8.bug22885

1 files changed, 20 insertions, 30 deletions

diff --git a/amqp-rabbitmq.json b/amqp-rabbitmq.json
index 4349514..72cd628 100644
--- a/amqp-rabbitmq.json
+++ b/amqp-rabbitmq.json
@@ -134,12 +134,12 @@
 			 "name": "tune-ok"},
 			{"id": 40,
 			 "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
-				       {"type": "shortstr", "name": "deprecated-capabilities", "default-value": ""},
-				       {"type": "bit", "name": "deprecated-insist", "default-value": false}],
+				       {"type": "shortstr", "name": "capabilities", "default-value": ""},
+				       {"type": "bit", "name": "insist", "default-value": false}],
 			 "name": "open",
 			 "synchronous" : true},
 			{"id": 41,
-			 "arguments": [{"type": "shortstr", "name": "deprecated-known-hosts", "default-value": ""}],
+			 "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],
 			 "name": "open-ok"},
 			{"id": 50,
 			 "arguments": [{"type": "short", "name": "reply-code"},
@@ -150,28 +150,18 @@
 			 "synchronous" : true},
 			{"id": 51,
 			 "arguments": [],
-			 "name": "close-ok"},
-			{"id": 60,
-			 "arguments": [{"type": "short", "name": "reply-code"},
-				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
-				       {"type": "short", "name": "class-id"},
-				       {"type": "short", "name": "method-id"}],
-			 "name": "close08",
-			 "synchronous" : true},
-			{"id": 61,
-			 "arguments": [],
-			 "name": "close08-ok"}],
+			 "name": "close-ok"}],
 	    "name": "connection",
 	    "properties": []
 	},
 	{
 	    "id": 20,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "shortstr", "name": "deprecated-out-of-band", "default-value": ""}],
+			 "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}],
 			 "name": "open",
 			 "synchronous" : true},
 			{"id": 11,
-			 "arguments": [{"type": "longstr", "name": "deprecated-channel-id", "default-value": ""}],
+			 "arguments": [{"type": "longstr", "name": "channel-id", "default-value": ""}],
 			 "name": "open-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "bit", "name": "active"}],
@@ -211,13 +201,13 @@
 	{
 	    "id": 40,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "shortstr", "name": "type", "default-value": "direct"},
 				       {"type": "bit", "name": "passive", "default-value": false},
 				       {"type": "bit", "name": "durable", "default-value": false},
-				       {"type": "bit", "name": "deprecated-auto-delete", "default-value": false},
-				       {"type": "bit", "name": "deprecated-internal", "default-value": false},
+				       {"type": "bit", "name": "auto-delete", "default-value": false},
+				       {"type": "bit", "name": "internal", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
 			 "name": "declare",
@@ -226,7 +216,7 @@
 			 "arguments": [],
 			 "name": "declare-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "bit", "name": "if-unused", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
@@ -240,7 +230,7 @@
 	{
 	    "id": 50,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
                            {"type": "shortstr", "name": "queue", "default-value": ""},
 				       {"type": "bit", "name": "passive", "default-value": false},
 				       {"type": "bit", "name": "durable", "default-value": false},
@@ -256,7 +246,7 @@
 				       {"type": "long", "name": "consumer-count"}],
 			 "name": "declare-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
@@ -268,7 +258,7 @@
 			 "arguments": [],
 			 "name": "bind-ok"},
 			{"id": 30,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
 			 "name": "purge",
@@ -277,7 +267,7 @@
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "purge-ok"},
 			{"id": 40,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "if-unused", "default-value": false},
 				       {"type": "bit", "name": "if-empty", "default-value": false},
@@ -288,7 +278,7 @@
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "delete-ok"},
 			{"id": 50,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
@@ -313,7 +303,7 @@
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
-			 "arguments": [{"domain": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"domain": "short", "name": "ticket", "default-value": 0},
 				       {"domain": "queue-name", "name": "queue"},
 				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
 				       {"type": "bit", "name": "no-local", "default-value": false},
@@ -336,7 +326,7 @@
 			 "name": "cancel-ok"},
 			{"content": true,
 			 "id": 40,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "exchange", "default-value": ""},
 				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "mandatory", "default-value": false},
@@ -358,7 +348,7 @@
 				       {"type": "shortstr", "name": "routing-key"}],
 			 "name": "deliver"},
 			{"id": 70,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "no-ack", "default-value": false}],
 			 "name": "get",
@@ -372,7 +362,7 @@
 				       {"type": "long", "name": "message-count"}],
 			 "name": "get-ok"},
 			{"id": 72,
-			 "arguments": [{"type": "shortstr", "name": "deprecated-cluster-id", "default-value": ""}],
+			 "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}],
 			 "name": "get-empty"},
 			{"id": 80,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
@@ -406,7 +396,7 @@
 			   {"type": "shortstr", "name": "type"},
 			   {"type": "shortstr", "name": "user-id"},
 			   {"type": "shortstr", "name": "app-id"},
-			   {"type": "shortstr", "name": "deprecated-cluster-id"}]
+			   {"type": "shortstr", "name": "cluster-id"}]
 	},
 	{
 	    "id": 90,