The commit contains fixes for QPID-2351, QPID-2350 and some ground work for QPID-2352

- Modified Connection.java to add more than one ConnectionListener. This was done to facilitate the SASL encryption patch - QPID-2352.
- Changed the access modifier for getSaslClient method to "public" to allow the SaslClient to be retrieved by the SASL encryption code -QPID-2352.
- Introduced ConnectionSettings object to hold all the configuration options. Previous constructor methods remains unchanged.
- Modified the ClientDelegate to handle heartbeat and idelTimeout value properly.
- Added support to specify config options via the connection URL - QPID-2351
- Added support to handle the heartbeat/idle_timeout options properly in the 0-10 code - QPID-2350. However once QPID-2343 is completed, the code will be further simplified.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index 8aa8c5f647..6554b135f5 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -160,7 +160,7 @@ public class ConnectionTest extends TestCase implements SessionListener
     private Connection connect(final Condition closed)
     {
         Connection conn = new Connection();
-        conn.setConnectionListener(new ConnectionListener()
+        conn.addConnectionListener(new ConnectionListener()
         {
             public void opened(Connection conn) {}
             public void exception(Connection conn, ConnectionException exc)
@@ -311,7 +311,7 @@ public class ConnectionTest extends TestCase implements SessionListener
         startServer();
 
         Connection conn = new Connection();
-        conn.setConnectionListener(new FailoverConnectionListener());
+        conn.addConnectionListener(new FailoverConnectionListener());
         conn.connect("localhost", port, null, "guest", "guest");
         Session ssn = conn.createSession(1);
         ssn.setSessionListener(new TestSessionListener());
@@ -366,7 +366,7 @@ public class ConnectionTest extends TestCase implements SessionListener
         startServer();
 
         Connection conn = new Connection();
-        conn.setConnectionListener(new FailoverConnectionListener());
+        conn.addConnectionListener(new FailoverConnectionListener());
         conn.connect("localhost", port, null, "guest", "guest");
         Session ssn = conn.createSession(1);
         ssn.setSessionListener(new TestSessionListener());