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

35 files changed, 173 insertions, 83 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
index 266e01b66a..338404a431 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
@@ -28,7 +28,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
-import javax.jms.Session;
+
 import javax.jms.TextMessage;
 
 import junit.framework.TestCase;
@@ -40,6 +40,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.jms.Session;
 
 public class RecoverTest extends TestCase
 {
@@ -66,15 +67,15 @@ public class RecoverTest extends TestCase
 
     public void testRecoverResendsMsgs() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
 
         Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-        Queue queue = new AMQQueue(new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
+        Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(),new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
         //force synch to ensure the consumer has resulted in a bound queue
         ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS);
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
 
@@ -123,15 +124,15 @@ public class RecoverTest extends TestCase
 
     public void testRecoverResendsMsgsAckOnEarlier() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
 
         Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-        Queue queue = new AMQQueue(new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
+        Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
         //force synch to ensure the consumer has resulted in a bound queue
         ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS);
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
 
@@ -187,15 +188,15 @@ public class RecoverTest extends TestCase
 
     public void testAcknowledgePerConsumer() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
 
         Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-        Queue queue = new AMQQueue(new AMQShortString("Q1"), new AMQShortString("Q1"), false, true);
-        Queue queue2 = new AMQQueue(new AMQShortString("Q2"), new AMQShortString("Q2"), false, true);
+        Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"), false, true);
+        Queue queue2 = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q2"), new AMQShortString("Q2"), false, true);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
         MessageConsumer consumer2 = consumerSession.createConsumer(queue2);
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
         MessageProducer producer2 = producerSession.createProducer(queue2);
@@ -226,10 +227,10 @@ public class RecoverTest extends TestCase
 
     public void testRecoverInAutoAckListener() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
 
         final Session consumerSession = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        Queue queue = new AMQQueue(new AMQShortString("Q3"), new AMQShortString("Q3"), false, true);
+        Queue queue = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q3"), new AMQShortString("Q3"), false, true);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
         MessageProducer producer = consumerSession.createProducer(queue);
         producer.send(consumerSession.createTextMessage("hello"));
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index a6ae69c4de..0f336998f0 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
@@ -68,7 +68,7 @@ public class BytesMessageTest extends TestCase implements MessageListener
 
     void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue(randomize("BytesMessageTest"), true));
+        init(connection, new AMQQueue(connection, randomize("BytesMessageTest"), true));
     }
 
     void init(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index a957c651b2..1b32b73dbe 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
@@ -70,7 +70,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue(randomize("FieldTableMessageTest"), true));
+        init(connection, new AMQQueue(connection,randomize("FieldTableMessageTest"), true));
     }
 
     private void init(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index 0cca3e4659..3830d61701 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -68,7 +68,7 @@ public class LargeMessageTest extends TestCase
 
     private void init(AMQConnection connection) throws Exception
     {
-        Destination destination = new AMQQueue("LargeMessageTest", true);
+        Destination destination = new AMQQueue(connection,"LargeMessageTest", true);
         init(connection, destination);
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
index 78a4bd6b49..75eb3a8d5e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
@@ -83,7 +83,7 @@ public class MapMessageTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        Destination destination = new AMQQueue(randomize("MapMessageTest"), true);
+        Destination destination = new AMQQueue(connection,randomize("MapMessageTest"), true);
         init(connection, destination);
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index bdd80b43fe..c4e4753c21 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
@@ -32,6 +32,7 @@ import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.exchange.ExchangeDefaults;
 
 public class MultipleConnectionTest extends TestCase
 {
@@ -191,7 +192,7 @@ public class MultipleConnectionTest extends TestCase
         String broker = _connectionString;
         int messages = 10;
 
-        AMQTopic topic = new AMQTopic("amq.topic");
+        AMQTopic topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME,"amq.topic");
 
         Receiver[] receivers = new Receiver[]{
                 new Receiver(broker, topic, 2),
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
index e5add8fe08..099433e779 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
@@ -72,7 +72,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue(randomize("ObjectMessageTest"), true));
+        init(connection, new AMQQueue(connection,randomize("ObjectMessageTest"), true));
     }
 
     private void init(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index aceb40f4c7..463cdca17b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -76,7 +76,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        Destination destination = new AMQQueue(randomize("PropertyValueTest"), true);
+        Destination destination = new AMQQueue(connection, randomize("PropertyValueTest"), true);
         init(connection, destination);
     }
 
@@ -132,7 +132,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
             }
             else
             {
-                q = new AMQQueue("TestReply");
+                q = new AMQQueue(_connection,"TestReply");
             }
 
             m.setJMSReplyTo(q);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
index b63677fc34..3aefc098aa 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
@@ -56,8 +56,11 @@ public class PubSubTwoConnectionTest extends TestCase
      */
     public void testTwoConnections() throws Exception
     {
-        Topic topic = new AMQTopic("MyTopic");
-        Connection con1 = new AMQConnection("vm://:1", "guest", "guest", "Client1", "test");
+
+        AMQConnection con1 = new AMQConnection("vm://:1", "guest", "guest", "Client1", "test");
+
+        Topic topic = new AMQTopic(con1, "MyTopic");
+
         Session session1 = con1.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         MessageProducer producer = session1.createProducer(topic);
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
index e6392916c8..668233f356 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
@@ -75,7 +75,7 @@ public class ReceiveTest extends TestCase
 
     private void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue("ReceiveTest", true));
+        init(connection, new AMQQueue(connection,"ReceiveTest", true));
     }
 
     private void init(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
index 70bd50db15..0cdafebb1c 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
@@ -61,7 +61,7 @@ public class SelectorTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue(randomize("SessionStartTest"), true));
+        init(connection, new AMQQueue(connection,randomize("SessionStartTest"), true));
     }
 
     private void init(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
index 498a18d1da..6cf64499aa 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
@@ -31,6 +31,7 @@ import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.testutil.VMBrokerSetup;
+import org.apache.qpid.framing.AMQShortString;
 
 public class SessionStartTest extends TestCase implements MessageListener
 {
@@ -53,7 +54,7 @@ public class SessionStartTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        init(connection, new AMQQueue(randomize("SessionStartTest"), true));
+        init(connection, new AMQQueue(connection.getDefaultQueueExchangeName(),new AMQShortString(randomize("SessionStartTest")), true));
     }
 
     private void init(AMQConnection connection, AMQDestination destination) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index d0d220c9e5..24c93a0af8 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -41,6 +41,7 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.testutil.VMBrokerSetup;
+import org.apache.qpid.framing.AMQShortString;
 
 public class TextMessageTest extends TestCase implements MessageListener
 {
@@ -74,7 +75,7 @@ public class TextMessageTest extends TestCase implements MessageListener
 
     private void init(AMQConnection connection) throws Exception
     {
-        Destination destination = new AMQQueue(randomize("TextMessageTest"), true);
+        Destination destination = new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("TextMessageTest")), true);
         init(connection, destination);
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 92f30e6478..0e15341615 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
@@ -31,6 +31,7 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.framing.AMQShortString;
 
 public class AMQConnectionTest extends TestCase
 {
@@ -45,8 +46,8 @@ public class AMQConnectionTest extends TestCase
         super.setUp();
         TransportConnection.createVMBroker(1);
         _connection = new AMQConnection("vm://:1", "guest", "guest", "fred", "test");
-        _topic = new AMQTopic("mytopic");
-        _queue = new AMQQueue("myqueue");
+        _topic = new AMQTopic(_connection.getDefaultTopicExchangeName(), new AMQShortString("mytopic"));
+        _queue = new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("myqueue"));
     }
 
     protected void tearDown() throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
index 6eff9d6d6a..78b7976f55 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
@@ -47,8 +47,8 @@ public class AMQSessionTest extends TestCase
     {
         super.setUp();
         _connection = new AMQConnection("vm://:1", "guest", "guest", "fred", "test");
-        _topic = new AMQTopic("mytopic");
-        _queue = new AMQQueue("myqueue");
+        _topic = new AMQTopic(_connection,"mytopic");
+        _queue = new AMQQueue(_connection,"myqueue");
         _session = (AMQSession) _connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
index 8211c5d8cf..c7f1bb3065 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
@@ -58,7 +58,7 @@ import org.apache.qpid.client.transport.TransportConnection;
  */
 public class ChannelCloseOkTest extends TestCase
 {
-    private Connection _connection;
+    private AMQConnection _connection;
     private Destination _destination1;
     private Destination _destination2;
     private Session _session1;
@@ -77,8 +77,8 @@ public class ChannelCloseOkTest extends TestCase
         TransportConnection.createVMBroker(1);
         _connection = new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test");
 
-        _destination1 = new AMQQueue("q1", true);
-        _destination2 = new AMQQueue("q2", true);
+        _destination1 = new AMQQueue(_connection,"q1", true);
+        _destination2 = new AMQQueue(_connection, "q2", true);
         _session1 = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         _session1.createConsumer(_destination1).setMessageListener(new MessageListener()
         {
@@ -164,7 +164,7 @@ public class ChannelCloseOkTest extends TestCase
         assertEquals(1, _received2.size());
 
         // Now send message to incorrect destination on session 1.
-        Destination destination = new AMQQueue("incorrect");
+        Destination destination = new AMQQueue(_connection, "incorrect");
         send(_session1, destination, "third"); // no point waiting as message will never be received.
 
         // Ensure both sessions are still ok.
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
index 3aa8eaacef..d19a6095d5 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
@@ -49,10 +49,10 @@ public class CloseWithBlockingReceiveTest extends TestCase
 
     public void testReceiveReturnsNull() throws Exception
     {
-        final Connection connection = new AMQConnection("vm://:1", "guest", "guest",
+        final AMQConnection connection = new AMQConnection("vm://:1", "guest", "guest",
                                                   "fred", "test");
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        MessageConsumer consumer = session.createConsumer(new AMQTopic("banana"));
+        MessageConsumer consumer = session.createConsumer(new AMQTopic(connection, "banana"));
         connection.start();
 
         Runnable r = new Runnable()
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
index b5586709d6..ae8e2cfbda 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
@@ -54,10 +54,12 @@ public class ConnectionStartTest extends TestCase
 
         try
         {
-            AMQQueue queue = new AMQQueue("ConnectionStartTest");
+
 
             AMQConnection pubCon = new AMQConnection(_broker, "guest", "guest", "fred", "test");
 
+            AMQQueue queue = new AMQQueue(pubCon,"ConnectionStartTest");
+
             Session pubSess = pubCon.createSession(false, AMQSession.AUTO_ACKNOWLEDGE);
 
             MessageProducer pub = pubSess.createProducer(queue);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 585f52a959..d9ce080e14 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -20,16 +20,21 @@
  */
 package org.apache.qpid.test.unit.client.connection;
 
-import javax.jms.Connection;
-
-import junit.framework.TestCase;
-
 import org.apache.qpid.AMQConnectionFailureException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQUnresolvedAddressException;
 import org.apache.qpid.client.AMQAuthenticationException;
 import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.jms.Session;
+
+import junit.framework.TestCase;
+
+import javax.jms.Connection;
+import javax.jms.QueueSession;
+import javax.jms.TopicSession;
 
 public class ConnectionTest extends TestCase
 {
@@ -54,7 +59,7 @@ public class ConnectionTest extends TestCase
     {
         try
         {
-            AMQConnection conn  = new AMQConnection(_broker, "guest", "guest", "fred", "test");
+            AMQConnection conn = new AMQConnection(_broker, "guest", "guest", "fred", "test");
             conn.close();
         }
         catch (Exception e)
@@ -63,6 +68,54 @@ public class ConnectionTest extends TestCase
         }
     }
 
+
+    public void testDefaultExchanges()
+    {
+        try
+        {
+            AMQConnection conn = new AMQConnection("amqp://guest:guestd@clientid/test?brokerlist='"
+                                                   + _broker
+                                                   + "?retries='1''&defaultQueueExchange='test.direct'"
+                                                   + "&defaultTopicExchange='test.topic'"
+                                                   + "&temporaryQueueExchange='tmp.direct'"
+                                                   + "&temporaryTopicExchange='tmp.topic'");
+
+            QueueSession queueSession = conn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            AMQQueue queue = (AMQQueue) queueSession.createQueue("MyQueue");
+
+            assertEquals(queue.getExchangeName().toString(), "test.direct");
+
+            AMQQueue tempQueue = (AMQQueue) queueSession.createTemporaryQueue();
+
+            assertEquals(tempQueue.getExchangeName().toString(), "tmp.direct");
+
+
+            queueSession.close();
+
+
+            TopicSession topicSession = conn.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            AMQTopic topic = (AMQTopic) topicSession.createTopic("silly.topic");
+
+            assertEquals(topic.getExchangeName().toString(), "test.topic");
+
+            AMQTopic tempTopic = (AMQTopic) topicSession.createTemporaryTopic();
+
+            assertEquals(tempTopic.getExchangeName().toString(), "tmp.topic");
+
+            topicSession.close();
+
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Connection to " + _broker + " should succeed. Reason: " + e);
+        }
+    }
+
+
     // FIXME The inVM broker currently has no authentication .. Needs added QPID-70
     public void passwordFailureConnection() throws Exception
     {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
index 41ab535c6e..bfbba61913 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
@@ -456,6 +456,24 @@ public class ConnectionURLTest extends TestCase
         }
     }
 
+
+    public void testDefaultExchanges() throws URLSyntaxException
+    {
+        String url = "amqp://guest:guest@id/test" + "?defaultQueueExchange='test.direct'&defaultTopicExchange='test.topic'&temporaryQueueExchange='tmp.direct'&temporaryTopicExchange='tmp.topic'";
+
+        AMQConnectionURL conn = new AMQConnectionURL(url);
+
+        assertEquals(conn.getDefaultQueueExchangeName(),"test.direct");
+
+        assertEquals(conn.getDefaultTopicExchangeName(),"test.topic");
+
+        assertEquals(conn.getTemporaryQueueExchangeName(),"tmp.direct");
+
+        assertEquals(conn.getTemporaryTopicExchangeName(),"tmp.topic");
+
+    }
+
+
     public static junit.framework.Test suite()
     {
         return new junit.framework.TestSuite(ConnectionURLTest.class);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
index 92a0d4a8ee..b9394b87a1 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
@@ -131,7 +131,7 @@ public class DestinationURLTest extends TestCase
         AMQBindingURL dest = new AMQBindingURL(url);
 
         assertTrue(dest.getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS));
-        assertTrue(dest.getExchangeName().equals(ExchangeDefaults.DIRECT_EXCHANGE_NAME));
+        assertTrue(dest.getExchangeName().equals(ExchangeDefaults.DEFAULT_EXCHANGE_NAME));
         assertTrue(dest.getDestinationName().equals(""));
         assertTrue(dest.getQueueName().equals("IBMPerfQueue1"));
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
index 47be69c826..2e63bf4739 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
@@ -26,6 +26,7 @@ import javax.jms.MessageListener;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.framing.AMQShortString;
 
 /**
  * Declare a private temporary response queue,
@@ -50,10 +51,10 @@ public class Client implements MessageListener
         _connection = connection;
         _expected = expected;
         _session = (AMQSession) _connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
-        AMQQueue response = new AMQQueue("ResponseQueue", true);
+        AMQQueue response = new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("ResponseQueue"), true);
         _session.createConsumer(response).setMessageListener(this);
         _connection.start();
-        AMQQueue service = new SpecialQueue("ServiceQueue");
+        AMQQueue service = new SpecialQueue(_connection,"ServiceQueue");
         Message request = _session.createTextMessage("Request!");
         request.setJMSReplyTo(response);
         _session.createProducer(service).send(request);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
index 6771453977..6593f7d86a 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
@@ -46,7 +46,7 @@ public class Service implements MessageListener
     Service(AMQConnection connection) throws Exception
     {
         _connection = connection;
-        AMQQueue queue = new SpecialQueue("ServiceQueue");
+        AMQQueue queue = new SpecialQueue(connection, "ServiceQueue");
         _session = (AMQSession) _connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         _session.createConsumer(queue).setMessageListener(this);
         _connection.start();
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
index 691acbb213..27371b0397 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.test.unit.client.forwardall;
 
 import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.framing.AMQShortString;
 
 /**
@@ -32,14 +33,10 @@ class SpecialQueue extends AMQQueue
 {
     private final AMQShortString name;
 
-    SpecialQueue(String name)
+    SpecialQueue(AMQConnection con, String name)
     {
-        this(new AMQShortString(name));
-    }
-    SpecialQueue(AMQShortString name)
-    {
-        super(name, true);
-        this.name = name;
+        super(con, name, true);
+        this.name = new AMQShortString(name);
     }
 
     public AMQShortString getRoutingKey()
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index 5b9fb2549e..6d131cd52e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
@@ -56,7 +56,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener
     {
         super.setUp();
         connection = new AMQConnection(_broker, "guest", "guest", randomize("Client"), "test");
-        destination = new AMQQueue(randomize("LatencyTest"), true);
+        destination = new AMQQueue(connection,randomize("LatencyTest"), true);
         session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
 
         //set up a consumer
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
index ddd08130e4..5e2703d5a5 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
@@ -55,7 +55,7 @@ public class TopicPublisherCloseTest extends TestCase
     {
         AMQConnection connection = new AMQConnection(_connectionString, "guest", "guest", "Client", "test");
 
-        Topic destination1 = new AMQTopic("t1");
+        Topic destination1 = new AMQTopic(connection, "t1");
         TopicSession session1 = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
         TopicPublisher pub = session1.createPublisher(destination1);
         connection.close();
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
index bf2cfa3682..a2cd2e4da3 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
@@ -41,9 +41,9 @@ public class JMSDestinationTest extends TestCase
 

     public void testJMSDestination() throws Exception

     {

-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");

+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");

         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);

-        Queue queue = new AMQQueue(new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);

+        Queue queue = new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);

         MessageConsumer consumer = consumerSession.createConsumer(queue);

 

         Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
index 0903d0a5ba..dad1666299 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
@@ -51,7 +51,7 @@ public class JMSPropertiesTest extends TestCase
     public static final String JMS_CORR_ID = "QPIDID_01";
     public static final int JMS_DELIV_MODE = 1;
     public static final String JMS_TYPE = "test.jms.type";
-    public static final Destination JMS_REPLY_TO = new AMQQueue("my.replyto");
+
 
     protected void setUp() throws Exception
     {
@@ -68,15 +68,15 @@ public class JMSPropertiesTest extends TestCase
 
     public void testJMSProperties() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-        Queue queue = new AMQQueue(new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
+        Queue queue = new AMQQueue(con.getDefaultQueueExchangeName(),new AMQShortString("someQ"), new AMQShortString("someQ"), false, true);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
-
+        Destination JMS_REPLY_TO = new AMQQueue(con2,"my.replyto");
         //create a test message to send
         ObjectMessage sentMsg = new NonQpidObjectMessage();
         sentMsg.setJMSCorrelationID(JMS_CORR_ID);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
index 8b617093fc..fd425b9930 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
@@ -33,6 +33,7 @@ import org.apache.qpid.client.message.AbstractJMSMessage;
 import org.apache.qpid.client.message.JMSMapMessage;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.client.message.MessageConverter;
+import org.apache.qpid.exchange.ExchangeDefaults;
 
 
 public class MessageConverterTest extends TestCase
@@ -41,7 +42,7 @@ public class MessageConverterTest extends TestCase
     public static final String JMS_CORR_ID = "QPIDID_01";
     public static final int JMS_DELIV_MODE = 1;
     public static final String JMS_TYPE = "test.jms.type";
-    public static final Destination JMS_REPLY_TO = new AMQQueue("my.replyto");
+    public static final Destination JMS_REPLY_TO = new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME,"my.replyto");
 
     protected JMSTextMessage testTextMessage;
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index a5eb0384d8..07ef5f04d4 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
@@ -40,6 +40,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.url.AMQBindingURL;
 import org.apache.qpid.url.BindingURL;
 
@@ -122,9 +123,9 @@ public class StreamMessageTest extends TestCase
 
     public void testModifyReceivedMessageExpandsBuffer() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-        AMQQueue queue = new AMQQueue("testQ");
+        AMQQueue queue = new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("testQ"));
         MessageConsumer consumer = consumerSession.createConsumer(queue);
         consumer.setMessageListener(new MessageListener()
         {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index f957df2c34..0828ab398c 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
@@ -54,8 +54,8 @@ public class DurableSubscriptionTest extends TestCase
 
     public void testUnsubscribe() throws AMQException, JMSException, URLSyntaxException
     {
-        AMQTopic topic = new AMQTopic("MyTopic");
         AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con,"MyTopic");
         Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         MessageConsumer consumer1 = session1.createConsumer(topic);
         MessageProducer producer = session1.createProducer(topic);
@@ -95,8 +95,9 @@ public class DurableSubscriptionTest extends TestCase
 
     public void testDurability() throws AMQException, JMSException, URLSyntaxException
     {
-        AMQTopic topic = new AMQTopic("MyTopic");
+
         AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con,"MyTopic");
         Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         MessageConsumer consumer1 = session1.createConsumer(topic);
         MessageProducer producer = session1.createProducer(topic);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
index 9aebef71ca..929e2799a9 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
@@ -51,8 +51,9 @@ public class TopicPublisherTest extends TestCase
 
     public void testUnidentifiedProducer() throws Exception
     {
-        AMQTopic topic = new AMQTopic("MyTopic");
+
         AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con,"MyTopic");
         TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(null);
         MessageConsumer consumer1 = session1.createConsumer(topic);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 481441797f..fe7efb4e88 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -59,8 +59,9 @@ public class TopicSessionTest extends TestCase
 
     public void testTopicSubscriptionUnsubscription() throws Exception
     {
-        AMQTopic topic = new AMQTopic("MyTopic");
+
         AMQConnection con = new AMQConnection("vm://:1?retries='0'", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con.getDefaultTopicExchangeName(),"MyTopic");
         TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicSubscriber sub = session1.createDurableSubscriber(topic,"subscription0");
         TopicPublisher publisher = session1.createPublisher(topic);
@@ -104,9 +105,10 @@ public class TopicSessionTest extends TestCase
 
     private void subscriptionNameReuseForDifferentTopic(boolean shutdown) throws Exception
     {
-        AMQTopic topic = new AMQTopic("MyTopic1" + String.valueOf(shutdown));
-        AMQTopic topic2 = new AMQTopic("MyOtherTopic1" + String.valueOf(shutdown));
         AMQConnection con = new AMQConnection("vm://:1?retries='0'", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con,"MyTopic1" + String.valueOf(shutdown));
+        AMQTopic topic2 = new AMQTopic(con,"MyOtherTopic1" + String.valueOf(shutdown));
+
         TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicSubscriber sub = session1.createDurableSubscriber(topic, "subscription0");
         TopicPublisher publisher = session1.createPublisher(null);
@@ -142,8 +144,9 @@ public class TopicSessionTest extends TestCase
 
     public void testUnsubscriptionAfterConnectionClose() throws Exception
     {
-        AMQTopic topic = new AMQTopic("MyTopic3");
         AMQConnection con1 = new AMQConnection("vm://:1?retries='0'", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con1,"MyTopic3");
+
         TopicSession session1 = con1.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(topic);
 
@@ -171,8 +174,9 @@ public class TopicSessionTest extends TestCase
 
     public void testTextMessageCreation() throws Exception
     {
-        AMQTopic topic = new AMQTopic("MyTopic4");
+
         AMQConnection con = new AMQConnection("vm://:1?retries='0'", "guest", "guest", "test", "test");
+        AMQTopic topic = new AMQTopic(con,"MyTopic4");
         TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(topic);
         MessageConsumer consumer1 = session1.createConsumer(topic);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
index e291da797c..4296e43f88 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
@@ -25,7 +25,6 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
-import javax.jms.Session;
 import javax.jms.TextMessage;
 
 import junit.framework.TestCase;
@@ -37,6 +36,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.jms.Session;
 
 public class TransactedTest extends TestCase
 {
@@ -62,11 +62,13 @@ public class TransactedTest extends TestCase
     {
         super.setUp();
         TransportConnection.createVMBroker(1);
-        queue1 = new AMQQueue(new AMQShortString("Q1"), new AMQShortString("Q1"), false, true);
-        queue2 = new AMQQueue("Q2", false);
-
         con = new AMQConnection("vm://:1", "guest", "guest", "TransactedTest", "test");
         session = con.createSession(true, 0);
+        queue1 = new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"), false, true);
+        queue2 = new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q2"), false);
+
+
+
         consumer1 = session.createConsumer(queue1);
         //Dummy just to create the queue. 
         MessageConsumer consumer2 = session.createConsumer(queue2);
@@ -147,15 +149,15 @@ public class TransactedTest extends TestCase
 
     public void testResendsMsgsAfterSessionClose() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
 
         Session consumerSession = con.createSession(true, Session.CLIENT_ACKNOWLEDGE);
-        AMQQueue queue3 = new AMQQueue("Q3", false);
+        AMQQueue queue3 = new AMQQueue(consumerSession.getDefaultQueueExchangeName(),new AMQShortString("Q3"), false);
         MessageConsumer consumer = consumerSession.createConsumer(queue3);
         //force synch to ensure the consumer has resulted in a bound queue
         ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS);
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
         Session producerSession = con2.createSession(true, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue3);
 
diff --git a/java/client/src/test/java/org/apache/qpid/testutil/Config.java b/java/client/src/test/java/org/apache/qpid/testutil/Config.java
index ad51fe498d..e5b4834622 100644
--- a/java/client/src/test/java/org/apache/qpid/testutil/Config.java
+++ b/java/client/src/test/java/org/apache/qpid/testutil/Config.java
@@ -27,6 +27,7 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQHeadersExchange;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.exchange.ExchangeDefaults;
 
 public class Config
 {
@@ -117,12 +118,12 @@ public class Config
         if(isQueue())
         {
             System.out.println("Using queue named " + name);
-            return new AMQQueue(name);
+            return new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME,name);
         }
         else if(isTopic())
         {
             System.out.println("Using topic named " + name);
-            return new AMQTopic(name);
+            return new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME,name);
         }
         else if(isHeaders())
         {