QPID-1044: Part of patch from Jonathan Robie + changes to verify scripts to keep automated testing working.

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

4 files changed, 82 insertions, 84 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in
index 2e96f03318..0089e55c16 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python.in
@@ -15,47 +15,41 @@ Producer: Sending message: 10
 Producer: Closing connection
 Producer: Closing JNDI context
 ==== fanout_consumer.py.out | remove_uuid
-Messages queue: 
 Subscribed to queue 
-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: Message 10
-Response: That's all, folks!
-No more messages!
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+Message 10
+That's all, folks!
 ==== fanout_consumer.pyX.out | remove_uuid
-Messages queue: 
 Subscribed to queue 
-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: Message 10
-Response: That's all, folks!
-No more messages!
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+Message 10
+That's all, folks!
 ==== fanout_consumer.pyXX.out | remove_uuid
-Messages queue: 
 Subscribed to queue 
-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: Message 10
-Response: That's all, folks!
-No more messages!
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+Message 10
+That's all, folks!
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in
index 1a8962515d..92184201d0 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python.in
@@ -80,11 +80,15 @@ message 6
 message 6
 message 6
 message 6
-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/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in
index 507a51f78c..68b96cba2b 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java.in
@@ -7,46 +7,46 @@ Listener: Creating a Message Subscriber for topic news
 Listener: Creating a Message Subscriber for topic usa
 Listener: Creating a Message Subscriber for topic weather
 Listener: Creating a non-transacted, auto-acknowledged session
-Listener: Received message for topic: europe: message 0
-Listener: Received message for topic: europe: message 0
-Listener: Received message for topic: europe: message 1
-Listener: Received message for topic: europe: message 1
-Listener: Received message for topic: europe: message 2
-Listener: Received message for topic: europe: message 2
-Listener: Received message for topic: europe: message 3
-Listener: Received message for topic: europe: message 3
-Listener: Received message for topic: europe: message 4
-Listener: Received message for topic: europe: message 4
-Listener: Received message for topic: news: message 0
-Listener: Received message for topic: news: message 0
-Listener: Received message for topic: news: message 1
-Listener: Received message for topic: news: message 1
-Listener: Received message for topic: news: message 2
-Listener: Received message for topic: news: message 2
-Listener: Received message for topic: news: message 3
-Listener: Received message for topic: news: message 3
-Listener: Received message for topic: news: message 4
-Listener: Received message for topic: news: message 4
-Listener: Received message for topic: usa: message 0
-Listener: Received message for topic: usa: message 0
-Listener: Received message for topic: usa: message 1
-Listener: Received message for topic: usa: message 1
-Listener: Received message for topic: usa: message 2
-Listener: Received message for topic: usa: message 2
-Listener: Received message for topic: usa: message 3
-Listener: Received message for topic: usa: message 3
-Listener: Received message for topic: usa: message 4
-Listener: Received message for topic: usa: message 4
-Listener: Received message for topic: weather: message 0
-Listener: Received message for topic: weather: message 0
-Listener: Received message for topic: weather: message 1
-Listener: Received message for topic: weather: message 1
-Listener: Received message for topic: weather: message 2
-Listener: Received message for topic: weather: message 2
-Listener: Received message for topic: weather: message 3
-Listener: Received message for topic: weather: message 3
-Listener: Received message for topic: weather: message 4
-Listener: Received message for topic: weather: message 4
+Listener: Received message for topic: europe: europe.news 0
+Listener: Received message for topic: europe: europe.news 1
+Listener: Received message for topic: europe: europe.news 2
+Listener: Received message for topic: europe: europe.news 3
+Listener: Received message for topic: europe: europe.news 4
+Listener: Received message for topic: europe: europe.weather 0
+Listener: Received message for topic: europe: europe.weather 1
+Listener: Received message for topic: europe: europe.weather 2
+Listener: Received message for topic: europe: europe.weather 3
+Listener: Received message for topic: europe: europe.weather 4
+Listener: Received message for topic: news: europe.news 0
+Listener: Received message for topic: news: europe.news 1
+Listener: Received message for topic: news: europe.news 2
+Listener: Received message for topic: news: europe.news 3
+Listener: Received message for topic: news: europe.news 4
+Listener: Received message for topic: news: usa.news 0
+Listener: Received message for topic: news: usa.news 1
+Listener: Received message for topic: news: usa.news 2
+Listener: Received message for topic: news: usa.news 3
+Listener: Received message for topic: news: usa.news 4
+Listener: Received message for topic: usa: usa.news 0
+Listener: Received message for topic: usa: usa.news 1
+Listener: Received message for topic: usa: usa.news 2
+Listener: Received message for topic: usa: usa.news 3
+Listener: Received message for topic: usa: usa.news 4
+Listener: Received message for topic: usa: usa.weather 0
+Listener: Received message for topic: usa: usa.weather 1
+Listener: Received message for topic: usa: usa.weather 2
+Listener: Received message for topic: usa: usa.weather 3
+Listener: Received message for topic: usa: usa.weather 4
+Listener: Received message for topic: weather: europe.weather 0
+Listener: Received message for topic: weather: europe.weather 1
+Listener: Received message for topic: weather: europe.weather 2
+Listener: Received message for topic: weather: europe.weather 3
+Listener: Received message for topic: weather: europe.weather 4
+Listener: Received message for topic: weather: usa.weather 0
+Listener: Received message for topic: weather: usa.weather 1
+Listener: Received message for topic: weather: usa.weather 2
+Listener: Received message for topic: weather: usa.weather 3
+Listener: Received message for topic: weather: usa.weather 4
 Listener: Setting an ExceptionListener on the connection as sample uses a TopicSubscriber
 Listener: Shutting down listener for europe
 Listener: Shutting down listener for news
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in
index 25285eb2a3..ead7a5747b 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.in
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_python.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,