QPID-4798 : add comments denoting where our xml extends the standard amqp xml

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

2 files changed, 14 insertions, 1 deletions

diff --git a/specs/amqp0-8-qpid.stripped.xml b/specs/amqp0-8-qpid.stripped.xml
index d1b44c2d92..6975e17aa6 100644
--- a/specs/amqp0-8-qpid.stripped.xml
+++ b/specs/amqp0-8-qpid.stripped.xml
@@ -173,6 +173,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="reply code" domain="reply code"/>
       <field name="reply text" domain="reply text"/>
       <field name="class id" domain="class id"/>
+      <!-- Qpid difference : correct the domain -->
       <field name="method id" domain="method id"/>
     </method>
     <method name="close-ok" synchronous="1" index="61">
@@ -278,6 +279,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <method name="delete-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
+    <!-- Qpid specific addition -->
     <method name="bound" synchronous="1" index="22">
       <chassis name="server" implement="SHOULD"/>
       <field name="exchange" domain="exchange name"/>
@@ -289,6 +291,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="reply text" domain="reply text"/>
       <chassis name="client" implement="SHOULD"/>
     </method>
+    <!-- End Qpid specific addition -->
   </class>
   <class name="queue" handler="channel" index="50">
     <chassis name="server" implement="MUST"/>
@@ -390,6 +393,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="no ack" domain="no ack"/>
       <field name="exclusive" type="bit"/>
       <field name="nowait" type="bit"/>
+      <!-- Qpid specific addition : interop issue extra field -->
       <field name="arguments" type="table"/>
     </method>
     <method name="consume-ok" synchronous="1" index="21">
@@ -459,6 +463,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
+    <!-- Qpid specific modification : interop issue, added synchronous reply -->
     <method name="recover" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
@@ -467,6 +472,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <method name="recover-ok" synchronous="1" index="101">
       <chassis name="client" implement="MUST"/>
     </method>
+    <!-- End Qpid specific modification --> 
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>
diff --git a/specs/amqp0-9-qpid.stripped.xml b/specs/amqp0-9-qpid.stripped.xml
index b7fbd100d2..e0075870de 100644
--- a/specs/amqp0-9-qpid.stripped.xml
+++ b/specs/amqp0-9-qpid.stripped.xml
@@ -309,6 +309,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <method name="delete-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
+    <!-- Qpid specific addition -->
     <method name="bound" synchronous="1" index="22">
       <chassis name="server" implement="SHOULD"/>
       <response name="bound-ok"/>
@@ -321,6 +322,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="reply-text" domain="reply-text"/>
       <chassis name="client" implement="SHOULD"/>
     </method>
+    <!-- End Qpid specific addition -->
   </class>
   <class name="queue" handler="channel" index="50">
     <chassis name="server" implement="MUST"/>
@@ -337,7 +339,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="exclusive" domain="bit"/>
       <field name="auto-delete" domain="bit"/>
       <field name="nowait" domain="bit"/>
-      <field name="arguments" domain="table"/>
+      <!-- Qpid diff - this field is known as filter in the original 0-9, 
+           however since the name does not go on the wire, there is no
+           interop implication  -->
+      <field name="arguments" domain="table"/> 
     </method>
     <method name="declare-ok" synchronous="1" index="11">
       <chassis name="client" implement="MUST"/>
@@ -507,6 +512,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <chassis name="server" implement="MUST"/>
       <field name="requeue" domain="bit"/>
     </method>
+    <!-- Qpid specific addition -->
     <method name="recover-sync" index="102">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
@@ -515,6 +521,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <method name="recover-sync-ok" synchronous="1" index="101">
       <chassis name="client" implement="MUST"/>
     </method>
+    <!-- End Qpid specific addition -->
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>