Merge bug22772 into amqp_0_9_1.

Author: Simon MacMullen

RabbitMQDotNetClient.sln

@@ -60,6 +60,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Sh
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.PerfTest", "projects\examples\client\PerfTest\RabbitMQ.Client.Examples.PerfTest.csproj", "{6ED176D6-B789-4673-8300-CB671962FE00}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Subscriber", "projects\examples\client\Subscriber\RabbitMQ.Client.Examples.Subscriber.csproj", "{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -192,6 +194,12 @@ Global
 		{6ED176D6-B789-4673-8300-CB671962FE00}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
 		{6ED176D6-B789-4673-8300-CB671962FE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED176D6-B789-4673-8300-CB671962FE00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -219,6 +227,7 @@ Global
 		{44D14FF0-1015-4AAA-ABCA-BF611879816C} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{6ED176D6-B789-4673-8300-CB671962FE00} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
 		{39CA1299-1F9E-452E-AA00-4BF874944B1E} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
 		{201B37E1-9BFC-4A01-9760-30C5BB19CFE3} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}

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

@@ -329,7 +329,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <field name="type" domain="shortstr"/>
     <field name="user-id" domain="shortstr"/>
     <field name="app-id" domain="shortstr"/>
-    <field name="reserved" domain="shortstr"/>
+    <field name="cluster-id" domain="shortstr"/>
     <method name="qos" synchronous="1" index="10">
       <chassis name="server" implement="MUST"/>
       <response name="qos-ok"/>

docs/wikipages/data.ApiOverview.txt

@@ -119,24 +119,21 @@ The following code connects to an AMQP broker:
 
 @code java
  ConnectionFactory factory = new ConnectionFactory();
- IProtocol protocol = Protocols.FromEnvironment();
- IConnection conn = factory.CreateConnection(protocol, hostName, portNumber);
-
-The default parameters are:
+ factory.UserName = user;
+ factory.Password = pass;
+ factory.VirtualHost = vhost;
+ factory.Protocol = Protocols.FromEnvironment();
+ factory.HostName = hostName;
+ factory.Port = AmqpTcpEndpoint.UseDefaultPort;
+ IConnection conn = factory.CreateConnection();
+
+All factory properties have default values. The default value for a property will be used if the property remains unassigned prior to creating a connection:
  - username: [code "guest"]
  - password: [code "guest"]
  - virtual-host: [code "/"]
-
-For control over the username, password and virtual-host supplied to
-the broker, modify the [code ConnectionFactory]'s [code
-ConnectionParameters] object before calling [code CreateConnection]:
-
-@code java
- ConnectionParameters params = factory.Parameters;
- params.UserName = userName;
- params.Password = password;
- params.VirtualHost = virtualHost;
- IConnection conn = factory.CreateConnection(protocol, hostName, portNumber);
+ - protocol: [code AMQP 0.8]
+ - hostname: [code localhost]
+ - port: [code 5672]
 
 The IConnection interface can then be used to open a channel:
 

docs/wikipages/data.MessagingPatterns.txt

@@ -382,22 +382,22 @@ on class [code RabbitMQ.Client.IModel].
 
 The class [code RabbitMQ.Client.MessagePatterns.Subscription]
 implements most of the boilerplate of receiving messages (including,
-in particular, broadcast events) for you, including queue and exchange
-declaration and queue binding, as well as consumer declaration and
-management. For example,
+in particular, broadcast events) for you, including consumer
+declaration and management, but excluding queue and exchange
+declaration and queue binding. For example,
 
 @code java
   // "IModel ch" in scope.
-  Subscription sub = new Subscription(ch, "price", "topic", "STOCK.IBM.#");
+  Subscription sub = new Subscription(ch, "STOCK.IBM.#");
   foreach (BasicDeliverEventArgs e in sub) {
     // handle the message contained in e ...
     // ... and finally acknowledge it
     sub.Ack(e);
   }
 
-will declare the relevant exchange, declare a temporary queue, bind
-the two together, and start a consumer on the queue using [code
-IModel.BasicConsume].
+will start a consumer on the queue using [code IModel.BasicConsume].
+It is assumed that the queue and any bindings have been previously
+declared.
 
 [code Subscription.Ack()] should be called for each received event,
 whether or not auto-acknowledgement mode is used, because [code

docs/wikipages/data.UserGuide.txt

@@ -13,9 +13,9 @@ NDocProc-generated javadoc-like HTML documentation.
 ** AMQP dialects implemented
 
 The client library implements AMQP specifications version 0-8, 0-8bis
-(0-8 as modified by QPid for their M2 release) and 0-9 (omitting
+(0-8 as modified by QPid for their M2 release), 0-9 (omitting
 sections of the specification marked "work in progress", i.e. the
-[code Message] content-class). The ApiGen tool processes the
+[code Message] content-class) and 0-9-1. The ApiGen tool processes the
 specification XML files in conjunction with certain C# interfaces,
 generating C# code directly, which is compiled into the final
 assembly.

docs/wikipages/meta.ApiOverview.txt

@@ -1,5 +1,5 @@
 owner: 
-timestamp: Thu, 24 Jan 2008 17:47:23 GMT
+timestamp: Mon, 05 Jul 2010 13:15:32 GMT
 author: 
 editgroup: 
 viewgroup: 

projects/client/Apigen/src/apigen/AmqpField.cs

@@ -70,13 +70,5 @@ public string Domain {
                 return result;
             }
         }
-
-        public bool Reserved
-        {
-            get
-            {
-                return GetString("@reserved", "") == "1";
-            }
-        }
     }
 }