You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2007/11/20 13:58:42 UTC
svn commit: r596647 - in
/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample:
./ direct/ pubsub/ requestResponse/ transacted/
Author: arnaudsimon
Date: Tue Nov 20 04:58:41 2007
New Revision: 596647
URL: http://svn.apache.org/viewvc?rev=596647&view=rev
Log:
Changed for no looking up destinations in JNDI
Removed:
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/examples.properties
Modified:
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/BaseExample.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/transacted/QueueToTopic.java
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/BaseExample.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/BaseExample.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/BaseExample.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/BaseExample.java Tue Nov 20 04:58:41 2007
@@ -88,7 +88,7 @@
_defaults.put("-deliveryMode", "non-persistent");
_options.put("-numMessages", "Number of messages to process");
_defaults.put("-numMessages", String.valueOf(DEFAULT_NUMBER_MESSAGES));
-
+
_argProcessor = new ArgProcessor(Id, args, _options, _defaults);
_argProcessor.display();
//Set the initial context factory
@@ -136,7 +136,7 @@
* we assume that the environment is correctly set
* i.e. -Djava.naming.provider.url="..//example.properties"
*
- * @return an initial context
+ * @return An initial context
* @throws Exception if there is an error getting the context
*/
public InitialContext getInitialContext() throws Exception
@@ -144,24 +144,12 @@
if (_initialContext == null)
{
Hashtable<String, String> jndiEnvironment = new Hashtable<String, String>();
- jndiEnvironment.put(Context.INITIAL_CONTEXT_FACTORY, INITIAL_CONTEXT_FACTORY_NAME);
+ 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");
if (getProviderURL() != null)
{
jndiEnvironment.put(Context.PROVIDER_URL, getProviderURL());
- }
- else
- {
- jndiEnvironment.put("connectionfactory.ConnectionFactory",
- "qpid:password=guest;username=guest;client_id=clientid;virtualhost=test@tcp:127.0.0.1:5672");
- jndiEnvironment.put("queue.message_queue", "message_queue");
- jndiEnvironment.put("topic.usa.news", "usa.news");
- jndiEnvironment.put("topic.usa.weather", "usa.weather");
- jndiEnvironment.put("topic.usa", "usa.#");
- jndiEnvironment.put("topic.europe.weather", "europe.weather");
- jndiEnvironment.put("topic.europe.news", "europe.news");
- jndiEnvironment.put("topic.europe", "europe.#");
- jndiEnvironment.put("topic.news", "#.news");
- jndiEnvironment.put("topic.weather", "#.weather");
}
_initialContext = new InitialContext(jndiEnvironment);
}
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java Tue Nov 20 04:58:41 2007
@@ -69,9 +69,6 @@
{
try
{
- // lookup the queue
- Queue destination = (Queue) getInitialContext().lookup(_queueName);
-
// Declare the connection
Connection connection = getConnection();
@@ -95,6 +92,9 @@
// This session is a default choice of non-transacted and uses the auto acknowledge feature of a session.
System.out.println(CLASS + ": Creating a non-transacted, auto-acknowledged session");
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ // lookup the queue
+ Queue destination = session.createQueue(_queueName);
// Create a MessageConsumer
System.out.println(CLASS + ": Creating a MessageConsumer");
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java Tue Nov 20 04:58:41 2007
@@ -83,9 +83,6 @@
{
try
{
- // lookup the queue
- Queue destination = (Queue) getInitialContext().lookup(_queueName);
-
// Declare the connection
Connection connection = getConnection();
@@ -110,6 +107,9 @@
System.out.println(CLASS + ": Creating a non-transacted, auto-acknowledged session");
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ // lookup the queue
+ Queue destination = session.createQueue(_queueName);
// Create a MessageConsumer
System.out.println(CLASS + ": Creating a MessageConsumer");
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Producer.java Tue Nov 20 04:58:41 2007
@@ -61,9 +61,6 @@
{
try
{
- // lookup the queue
- Queue destination = (Queue) getInitialContext().lookup(_queueName);
-
// Declare the connection
Connection connection = getConnection();
@@ -71,6 +68,9 @@
// This session is a default choice of non-transacted and uses the auto acknowledge feature of a session.
System.out.println(CLASS + ": Creating a non-transacted, auto-acknowledged session");
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ // lookup the queue
+ Queue destination = session.createQueue(_queueName);
// Create a Message producer
System.out.println(CLASS + ": Creating a Message PRoducer");
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Listener.java Tue Nov 20 04:58:41 2007
@@ -93,7 +93,7 @@
TopicSession session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
// lookup the topics usa
- Topic topic = (Topic) getInitialContext().lookup("usa");
+ Topic topic = session.createTopic("usa.#");
// Create a Message Subscriber
System.out.println(CLASS + ": Creating a Message Subscriber");
TopicSubscriber messageSubscriber = session.createSubscriber(topic);
@@ -101,7 +101,7 @@
messageSubscriber.setMessageListener(new MyMessageListener("usa"));
// lookup the topics world.usa.news
- topic = (Topic) getInitialContext().lookup("europe");
+ topic = session.createTopic("europe.#");
// Create a Message Subscriber
System.out.println(CLASS + ": Creating a Message Subscriber");
messageSubscriber = session.createSubscriber(topic);
@@ -109,7 +109,7 @@
messageSubscriber.setMessageListener(new MyMessageListener("europe"));
// lookup the topics world.europw
- topic = (Topic) getInitialContext().lookup("news");
+ topic = session.createTopic("#.news");
// Create a Message Subscriber
System.out.println(CLASS + ": Creating a Message Subscriber");
messageSubscriber = session.createSubscriber(topic);
@@ -117,7 +117,7 @@
messageSubscriber.setMessageListener(new MyMessageListener("news"));
// lookup the topics world.europw
- topic = (Topic) getInitialContext().lookup("weather");
+ topic = session.createTopic("#.weather");
// Create a Message Subscriber
System.out.println(CLASS + ": Creating a Message Subscriber");
messageSubscriber = session.createSubscriber(topic);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/Publisher.java Tue Nov 20 04:58:41 2007
@@ -71,7 +71,7 @@
message = session.createTextMessage();
// lookup the topics .usa.weather
- Topic topic = (Topic) getInitialContext().lookup("usa.weather");
+ Topic topic = session.createTopic("usa.weather");
message.setStringProperty("topicName", "usa.weather");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -79,7 +79,7 @@
publishMessages(message, messagePublisher);
// lookup the topics usa.news
- topic = (Topic) getInitialContext().lookup("usa.news");
+ topic = session.createTopic("usa.news");
message.setStringProperty("topicName", "usa.news");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -87,7 +87,7 @@
publishMessages(message, messagePublisher);
// lookup the topics europe.weather
- topic = (Topic) getInitialContext().lookup("europe.weather");
+ topic = session.createTopic("europe.weather");
message.setStringProperty("topicName", "europe.weather");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -95,7 +95,7 @@
publishMessages(message, messagePublisher);
// lookup the topics europe.news
- topic = (Topic) getInitialContext().lookup("europe.news");
+ topic = session.createTopic("europe.news");
message.setStringProperty("topicName", "europe.news");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -104,7 +104,7 @@
// send the final message
message.setText("That's all, folks!");
- topic = (Topic) getInitialContext().lookup("news");
+ topic = session.createTopic("#.news");
message.setStringProperty("topicName", "news");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -112,7 +112,7 @@
messagePublisher
.send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
- topic = (Topic) getInitialContext().lookup("weather");
+ topic = session.createTopic("#.weather");
message.setStringProperty("topicName", "weather");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -120,7 +120,7 @@
messagePublisher
.send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
- topic = (Topic) getInitialContext().lookup("europe");
+ topic = session.createTopic("europe.#");
message.setStringProperty("topicName", "europe");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
@@ -128,7 +128,7 @@
messagePublisher
.send(message, getDeliveryMode(), Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
- topic = (Topic) getInitialContext().lookup("usa");
+ topic = session.createTopic("usa.#");
message.setStringProperty("topicName", "usa");
// Create a Message Publisher
System.out.println(CLASS + ": Creating a Message Publisherr");
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/MessageMirror.java Tue Nov 20 04:58:41 2007
@@ -29,7 +29,6 @@
* Destination which is used to synchronously consume messages. If a
* received message has a ReplyTo header then a new response message is sent
* to that specified destination.
- *
*/
public class MessageMirror extends BaseExample
{
@@ -44,24 +43,26 @@
/**
* Create a MessageMirror client.
+ *
* @param args Command line arguments.
*/
public MessageMirror(String[] args)
{
super(CLASS, args);
_destinationType = _argProcessor.getStringArgument("-destinationType");
- _destinationName = _argProcessor.getStringArgument("-destinationName");
+ _destinationName = _argProcessor.getStringArgument("-destinationName");
}
/**
* Run the message mirror example.
+ *
* @param args Command line arguments.
*/
public static void main(String[] args)
{
_options.put("-destinationType", "Destination Type: queue/topic");
_defaults.put("-destinationType", "queue");
- _options.put("-destinationName", "Destination Name");
+ _options.put("-destinationName", "Destination Name");
_defaults.put("-destinationName", "message_queue");
MessageMirror messageMirror = new MessageMirror(args);
messageMirror.runTest();
@@ -74,27 +75,13 @@
{
try
{
- Destination destination;
-
- if (_destinationType.equals("queue"))
- {
- // Lookup the queue
- System.out.println(CLASS + ": Looking up queue with name: " + _destinationName);
- destination = (Queue) getInitialContext().lookup(_destinationName);
- }
- else
- {
- // Lookup the topic
- System.out.println(CLASS + ": Looking up topic with name: " + _destinationName);
- destination = (Topic) getInitialContext().lookup(_destinationName);
- }
-
// Declare the connection
Connection connection = getConnection();
// As this application is using a MessageConsumer we need to set an ExceptionListener on the connection
// so that errors raised within the JMS client library can be reported to the application
- System.out.println(CLASS + ": Setting an ExceptionListener on the connection as sample uses a MessageConsumer");
+ System.out.println(
+ CLASS + ": Setting an ExceptionListener on the connection as sample uses a MessageConsumer");
connection.setExceptionListener(new ExceptionListener()
{
@@ -114,6 +101,21 @@
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Destination destination;
+
+ if (_destinationType.equals("queue"))
+ {
+ // Lookup the queue
+ System.out.println(CLASS + ": Looking up queue with name: " + _destinationName);
+ destination = session.createQueue(_destinationName);
+ }
+ else
+ {
+ // Lookup the topic
+ System.out.println(CLASS + ": Looking up topic with name: " + _destinationName);
+ destination = session.createTopic(_destinationName);
+ }
+
// Create a MessageConsumer
System.out.println(CLASS + ": Creating a MessageConsumer");
MessageConsumer messageConsumer = session.createConsumer(destination);
@@ -145,25 +147,26 @@
if (requestMessage instanceof TextMessage)
{
- if (((TextMessage) requestMessage).getText().equals("That's all, folks!"))
+ if (((TextMessage) requestMessage).getText().equals("That's all, folks!"))
{
System.out.println("Received final message for " + destination);
end = true;
}
- System.out.println("\tContents = " + ((TextMessage)requestMessage).getText());
+ System.out.println("\tContents = " + ((TextMessage) requestMessage).getText());
}
// Now bounce the message if a ReplyTo header was set.
if (requestMessage.getJMSReplyTo() != null)
{
- System.out.println("Activating response queue listener for: " + destination);
- responseMessage = session.createTextMessage("Activating response queue listener for: " + destination);
+ 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)
{
responseMessage.setJMSCorrelationID(correlationID);
}
- messageProducer = session.createProducer(requestMessage.getJMSReplyTo()) ;
+ messageProducer = session.createProducer(requestMessage.getJMSReplyTo());
messageProducer.send(responseMessage);
}
System.out.println();
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/P2PRequestor.java Tue Nov 20 04:58:41 2007
@@ -93,7 +93,7 @@
// Lookup the destination
System.out.println(CLASS + ": Looking up queue with name: " + _queueName);
- Queue destination = (Queue) getInitialContext().lookup(_queueName);
+ Queue destination = session.createQueue(_queueName);
// Create a QueueRequestor
System.out.println(CLASS + ": Creating a QueueRequestor");
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/PubSubRequestor.java Tue Nov 20 04:58:41 2007
@@ -93,7 +93,7 @@
// Lookup the destination
System.out.println(CLASS + ": Looking up topic with name: " + _topicName);
- Topic destination = (Topic) getInitialContext().lookup(_topicName);
+ Topic destination = session.createTopic(_topicName);
// Create a TopicRequestor
System.out.println(CLASS + ": Creating a TopicRequestor");
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/transacted/QueueToTopic.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/transacted/QueueToTopic.java?rev=596647&r1=596646&r2=596647&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/transacted/QueueToTopic.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/transacted/QueueToTopic.java Tue Nov 20 04:58:41 2007
@@ -89,16 +89,7 @@
{
try
{
-
- // Lookup the queue
- System.out.println(CLASS + ": Looking up queue with name: " + _queueName);
- Queue queue = (Queue) getInitialContext().lookup(_queueName);
-
- // Lookup the topic
- System.out.println(CLASS + ": Looking up topic with name: " + _topicName);
- Topic topic = (Topic) getInitialContext().lookup(_topicName);
-
- // Declare the connection
+ // Declare the connection
Connection connection = getConnection();
// As this application is using a MessageConsumer we need to set an ExceptionListener on the connection
@@ -112,12 +103,6 @@
{
// The connection may have broken invoke reconnect code if available.
System.err.println(CLASS + ": The sample received an exception through the ExceptionListener");
- System.err.println(
- CLASS + ": If this was a real application it should now go through reconnect code");
- System.err.println();
- System.err.println("Exception: " + jmse);
- System.err.println();
- System.err.println("Now exiting.");
System.exit(0);
}
});
@@ -133,6 +118,14 @@
System.out.println(CLASS + ": Creating a non-transacted, auto-acknowledged session");
Session nonTransactedSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ // Lookup the queue
+ System.out.println(CLASS + ": Looking up queue with name: " + _queueName);
+ Queue queue = nonTransactedSession.createQueue(_queueName);
+
+ // Lookup the topic
+ System.out.println(CLASS + ": Looking up topic with name: " + _topicName);
+ Topic topic = nonTransactedSession.createTopic(_topicName);
+
// Make sure that the queue is empty
System.out.print(CLASS + ": Purging messages from queue...");
MessageConsumer queueMessageConsumer = nonTransactedSession.createConsumer(queue);