more order tweaks and removed rules

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1478396 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 142 insertions, 247 deletions

diff --git a/qpid/specs/amqp.0-8.stripped.xml b/qpid/specs/amqp.0-8.stripped.xml
index da09c2823e..267bb806e3 100644
--- a/qpid/specs/amqp.0-8.stripped.xml
+++ b/qpid/specs/amqp.0-8.stripped.xml
@@ -42,38 +42,31 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <constant name="frame min size" value="4096"/>
   <constant name="frame end" value="206"/>
   <constant name="reply success" value="200"/>
-  <constant name="not delivered" class="soft error" value="310"/>
-  <constant name="content too large" class="soft error" value="311"/>
-  <constant name="connection forced" class="hard error" value="320"/>
-  <constant name="invalid path" class="hard error" value="402"/>
-  <constant name="access refused" class="soft error" value="403"/>
-  <constant name="not found" class="soft error" value="404"/>
-  <constant name="resource locked" class="soft error" value="405"/>
-  <constant name="frame error" class="hard error" value="501"/>
-  <constant name="syntax error" class="hard error" value="502"/>
-  <constant name="command invalid" class="hard error" value="503"/>
-  <constant name="channel error" class="hard error" value="504"/>
-  <constant name="resource error" class="hard error" value="506"/>
-  <constant name="not allowed" class="hard error" value="530"/>
-  <constant name="not implemented" class="hard error" value="540"/>
-  <constant name="internal error" class="hard error" value="541"/>
+  <constant name="not delivered" value="310" class="soft error"/>
+  <constant name="content too large" value="311" class="soft error"/>
+  <constant name="connection forced" value="320" class="hard error"/>
+  <constant name="invalid path" value="402" class="hard error"/>
+  <constant name="access refused" value="403" class="soft error"/>
+  <constant name="not found" value="404" class="soft error"/>
+  <constant name="resource locked" value="405" class="soft error"/>
+  <constant name="frame error" value="501" class="hard error"/>
+  <constant name="syntax error" value="502" class="hard error"/>
+  <constant name="command invalid" value="503" class="hard error"/>
+  <constant name="channel error" value="504" class="hard error"/>
+  <constant name="resource error" value="506" class="hard error"/>
+  <constant name="not allowed" value="530" class="hard error"/>
+  <constant name="not implemented" value="540" class="hard error"/>
+  <constant name="internal error" value="541" class="hard error"/>
   <domain name="access ticket" type="short">
     <assert check="ne" value="0"/>
   </domain>
   <domain name="class id" type="short"/>
-  <domain name="consumer tag" type="shortstr">
-    <rule implement="MUST"/>
-  </domain>
-  <domain name="delivery tag" type="longlong">
-    <rule implement="MUST"/>
-    <rule implement="MUST"/>
-  </domain>
+  <domain name="consumer tag" type="shortstr"/>
+  <domain name="delivery tag" type="longlong"/>
   <domain name="exchange name" type="shortstr">
     <assert check="length" value="127"/>
   </domain>
-  <domain name="known hosts" type="shortstr">
-    <rule implement="MAY"/>
-  </domain>
+  <domain name="known hosts" type="shortstr"/>
   <domain name="method id" type="short"/>
   <domain name="no ack" type="bit"/>
   <domain name="no local" type="bit"/>
@@ -82,28 +75,21 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <assert check="syntax" rule="path"/>
     <assert check="length" value="127"/>
   </domain>
-  <domain name="peer properties" type="table">
-    <rule implement="SHOULD"/>
-  </domain>
+  <domain name="peer properties" type="table"/>
   <domain name="queue name" type="shortstr">
     <assert check="length" value="127"/>
   </domain>
-  <domain name="redelivered" type="bit">
-    <rule implement="SHOULD"/>
-    <rule implement="MUST"/>
-  </domain>
+  <domain name="redelivered" type="bit"/>
   <domain name="reply code" type="short">
     <assert check="notnull"/>
   </domain>
   <domain name="reply text" type="shortstr">
     <assert check="notnull"/>
   </domain>
-  <class index="10" name="connection" handler="connection">
+  <class name="connection" index="10" handler="connection">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="MUST"/>
-    <method index="10" name="start" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MUST"/>
+    <method name="start" synchronous="1" index="10">
       <chassis name="client" implement="MUST"/>
       <response name="start-ok"/>
       <field name="version major" type="octet"/>
@@ -114,16 +100,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <assert check="notnull"/>
       </field>
       <field name="locales" type="longstr">
-        <rule implement="MUST"/>
         <assert check="notnull"/>
       </field>
     </method>
-    <method index="11" name="start-ok" synchronous="1">
+    <method name="start-ok" synchronous="1" index="11">
       <chassis name="server" implement="MUST"/>
       <field name="client properties" domain="peer properties"/>
       <field name="mechanism" type="shortstr">
-        <rule implement="SHOULD"/>
-        <rule implement="MUST"/>
         <assert check="notnull"/>
       </field>
       <field name="response" type="longstr">
@@ -133,72 +116,57 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <assert check="notnull"/>
       </field>
     </method>
-    <method index="20" name="secure" synchronous="1">
+    <method name="secure" synchronous="1" index="20">
       <chassis name="client" implement="MUST"/>
       <response name="secure-ok"/>
       <field name="challenge" type="longstr">
         <see name="security mechanisms"/>
       </field>
     </method>
-    <method index="21" name="secure-ok" synchronous="1">
+    <method name="secure-ok" synchronous="1" index="21">
       <chassis name="server" implement="MUST"/>
       <field name="response" type="longstr">
         <assert check="notnull"/>
       </field>
     </method>
-    <method index="30" name="tune" synchronous="1">
+    <method name="tune" synchronous="1" index="30">
       <chassis name="client" implement="MUST"/>
       <response name="tune-ok"/>
       <field name="channel max" type="short"/>
-      <field name="frame max" type="long">
-        <rule implement="MUST"/>
-      </field>
+      <field name="frame max" type="long"/>
       <field name="heartbeat" type="short"/>
     </method>
-    <method index="31" name="tune-ok" synchronous="1">
+    <method name="tune-ok" synchronous="1" index="31">
       <chassis name="server" implement="MUST"/>
       <field name="channel max" type="short">
-        <rule implement="MAY"/>
         <assert check="notnull"/>
-        <assert field="channel max" check="le" method="tune"/>
-      </field>
-      <field name="frame max" type="long">
-        <rule implement="MUST"/>
+        <assert check="le" method="tune" field="channel max"/>
       </field>
+      <field name="frame max" type="long"/>
       <field name="heartbeat" type="short"/>
     </method>
-    <method index="40" name="open" synchronous="1">
-      <rule implement="MUST"/>
+    <method name="open" synchronous="1" index="40">
       <chassis name="server" implement="MUST"/>
       <response name="open-ok"/>
       <response name="redirect"/>
       <field name="virtual host" domain="path">
         <assert check="regexp" value="^[a-zA-Z0-9/-_]+$"/>
-        <rule implement="MUST"/>
-        <rule implement="SHOULD"/>
-        <rule implement="MAY"/>
       </field>
       <field name="capabilities" type="shortstr"/>
-      <field name="insist" type="bit">
-        <rule implement="SHOULD"/>
-      </field>
+      <field name="insist" type="bit"/>
     </method>
-    <method index="41" name="open-ok" synchronous="1">
+    <method name="open-ok" synchronous="1" index="41">
       <chassis name="client" implement="MUST"/>
       <field name="known hosts" domain="known hosts"/>
     </method>
-    <method index="50" name="redirect" synchronous="1">
-      <rule implement="SHOULD"/>
+    <method name="redirect" synchronous="1" index="50">
       <chassis name="client" implement="MAY"/>
       <field name="host" type="shortstr">
         <assert check="notnull"/>
       </field>
       <field name="known hosts" domain="known hosts"/>
     </method>
-    <method index="60" name="close" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MAY"/>
-      <rule implement="MUST"/>
+    <method name="close" synchronous="1" index="60">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <response name="close-ok"/>
@@ -207,50 +175,42 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="class id" domain="class id"/>
       <field name="method id" domain="method id"/>
     </method>
-    <method index="61" name="close-ok" synchronous="1">
-      <rule implement="SHOULD"/>
+    <method name="close-ok" synchronous="1" index="61">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
     </method>
   </class>
-  <class index="20" name="channel" handler="channel">
+  <class name="channel" index="20" handler="channel">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="MUST"/>
-    <method index="10" name="open" synchronous="1">
-      <rule implement="MUST"/>
+    <method name="open" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="open-ok"/>
       <field name="out of band" type="shortstr">
         <assert check="null"/>
       </field>
     </method>
-    <method index="11" name="open-ok" synchronous="1">
+    <method name="open-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="flow" synchronous="1">
-      <rule implement="MAY"/>
-      <rule implement="SHOULD"/>
-      <rule implement="MAY"/>
-      <rule implement="MAY"/>
+    <method name="flow" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <chassis name="client" implement="MUST"/>
       <response name="flow-ok"/>
       <field name="active" type="bit"/>
     </method>
-    <method index="21" name="flow-ok">
+    <method name="flow-ok" index="21">
       <chassis name="server" implement="MUST"/>
       <chassis name="client" implement="MUST"/>
       <field name="active" type="bit"/>
     </method>
-    <method index="30" name="alert">
+    <method name="alert" index="30">
       <chassis name="client" implement="MUST"/>
       <field name="reply code" domain="reply code"/>
       <field name="reply text" domain="reply text"/>
       <field name="details" type="table"/>
     </method>
-    <method index="40" name="close" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MAY"/>
+    <method name="close" synchronous="1" index="40">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <response name="close-ok"/>
@@ -259,143 +219,95 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="class id" domain="class id"/>
       <field name="method id" domain="method id"/>
     </method>
-    <method index="41" name="close-ok" synchronous="1">
-      <rule implement="SHOULD"/>
+    <method name="close-ok" synchronous="1" index="41">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
     </method>
   </class>
-  <class index="30" name="access" handler="connection">
+  <class name="access" index="30" handler="connection">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="MUST"/>
-    <method index="10" name="request" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MUST"/>
+    <method name="request" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="request-ok"/>
-      <field name="realm" domain="path">
-        <rule implement="MUST"/>
-      </field>
+      <field name="realm" domain="path"/>
       <field name="exclusive" type="bit"/>
       <field name="passive" type="bit"/>
       <field name="active" type="bit"/>
       <field name="write" type="bit"/>
       <field name="read" type="bit"/>
     </method>
-    <method index="11" name="request-ok" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MUST"/>
+    <method name="request-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
       <field name="ticket" domain="access ticket"/>
     </method>
   </class>
-  <class index="40" name="exchange" handler="channel">
+  <class name="exchange" index="40" handler="channel">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="MUST"/>
-    <rule implement="MUST"/>
-    <rule implement="SHOULD"/>
-    <rule implement="MAY"/>
-    <rule implement="MUST"/>
-    <method index="10" name="declare" synchronous="1">
-      <rule implement="SHOULD"/>
+    <method name="declare" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="declare-ok"/>
-      <field name="ticket" domain="access ticket">
-        <rule implement="MUST"/>
-      </field>
+      <field name="ticket" domain="access ticket"/>
       <field name="exchange" domain="exchange name">
-        <rule implement="MUST"/>
         <assert check="regexp" value="^[a-zA-Z0-9-_.:]+$"/>
       </field>
       <field name="type" type="shortstr">
-        <rule implement="MUST"/>
-        <rule implement="MUST"/>
         <assert check="regexp" value="^[a-zA-Z0-9-_.:]+$"/>
       </field>
-      <field name="passive" type="bit">
-        <rule implement="MUST"/>
-      </field>
-      <field name="durable" type="bit">
-        <rule implement="MUST"/>
-        <rule implement="MUST"/>
-      </field>
-      <field name="auto delete" type="bit">
-        <rule implement="SHOULD"/>
-        <rule implement="MUST"/>
-      </field>
+      <field name="passive" type="bit"/>
+      <field name="durable" type="bit"/>
+      <field name="auto delete" type="bit"/>
       <field name="internal" type="bit"/>
       <field name="nowait" type="bit"/>
       <field name="arguments" type="table"/>
     </method>
-    <method index="11" name="declare-ok" synchronous="1">
+    <method name="declare-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="delete" synchronous="1">
+    <method name="delete" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <response name="delete-ok"/>
-      <field name="ticket" domain="access ticket">
-        <rule implement="MUST"/>
-      </field>
+      <field name="ticket" domain="access ticket"/>
       <field name="exchange" domain="exchange name">
-        <rule implement="MUST"/>
         <assert check="notnull"/>
       </field>
-      <field name="if unused" type="bit">
-        <rule implement="SHOULD"/>
-        <rule implement="SHOULD"/>
-      </field>
+      <field name="if unused" type="bit"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="21" name="delete-ok" synchronous="1">
+    <method name="delete-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="22" name="bound" synchronous="1">
+    <method name="bound" synchronous="1" index="22">
       <chassis name="server" implement="SHOULD"/>
       <field name="exchange" domain="exchange name"/>
       <field name="routing key" type="shortstr"/>
       <field name="queue" domain="queue name"/>
     </method>
-    <method index="23" name="bound-ok" synchronous="1">
+    <method name="bound-ok" synchronous="1" index="23">
       <field name="reply code" domain="reply code"/>
       <field name="reply text" domain="reply text"/>
       <chassis name="client" implement="SHOULD"/>
     </method>
   </class>
-  <class index="50" name="queue" handler="channel">
+  <class name="queue" index="50" handler="channel">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="MUST"/>
-    <rule implement="MUST"/>
-    <method index="10" name="declare" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="SHOULD"/>
+    <method name="declare" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="declare-ok"/>
       <field name="ticket" domain="access ticket"/>
       <field name="queue" domain="queue name">
-        <rule implement="MAY"/>
-        <rule implement="MUST"/>
         <assert check="regexp" value="^[a-zA-Z0-9-_.:]*$"/>
       </field>
-      <field name="passive" type="bit">
-        <rule implement="MUST"/>
-      </field>
-      <field name="durable" type="bit">
-        <rule implement="MUST"/>
-        <rule implement="MUST"/>
-        <rule implement="MUST"/>
-      </field>
-      <field name="exclusive" type="bit">
-        <rule implement="MUST"/>
-        <rule implement="MUST"/>
-      </field>
-      <field name="auto delete" type="bit">
-        <rule implement="SHOULD"/>
-        <rule implement="MUST"/>
-      </field>
+      <field name="passive" type="bit"/>
+      <field name="durable" type="bit"/>
+      <field name="exclusive" type="bit"/>
+      <field name="auto delete" type="bit"/>
       <field name="nowait" type="bit"/>
       <field name="arguments" type="table"/>
     </method>
-    <method index="11" name="declare-ok" synchronous="1">
+    <method name="declare-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
       <field name="queue" domain="queue name">
         <assert check="notnull"/>
@@ -403,61 +315,45 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="message count" type="long"/>
       <field name="consumer count" type="long"/>
     </method>
-    <method index="20" name="bind" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MUST"/>
-      <rule implement="MUST"/>
-      <rule implement="SHOULD"/>
-      <rule implement="MUST"/>
-      <rule implement="SHOULD"/>
+    <method name="bind" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <response name="bind-ok"/>
       <field name="ticket" domain="access ticket"/>
       <field name="queue" domain="queue name"/>
-      <field name="exchange" domain="exchange name">
-        <rule implement="MUST"/>
-      </field>
+      <field name="exchange" domain="exchange name"/>
       <field name="routing key" type="shortstr"/>
       <field name="nowait" type="bit"/>
       <field name="arguments" type="table"/>
     </method>
-    <method index="21" name="bind-ok" synchronous="1">
+    <method name="bind-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="30" name="purge" synchronous="1">
-      <rule implement="MUST"/>
-      <rule implement="MUST"/>
-      <rule implement="MAY"/>
+    <method name="purge" synchronous="1" index="30">
       <chassis name="server" implement="MUST"/>
       <response name="purge-ok"/>
-      <field name="ticket" domain="access ticket">
-        <rule implement="MUST"/>
-      </field>
+      <field name="ticket" domain="access ticket"/>
       <field name="queue" domain="queue name"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="31" name="purge-ok" synchronous="1">
+    <method name="purge-ok" synchronous="1" index="31">
       <chassis name="client" implement="MUST"/>
       <field name="message count" type="long"/>
     </method>
-    <method index="40" name="delete" synchronous="1">
-      <rule implement="SHOULD"/>
+    <method name="delete" synchronous="1" index="40">
       <chassis name="server" implement="MUST"/>
       <response name="delete-ok"/>
       <field name="ticket" domain="access ticket"/>
       <field name="queue" domain="queue name"/>
-      <field name="if unused" type="bit">
-        <rule implement="MUST"/>
-      </field>
+      <field name="if unused" type="bit"/>
       <field name="if empty" type="bit"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="41" name="delete-ok" synchronous="1">
+    <method name="delete-ok" synchronous="1" index="41">
       <chassis name="client" implement="MUST"/>
       <field name="message count" type="long"/>
     </method>
   </class>
-  <class index="60" name="basic" handler="channel">
+  <class name="basic" index="60" handler="channel">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="MAY"/>
     <field name="content type" type="shortstr"/>
@@ -474,17 +370,17 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <field name="user id" type="shortstr"/>
     <field name="app id" type="shortstr"/>
     <field name="cluster id" type="shortstr"/>
-    <method index="10" name="qos" synchronous="1">
+    <method name="qos" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="qos-ok"/>
       <field name="prefetch size" type="long"/>
       <field name="prefetch count" type="short"/>
       <field name="global" type="bit"/>
     </method>
-    <method index="11" name="qos-ok" synchronous="1">
+    <method name="qos-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="consume" synchronous="1">
+    <method name="consume" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <response name="consume-ok"/>
       <field name="ticket" domain="access ticket"/>
@@ -496,21 +392,21 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="nowait" type="bit"/>
       <field name="arguments" type="table"/>
     </method>
-    <method index="21" name="consume-ok" synchronous="1">
+    <method name="consume-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
     </method>
-    <method index="30" name="cancel" synchronous="1">
+    <method name="cancel" synchronous="1" index="30">
       <chassis name="server" implement="MUST"/>
       <response name="cancel-ok"/>
       <field name="consumer tag" domain="consumer tag"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="31" name="cancel-ok" synchronous="1">
+    <method name="cancel-ok" synchronous="1" index="31">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
     </method>
-    <method index="40" name="publish" content="1">
+    <method name="publish" index="40" content="1">
       <chassis name="server" implement="MUST"/>
       <field name="ticket" domain="access ticket"/>
       <field name="exchange" domain="exchange name"/>
@@ -518,14 +414,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="mandatory" type="bit"/>
       <field name="immediate" type="bit"/>
     </method>
-    <method index="50" name="return" content="1">
+    <method name="return" index="50" content="1">
       <chassis name="client" implement="MUST"/>
       <field name="reply code" domain="reply code"/>
       <field name="reply text" domain="reply text"/>
       <field name="exchange" domain="exchange name"/>
       <field name="routing key" type="shortstr"/>
     </method>
-    <method index="60" name="deliver" content="1">
+    <method name="deliver" index="60" content="1">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
       <field name="delivery tag" domain="delivery tag"/>
@@ -533,7 +429,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="exchange" domain="exchange name"/>
       <field name="routing key" type="shortstr"/>
     </method>
-    <method index="70" name="get" synchronous="1">
+    <method name="get" synchronous="1" index="70">
       <response name="get-ok"/>
       <response name="get-empty"/>
       <chassis name="server" implement="MUST"/>
@@ -541,7 +437,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="queue" domain="queue name"/>
       <field name="no ack" domain="no ack"/>
     </method>
-    <method index="71" name="get-ok" content="1" synchronous="1">
+    <method name="get-ok" synchronous="1" index="71" content="1">
       <chassis name="client" implement="MAY"/>
       <field name="delivery tag" domain="delivery tag"/>
       <field name="redelivered" domain="redelivered"/>
@@ -549,30 +445,30 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="routing key" type="shortstr"/>
       <field name="message count" type="long"/>
     </method>
-    <method index="72" name="get-empty" synchronous="1">
+    <method name="get-empty" synchronous="1" index="72">
       <chassis name="client" implement="MAY"/>
       <field name="cluster id" type="shortstr"/>
     </method>
-    <method index="80" name="ack">
+    <method name="ack" index="80">
       <chassis name="server" implement="MUST"/>
       <field name="delivery tag" domain="delivery tag"/>
       <field name="multiple" type="bit"/>
     </method>
-    <method index="90" name="reject">
+    <method name="reject" index="90">
       <chassis name="server" implement="MUST"/>
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
-    <method index="100" name="recover">
+    <method name="recover" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
       <response name="recover-ok"/>
     </method>
-    <method index="101" name="recover-ok" synchronous="1">
+    <method name="recover-ok" synchronous="1" index="101">
       <chassis name="client" implement="MUST"/>
     </method>
   </class>
-  <class index="70" name="file" handler="channel">
+  <class name="file" index="70" handler="channel">
     <chassis name="server" implement="MAY"/>
     <chassis name="client" implement="MAY"/>
     <field name="content type" type="shortstr"/>
@@ -584,17 +480,17 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <field name="filename" type="shortstr"/>
     <field name="timestamp" type="timestamp"/>
     <field name="cluster id" type="shortstr"/>
-    <method index="10" name="qos" synchronous="1">
+    <method name="qos" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="qos-ok"/>
       <field name="prefetch size" type="long"/>
       <field name="prefetch count" type="short"/>
       <field name="global" type="bit"/>
     </method>
-    <method index="11" name="qos-ok" synchronous="1">
+    <method name="qos-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="consume" synchronous="1">
+    <method name="consume" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <response name="consume-ok"/>
       <field name="ticket" domain="access ticket"/>
@@ -605,38 +501,38 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="exclusive" type="bit"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="21" name="consume-ok" synchronous="1">
+    <method name="consume-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
     </method>
-    <method index="30" name="cancel" synchronous="1">
+    <method name="cancel" synchronous="1" index="30">
       <chassis name="server" implement="MUST"/>
       <response name="cancel-ok"/>
       <field name="consumer tag" domain="consumer tag"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="31" name="cancel-ok" synchronous="1">
+    <method name="cancel-ok" synchronous="1" index="31">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
     </method>
-    <method index="40" name="open" synchronous="1">
+    <method name="open" synchronous="1" index="40">
       <response name="open-ok"/>
       <chassis name="server" implement="MUST"/>
       <chassis name="client" implement="MUST"/>
       <field name="identifier" type="shortstr"/>
       <field name="content size" type="longlong"/>
     </method>
-    <method index="41" name="open-ok" synchronous="1">
+    <method name="open-ok" synchronous="1" index="41">
       <response name="stage"/>
       <chassis name="server" implement="MUST"/>
       <chassis name="client" implement="MUST"/>
       <field name="staged size" type="longlong"/>
     </method>
-    <method index="50" name="stage" content="1">
+    <method name="stage" index="50" content="1">
       <chassis name="server" implement="MUST"/>
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="60" name="publish">
+    <method name="publish" index="60">
       <chassis name="server" implement="MUST"/>
       <field name="ticket" domain="access ticket"/>
       <field name="exchange" domain="exchange name"/>
@@ -645,14 +541,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="immediate" type="bit"/>
       <field name="identifier" type="shortstr"/>
     </method>
-    <method index="70" name="return" content="1">
+    <method name="return" index="70" content="1">
       <chassis name="client" implement="MUST"/>
       <field name="reply code" domain="reply code"/>
       <field name="reply text" domain="reply text"/>
       <field name="exchange" domain="exchange name"/>
       <field name="routing key" type="shortstr"/>
     </method>
-    <method index="80" name="deliver">
+    <method name="deliver" index="80">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
       <field name="delivery tag" domain="delivery tag"/>
@@ -661,18 +557,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="routing key" type="shortstr"/>
       <field name="identifier" type="shortstr"/>
     </method>
-    <method index="90" name="ack">
+    <method name="ack" index="90">
       <chassis name="server" implement="MUST"/>
       <field name="delivery tag" domain="delivery tag"/>
       <field name="multiple" type="bit"/>
     </method>
-    <method index="100" name="reject">
+    <method name="reject" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
   </class>
-  <class index="80" name="stream" handler="channel">
+  <class name="stream" index="80" handler="channel">
     <chassis name="server" implement="MAY"/>
     <chassis name="client" implement="MAY"/>
     <field name="content type" type="shortstr"/>
@@ -680,7 +576,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <field name="headers" type="table"/>
     <field name="priority" type="octet"/>
     <field name="timestamp" type="timestamp"/>
-    <method index="10" name="qos" synchronous="1">
+    <method name="qos" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="qos-ok"/>
       <field name="prefetch size" type="long"/>
@@ -688,10 +584,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="consume rate" type="long"/>
       <field name="global" type="bit"/>
     </method>
-    <method index="11" name="qos-ok" synchronous="1">
+    <method name="qos-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="consume" synchronous="1">
+    <method name="consume" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <response name="consume-ok"/>
       <field name="ticket" domain="access ticket"/>
@@ -701,21 +597,21 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="exclusive" type="bit"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="21" name="consume-ok" synchronous="1">
+    <method name="consume-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
     </method>
-    <method index="30" name="cancel" synchronous="1">
+    <method name="cancel" synchronous="1" index="30">
       <chassis name="server" implement="MUST"/>
       <response name="cancel-ok"/>
       <field name="consumer tag" domain="consumer tag"/>
       <field name="nowait" type="bit"/>
     </method>
-    <method index="31" name="cancel-ok" synchronous="1">
+    <method name="cancel-ok" synchronous="1" index="31">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
     </method>
-    <method index="40" name="publish" content="1">
+    <method name="publish" index="40" content="1">
       <chassis name="server" implement="MUST"/>
       <field name="ticket" domain="access ticket"/>
       <field name="exchange" domain="exchange name"/>
@@ -723,14 +619,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="mandatory" type="bit"/>
       <field name="immediate" type="bit"/>
     </method>
-    <method index="50" name="return" content="1">
+    <method name="return" index="50" content="1">
       <chassis name="client" implement="MUST"/>
       <field name="reply code" domain="reply code"/>
       <field name="reply text" domain="reply text"/>
       <field name="exchange" domain="exchange name"/>
       <field name="routing key" type="shortstr"/>
     </method>
-    <method index="60" name="deliver" content="1">
+    <method name="deliver" index="60" content="1">
       <chassis name="client" implement="MUST"/>
       <field name="consumer tag" domain="consumer tag"/>
       <field name="delivery tag" domain="delivery tag"/>
@@ -740,54 +636,53 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </field>
     </method>
   </class>
-  <class index="90" name="tx" handler="channel">
-    <rule implement="SHOULD"/>
+  <class name="tx" index="90" handler="channel">
     <chassis name="server" implement="SHOULD"/>
     <chassis name="client" implement="MAY"/>
-    <method index="10" name="select" synchronous="1">
+    <method name="select" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="select-ok"/>
     </method>
-    <method index="11" name="select-ok" synchronous="1">
+    <method name="select-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="commit" synchronous="1">
+    <method name="commit" synchronous="1" index="20">
       <chassis name="server" implement="MUST"/>
       <response name="commit-ok"/>
     </method>
-    <method index="21" name="commit-ok" synchronous="1">
+    <method name="commit-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="30" name="rollback" synchronous="1">
+    <method name="rollback" synchronous="1" index="30">
       <chassis name="server" implement="MUST"/>
       <response name="rollback-ok"/>
     </method>
-    <method index="31" name="rollback-ok" synchronous="1">
+    <method name="rollback-ok" synchronous="1" index="31">
       <chassis name="client" implement="MUST"/>
     </method>
   </class>
-  <class index="100" name="dtx" handler="channel">
+  <class name="dtx" index="100" handler="channel">
     <chassis name="server" implement="MAY"/>
     <chassis name="client" implement="MAY"/>
-    <method index="10" name="select" synchronous="1">
+    <method name="select" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="select-ok"/>
     </method>
-    <method index="11" name="select-ok" synchronous="1">
+    <method name="select-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
     </method>
-    <method index="20" name="start" synchronous="1">
+    <method name="start" synchronous="1" index="20">
       <chassis name="server" implement="MAY"/>
       <response name="start-ok"/>
       <field name="dtx identifier" type="shortstr">
         <assert check="notnull"/>
       </field>
     </method>
-    <method index="21" name="start-ok" synchronous="1">
+    <method name="start-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
   </class>
-  <class index="110" name="tunnel" handler="tunnel">
+  <class name="tunnel" index="110" handler="tunnel">
     <chassis name="server" implement="MAY"/>
     <chassis name="client" implement="MAY"/>
     <field name="headers" type="table"/>
@@ -795,15 +690,15 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <field name="data name" type="shortstr"/>
     <field name="durable" type="octet"/>
     <field name="broadcast" type="octet"/>
-    <method index="10" name="request" content="1">
+    <method name="request" index="10" content="1">
       <chassis name="server" implement="MUST"/>
       <field name="meta data" type="table"/>
     </method>
   </class>
-  <class index="120" name="test" handler="channel">
+  <class name="test" index="120" handler="channel">
     <chassis name="server" implement="MUST"/>
     <chassis name="client" implement="SHOULD"/>
-    <method index="10" name="integer" synchronous="1">
+    <method name="integer" synchronous="1" index="10">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <response name="integer-ok"/>
@@ -819,12 +714,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </assert>
       </field>
     </method>
-    <method index="11" name="integer-ok" synchronous="1">
+    <method name="integer-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <field name="result" type="longlong"/>
     </method>
-    <method index="20" name="string" synchronous="1">
+    <method name="string" synchronous="1" index="20">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <response name="string-ok"/>
@@ -838,12 +733,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </assert>
       </field>
     </method>
-    <method index="21" name="string-ok" synchronous="1">
+    <method name="string-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <field name="result" type="longstr"/>
     </method>
-    <method index="30" name="table" synchronous="1">
+    <method name="table" synchronous="1" index="30">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <response name="table-ok"/>
@@ -863,18 +758,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </assert>
       </field>
     </method>
-    <method index="31" name="table-ok" synchronous="1">
+    <method name="table-ok" synchronous="1" index="31">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <field name="integer result" type="longlong"/>
       <field name="string result" type="longstr"/>
     </method>
-    <method index="40" name="content" content="1" synchronous="1">
+    <method name="content" synchronous="1" index="40" content="1">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <response name="content-ok"/>
     </method>
-    <method index="41" name="content-ok" content="1" synchronous="1">
+    <method name="content-ok" synchronous="1" index="41" content="1">
       <chassis name="client" implement="MUST"/>
       <chassis name="server" implement="MUST"/>
       <field name="content checksum" type="long"/>