Updated ofr converting request text in upercase text

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

3 files changed, 47 insertions, 67 deletions

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 7d0523b161..be0fe95e90 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
@@ -142,8 +142,6 @@ public class MessageMirror extends BaseExample
 
                 // Print out the details of the just received message
                 System.out.println(CLASS + ": Message received:");
-                System.out.println("\tID=" + requestMessage.getJMSMessageID());
-                System.out.println("\tCorrelationID=" + requestMessage.getJMSCorrelationID());
 
                 if (requestMessage instanceof TextMessage)
                 {
@@ -160,11 +158,11 @@ public class MessageMirror extends BaseExample
                 {
                     System.out.println("Activating response queue listener for: " + destination);
                     responseMessage =
-                            session.createTextMessage("Activating response queue listener for: " + destination);
-                    String correlationID = requestMessage.getJMSCorrelationID();
-                    if (correlationID != null)
+                            session.createTextMessage();
+                     if (requestMessage instanceof TextMessage)
                     {
-                        responseMessage.setJMSCorrelationID(correlationID);
+                       responseMessage.setText(((TextMessage) requestMessage).getText().toUpperCase());
+                        System.out.println("\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 fbc3d1c460..430b4e779e 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
@@ -107,42 +107,19 @@ public class P2PRequestor extends BaseExample
             // Create a message to send as a request for service
             TextMessage request;
 
-            request = session.createTextMessage("\"Twas brillig, and the slithy toves\",\n" +
-                    "\t\t\"Did gire and gymble in the wabe.\",\n" +
-                    "\t\t\"All mimsy were the borogroves,\",\n" +
-                    "\t\t\"And the mome raths outgrabe.\"");
+            request = session.createTextMessage();
 
-            // Declare a message to be used for receiving any response
-           Message response;
-
-            // Get the number of times that this sample should request service
+         // Get the number of times that this sample should request service
             for (int i = 0; i < getNumberMessages(); i++)
             {
-                /**
-                 * Set a message correlation value. This is not strictly required it is
-                 * just an example of how messages requests can be tied together.
-                 */
-                request.setJMSCorrelationID("Message " + i);
-                System.out.println(CLASS + ": Sending request " + i);
-
-                response = requestor.request(request);
-
-                // Print out the details of the message sent
-                System.out.println(CLASS + ": Message details of request");
-                System.out.println("\tID = " + request.getJMSMessageID());
-                System.out.println("\tCorrelationID = " + request.getJMSCorrelationID());
-                 System.out.println("\tContents= " + ((TextMessage)request).getText());
-
-                // Print out the details of the response received
-                System.out.println(CLASS + ": Message details of response");
-                System.out.println("\tID = " + response.getJMSMessageID());
-                System.out.println("\tCorrelationID = " + response.getJMSCorrelationID());
-                if (response instanceof TextMessage)
-                {
-                    System.out.println("\tContents= " + ((TextMessage) response).getText());
-                }
-
-                System.out.println();
+                request = session.createTextMessage("Twas brillig, and the slithy toves");
+                sendReceive(request, requestor);
+                request = session.createTextMessage("Did gire and gymble in the wabe");
+                sendReceive(request, requestor);
+                request = session.createTextMessage("All mimsy were the borogroves,");
+                sendReceive(request, requestor);
+                request = session.createTextMessage("And the mome raths outgrabe.");
+                sendReceive(request, requestor);
             }
 
             //send the final message  for ending the mirror
@@ -164,4 +141,16 @@ public class P2PRequestor extends BaseExample
             System.err.println(CLASS + ": Caught an Exception: " + exp);
         }
     }
+
+     private void sendReceive(TextMessage request, QueueRequestor requestor) throws JMSException
+    {
+        Message response;
+        response = requestor.request(request);
+        System.out.println("\tRequest Contents= " + request.getText());
+        // Print out the details of the response received
+        if (response instanceof TextMessage)
+        {
+            System.out.println("\t Response Contents= " + ((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 6cc49f757d..0a82074f7a 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
@@ -105,38 +105,19 @@ public class PubSubRequestor extends BaseExample
 
             // Create a message to send as a request for service
             TextMessage request;
-            request = session.createTextMessage(
-                    "\"Twas brillig, and the slithy toves\",\n" + "\t\t\"Did gire and gymble in the wabe.\",\n" + "\t\t\"All mimsy were the borogroves,\",\n" + "\t\t\"And the mome raths outgrabe.\"");
-
-            // Declare a message to be used for receiving any response
-            Message response;
+            request = session.createTextMessage();                   
 
             // Get the number of times that this sample should request service
             for (int i = 0; i < getNumberMessages(); i++)
             {
-                /**
-                 * Set a message correlation value. This is not strictly required it is
-                 * just an example of how messages requests can be tied together.
-                 */
-                request.setJMSCorrelationID("Message " + i);
-                System.out.println(CLASS + ": Sending request " + i);
-
-                response = requestor.request(request);
-
-                // Print out the details of the message sent
-                System.out.println(CLASS + ": Message details of request");
-                System.out.println("\tID = " + request.getJMSMessageID());
-                System.out.println("\tCorrelationID = " + request.getJMSCorrelationID());
-                System.out.println("\tContents= " + ((TextMessage) request).getText());
-
-                // Print out the details of the response received
-                System.out.println(CLASS + ": Message details of response");
-                System.out.println("\tID = " + response.getJMSMessageID());
-                System.out.println("\tCorrelationID = " + response.getJMSCorrelationID());
-                if (response instanceof TextMessage)
-                {
-                    System.out.println("\tContents= " + ((TextMessage) response).getText());
-                }
+                request = session.createTextMessage("Twas brillig, and the slithy toves");
+                sendReceive(request, requestor);
+                request = session.createTextMessage("Did gire and gymble in the wabe");
+                sendReceive(request, requestor);
+                request = session.createTextMessage("All mimsy were the borogroves,");
+                sendReceive(request, requestor);
+                request = session.createTextMessage("And the mome raths outgrabe.");
+                sendReceive(request, requestor);
             }
             // And send a final message to indicate termination.
             request.setText("That's all, folks!");
@@ -156,4 +137,16 @@ public class PubSubRequestor extends BaseExample
             System.err.println(CLASS + ": Caught an Exception: " + exp);
         }
     }
+
+    private void sendReceive(TextMessage request, TopicRequestor requestor) throws JMSException
+    {
+        Message response;
+        response = requestor.request(request);
+        System.out.println("\tRequest Contents= " + request.getText());
+        // Print out the details of the response received
+        if (response instanceof TextMessage)
+        {
+            System.out.println("\t Response Contents= " + ((TextMessage) response).getText());
+        }
+    }
 }