merge bug19130 into default

Author: tonyg

docs/RabbitMQ Service Model.doc

@@ -295,7 +295,7 @@ method to cause code-generation to skip that method.
 
 @code java
     [AmqpMethodDoNotImplement(null)]
-    void ExchangeDeclare(ushort ticket, string exchange, string type);
+    void ExchangeDeclare(string exchange, string type);
 
 It should be used to mark interface methods that are backed by
 hand-written code: for example, the [code ExchangeDeclare] overload
@@ -360,8 +360,7 @@ of the interaction style of the command. The [code AmqpNowaitArgument]
 attribute should be used for this purpose:
 
 @code java
-    void ExchangeDelete(ushort ticket,
-                        string exchange,
+    void ExchangeDelete(string exchange,
                         bool ifUnused,
                           [AmqpNowaitArgument(null)]
                         bool nowait);
@@ -449,7 +448,7 @@ of the returned struct.
 
 @code java
     [return: AmqpFieldMapping(null, "messageCount")]
-    uint QueuePurge(ushort ticket, ...);
+    uint QueuePurge(...);
 
 The above example extracts and returns just the "message-count" field
 of the [code queue.purge-ok] reply.
@@ -542,8 +541,7 @@ applications:
 @code java
     [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
     [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
-    void QueueUnbind(ushort ticket,
-                     string queue,
+    void QueueUnbind(string queue,
                      string exchange,
                      string routingKey,
                      IDictionary arguments);

docs/RabbitMQ Service Model.docx

@@ -138,22 +138,13 @@ ConnectionParameters] object before calling [code CreateConnection]:
  params.VirtualHost = virtualHost;
  IConnection conn = factory.CreateConnection(protocol, hostName, portNumber);
 
-The IConnection interface can then be used to open a channel and
-request an access ticket to a realm:
+The IConnection interface can then be used to open a channel:
 
 @code java
  IModel channel = conn.CreateModel();
- string realm = "/data";
- ushort ticket = channel.AccessRequest(realm);
 
-The channel and access ticket can now be used to send and receive
-messages, as described in subsequent sections.
-
-Some AMQP brokers do not understand the [code access.request] method.
-The environment variable [code AMQP_ACCESS_REQUEST] specifies behaviour
-of the client when communicating with such broker. The valid values 
-ENABLE, SUPPRESS and USE_DEFAULT are explained in api-guide in
-the [code AccessRequestConfig].
+The channel can now be used to send and receive messages,
+as described in subsequent sections.
 
 ** Disconnecting from a broker
 
@@ -194,9 +185,9 @@ Continuing the previous example, the following code declares an
 exchange and a queue, then binds them together.
 
 @code java
- channel.ExchangeDeclare(ticket, exchangeName, ExchangeType.Direct);
- channel.QueueDeclare(ticket, queueName);
- channel.QueueBind(ticket, queueName, exchangeName, routingKey, false, null);
+ channel.ExchangeDeclare(exchangeName, ExchangeType.Direct);
+ channel.QueueDeclare(queueName);
+ channel.QueueBind(queueName, exchangeName, routingKey, false, null);
 
 This will actively declare the following objects:
 
@@ -224,7 +215,7 @@ follows:
 
 @code java
  byte[] messageBodyBytes = System.Text.Encoding.UTF8.GetBytes("Hello, world!");
- channel.BasicPublish(ticket, exchangeName, routingKey, null, messageBodyBytes);
+ channel.BasicPublish(exchangeName, routingKey, null, messageBodyBytes);
 
 For fine control, you can use overloaded variants to specify the
 mandatory and immediate flags, or send messages with basic-class
@@ -235,7 +226,7 @@ header properties:
  IBasicProperties props = channel.CreateBasicProperties();
  props.ContentType = "text/plain";
  props.DeliveryMode = 2;
- channel.BasicPublish(ticket, exchangeName,
+ channel.BasicPublish(exchangeName,
                       routingKey, props,
                       messageBodyBytes);
 
@@ -252,7 +243,7 @@ information (properties) and message body can be extracted:
 
 @code java
  bool noAck = false;
- BasicGetResult result = channel.BasicGet(ticket, queueName, noAck);
+ BasicGetResult result = channel.BasicGet(queueName, noAck);
  if (result == null) {
      // No message available at this time.
  } else {
@@ -283,7 +274,7 @@ deliveries from the [code SharedQueue] instance contained therein:
 
 @code java
  QueueingBasicConsumer consumer = new QueueingBasicConsumer(channel);
- channel.BasicConsume(ticket, queueName, null, consumer);
+ channel.BasicConsume(queueName, null, consumer);
  while (true) {
      try {
          RabbitMQ.Client.Events.BasicDeliverEventArgs e =
@@ -441,7 +432,7 @@ For example, to construct (and send) a MapMessage:
   b.Body["field1"] = 123.45;
   b.Body["field2"] = new byte[] { 1, 2, 3 };
 
-  channel.BasicPublish(ticket, exchange, routingKey,
+  channel.BasicPublish(exchange, routingKey,
                        (IBasicProperties)  b.GetContentHeader(),
                        b.GetContentBody());
 

docs/RabbitMQ Service Model.pdf

@@ -115,7 +115,7 @@ waiting [code IRpcContinuation], about which more below.
 There are two styles of interaction available to [code ModelBase]:
 
  - synchronous, RPC-style interaction, e.g. [code ExchangeDeclare],
-   [code BasicGet], [code BasicConsume] and [code AccessRequest].
+   [code BasicGet] and [code BasicConsume].
 
  - asynchronous, event-style interaction, e.g. [code BasicAck], [code
    BasicPublish].

docs/RabbitMQ Service Model.xps

@@ -254,10 +254,9 @@ MySimpleRpcServerSubclass] extending [code SimpleRpcServer]):
   using (IConnection conn = new ConnectionFactory()
                                   .CreateConnection(serverAddress)) {
       using (IModel ch = conn.CreateModel()) {
-          ushort ticket = ch.AccessRequest("/data");
 
           Subscription subscription =
-              new Subscription(ch, ticket, /* ... */);
+              new Subscription(ch, /* ... */);
           // in the line above, the "..." indicates the parameters
           // used to specify the address to use to route messages
           // to the subscription. This subscription will be used
@@ -306,9 +305,8 @@ The basic pattern for using [code SimpleRpcClient] is as follows:
   using (IConnection conn = new ConnectionFactory()
                                   .CreateConnection(args[0])) {
       using (IModel ch = conn.CreateModel()) {
-          ushort ticket = ch.AccessRequest("/data");
 
-          SimpleRpcClient client = new SimpleRpcClient(ch, ticket, /* ... */);
+          SimpleRpcClient client = new SimpleRpcClient(ch, /* ... */);
           // in the line above, the "..." indicates the parameters
           // used to specify the address to use to route messages
           // to the service.
@@ -365,14 +363,12 @@ For example:
   using (IConnection conn = new ConnectionFactory()
                                   .CreateConnection(args[0])) {
       using (IModel ch = conn.CreateModel()) {
-          ushort ticket = ch.AccessRequest("/data");
 
 	  IBasicProperties props = ch.CreateBasicProperties();
           FillInHeaders(props); // or similar
           byte[] body = ComputeBody(props); // or similar
 
-          ch.BasicPublish(ticket,
-                          "exchangeName",
+          ch.BasicPublish("exchangeName",
                           "chosen.routing.key",
                           props,
                           body);
@@ -391,8 +387,8 @@ declaration and queue binding, as well as consumer declaration and
 management. For example,
 
 @code java
-  // "IModel ch" and "ushort ticket" in scope.
-  Subscription sub = new Subscription(ch, ticket, "price", "topic", "STOCK.IBM.#");
+  // "IModel ch" in scope.
+  Subscription sub = new Subscription(ch, "price", "topic", "STOCK.IBM.#");
   foreach (BasicDeliverEventArgs e in sub) {
     // handle the message contained in e ...
     // ... and finally acknowledge it
@@ -423,10 +419,10 @@ application wanted to retrieve all prices regarding IBM on queue
 "MyApplicationQueue":
 
 @code java
-  // "IModel ch" and "ushort ticket" in scope.
-  ch.ExchangeDeclare(ticket, "prices", "topic");
-  ch.QueueDeclare(ticket, "MyApplicationQueue");
-  ch.QueueBind(ticket, "MyApplicationQueue", "prices",
+  // "IModel ch" in scope.
+  ch.ExchangeDeclare("prices", "topic");
+  ch.QueueDeclare("MyApplicationQueue");
+  ch.QueueBind("MyApplicationQueue", "prices",
                "STOCK.IBM.#", false, null);
 
 ... followed by consumption of messages from "MyApplicationQueue"

docs/wikipages/data.ApiGen.txt

@@ -12,7 +12,6 @@ In our current (0-8) Java client, our ConnectionParameters/ConnectionFactory obj
  - Channel Max
  - Frame Max
  - Heartbeat interval
- - AccessRequest suppression
  - a list of Addresses (Hostname/Portnumber pairs) where the broker is reachable
 
 These need splitting up.
@@ -27,7 +26,6 @@ These need splitting up.
   || - Username
   || - Password
   || - Virtual Host
-  || - AccessRequest suppression
 
 So, let's define a bunch of entities.