Merge bug22986 into amqp_0_9_1

Author: Simon MacMullen

docs/specs/amqp0-8.stripped.xml

@@ -456,10 +456,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
     </method>
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
+      <chassis name="server" implement="MAY"/>
+      <field name="requeue" domain="bit"/>
+    </method>
+    <method name="recover-ok" index="111">
+      <chassis name="client" implement="MAY"/>
+    </method>
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>

docs/specs/amqp0-9-1.stripped.xml

@@ -423,7 +423,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <chassis name="server" implement="MAY"/>
       <field name="requeue" domain="bit"/>
     </method>
-    <method name="recover" index="110">
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
       <chassis name="server" implement="MUST"/>
       <field name="requeue" domain="bit"/>
     </method>

docs/specs/amqp0-9.stripped.xml

@@ -486,10 +486,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery-tag" domain="delivery-tag"/>
       <field name="requeue" domain="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" domain="bit"/>
     </method>
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
+      <chassis name="server" implement="MAY"/>
+      <field name="requeue" domain="bit"/>
+    </method>
+    <method name="recover-ok" index="111">
+      <chassis name="client" implement="MAY"/>
+    </method>
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>

docs/specs/qpid-amqp.0-8.stripped.xml

@@ -454,7 +454,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>
-    <method name="recover" index="100">
+    <method name="recover" synchronous="1" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
       <response name="recover-ok"/>

docs/wikipages/data.ApiOverview.txt

@@ -58,26 +58,28 @@ protocol variant. At the time of writing, the library supports:
 
  - [code Protocols.DefaultProtocol]: An alias to one of the other
    protocols. At the time of writing, [b the default protocol is [code
-   AMQP_0_8]].
+   AMQP_0_9_1]].
 
- - [code Protocols.AMQP_0_8]: Standard, unmodified AMQP 0-8 protocol,
-   including [code access.request].
+ - [code Protocols.AMQP_0_8]: Standard AMQP 0-8 protocol, including
+   [code access.request], [code basic.recover-async] and [code queue.unbind].
 
  - [code Protocols.AMQP_0_8_QPID]: AMQP 0-8 as extended by QPid's 0-8
    M1 release, without [code access.request] and with extra parameters
    available on certain methods.
 
- - [code Protocols.AMQP_0_9]: Standard, unmodified AMQP 0-9 protocol,
-   including [code access.request], but excluding the [code Message]
-   content-class and other areas of the specification marked "work in
-   progress".
+ - [code Protocols.AMQP_0_9]: Standard AMQP 0-9 protocol, including
+   [code access.request] and [code basic.recover-async], but excluding
+   the [code Message] content-class and other areas of the specification
+   marked "work in progress".
+
+ - [code Protocols.AMQP_0_9_1]: Standard AMQP 0-9-1 protocol.
 
 The [code Protocols] class also contains some convenience functions
 for retrieving an IProtocol from a string, from the environment or
 from a .NET XML configuration file. The protocol names permitted are
 the same as the static instance variables on class [code Protocols],
-that is, [code AMQP_0_8], [code AMQP_0_8_QPID], [code AMQP_0_9], and
-[code DefaultProtocol].
+that is, [code AMQP_0_8], [code AMQP_0_8_QPID], [code AMQP_0_9],
+[code AMQP_0_9_1] and [code DefaultProtocol].
 
 The following code binds [code p] to the [code Protocols.AMQP_0_9]
 instance by looking it up dynamically:
@@ -131,7 +133,7 @@ All factory properties have default values. The default value for a property wil
  - username: [code "guest"]
  - password: [code "guest"]
  - virtual-host: [code "/"]
- - protocol: [code AMQP 0.8]
+ - protocol: [code AMQP 0-9-1]
  - hostname: [code localhost]
  - port: [code 5672]
 

docs/wikipages/meta.ApiOverview.txt

@@ -1,5 +1,5 @@
 owner: 
-timestamp: Mon, 05 Jul 2010 13:15:32 GMT
+timestamp: Wed, 04 Aug 2010 14:28:29 GMT
 author: 
 editgroup: 
 viewgroup: 

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -366,6 +366,10 @@ void BasicReject(ulong deliveryTag,
         ///<summary>(Spec method)</summary>
         void BasicRecover(bool requeue);
 
+        ///<summary>(Spec method)</summary>
+        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
+        void BasicRecoverAsync(bool requeue);
+
         ///<summary>(Spec method) Retrieve an individual message, if
         ///one is available; returns null if the server answers that
         ///no messages are currently available. See also

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -805,6 +805,7 @@ public abstract void BasicReject(ulong deliveryTag,
                                          bool requeue);
 
         public abstract void BasicRecover(bool requeue);
+        public abstract void BasicRecoverAsync(bool requeue);
 
         public abstract void TxSelect();
         public abstract void TxCommit();