Author: rgodfrey Date: Wed Jan 11 21:24:08 2012 New Revision: 1230256 URL: http://svn.apache.org/viewvc?rev=1230256&view=rev Log: Add SSL support to JMS 1-0 prototype
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java?rev=1230256&r1=1230255&r2=1230256&view=diff ============================================================================== --- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java (original) +++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java Wed Jan 11 21:24:08 2012 @@ -38,6 +38,8 @@ public class ConnectionFactoryImpl imple private String _username; private String _password; private String _clientId; + private boolean _ssl; + public ConnectionFactoryImpl(final String host, final int port, @@ -45,21 +47,32 @@ public class ConnectionFactoryImpl imple final String password, final String clientId) { + this(host,port,username,password,clientId,false); + } + + public ConnectionFactoryImpl(final String host, + final int port, + final String username, + final String password, + final String clientId, + final boolean ssl) + { _host = host; _port = port; _username = username; _password = password; _clientId = clientId; + _ssl = ssl; } public ConnectionImpl createConnection() throws JMSException { - return new ConnectionImpl(_host, _port, _username, _password, _clientId); + return new ConnectionImpl(_host, _port, _username, _password, _clientId, _ssl); } public ConnectionImpl createConnection(final String username, final String password) throws JMSException { - return new ConnectionImpl(_host, _port, username, password, _clientId); + return new ConnectionImpl(_host, _port, username, password, _clientId, _ssl); } public static ConnectionFactoryImpl createFromURL(final String urlString) throws MalformedURLException @@ -75,6 +88,7 @@ public class ConnectionFactoryImpl imple String username = null; String password = null; String clientId = null; + boolean ssl = false; if(userInfo != null) { String[] components = userInfo.split(":",2); @@ -93,12 +107,15 @@ public class ConnectionFactoryImpl imple if(keyValuePair[0].equalsIgnoreCase("clientid")) { clientId = keyValuePair[1]; - break; + } + else if(keyValuePair[0].equalsIgnoreCase("ssl")) + { + ssl = Boolean.valueOf(keyValuePair[1]); } } } - return new ConnectionFactoryImpl(host, port, username, password, clientId); + return new ConnectionFactoryImpl(host, port, username, password, clientId, ssl); } Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java?rev=1230256&r1=1230255&r2=1230256&view=diff ============================================================================== --- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java (original) +++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java Wed Jan 11 21:24:08 2012 @@ -54,6 +54,10 @@ public class ConnectionImpl implements C public ConnectionImpl(String host, int port, String username, String password, String clientId) throws JMSException { + this(host,port,username,password,clientId,false); + } + public ConnectionImpl(String host, int port, String username, String password, String clientId, boolean ssl) throws JMSException + { Container container = clientId == null ? new Container() : new Container(clientId); // TODO - authentication, containerId, clientId, ssl?, etc try --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org