fixed speling issues and pubsub ones

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

4 files changed, 13 insertions, 17 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/common/BaseExample.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/common/BaseExample.java
index 6b82bd469b..4f22a5cb58 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/common/BaseExample.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/common/BaseExample.java
@@ -49,7 +49,7 @@ abstract public class BaseExample
     private static final String DEFAULT_CONNECTION_FACTORY_NAME = "ConnectionFactory";
 
     /* Default number of messages to process. */
-    private static final int DEFAULT_NUMBER_MESSAGES = 10;
+    private static final int DEFAULT_NUMBER_MESSAGES = 1;
 
     /* JNDI provider URL. */
     private String _providerURL;
@@ -146,7 +146,7 @@ abstract public class BaseExample
             Hashtable<String, String> jndiEnvironment = new Hashtable<String, String>();
             jndiEnvironment.put(Context.INITIAL_CONTEXT_FACTORY, INITIAL_CONTEXT_FACTORY_NAME);
             jndiEnvironment.put("connectionfactory.ConnectionFactory",
-                                "qpid:password=guest;username=guest;client_id=clientid;virtualhost=test@tcp:127.0.0.1:5672");
+                                "qpid:password=guest;username=guest;client_id=clientid;virtualhost=test@tcp:192.168.1.11:5672");
             if (getProviderURL() != null)
             {
                 jndiEnvironment.put(Context.PROVIDER_URL, getProviderURL());
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java
index 35f4b87cd3..2f3a185809 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java
@@ -73,7 +73,7 @@ public class Producer extends BaseExample
             Queue   destination = session.createQueue(_queueName);
 
             // Create a Message producer
-            System.out.println(CLASS + ": Creating a Message PRoducer");
+            System.out.println(CLASS + ": Creating a Message Producer");
             MessageProducer messageProducer = session.createProducer(destination);
 
             // Create a Message
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 bb0f03c755..e8c5b8a38c 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
@@ -95,7 +95,7 @@ public class Listener extends BaseExample
             // lookup the topics usa
             Topic topic = session.createTopic("usa.#");
             // Create a Message Subscriber
-            System.out.println(CLASS + ": Creating a Message Subscriber");
+            System.out.println(CLASS + ": Creating a Message Subscriber fpr topic usa.#");
             TopicSubscriber messageSubscriber = session.createSubscriber(topic);
             // Set a message listener on the messageConsumer
             messageSubscriber.setMessageListener(new MyMessageListener("usa"));
@@ -103,7 +103,7 @@ public class Listener extends BaseExample
             // lookup the topics world.usa.news
             topic = session.createTopic("europe.#");
             // Create a Message Subscriber
-            System.out.println(CLASS + ": Creating a Message Subscriber");
+            System.out.println(CLASS + ": Creating a Message Subscriber for topic europe.#");
             messageSubscriber = session.createSubscriber(topic);
             // Set a message listener on the messageConsumer
             messageSubscriber.setMessageListener(new MyMessageListener("europe"));
@@ -111,7 +111,7 @@ public class Listener extends BaseExample
             // lookup the topics world.europw
             topic = session.createTopic("#.news");
             // Create a Message Subscriber
-            System.out.println(CLASS + ": Creating a Message Subscriber");
+            System.out.println(CLASS + ": Creating a Message Subscriber for topic #.news");
             messageSubscriber = session.createSubscriber(topic);
             // Set a message listener on the messageConsumer
             messageSubscriber.setMessageListener(new MyMessageListener("news"));
@@ -119,7 +119,7 @@ public class Listener extends BaseExample
             // lookup the topics world.europw
             topic = session.createTopic("#.weather");
             // Create a Message Subscriber
-            System.out.println(CLASS + ": Creating a Message Subscriber");
+            System.out.println(CLASS + ": Creating a Message Subscriber for topic #.weather");
             messageSubscriber = session.createSubscriber(topic);
             // Set a message listener on the messageConsumer
             messageSubscriber.setMessageListener(new MyMessageListener("weather"));
@@ -185,7 +185,7 @@ 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.println(CLASS + ":  Received message:  " + ((TextMessage) message).getText());
+                System.out.println(CLASS + ":  Received message for topic:  " + _topicName + ": " + ((TextMessage) message).getText());
                 // If this is the total number of messages required
                 if (((TextMessage) message).getText().equals("That's all, folks!"))
                 {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java
index 0b0cc7e089..3748e106dd 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java
@@ -74,7 +74,7 @@ public class Publisher extends BaseExample
             Topic topic = session.createTopic("usa.weather");
             message.setStringProperty("topicName", "usa.weather");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
+            System.out.println(CLASS + ": Creating a Message Publisher for topic usa.weather");
             TopicPublisher messagePublisher = session.createPublisher(topic);
             publishMessages(message, messagePublisher);
 
@@ -82,7 +82,7 @@ public class Publisher extends BaseExample
             topic = session.createTopic("usa.news");
             message.setStringProperty("topicName", "usa.news");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisher");
+            System.out.println(CLASS + ": Creating a Message Publisher for topic usa.news");
             messagePublisher = session.createPublisher(topic);
             publishMessages(message, messagePublisher);
 
@@ -90,7 +90,7 @@ public class Publisher extends BaseExample
             topic = session.createTopic("europe.weather");
             message.setStringProperty("topicName", "europe.weather");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
+            System.out.println(CLASS + ": Creating a Message Publisher for topic europe.weather");
             messagePublisher = session.createPublisher(topic);
             publishMessages(message, messagePublisher);
 
@@ -98,16 +98,15 @@ public class Publisher extends BaseExample
             topic = session.createTopic("europe.news");
             message.setStringProperty("topicName", "europe.news");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
+            System.out.println(CLASS + ": Creating a Message Publisher for topic europe.news");
             messagePublisher = session.createPublisher(topic);
             publishMessages(message, messagePublisher);
 
             // send the final message
-            message.setText("That's all, folks!");
+            message = session.createTextMessage("That's all, folks!");
             topic = session.createTopic("#.news");
             message.setStringProperty("topicName", "news");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
             messagePublisher = session.createPublisher(topic);
             messagePublisher
                     .send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
@@ -115,7 +114,6 @@ public class Publisher extends BaseExample
             topic = session.createTopic("#.weather");
             message.setStringProperty("topicName", "weather");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
             messagePublisher = session.createPublisher(topic);
             messagePublisher
                     .send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
@@ -123,7 +121,6 @@ public class Publisher extends BaseExample
             topic = session.createTopic("europe.#");
             message.setStringProperty("topicName", "europe");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
             messagePublisher = session.createPublisher(topic);
             messagePublisher
                     .send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
@@ -131,7 +128,6 @@ public class Publisher extends BaseExample
             topic = session.createTopic("usa.#");
             message.setStringProperty("topicName", "usa");
             // Create a Message Publisher
-            System.out.println(CLASS + ": Creating a Message Publisherr");
             messagePublisher = session.createPublisher(topic);
             messagePublisher
                     .send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);