Update to dtx inline with latest spec:

* Updated dtx handling in c++ broker to take account of separation of completion and acceptance.
* Added final dtx method defs to extra xml fragment and implemented appropriate handlers in c++ broker.
* Converted dtx python tests (recover test still requires some work on decoding arrays).
* Allow creation of structs without type codes through a python session method.
* Fixed exception handling in python client for commands with results.



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

1 files changed, 101 insertions, 0 deletions

diff --git a/cpp/xml/extra.xml b/cpp/xml/extra.xml
index 0acc2260ad..6080800f60 100644
--- a/cpp/xml/extra.xml
+++ b/cpp/xml/extra.xml
@@ -33,6 +33,14 @@
     </doc>
   </domain>
 
+  <domain name="xid010">
+    <struct size="short" pack="short">
+      <field name="format" domain="long" />
+      <field name="global-id" domain="shortstr" />
+      <field name="branch-id" domain="shortstr" />
+    </struct>
+  </domain>
+
   <domain name="delivery-properties-010">
     <struct size="long" pack="short" type="1025">
       <field name="discard-unroutable" domain="bit" label="controls discard of unroutable messages"/>
@@ -739,6 +747,99 @@
     </method>
 </class>
 
+<class name="dtx010" index="6">
+    <doc>blah, blah</doc>
+    <method name = "select" index="1">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+    </method>
+    <method name = "start" index="2">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <field name="join" domain="bit"/>
+        <field name="resume" domain="bit"/>
+        <result>
+            <struct size="long" pack="short" type="1">
+                <field name="status" domain="short" />
+            </struct>
+        </result>
+    </method>
+    <method name = "end" index="3">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <field name="fail" domain="bit"/>
+        <field name="suspend" domain="bit"/>
+        <result>
+            <struct size="long" pack="short" type="1">
+                <field name="status" domain="short" />
+            </struct>
+        </result>
+    </method>
+    <method name = "commit" index="4">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <field name="one-phase" domain="bit"/>
+        <result>
+            <struct size="long" pack="short" type="1">
+                <field name="status" domain="short" />
+            </struct>
+        </result>
+    </method>
+    <method name = "forget" index="5">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+    </method>
+    <method name = "get-timeout" index="6">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <result>
+            <struct size="long" pack="short" type="2">
+                <field name="timeout" domain="long" />
+            </struct>
+        </result>
+    </method>
+    <method name = "prepare" index="7">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <result>
+            <struct size="long" pack="short" type="1">
+                <field name="status" domain="short" />
+            </struct>
+        </result>
+    </method>
+    <method name = "recover" index="8">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <result>
+            <struct size="long" pack="short" type="3">
+                <field name="in-doubt" domain="array" />
+            </struct>
+        </result>
+    </method>
+    <method name = "rollback" index="9">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <result>
+            <struct size="long" pack="short" type="1">
+                <field name="status" domain="short" />
+            </struct>
+        </result>
+    </method>
+    <method name = "set-timeout" index="10">
+        <doc>blah, blah</doc>
+        <chassis name="server" implement="MUST" />
+        <field name="xid" domain="xid010"/>
+        <field name="timeout" domain="long"/>
+    </method>
+</class>
+
 <class name="exchange010" index="7">
     <doc>blah, blah</doc>
     <method name = "declare" index="1">