clean up output

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

6 files changed, 13 insertions, 16 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
index 9512ac07e1..86835da1ba 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
@@ -109,20 +109,19 @@ public class Consumer extends BaseExample
             boolean end = false;
             while (!end)
             {
-                System.out.println(CLASS + ": Receiving a message");
                 message = messageConsumer.receive();
                 if (message instanceof TextMessage)
                 {
-                    System.out.println(" - contents = " + ((TextMessage) message).getText());
+                    System.out.println(CLASS + ": Received  message:  " + ((TextMessage) message).getText());
                     if (((TextMessage) message).getText().equals("That's all, folks!"))
                     {
-                        System.out.println("Received final message for " + _queueName);
+                        System.out.println(CLASS + ": Received final message for " + _queueName);
                         end = true;
                     }
                 }
                 else
                 {
-                    System.out.println(" not text message");
+                    System.out.println(CLASS + ": Received messages is  not a text message");
                 }
             }
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
index 02694a477b..7883556b67 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
@@ -166,10 +166,10 @@ public class Listener extends BaseExample implements MessageListener
         {
             if (message instanceof TextMessage)
             {
-                System.out.println(" - contents = " + ((TextMessage) message).getText());
+                System.out.println(CLASS + ": Received message: " + ((TextMessage) message).getText());
                 if (((TextMessage) message).getText().equals("That's all, folks!"))
                 {
-                    System.out.println("Shutting down listener for " + _queueName);
+                    System.out.println(CLASS + ": Shutting down listener for " + _queueName);
                     synchronized (_lock)
                     {
                         _finished = true;
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java
index 2e9835eadf..bb0f03c755 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java
@@ -185,13 +185,11 @@ public class Listener extends BaseExample
                 // Increment the number of messages that have been received
                 _messageCount = _messageCount + 1;
                 // Print out the details of the just received message
-                System.out
-                        .print(_topicName + ":  message received: " + _messageCount + " " + message.getJMSMessageID());
-                System.out.println(" - contents = " + ((TextMessage) message).getText());
+                System.out.println(CLASS + ":  Received message:  " + ((TextMessage) message).getText());
                 // If this is the total number of messages required
                 if (((TextMessage) message).getText().equals("That's all, folks!"))
                 {
-                    System.out.println("Shutting down listener for " + _topicName);
+                    System.out.println(CLASS + ": Shutting down listener for " + _topicName);
                     synchronized (_lock)
                     {
                         _finished++;
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java
index 749556c090..cc5d35d778 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java
@@ -156,13 +156,13 @@ public class MessageMirror extends BaseExample
                 // Now bounce the message if a ReplyTo header was set.
                 if (requestMessage.getJMSReplyTo() != null)
                 {
-                    System.out.println("Activating response queue listener for: " + destination);
+                    System.out.println(CLASS + ": Activating response queue listener for: " + destination);
                     responseMessage =
                             session.createTextMessage();
                      if (requestMessage instanceof TextMessage)
                     {
                        responseMessage.setText(((TextMessage) requestMessage).getText().toUpperCase());
-                        System.out.println("\tResponse = " + responseMessage.getText());                        
+                        System.out.println(CLASS + ": \tResponse = " + responseMessage.getText());
                     }
                     messageProducer = session.createProducer(requestMessage.getJMSReplyTo());
                     messageProducer.send(responseMessage);
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java
index aef21d2ea3..813832b5a9 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java
@@ -146,11 +146,11 @@ public class P2PRequestor extends BaseExample
     {
         Message response;
         response = requestor.request(request);
-        System.out.println("\tRequest Contents= " + request.getText());
+        System.out.println(CLASS + ": \tRequest Content= " + request.getText());
         // Print out the details of the response received
         if (response instanceof TextMessage)
         {
-            System.out.println("\t Response Contents= " + ((TextMessage) response).getText());
+            System.out.println(CLASS + ": \t Response Content= " + ((TextMessage) response).getText());
         }
     }
 }
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java
index 0bc7ab61f5..b61d9086d1 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java
@@ -142,11 +142,11 @@ public class PubSubRequestor extends BaseExample
     {
         Message response;
         response = requestor.request(request);
-        System.out.println("\tRequest Contents= " + request.getText());
+        System.out.println(CLASS + ": \tRequest Content= " + request.getText());
         // Print out the details of the response received
         if (response instanceof TextMessage)
         {
-            System.out.println("\t Response Contents= " + ((TextMessage) response).getText());
+            System.out.println(CLASS + ": \t Response Content= " + ((TextMessage) response).getText());
         }
     }
 }