QPID-3434: Refactored 0-8..0-9-1 code paths to use same SSL configuration mechanisms as 0-10.

Apply work by myself and Keith Wall

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

11 files changed, 136 insertions, 510 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index c8576bf00d..c0d4d8a893 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.qpid.jms.BrokerDetails;
-import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.transport.ConnectionSettings;
 import org.apache.qpid.url.URLHelper;
 import org.apache.qpid.url.URLSyntaxException;
 
@@ -38,8 +38,6 @@ public class AMQBrokerDetails implements BrokerDetails
 
     private Map<String, String> _options = new HashMap<String, String>();
 
-    private SSLConfiguration _sslConfiguration;
-
     public AMQBrokerDetails(){}
     
     public AMQBrokerDetails(String url) throws URLSyntaxException
@@ -200,11 +198,10 @@ public class AMQBrokerDetails implements BrokerDetails
         }
     }
 
-    public AMQBrokerDetails(String host, int port, SSLConfiguration sslConfiguration)
+    public AMQBrokerDetails(String host, int port)
     {
         _host = host;
         _port = port;
-        _sslConfiguration = sslConfiguration;
     }
 
     public String getHost()
@@ -280,16 +277,6 @@ public class AMQBrokerDetails implements BrokerDetails
         setProperty(OPTIONS_CONNECT_TIMEOUT, Long.toString(timeout));
     }
 
-    public SSLConfiguration getSSLConfiguration()
-    {
-        return _sslConfiguration;
-    }
-
-    public void setSSLConfiguration(SSLConfiguration sslConfig)
-    {
-        _sslConfiguration = sslConfig;
-    }
-
     public String toString()
     {
         StringBuffer sb = new StringBuffer();
@@ -316,9 +303,8 @@ public class AMQBrokerDetails implements BrokerDetails
 
         return _host.equalsIgnoreCase(bd.getHost()) &&
                (_port == bd.getPort()) &&
-               _transport.equalsIgnoreCase(bd.getTransport()) &&
-               compareSSLConfigurations(bd.getSSLConfiguration());
-        //todo do we need to compare all the options as well?
+               _transport.equalsIgnoreCase(bd.getTransport());
+        //TODO do we need to compare all the options as well?
     }
 
     @Override
@@ -359,24 +345,6 @@ public class AMQBrokerDetails implements BrokerDetails
         return optionsURL.toString();
     }
 
-    // Do we need to do a more in-depth comparison?
-    private boolean compareSSLConfigurations(SSLConfiguration other)
-    {
-        boolean retval = false;
-        if (_sslConfiguration == null &&
-                other == null)
-        {
-            retval = true;
-        }
-        else if (_sslConfiguration != null &&
-                other != null)
-        {
-            retval = true;
-        }
-
-        return retval;
-    }
-
     public static String checkTransport(String broker)
     {
         if ((!broker.contains("://")))
@@ -398,4 +366,82 @@ public class AMQBrokerDetails implements BrokerDetails
     {
         _options = props;
     }
+
+    public ConnectionSettings buildConnectionSettings()
+    {
+        ConnectionSettings conSettings = new ConnectionSettings();
+
+        conSettings.setHost(getHost());
+        conSettings.setPort(getPort());
+
+        // ------------ sasl options ---------------
+        if (getProperty(BrokerDetails.OPTIONS_SASL_MECHS) != null)
+        {
+            conSettings.setSaslMechs(
+                    getProperty(BrokerDetails.OPTIONS_SASL_MECHS));
+        }
+
+        // Sun SASL Kerberos client uses the
+        // protocol + servername as the service key.
+
+        if (getProperty(BrokerDetails.OPTIONS_SASL_PROTOCOL_NAME) != null)
+        {
+            conSettings.setSaslProtocol(
+                    getProperty(BrokerDetails.OPTIONS_SASL_PROTOCOL_NAME));
+        }
+
+
+        if (getProperty(BrokerDetails.OPTIONS_SASL_SERVER_NAME) != null)
+        {
+            conSettings.setSaslServerName(
+                    getProperty(BrokerDetails.OPTIONS_SASL_SERVER_NAME));
+        }
+
+        conSettings.setUseSASLEncryption(
+                getBooleanProperty(BrokerDetails.OPTIONS_SASL_ENCRYPTION));
+
+        // ------------- ssl options ---------------------
+        conSettings.setUseSSL(getBooleanProperty(BrokerDetails.OPTIONS_SSL));
+
+        if (getProperty(BrokerDetails.OPTIONS_TRUST_STORE) != null)
+        {
+            conSettings.setTrustStorePath(
+                    getProperty(BrokerDetails.OPTIONS_TRUST_STORE));
+        }
+
+        if (getProperty(BrokerDetails.OPTIONS_TRUST_STORE_PASSWORD) != null)
+        {
+            conSettings.setTrustStorePassword(
+                    getProperty(BrokerDetails.OPTIONS_TRUST_STORE_PASSWORD));
+        }
+
+        if (getProperty(BrokerDetails.OPTIONS_KEY_STORE) != null)
+        {
+            conSettings.setKeyStorePath(
+                    getProperty(BrokerDetails.OPTIONS_KEY_STORE));
+        }
+
+        if (getProperty(BrokerDetails.OPTIONS_KEY_STORE_PASSWORD) != null)
+        {
+            conSettings.setKeyStorePassword(
+                    getProperty(BrokerDetails.OPTIONS_KEY_STORE_PASSWORD));
+        }
+
+        if (getProperty(BrokerDetails.OPTIONS_SSL_CERT_ALIAS) != null)
+        {
+            conSettings.setCertAlias(
+                    getProperty(BrokerDetails.OPTIONS_SSL_CERT_ALIAS));
+        }
+        // ----------------------------
+
+        conSettings.setVerifyHostname(getBooleanProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME));
+
+        if (getProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY) != null)
+        {
+            conSettings.setTcpNodelay(
+                    getBooleanProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY));
+        }
+
+        return conSettings;
+    }
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 4a62f443f1..c38188cdc3 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -147,9 +147,6 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
      */
     private QpidConnectionMetaData _connectionMetaData;
 
-    /** Configuration info for SSL */
-    private SSLConfiguration _sslConfiguration;
-
     private AMQShortString _defaultTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
     private AMQShortString _defaultQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
     private AMQShortString _temporaryTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
@@ -194,68 +191,27 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
         this(new AMQConnectionURL(
                 ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
                 + ((clientName == null) ? "" : clientName) + "/" + virtualHost + "?brokerlist='"
-                + AMQBrokerDetails.checkTransport(broker) + "'"), null);
-    }
-
-    /**
-     * @param broker      brokerdetails
-     * @param username    username
-     * @param password    password
-     * @param clientName  clientid
-     * @param virtualHost virtualhost
-     *
-     * @throws AMQException
-     * @throws URLSyntaxException
-     */
-    public AMQConnection(String broker, String username, String password, String clientName, String virtualHost,
-                         SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(
-                ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                + ((clientName == null) ? "" : clientName) + "/" + virtualHost + "?brokerlist='"
-                + AMQBrokerDetails.checkTransport(broker) + "'"), sslConfig);
+                + AMQBrokerDetails.checkTransport(broker) + "'"));
     }
 
     public AMQConnection(String host, int port, String username, String password, String clientName, String virtualHost)
             throws AMQException, URLSyntaxException
     {
-        this(host, port, false, username, password, clientName, virtualHost, null);
-    }
-
-    public AMQConnection(String host, int port, String username, String password, String clientName, String virtualHost,
-                         SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(host, port, false, username, password, clientName, virtualHost, sslConfig);
-    }
-
-    public AMQConnection(String host, int port, boolean useSSL, String username, String password, String clientName,
-                         String virtualHost, SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
         this(new AMQConnectionURL(
-                useSSL
-                ? (ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port
-                   + "'" + "," + BrokerDetails.OPTIONS_SSL + "='true'")
-                : (ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
-                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port
-                   + "'" + "," + BrokerDetails.OPTIONS_SSL + "='false'")), sslConfig);
+                   ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@"
+                   + ((clientName == null) ? "" : clientName) + virtualHost + "?brokerlist='tcp://" + host + ":" + port + "'"));
     }
 
     public AMQConnection(String connection) throws AMQException, URLSyntaxException
     {
-        this(new AMQConnectionURL(connection), null);
-    }
-
-    public AMQConnection(String connection, SSLConfiguration sslConfig) throws AMQException, URLSyntaxException
-    {
-        this(new AMQConnectionURL(connection), sslConfig);
+        this(new AMQConnectionURL(connection));
     }
 
     /**
      * @todo Some horrible stuff going on here with setting exceptions to be non-null to detect if an exception
      * was thrown during the connection! Intention not clear. Use a flag anyway, not exceptions... Will fix soon.
      */
-    public AMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig) throws AMQException
+    public AMQConnection(ConnectionURL connectionURL) throws AMQException
     {
         if (connectionURL == null)
         {
@@ -350,7 +306,6 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
             _logger.info("Connection:" + connectionURL);
         }
 
-        _sslConfiguration = sslConfig;
         _connectionURL = connectionURL;
 
         _clientName = connectionURL.getClientName();
@@ -548,7 +503,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
 
     public boolean attemptReconnection(String host, int port)
     {
-        BrokerDetails bd = new AMQBrokerDetails(host, port, _sslConfiguration);
+        BrokerDetails bd = new AMQBrokerDetails(host, port);
 
         _failoverPolicy.setBroker(bd);
 
@@ -1376,11 +1331,6 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
                              AMQConnectionFactory.class.getName(), null); // factory location
     }
 
-    public SSLConfiguration getSSLConfiguration()
-    {
-        return _sslConfiguration;
-    }
-
     public AMQShortString getDefaultTopicExchangeName()
     {
         return _defaultTopicExchangeName;
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index cb531d4fca..6b9cf909a8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
@@ -191,8 +191,7 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Connec
                         + _conn.getPassword());
             }
 
-            ConnectionSettings conSettings = new ConnectionSettings();
-            retriveConnectionSettings(conSettings,brokerDetail);
+            ConnectionSettings conSettings = retriveConnectionSettings(brokerDetail);
             _qpidConnection.connect(conSettings);
 
             _conn._connected = true;
@@ -352,77 +351,14 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Connec
         return (String)_qpidConnection.getServerProperties().get(UUID_NAME);        
     }
     
-    private void retriveConnectionSettings(ConnectionSettings conSettings, BrokerDetails brokerDetail)
+    private ConnectionSettings retriveConnectionSettings(BrokerDetails brokerDetail)
     {
+        ConnectionSettings conSettings = brokerDetail.buildConnectionSettings();
 
-        conSettings.setHost(brokerDetail.getHost());
-        conSettings.setPort(brokerDetail.getPort());
         conSettings.setVhost(_conn.getVirtualHost());
         conSettings.setUsername(_conn.getUsername());
         conSettings.setPassword(_conn.getPassword());
         
-        // ------------ sasl options ---------------
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_SASL_MECHS) != null)
-        {
-            conSettings.setSaslMechs(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_SASL_MECHS));
-        }
-
-        // Sun SASL Kerberos client uses the
-        // protocol + servername as the service key.
-        
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_SASL_PROTOCOL_NAME) != null)
-        {
-            conSettings.setSaslProtocol(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_SASL_PROTOCOL_NAME));
-        }
-        
-        
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_SASL_SERVER_NAME) != null)
-        {
-            conSettings.setSaslServerName(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_SASL_SERVER_NAME));
-        }
-                        
-        conSettings.setUseSASLEncryption(
-                brokerDetail.getBooleanProperty(BrokerDetails.OPTIONS_SASL_ENCRYPTION));
-
-        // ------------- ssl options ---------------------
-        conSettings.setUseSSL(brokerDetail.getBooleanProperty(BrokerDetails.OPTIONS_SSL));
-        
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_TRUST_STORE) != null)
-        {
-            conSettings.setTrustStorePath(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_TRUST_STORE));
-        }
-
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_TRUST_STORE_PASSWORD) != null)
-        {
-            conSettings.setTrustStorePassword(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_TRUST_STORE_PASSWORD));
-        }
-        
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_KEY_STORE) != null)
-        {
-            conSettings.setKeyStorePath(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_KEY_STORE));
-        }
-        
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_KEY_STORE_PASSWORD) != null)
-        {
-            conSettings.setKeyStorePassword(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_KEY_STORE_PASSWORD));
-        }
-
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_SSL_CERT_ALIAS) != null)
-        {
-            conSettings.setCertAlias(
-                    brokerDetail.getProperty(BrokerDetails.OPTIONS_SSL_CERT_ALIAS));
-        }
-        // ----------------------------
-        
-        conSettings.setVerifyHostname(brokerDetail.getBooleanProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME));
-        
         // Pass client name from connection URL
         Map<String, Object> clientProps = new HashMap<String, Object>();
         try
@@ -434,14 +370,10 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Connec
         {
             // Ignore
         }
-        
-        if (brokerDetail.getProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY) != null)
-        {
-            conSettings.setTcpNodelay(
-                    brokerDetail.getBooleanProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY));
-        }
-        
+
         conSettings.setHeartbeatInterval(getHeartbeatInterval(brokerDetail));
+
+        return conSettings;
     }
     
     // The idle_timeout prop is in milisecs while
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index 756bf11663..8bc9889050 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
@@ -95,18 +95,22 @@ public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate
 
         StateWaiter waiter = _conn._protocolHandler.createWaiter(openOrClosedStates);
 
-        ConnectionSettings settings = new ConnectionSettings();
-        settings.setHost(brokerDetail.getHost());
-        settings.setPort(brokerDetail.getPort());
+        ConnectionSettings settings = brokerDetail.buildConnectionSettings();
         settings.setProtocol(brokerDetail.getTransport());
 
-        SSLConfiguration sslConfig = _conn.getSSLConfiguration();
         SSLContext sslContext = null;
-        if (sslConfig != null)
+        if (settings.isUseSSL())
         {
             try
             {
-                sslContext = SSLContextFactory.buildClientContext(sslConfig.getKeystorePath(), sslConfig.getKeystorePassword(), sslConfig.getCertType(),null,null,null,null);
+                sslContext = SSLContextFactory.buildClientContext(
+                                settings.getTrustStorePath(),
+                                settings.getTrustStorePassword(),
+                                settings.getTrustStoreCertType(),
+                                settings.getKeyStorePath(),
+                                settings.getKeyStorePassword(),
+                                settings.getKeyStoreCertType(),
+                                settings.getCertAlias());
             }
             catch (GeneralSecurityException e)
             {
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
index ec4c668d7e..fc2d6c94eb 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
@@ -44,210 +44,34 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
                                              ObjectFactory, Referenceable, XATopicConnectionFactory,
                                              XAQueueConnectionFactory, XAConnectionFactory
 {
-    private String _host;
-    private int _port;
-    private String _defaultUsername;
-    private String _defaultPassword;
-    private String _virtualPath;
+    private final ConnectionURL _connectionDetails;
 
-    private ConnectionURL _connectionDetails;
-    private SSLConfiguration _sslConfig;
-
-    public AMQConnectionFactory()
+    public AMQConnectionFactory(final String url) throws URLSyntaxException
     {
-    }
-
-    /**
-     * This is the Only constructor used!
-     * It is used form the context and from the JNDI objects.
-     */
-    public AMQConnectionFactory(String url) throws URLSyntaxException
-    {
-        _connectionDetails = new AMQConnectionURL(url);
-    }
-
-    /**
-     * This constructor is never used!
-     */
-    public AMQConnectionFactory(ConnectionURL url)
-    {
-        _connectionDetails = url;
-    }
-
-    /**
-     * This constructor is never used!
-     */
-    public AMQConnectionFactory(String broker, String username, String password, String clientName, String virtualHost)
-            throws URLSyntaxException
-    {
-        this(new AMQConnectionURL(
-                ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@" + clientName + "/" + virtualHost + "?brokerlist='" + broker + "'"));
-    }
-
-    /**
-     * This constructor is never used!
-     */
-    public AMQConnectionFactory(String host, int port, String virtualPath)
-    {
-        this(host, port, "guest", "guest", virtualPath);
-    }
-
-    /**
-     * This constructor is never used!
-     */
-    public AMQConnectionFactory(String host, int port, String defaultUsername, String defaultPassword,
-                                String virtualPath)
-    {
-        _host = host;
-        _port = port;
-        _defaultUsername = defaultUsername;
-        _defaultPassword = defaultPassword;
-        _virtualPath = virtualPath;
-
-//todo when setting Host/Port has been resolved then we can use this otherwise those methods won't work with the following line.
-//        _connectionDetails = new AMQConnectionURL(
-//                ConnectionURL.AMQ_PROTOCOL + "://" +
-//                        _defaultUsername + ":" + _defaultPassword + "@" +
-//                        virtualPath + "?brokerlist='tcp://" + host + ":" + port + "'");
-    }
-
-    /**
-     * @return The _defaultPassword.
-     */
-    public final String getDefaultPassword(String password)
-    {
-        if (_connectionDetails != null)
-        {
-            return _connectionDetails.getPassword();
-        }
-        else
-        {
-            return _defaultPassword;
-        }
-    }
-
-    /**
-     * @param password The _defaultPassword to set.
-     */
-    public final void setDefaultPassword(String password)
-    {
-        if (_connectionDetails != null)
+        if (url == null)
         {
-            _connectionDetails.setPassword(password);
+            throw new IllegalArgumentException("url cannot be null");
         }
-        _defaultPassword = password;
-    }
-
-    /**
-     * Getter for SSLConfiguration
-     *
-     * @return SSLConfiguration if set, otherwise null
-     */
-    public final SSLConfiguration getSSLConfiguration()
-    {
-        return _sslConfig;
-    }
-
-    /**
-     * Setter for SSLConfiguration
-     *
-     * @param sslConfig config to store
-     */
-    public final void setSSLConfiguration(SSLConfiguration sslConfig)
-    {
-        _sslConfig = sslConfig;
-    }
 
-    /**
-     * @return The _defaultPassword.
-     */
-    public final String getDefaultUsername(String password)
-    {
-        if (_connectionDetails != null)
-        {
-            return _connectionDetails.getUsername();
-        }
-        else
-        {
-            return _defaultUsername;
-        }
+        _connectionDetails = new AMQConnectionURL(url);
     }
 
-    /**
-     * @param username The _defaultUsername to set.
-     */
-    public final void setDefaultUsername(String username)
+    public AMQConnectionFactory(ConnectionURL url)
     {
-        if (_connectionDetails != null)
+        if (url == null)
         {
-            _connectionDetails.setUsername(username);
+            throw new IllegalArgumentException("url cannot be null");
         }
-        _defaultUsername = username;
-    }
-
-    /**
-     * @return The _host .
-     */
-    public final String getHost()
-    {
-        //todo this doesn't make sense in a multi broker URL as we have no current as that is done by AMQConnection
-        return _host;
-    }
 
-    /**
-     * @param host The _host to set.
-     */
-    public final void setHost(String host)
-    {
-        //todo if _connectionDetails is set then run _connectionDetails.addBrokerDetails()
-        // Should perhaps have this method changed to setBroker(host,port)
-        _host = host;
-    }
-
-    /**
-     * @return _port The _port to set.
-     */
-    public final int getPort()
-    {
-        //todo see getHost
-        return _port;
-    }
-
-    /**
-     * @param port The port to set.
-     */
-    public final void setPort(int port)
-    {
-        //todo see setHost
-        _port = port;
+        _connectionDetails = url;
     }
 
     /**
-     * @return he _virtualPath.
+     * @return the virtualPath of the connection details.
      */
     public final String getVirtualPath()
     {
-        if (_connectionDetails != null)
-        {
-            return _connectionDetails.getVirtualHost();
-        }
-        else
-        {
-            return _virtualPath;
-        }
-    }
-
-    /**
-     * @param path The _virtualPath to set.
-     */
-    public final void setVirtualPath(String path)
-    {
-        if (_connectionDetails != null)
-        {
-            _connectionDetails.setVirtualHost(path);
-        }
-
-        _virtualPath = path;
+        return _connectionDetails.getVirtualHost();
     }
 
     public static String getUniqueClientID()
@@ -267,19 +91,11 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
     {
         try
         {
-            if (_connectionDetails != null)
-            {
-                if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
-                {
-                    _connectionDetails.setClientName(getUniqueClientID());
-                }
-                return new AMQConnection(_connectionDetails, _sslConfig);
-            }
-            else
+            if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
             {
-                return new AMQConnection(_host, _port, _defaultUsername, _defaultPassword, getUniqueClientID(),
-                                         _virtualPath);
+                _connectionDetails.setClientName(getUniqueClientID());
             }
+            return new AMQConnection(_connectionDetails);
         }
         catch (Exception e)
         {
@@ -288,8 +104,6 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
             jmse.initCause(e);
             throw jmse;
         }
-
-
     }
 
     public Connection createConnection(String userName, String password) throws JMSException
@@ -301,25 +115,18 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
     {
         try
         {
-            if (_connectionDetails != null)
+            _connectionDetails.setUsername(userName);
+            _connectionDetails.setPassword(password);
+            
+            if (id != null && !id.equals(""))
             {
-                _connectionDetails.setUsername(userName);
-                _connectionDetails.setPassword(password);
-                
-                if (id != null && !id.equals(""))
-                {
-                    _connectionDetails.setClientName(id);
-                } 
-                else if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
-                {
-                    _connectionDetails.setClientName(getUniqueClientID());
-                }
-                return new AMQConnection(_connectionDetails, _sslConfig);
-            }
-            else
+                _connectionDetails.setClientName(id);
+            } 
+            else if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
             {
-                return new AMQConnection(_host, _port, userName, password, (id != null ? id : getUniqueClientID()), _virtualPath);
+                _connectionDetails.setClientName(getUniqueClientID());
             }
+            return new AMQConnection(_connectionDetails);
         }
         catch (Exception e)
         {
@@ -361,12 +168,6 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
         return _connectionDetails.toString();
     }
 
-
-    public final void setConnectionURLString(String url) throws URLSyntaxException
-    {
-        _connectionDetails = new AMQConnectionURL(url);
-    }
-
     /**
      * JNDI interface to create objects from References.
      *
@@ -457,7 +258,7 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
     {
         try
         {
-            return new XAConnectionImpl(_connectionDetails, _sslConfig);
+            return new XAConnectionImpl(_connectionDetails);
         }
         catch (Exception e)
         {
diff --git a/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java b/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
deleted file mode 100644
index 2280cc9870..0000000000
--- a/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.client;
-
-public class SSLConfiguration {
-	
-	private String _keystorePath;
-	
-	private String _keystorePassword;
-	
-	private String _certType = "SunX509";
-	
-	public void setKeystorePath(String path) 
-	{
-		_keystorePath = path;
-	}
-	
-	public String getKeystorePath() 
-	{
-		return _keystorePath;
-	}
-	
-	public void setKeystorePassword(String password) 
-	{
-		_keystorePassword = password;
-	}
-	
-	public String getKeystorePassword() 
-	{
-		return _keystorePassword;
-	}
-	
-	public void setCertType(String type) 
-	{
-		_certType = type;
-	}
-	
-	public String getCertType() 
-	{
-		return _certType;
-	}
-}
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java b/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
index 43025bd724..97048f39f4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
@@ -31,9 +31,9 @@ public class XAConnectionImpl extends AMQConnection implements XAConnection, XAQ
     /**
      * Create a XAConnection from a connectionURL
      */
-    public XAConnectionImpl(ConnectionURL connectionURL, SSLConfiguration sslConfig) throws AMQException
+    public XAConnectionImpl(ConnectionURL connectionURL) throws AMQException
     {
-        super(connectionURL, sslConfig);
+        super(connectionURL);
     }
 
     //-- interface XAConnection
diff --git a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 4db6a11e4d..0c2f4ce57d 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
@@ -22,7 +22,7 @@ package org.apache.qpid.jms;
 
 import java.util.Map;
 
-import org.apache.qpid.client.SSLConfiguration;
+import org.apache.qpid.transport.ConnectionSettings;
 
 public interface BrokerDetails
 {
@@ -104,14 +104,12 @@ public interface BrokerDetails
     long getTimeout();
 
     void setTimeout(long timeout);
-
-    SSLConfiguration getSSLConfiguration();
-
-    void setSSLConfiguration(SSLConfiguration sslConfiguration);
     
     boolean getBooleanProperty(String propName);
 
     String toString();
 
     boolean equals(Object o);
+
+    ConnectionSettings buildConnectionSettings();
 }
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
index ef30f2adbc..cb3ab718e9 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
@@ -140,7 +140,6 @@ public class FailoverExchangeMethod implements FailoverMethod, MessageListener
                         broker.setHost(tokens[1]);
                         broker.setPort(Integer.parseInt(tokens[2]));
                         broker.setProperties(_originalBrokerDetail.getProperties());
-                        broker.setSSLConfiguration(_originalBrokerDetail.getSSLConfiguration());
                         brokerList.add(broker);
                         
                         if (currentBrokerIP.equals(broker.getHost()) && 
diff --git a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
index 5972bf3fae..73e67469ae 100644
--- a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
+++ b/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
@@ -23,7 +23,6 @@ package org.apache.qpid.client;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.state.AMQState;
 import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.url.URLSyntaxException;
 
@@ -37,48 +36,18 @@ public class MockAMQConnection extends AMQConnection
         super(broker, username, password, clientName, virtualHost);
     }
 
-    public MockAMQConnection(String broker, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(broker, username, password, clientName, virtualHost, sslConfig);
-    }
-
     public MockAMQConnection(String host, int port, String username, String password, String clientName, String virtualHost)
             throws AMQException, URLSyntaxException
     {
         super(host, port, username, password, clientName, virtualHost);
     }
 
-    public MockAMQConnection(String host, int port, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(host, port, username, password, clientName, virtualHost, sslConfig);
-    }
-
-    public MockAMQConnection(String host, int port, boolean useSSL, String username, String password, String clientName, String virtualHost, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(host, port, useSSL, username, password, clientName, virtualHost, sslConfig);
-    }
-
     public MockAMQConnection(String connection)
             throws AMQException, URLSyntaxException
     {
         super(connection);
     }
 
-    public MockAMQConnection(String connection, SSLConfiguration sslConfig)
-            throws AMQException, URLSyntaxException
-    {
-        super(connection, sslConfig);
-    }
-
-    public MockAMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig)
-            throws AMQException
-    {
-        super(connectionURL, sslConfig);
-    }
-
     @Override
     public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException
     {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
index 9e76b0d468..20496026ce 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
@@ -21,10 +21,10 @@
 package org.apache.qpid.test.unit.jndi;
 
 import junit.framework.TestCase;
+
 import org.apache.qpid.client.AMQConnectionFactory;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.url.URLSyntaxException;
 
 public class ConnectionFactoryTest extends TestCase
 {
@@ -34,21 +34,9 @@ public class ConnectionFactoryTest extends TestCase
     public static final String URL = "amqp://guest:guest@clientID/test?brokerlist='tcp://localhost:5672'";
     public static final String URL_STAR_PWD = "amqp://guest:********@clientID/test?brokerlist='tcp://localhost:5672'";
 
-    public void testConnectionURLString()
+    public void testConnectionURLStringMasksPassword() throws Exception
     {
-        AMQConnectionFactory factory = new AMQConnectionFactory();
-
-        assertNull("ConnectionURL should have no value at start",
-                   factory.getConnectionURL());
-
-        try
-        {
-            factory.setConnectionURLString(URL);
-        }
-        catch (URLSyntaxException e)
-        {
-            fail(e.getMessage());
-        }
+        AMQConnectionFactory factory = new AMQConnectionFactory(URL);
 
         //URL will be returned with the password field swapped for '********'
         assertEquals("Connection URL not correctly set", URL_STAR_PWD, factory.getConnectionURLString());