QPID-375 : remove assumptions on standard exchanges (amq.direct, amq.topic, etc), allow other exchanges to be created through virtualhosts.xml

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

12 files changed, 49 insertions, 22 deletions

diff --git a/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java b/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
index 7a413eee3d..cf8059a143 100644
--- a/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
+++ b/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
@@ -25,6 +25,8 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.url.URLSyntaxException;
 
 import javax.jms.MessageListener;
@@ -48,8 +50,8 @@ public class Client
         this.name = name;
         session = connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
 
-        AMQTopic topic = new AMQTopic("cluster_test_topic");
-        AMQQueue queue = new AMQQueue("cluster_test_queue");
+        AMQTopic topic = new AMQTopic(((AMQSession)session).getDefaultTopicExchangeName(), new AMQShortString("cluster_test_topic"));
+        AMQQueue queue = new AMQQueue(((AMQSession)session).getDefaultQueueExchangeName(), new AMQShortString("cluster_test_queue"));
 
         topicProducer = session.createProducer(topic);
         queueProducer = session.createProducer(queue);
diff --git a/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java b/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
index 0c57a73d5d..aba2d5d657 100644
--- a/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
+++ b/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
@@ -24,6 +24,8 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 
 import javax.jms.Message;
 import javax.jms.MessageListener;
@@ -41,7 +43,7 @@ public class ChannelFlowTest implements MessageListener
 
     ChannelFlowTest(AMQConnection connection) throws Exception
     {
-        this(connection, new AMQQueue(randomize("ChannelFlowTest"), true));
+        this(connection, new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("ChannelFlowTest")), true));
     }
 
     ChannelFlowTest(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java b/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
index 983186a545..a246352d8b 100644
--- a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
+++ b/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
@@ -21,9 +21,12 @@
 package org.apache.qpid.fragmentation;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.jms.MessageProducer;
 import org.apache.qpid.jms.Session;
 import org.apache.log4j.Logger;
@@ -49,7 +52,7 @@ public class TestLargePublisher
 
     private AMQConnection _connection;
 
-    private Session _session;
+    private AMQSession _session;
 
     private class CallbackHandler implements MessageListener
     {
@@ -109,8 +112,8 @@ public class TestLargePublisher
         {
             createConnection(host, port, clientID);
             
-            _session = (Session) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            AMQTopic destination = new AMQTopic("large");
+            _session = (AMQSession) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            AMQTopic destination = new AMQTopic(_session.getDefaultTopicExchangeName(), new AMQShortString("large"));
             MessageProducer producer = (MessageProducer) _session.createProducer(destination);
 
             _connection.start();
diff --git a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java b/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
index 03ace4a8d9..b0cde22349 100644
--- a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
+++ b/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
@@ -22,7 +22,10 @@ package org.apache.qpid.fragmentation;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.jms.Session;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.log4j.Logger;
 
 import javax.jms.*;
@@ -76,11 +79,12 @@ public class TestLargeSubscriber
             InetAddress address = InetAddress.getLocalHost();
             AMQConnection con = new AMQConnection(host, port, username, password,
                                                   address.getHostName(), virtualPath);
-            final Session session = (Session) con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final AMQSession session = (AMQSession) con.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
             final int expectedMessageCount = numExpectedMessages;
 
-            MessageConsumer consumer = session.createConsumer(new AMQTopic("large"),
+            MessageConsumer consumer = session.createConsumer(new AMQTopic(session.getDefaultTopicExchangeName(),
+                                                                           new AMQShortString("large")),
                                                               100, true, false, null);
 
             consumer.setMessageListener(new MessageListener()
diff --git a/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java b/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
index ebc9488f68..8d833f4d4c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
+++ b/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
@@ -24,6 +24,8 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 
 import javax.jms.MessageProducer;
 import javax.jms.Message;
@@ -51,7 +53,7 @@ public class LatencyTest implements MessageListener
 
     LatencyTest(AMQConnection connection, int count, int delay, int length) throws Exception
     {
-        this(connection, new AMQQueue(randomize("LatencyTest"), true), count, delay, length);
+        this(connection, new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("LatencyTest")), true), count, delay, length);
     }
 
     LatencyTest(AMQConnection connection, AMQDestination destination, int count, int delay, int length) throws Exception
diff --git a/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java b/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
index 10e03d3522..db02b9954a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
+++ b/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
@@ -31,7 +31,6 @@ import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
-import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
@@ -41,6 +40,9 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.qpid.client.AMQConnectionFactory;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.jms.Session;
 
 /**
  * Test AMQ.
@@ -54,7 +56,7 @@ public class AMQTest extends TestCase implements ExceptionListener
     private static final String DUMMYCONTENT = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     private static final String HUGECONTENT;
 
-    private Connection connect = null;
+    private AMQConnection connect = null;
     private Session pubSession = null;
     private Session subSession = null;
     private Topic topic = null;
@@ -75,7 +77,7 @@ public class AMQTest extends TestCase implements ExceptionListener
         connect.setExceptionListener(this);
         pubSession = connect.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
         subSession = connect.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
-        topic = new AMQTopic(SUBJECT);
+        topic = new AMQTopic(pubSession.getDefaultTopicExchangeName(), new AMQShortString(SUBJECT));
 
         connect.start();
     }
diff --git a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java b/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
index 45b241975d..33891142b5 100644
--- a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
+++ b/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
@@ -23,6 +23,8 @@ package org.apache.qpid.pubsub1;
 import org.apache.log4j.Logger;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.jms.MessageProducer;
@@ -110,8 +112,8 @@ public class TestPublisher
         {
             createConnection(host, port, clientID);
             
-            _session = (Session) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            AMQTopic destination = new AMQTopic(commandQueueName);
+            _session =  _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            AMQTopic destination = new AMQTopic(_session.getDefaultTopicExchangeName(), new AMQShortString(commandQueueName));
             MessageProducer producer = (MessageProducer) _session.createProducer(destination);
 
             _connection.start();
diff --git a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java b/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
index 14cf206f50..450d9b3914 100644
--- a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
+++ b/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
@@ -24,6 +24,8 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.jms.Session;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
@@ -87,17 +89,17 @@ public class TestSubscriber
             InetAddress address = InetAddress.getLocalHost();
             AMQConnection con1 = new AMQConnection(args[0], Integer.parseInt(args[1]), args[2], args[3],
                                                   address.getHostName(), args[4]);
-            final org.apache.qpid.jms.Session session1 = (org.apache.qpid.jms.Session) con1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final Session session1 = con1.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
             AMQConnection con2 = new AMQConnection(args[0], Integer.parseInt(args[1]), args[2], args[3],
                                                   address.getHostName(), args[4]);
-            final org.apache.qpid.jms.Session session2 = (org.apache.qpid.jms.Session) con2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final Session session2 = con2.createSession(false, Session.AUTO_ACKNOWLEDGE);
             String selector = args[6];
 
             final int expectedMessageCount = Integer.parseInt(args[5]);
             _logger.info("Message selector is <" + selector + ">...");
 
-            Topic t = new AMQTopic("cbr");
+            Topic t = new AMQTopic(session1.getDefaultTopicExchangeName(), new AMQShortString("cbr"));
             MessageConsumer consumer1 = session1.createConsumer(t,
                                                                 100, false, false, selector);
             MessageConsumer consumer2 = session2.createConsumer(t,
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java b/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
index 1520f18408..39d64069d1 100644
--- a/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
+++ b/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
@@ -22,6 +22,8 @@ package org.apache.qpid.topic;
 
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 
 import javax.jms.*;
 
@@ -47,8 +49,8 @@ class MessageFactory
         _session = session;
         if(session instanceof AMQSession)
         {
-            _topic = new AMQTopic("topictest.messages");
-            _control = new AMQTopic("topictest.control");
+            _topic = new AMQTopic(((AMQSession)session).getDefaultTopicExchangeName(),new AMQShortString("topictest.messages"));
+            _control = new AMQTopic(((AMQSession)session).getDefaultTopicExchangeName(),new AMQShortString("topictest.control"));
         }
         else
         {
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java b/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
index e0af4422a6..8f15bf089e 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
+++ b/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
@@ -22,6 +22,8 @@ package org.apache.qpid.transacted;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.client.AMQQueue;
 
 import javax.jms.Connection;
@@ -35,7 +37,7 @@ public class Ping
         Config config = new Config(argv);
         Connection con = config.createConnection();
         con.setClientID("ping");
-        new Relay(new AMQQueue("ping"), new AMQQueue("pong"), con,
+        new Relay(new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, new AMQShortString("ping")), new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, new AMQShortString("pong")), con,
                   config.isEchoOn(),
                   config.getBatchSize(),
                   config.usePersistentMessages()).start();
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java b/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
index 13295c137a..f4f4b20d7c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
+++ b/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
@@ -22,6 +22,8 @@ package org.apache.qpid.transacted;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.client.AMQQueue;
 
 import javax.jms.Connection;
@@ -34,7 +36,7 @@ public class Pong
         Config config = new Config(argv);
         Connection con = config.createConnection();
         con.setClientID("pong");
-        new Relay(new AMQQueue("pong"), new AMQQueue("ping"), con,
+        new Relay(new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, new AMQShortString("pong")), new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, new AMQShortString("ping")), con,
                   config.isEchoOn(),
                   config.getBatchSize(),
                   config.usePersistentMessages()).start();
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java b/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
index 5564ed93ab..de718d828a 100644
--- a/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
+++ b/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
@@ -22,6 +22,8 @@ package org.apache.qpid.transacted;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.client.AMQQueue;
 
 import javax.jms.Connection;
@@ -33,7 +35,7 @@ public class Start
     public static void main(String[] argv) throws Exception
     {
         Connection con = new Config(argv).createConnection();
-        AMQQueue ping = new AMQQueue("ping");
+        AMQQueue ping = new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, new AMQShortString("ping"));
         Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
         session.createProducer(ping).send(session.createTextMessage("start"));
         session.close();