diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-01-12 00:03:53 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-01-12 00:03:53 +0000 |
| commit | d81a1a66c0f3612f0bd6a478c91c7846b91c79b5 (patch) | |
| tree | c91b86ef885432c35166461925ff7191ad792d93 | |
| parent | 5872cd9b9941776454ad0e602ebbceaf26ffcb9b (diff) | |
| download | qpid-python-d81a1a66c0f3612f0bd6a478c91c7846b91c79b5.tar.gz | |
NO-JIRA: 1-0 sandbox - finish off JMS SSL changes
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1230334 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 8 insertions, 1 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java index 3d9e32f7b5..ac1f8bdc7f 100644 --- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java +++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java @@ -62,7 +62,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect // TODO - authentication, containerId, clientId, ssl?, etc
try
{
- _conn = new org.apache.qpid.amqp_1_0.client.Connection(host, port, username, password, container);
+ _conn = new org.apache.qpid.amqp_1_0.client.Connection(host, port, username, password, container, ssl);
// TODO - retrieve negotiated AMQP version
_connectionMetaData = new ConnectionMetaDataImpl(1,0,0);
}
diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java index 934ac428c7..e6484741af 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java @@ -108,6 +108,13 @@ public class Connection public Connection(final String address,
final int port,
final String username,
+ final String password, Container container,boolean ssl) throws ConnectionException
+ {
+ this(address, port, username, password, MAX_FRAME_SIZE,container,null,ssl);
+ }
+ public Connection(final String address,
+ final int port,
+ final String username,
final String password,
final int maxFrameSize,
final Container container,
|