1.1 --- a/docs/specs/amqp0-8.stripped.xml	Wed Aug 04 13:15:52 2010 +0100
     1.2 +++ b/docs/specs/amqp0-8.stripped.xml	Wed Aug 04 16:34:27 2010 +0100
     1.3 @@ -456,10 +456,18 @@
     1.4        <field name="delivery tag" domain="delivery tag"/>
     1.5        <field name="requeue" type="bit"/>
     1.6      </method>
     1.7 -    <method name="recover" index="100">
     1.8 +    <method name="recover-async" index="100">
     1.9        <chassis name="server" implement="MUST"/>
    1.10        <field name="requeue" type="bit"/>
    1.11      </method>
    1.12 +    <method name="recover" synchronous="1" index="110">
    1.13 +      <response name="recover-ok"/>
    1.14 +      <chassis name="server" implement="MAY"/>
    1.15 +      <field name="requeue" domain="bit"/>
    1.16 +    </method>
    1.17 +    <method name="recover-ok" index="111">
    1.18 +      <chassis name="client" implement="MAY"/>
    1.19 +    </method>
    1.20    </class>
    1.21    <class name="file" handler="channel" index="70">
    1.22      <chassis name="server" implement="MAY"/>

     2.1 --- a/docs/specs/amqp0-9-1.stripped.xml	Wed Aug 04 13:15:52 2010 +0100
     2.2 +++ b/docs/specs/amqp0-9-1.stripped.xml	Wed Aug 04 16:34:27 2010 +0100
     2.3 @@ -423,7 +423,8 @@
     2.4        <chassis name="server" implement="MAY"/>
     2.5        <field name="requeue" domain="bit"/>
     2.6      </method>
     2.7 -    <method name="recover" index="110">
     2.8 +    <method name="recover" synchronous="1" index="110">
     2.9 +      <response name="recover-ok"/>
    2.10        <chassis name="server" implement="MUST"/>
    2.11        <field name="requeue" domain="bit"/>
    2.12      </method>

     3.1 --- a/docs/specs/amqp0-9.stripped.xml	Wed Aug 04 13:15:52 2010 +0100
     3.2 +++ b/docs/specs/amqp0-9.stripped.xml	Wed Aug 04 16:34:27 2010 +0100
     3.3 @@ -486,10 +486,18 @@
     3.4        <field name="delivery-tag" domain="delivery-tag"/>
     3.5        <field name="requeue" domain="bit"/>
     3.6      </method>
     3.7 -    <method name="recover" index="100">
     3.8 +    <method name="recover-async" index="100">
     3.9        <chassis name="server" implement="MUST"/>
    3.10        <field name="requeue" domain="bit"/>
    3.11      </method>
    3.12 +    <method name="recover" synchronous="1" index="110">
    3.13 +      <response name="recover-ok"/>
    3.14 +      <chassis name="server" implement="MAY"/>
    3.15 +      <field name="requeue" domain="bit"/>
    3.16 +    </method>
    3.17 +    <method name="recover-ok" index="111">
    3.18 +      <chassis name="client" implement="MAY"/>
    3.19 +    </method>
    3.20    </class>
    3.21    <class name="file" handler="channel" index="70">
    3.22      <chassis name="server" implement="MAY"/>

     4.1 --- a/docs/specs/qpid-amqp.0-8.stripped.xml	Wed Aug 04 13:15:52 2010 +0100
     4.2 +++ b/docs/specs/qpid-amqp.0-8.stripped.xml	Wed Aug 04 16:34:27 2010 +0100
     4.3 @@ -454,7 +454,7 @@
     4.4        <field name="delivery tag" domain="delivery tag"/>
     4.5        <field name="requeue" type="bit"/>
     4.6      </method>
     4.7 -    <method name="recover" index="100">
     4.8 +    <method name="recover" synchronous="1" index="100">
     4.9        <chassis name="server" implement="MUST"/>
    4.10        <field name="requeue" type="bit"/>
    4.11        <response name="recover-ok"/>

     5.1 --- a/docs/wikipages/data.ApiOverview.txt	Wed Aug 04 13:15:52 2010 +0100
     5.2 +++ b/docs/wikipages/data.ApiOverview.txt	Wed Aug 04 16:34:27 2010 +0100
     5.3 @@ -58,26 +58,28 @@
     5.4  
     5.5   - [code Protocols.DefaultProtocol]: An alias to one of the other
     5.6     protocols. At the time of writing, [b the default protocol is [code
     5.7 -   AMQP_0_8]].
     5.8 +   AMQP_0_9_1]].
     5.9  
    5.10 - - [code Protocols.AMQP_0_8]: Standard, unmodified AMQP 0-8 protocol,
    5.11 -   including [code access.request].
    5.12 + - [code Protocols.AMQP_0_8]: Standard AMQP 0-8 protocol, including
    5.13 +   [code access.request], [code basic.recover-async] and [code queue.unbind].
    5.14  
    5.15   - [code Protocols.AMQP_0_8_QPID]: AMQP 0-8 as extended by QPid's 0-8
    5.16     M1 release, without [code access.request] and with extra parameters
    5.17     available on certain methods.
    5.18  
    5.19 - - [code Protocols.AMQP_0_9]: Standard, unmodified AMQP 0-9 protocol,
    5.20 -   including [code access.request], but excluding the [code Message]
    5.21 -   content-class and other areas of the specification marked "work in
    5.22 -   progress".
    5.23 + - [code Protocols.AMQP_0_9]: Standard AMQP 0-9 protocol, including
    5.24 +   [code access.request] and [code basic.recover-async], but excluding
    5.25 +   the [code Message] content-class and other areas of the specification
    5.26 +   marked "work in progress".
    5.27 +
    5.28 + - [code Protocols.AMQP_0_9_1]: Standard AMQP 0-9-1 protocol.
    5.29  
    5.30  The [code Protocols] class also contains some convenience functions
    5.31  for retrieving an IProtocol from a string, from the environment or
    5.32  from a .NET XML configuration file. The protocol names permitted are
    5.33  the same as the static instance variables on class [code Protocols],
    5.34 -that is, [code AMQP_0_8], [code AMQP_0_8_QPID], [code AMQP_0_9], and
    5.35 -[code DefaultProtocol].
    5.36 +that is, [code AMQP_0_8], [code AMQP_0_8_QPID], [code AMQP_0_9],
    5.37 +[code AMQP_0_9_1] and [code DefaultProtocol].
    5.38  
    5.39  The following code binds [code p] to the [code Protocols.AMQP_0_9]
    5.40  instance by looking it up dynamically:
    5.41 @@ -131,7 +133,7 @@
    5.42   - username: [code "guest"]
    5.43   - password: [code "guest"]
    5.44   - virtual-host: [code "/"]
    5.45 - - protocol: [code AMQP 0.8]
    5.46 + - protocol: [code AMQP 0-9-1]
    5.47   - hostname: [code localhost]
    5.48   - port: [code 5672]
    5.49  

     6.1 --- a/docs/wikipages/meta.ApiOverview.txt	Wed Aug 04 13:15:52 2010 +0100
     6.2 +++ b/docs/wikipages/meta.ApiOverview.txt	Wed Aug 04 16:34:27 2010 +0100
     6.3 @@ -1,5 +1,5 @@
     6.4  owner: 
     6.5 -timestamp: Mon, 05 Jul 2010 13:15:32 GMT
     6.6 +timestamp: Wed, 04 Aug 2010 14:28:29 GMT
     6.7  author: 
     6.8  editgroup: 
     6.9  viewgroup: 

     7.1 --- a/projects/client/RabbitMQ.Client/src/client/api/IModel.cs	Wed Aug 04 13:15:52 2010 +0100
     7.2 +++ b/projects/client/RabbitMQ.Client/src/client/api/IModel.cs	Wed Aug 04 16:34:27 2010 +0100
     7.3 @@ -366,6 +366,10 @@
     7.4          ///<summary>(Spec method)</summary>
     7.5          void BasicRecover(bool requeue);
     7.6  
     7.7 +        ///<summary>(Spec method)</summary>
     7.8 +        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
     7.9 +        void BasicRecoverAsync(bool requeue);
    7.10 +
    7.11          ///<summary>(Spec method) Retrieve an individual message, if
    7.12          ///one is available; returns null if the server answers that
    7.13          ///no messages are currently available. See also

     8.1 --- a/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs	Wed Aug 04 13:15:52 2010 +0100
     8.2 +++ b/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs	Wed Aug 04 16:34:27 2010 +0100
     8.3 @@ -805,6 +805,7 @@
     8.4                                           bool requeue);
     8.5  
     8.6          public abstract void BasicRecover(bool requeue);
     8.7 +        public abstract void BasicRecoverAsync(bool requeue);
     8.8  
     8.9          public abstract void TxSelect();
    8.10          public abstract void TxCommit();