QPID-920: converted c++ client to use final 0-10 protocol

* connection handler converted to using invoker & proxy and updated to final method defs
* SessionCore & ExecutionHandler replace by SessionImpl
* simplified handling of completion & results, removed handling of responses



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

5 files changed, 13 insertions, 11 deletions

diff --git a/cpp/examples/examples/direct/declare_queues.cpp b/cpp/examples/examples/direct/declare_queues.cpp
index de7eff0490..71ed28dac4 100644
--- a/cpp/examples/examples/direct/declare_queues.cpp
+++ b/cpp/examples/examples/direct/declare_queues.cpp
@@ -66,10 +66,10 @@ int main(int argc, char** argv) {
   //--------- Main body of program --------------------------------------------
 
       // Create a queue named "message_queue", and route all messages whose
-      // routing key is "routing_key to this newly created queue.
+      // routing key is "routing_key" to this newly created queue.
 
       session.queueDeclare(arg::queue="message_queue");
-      session.queueBind(arg::exchange="amq.direct", arg::queue="message_queue", arg::routingKey="routing_key");
+      session.exchangeBind(arg::exchange="amq.direct", arg::queue="message_queue", arg::bindingKey="routing_key");
 
   //-----------------------------------------------------------------------------
 
diff --git a/cpp/examples/examples/fanout/listener.cpp b/cpp/examples/examples/fanout/listener.cpp
index 2860528b1f..79809d679e 100644
--- a/cpp/examples/examples/fanout/listener.cpp
+++ b/cpp/examples/examples/fanout/listener.cpp
@@ -71,13 +71,15 @@ int main(int argc, char** argv) {
 
         // Unique name for private queue:
         std::string myQueue=session.getId().str();
-        // Declear my queue. 
+        // Declare my queue. 
         session.queueDeclare(arg::queue=myQueue, arg::exclusive=true,
                              arg::autoDelete=true);
-        // Bind my queue to the fanout exchange.
-        // Note no routingKey required, the fanout exchange delivers
-        // all messages to all bound queues unconditionally.
-        session.queueBind(arg::exchange="amq.fanout", arg::queue=myQueue);
+        // Bind my queue to the fanout exchange.  
+        //Note no the binding key will not affect routing (its just
+        //used to identify the binding e.g. when unbinding), the
+        //fanout exchange delivers all messages to all bound queues
+        //unconditionally.
+        session.exchangeBind(arg::exchange="amq.fanout", arg::queue=myQueue, arg::bindingKey="my-key");
 
         // Create a listener and subscribe it to my queue.
         SubscriptionManager subscriptions(session);
diff --git a/cpp/examples/examples/pub-sub/topic_listener.cpp b/cpp/examples/examples/pub-sub/topic_listener.cpp
index e5292db703..c7e9d3877d 100644
--- a/cpp/examples/examples/pub-sub/topic_listener.cpp
+++ b/cpp/examples/examples/pub-sub/topic_listener.cpp
@@ -107,8 +107,8 @@ void Listener::prepareQueue(std::string queue, std::string routing_key) {
      * "control" routing key, when it is finished.
      */
 
-    session.queueBind(arg::exchange="amq.topic", arg::queue=queue, arg::routingKey=routing_key);
-    session.queueBind(arg::exchange="amq.topic", arg::queue=queue, arg::routingKey="control");
+    session.exchangeBind(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey=routing_key);
+    session.exchangeBind(arg::exchange="amq.topic", arg::queue=queue, arg::bindingKey="control");
 
     /*
      * subscribe to the queue using the subscription manager.
diff --git a/cpp/examples/examples/request-response/client.cpp b/cpp/examples/examples/request-response/client.cpp
index 9f82bd9d9e..8cec16a461 100644
--- a/cpp/examples/examples/request-response/client.cpp
+++ b/cpp/examples/examples/request-response/client.cpp
@@ -128,7 +128,7 @@ int main(int argc, char** argv) {
         // Use the name of the response queue as the routing key
 
 	session.queueDeclare(arg::queue=response_queue.str());
-        session.queueBind(arg::exchange="amq.direct", arg::queue=response_queue.str(), arg::routingKey=response_queue.str());
+        session.exchangeBind(arg::exchange="amq.direct", arg::queue=response_queue.str(), arg::bindingKey=response_queue.str());
 
 	// Create a listener for the response queue and start listening.
 
diff --git a/cpp/examples/examples/request-response/server.cpp b/cpp/examples/examples/request-response/server.cpp
index 0de2ce5234..6c9bc7ffa6 100644
--- a/cpp/examples/examples/request-response/server.cpp
+++ b/cpp/examples/examples/request-response/server.cpp
@@ -143,7 +143,7 @@ int main(int argc, char** argv) {
         // Use the name of the request queue as the routing key
 
 	session.queueDeclare(arg::queue=request_queue);
-        session.queueBind(arg::exchange="amq.direct", arg::queue=request_queue, arg::routingKey=request_queue);
+        session.exchangeBind(arg::exchange="amq.direct", arg::queue=request_queue, arg::bindingKey=request_queue);
 
 	// Create a listener for the request queue and start listening.