QPID-1203: Add 08ExcludeList for external Java broker and make the profile use that.

Make AMQConnectionFactory take an optional clientid and use that if specified.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index ee970759ad..65e0563141 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -138,13 +138,13 @@ public class TopicSessionTest extends QpidTestCase
 
     public void testUnsubscriptionAfterConnectionClose() throws Exception
     {
-        AMQConnection con1 = (AMQConnection) getConnection("guest", "guest");
+        AMQConnection con1 = (AMQConnection) getConnection("guest", "guest", "clientid");
         AMQTopic topic = new AMQTopic(con1, "MyTopic3");
 
         TopicSession session1 = con1.createTopicSession(false, AMQSession.AUTO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(topic);
 
-        AMQConnection con2 = (AMQConnection) getConnection("guest", "guest");
+        AMQConnection con2 = (AMQConnection) getConnection("guest", "guest", "clientid");
         TopicSession session2 = con2.createTopicSession(false, AMQSession.AUTO_ACKNOWLEDGE);
         TopicSubscriber sub = session2.createDurableSubscriber(topic, "subscription0");
 
@@ -155,7 +155,7 @@ public class TopicSessionTest extends QpidTestCase
         assertNotNull(tm);
         con2.close();
         publisher.publish(session1.createTextMessage("Hello2"));
-        con2 =  (AMQConnection) getConnection("guest", "guest");
+        con2 =  (AMQConnection) getConnection("guest", "guest", "clientid");
         session2 = con2.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         sub = session2.createDurableSubscriber(topic, "subscription0");
         con2.start();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index f5958f05e6..17088f05c3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -481,7 +481,7 @@ public class QpidTestCase extends TestCase
         }
         else
         {
-            con = getConnectionFactory().createConnection(username, password);
+            con = getConnectionFactory().createConnection(username, password, id);
         }
         //add the connection in the lis of connections
         _connections.add(con);