9 files changed, 90 insertions, 86 deletions
diff --git a/cpp/examples/examples/Makefile b/cpp/examples/examples/Makefile
index 8591bd3361..738675c58f 100644
--- a/cpp/examples/examples/Makefile
+++ b/cpp/examples/examples/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=direct fanout pub-sub request-response
+SUBDIRS=direct fanout pub-sub request-response xml-exchange
 all:
 	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) $@; ) ; done
 clean:
diff --git a/cpp/examples/examples/direct/listener.cpp b/cpp/examples/examples/direct/listener.cpp
index ae6a7699f1..7ee68ebf35 100644
--- a/cpp/examples/examples/direct/listener.cpp
+++ b/cpp/examples/examples/direct/listener.cpp
@@ -20,7 +20,7 @@
  */
 
 /**
- *  listener.cpp: This program reads messages fro a queue on
+ *  listener.cpp: This program reads messages from a queue on
  *  the broker using a message listener.
  */
 
diff --git a/cpp/examples/examples/fanout/listener.cpp b/cpp/examples/examples/fanout/listener.cpp
index 79809d679e..c3123bb944 100644
--- a/cpp/examples/examples/fanout/listener.cpp
+++ b/cpp/examples/examples/fanout/listener.cpp
@@ -69,16 +69,20 @@ int main(int argc, char** argv) {
 
         //--------- Main body of program --------------------------------------------
 
-        // Unique name for private queue:
+        // Each client creates its own private queue, using the 
+        // session id to guarantee a unique name. It then routes
+        // all messages from the fanout exchange to its own queue
+        // by binding to the queue.
+        //
+        // The binding specifies a binding key, but for a fanout
+        // exchange, the binding key is optional and is not used
+        // for routing decisions. It can be useful for tracking
+        // messages and routing in logs.
+
         std::string myQueue=session.getId().str();
-        // Declare my queue. 
         session.queueDeclare(arg::queue=myQueue, arg::exclusive=true,
                              arg::autoDelete=true);
-        // 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.
diff --git a/cpp/examples/examples/fanout/verify_cpp_python.in b/cpp/examples/examples/fanout/verify_cpp_python.in
index 6a4c2616d8..21bafe06de 100644
--- a/cpp/examples/examples/fanout/verify_cpp_python.in
+++ b/cpp/examples/examples/fanout/verify_cpp_python.in
@@ -1,31 +1,27 @@
 ==== fanout_producer.out
 ==== fanout_consumer.py.out | remove_uuid
-Messages queue: 
 Subscribed to queue 
-Response: Message 0
-Response: Message 1
-Response: Message 2
-Response: Message 3
-Response: Message 4
-Response: Message 5
-Response: Message 6
-Response: Message 7
-Response: Message 8
-Response: Message 9
-Response: That's all, folks!
-No more messages!
+Message 0
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+That's all, folks!
 ==== fanout_consumer.pyX.out | remove_uuid
-Messages queue: 
 Subscribed to queue 
-Response: Message 0
-Response: Message 1
-Response: Message 2
-Response: Message 3
-Response: Message 4
-Response: Message 5
-Response: Message 6
-Response: Message 7
-Response: Message 8
-Response: Message 9
-Response: That's all, folks!
-No more messages!
+Message 0
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+That's all, folks!
diff --git a/cpp/examples/examples/pub-sub/topic_listener.cpp b/cpp/examples/examples/pub-sub/topic_listener.cpp
index c7e9d3877d..883d6eba42 100644
--- a/cpp/examples/examples/pub-sub/topic_listener.cpp
+++ b/cpp/examples/examples/pub-sub/topic_listener.cpp
@@ -97,7 +97,7 @@ void Listener::prepareQueue(std::string queue, std::string routing_key) {
     /* Declare an exclusive queue on the broker
      */
 
-    session.queueDeclare(arg::queue=queue, arg::exclusive=true);
+    session.queueDeclare(arg::queue=queue, arg::exclusive=true, arg::autoDelete=true);
 
     /* Route messages to the new queue if they match the routing key.
      *
diff --git a/cpp/examples/examples/pub-sub/verify_cpp_python.in b/cpp/examples/examples/pub-sub/verify_cpp_python.in
index d16eab0f6c..951d9ad9dd 100644
--- a/cpp/examples/examples/pub-sub/verify_cpp_python.in
+++ b/cpp/examples/examples/pub-sub/verify_cpp_python.in
@@ -40,11 +40,15 @@ Message 4
 Message 4
 Message 4
 Message 4
-Messages queue: europe
-Messages queue: news
-Messages queue: usa
-Messages queue: weather
+Messages on 'europe' queue:
+Messages on 'news' queue:
+Messages on 'usa' queue:
+Messages on 'weather' queue:
 Queues created - please start the topic producer
+Subscribing local queue 'local_europe' to europe-'
+Subscribing local queue 'local_news' to news-'
+Subscribing local queue 'local_usa' to usa-'
+Subscribing local queue 'local_weather' to weather-'
 That's all, folks!
 That's all, folks!
 That's all, folks!
diff --git a/cpp/examples/examples/pub-sub/verify_python_cpp.in b/cpp/examples/examples/pub-sub/verify_python_cpp.in
index 97fccf0a32..52e8db9d72 100644
--- a/cpp/examples/examples/pub-sub/verify_python_cpp.in
+++ b/cpp/examples/examples/pub-sub/verify_python_cpp.in
@@ -5,50 +5,50 @@ Declaring queue: news
 Declaring queue: usa
 Declaring queue: weather
 Listening for messages ...
-Message: message 0 from europe
-Message: message 0 from europe
-Message: message 0 from news
-Message: message 0 from news
-Message: message 0 from usa
-Message: message 0 from usa
-Message: message 0 from weather
-Message: message 0 from weather
-Message: message 1 from europe
-Message: message 1 from europe
-Message: message 1 from news
-Message: message 1 from news
-Message: message 1 from usa
-Message: message 1 from usa
-Message: message 1 from weather
-Message: message 1 from weather
-Message: message 2 from europe
-Message: message 2 from europe
-Message: message 2 from news
-Message: message 2 from news
-Message: message 2 from usa
-Message: message 2 from usa
-Message: message 2 from weather
-Message: message 2 from weather
-Message: message 3 from europe
-Message: message 3 from europe
-Message: message 3 from news
-Message: message 3 from news
-Message: message 3 from usa
-Message: message 3 from usa
-Message: message 3 from weather
-Message: message 3 from weather
-Message: message 4 from europe
-Message: message 4 from europe
-Message: message 4 from news
-Message: message 4 from news
-Message: message 4 from usa
-Message: message 4 from usa
-Message: message 4 from weather
-Message: message 4 from weather
+Message: europe.news 0 from europe
+Message: europe.news 0 from news
+Message: europe.news 1 from europe
+Message: europe.news 1 from news
+Message: europe.news 2 from europe
+Message: europe.news 2 from news
+Message: europe.news 3 from europe
+Message: europe.news 3 from news
+Message: europe.news 4 from europe
+Message: europe.news 4 from news
+Message: europe.weather 0 from europe
+Message: europe.weather 0 from weather
+Message: europe.weather 1 from europe
+Message: europe.weather 1 from weather
+Message: europe.weather 2 from europe
+Message: europe.weather 2 from weather
+Message: europe.weather 3 from europe
+Message: europe.weather 3 from weather
+Message: europe.weather 4 from europe
+Message: europe.weather 4 from weather
 Message: That's all, folks! from europe
 Message: That's all, folks! from news
 Message: That's all, folks! from usa
 Message: That's all, folks! from weather
+Message: usa.news 0 from news
+Message: usa.news 0 from usa
+Message: usa.news 1 from news
+Message: usa.news 1 from usa
+Message: usa.news 2 from news
+Message: usa.news 2 from usa
+Message: usa.news 3 from news
+Message: usa.news 3 from usa
+Message: usa.news 4 from news
+Message: usa.news 4 from usa
+Message: usa.weather 0 from usa
+Message: usa.weather 0 from weather
+Message: usa.weather 1 from usa
+Message: usa.weather 1 from weather
+Message: usa.weather 2 from usa
+Message: usa.weather 2 from weather
+Message: usa.weather 3 from usa
+Message: usa.weather 3 from weather
+Message: usa.weather 4 from usa
+Message: usa.weather 4 from weather
 Shutting down listener for europe
 Shutting down listener for news
 Shutting down listener for usa
diff --git a/cpp/examples/examples/request-response/client.cpp b/cpp/examples/examples/request-response/client.cpp
index 8cec16a461..073af596bf 100644
--- a/cpp/examples/examples/request-response/client.cpp
+++ b/cpp/examples/examples/request-response/client.cpp
@@ -61,9 +61,9 @@ private:
   int counter;
 public:
   Listener(Session& session, string destination_name): 
+    session(session),
     destination_name(destination_name),
     dispatcher(session),
-    session(session),
     counter(0)
   {};
 
diff --git a/cpp/examples/examples/request-response/verify_python_cpp.in b/cpp/examples/examples/request-response/verify_python_cpp.in
index 41ec500774..ba9e01f465 100644
--- a/cpp/examples/examples/request-response/verify_python_cpp.in
+++ b/cpp/examples/examples/request-response/verify_python_cpp.in
@@ -3,7 +3,7 @@ Request: Twas brilling, and the slithy toves
 Request: Did gyre and gimble in the wabe.
 Request: All mimsy were the borogroves,
 Request: And the mome raths outgrabe.
-Messages queue: ReplyTo:
+Messages on queue: reply_to:
 Response: TWAS BRILLING, AND THE SLITHY TOVES
 Response: DID GYRE AND GIMBLE IN THE WABE.
 Response: ALL MIMSY WERE THE BOROGROVES,
@@ -12,7 +12,7 @@ No more messages!
 ==== server.out | remove_uuid
 Activating request queue listener for: request
 Waiting for requests
-Request: Twas brilling, and the slithy toves  (ReplyTo:)
-Request: Did gyre and gimble in the wabe.  (ReplyTo:)
-Request: All mimsy were the borogroves,  (ReplyTo:)
-Request: And the mome raths outgrabe.  (ReplyTo:)
+Request: Twas brilling, and the slithy toves  (reply_to:)
+Request: Did gyre and gimble in the wabe.  (reply_to:)
+Request: All mimsy were the borogroves,  (reply_to:)
+Request: And the mome raths outgrabe.  (reply_to:)