Support for multiple protocols in qpid::Url.

- simplified qpid::Address to hold (protocol,host,port) triples.
- protocol plugins call Url:addProtocol to add tags to Url parser.
- use Address::protocol when establishing connections.
- ssl_test: tests using URL to connect.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/qpid/cpp/src/tests/RetryList.cpp b/qpid/cpp/src/tests/RetryList.cpp
index d1d22348a3..50cd5edfe8 100644
--- a/qpid/cpp/src/tests/RetryList.cpp
+++ b/qpid/cpp/src/tests/RetryList.cpp
@@ -33,7 +33,7 @@ struct RetryListFixture
 {
     RetryList list;
     std::vector<Url> urls;
-    std::vector<TcpAddress> expected;
+    std::vector<Address> expected;
 
     void addUrl(const std::string& s)
     {
@@ -42,15 +42,15 @@ struct RetryListFixture
 
     void addExpectation(const std::string& host, uint16_t port)
     {
-        expected.push_back(TcpAddress(host, port));
+        expected.push_back(Address("tcp", host, port));
     }
 
     void check()
     {
         list.reset(urls);
         for (int t = 0; t < 2; t++) {
-            TcpAddress next;
-            for (std::vector<TcpAddress>::const_iterator i = expected.begin(); i != expected.end(); ++i) {
+            Address next;
+            for (std::vector<Address>::const_iterator i = expected.begin(); i != expected.end(); ++i) {
                 BOOST_CHECK(list.next(next));
                 BOOST_CHECK_EQUAL(i->host, next.host);
                 BOOST_CHECK_EQUAL(i->port, next.port);