You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2008/10/23 21:32:03 UTC
svn commit: r707453 - in /incubator/qpid/trunk/qpid/java:
client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/
client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/
client/example/src/main/java/org/apache/qpid/exa...
Author: rajith
Date: Thu Oct 23 12:32:02 2008
New Revision: 707453
URL: http://svn.apache.org/viewvc?rev=707453&view=rev
Log:
This is for QPID-1296
added a boolean to the connect method to indicate whether an SSL connection should be created.
currently there seems to be two issues.
1. The shutdownInput method used in IoReceiver is not supported by the SSLSocket implementation.
2. I haven't able to get client side authentication working.
For item 1 we may need to use nio classes to get around the issue.
For item 2 I am yet to figure out the correct config options to get client side auth working.
Modified:
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java Thu Oct 23 12:32:02 2008
@@ -36,7 +36,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java Thu Oct 23 12:32:02 2008
@@ -38,7 +38,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java Thu Oct 23 12:32:02 2008
@@ -64,7 +64,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java Thu Oct 23 12:32:02 2008
@@ -36,7 +36,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java Thu Oct 23 12:32:02 2008
@@ -38,7 +38,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java Thu Oct 23 12:32:02 2008
@@ -64,7 +64,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java Thu Oct 23 12:32:02 2008
@@ -78,7 +78,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java (original)
+++ incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java Thu Oct 23 12:32:02 2008
@@ -57,7 +57,7 @@
{
// Create connection
Connection con = new Connection();
- con.connect("localhost", 5672, "test", "guest", "guest");
+ con.connect("localhost", 5672, "test", "guest", "guest",false);
// Create session
Session session = con.createSession(0);
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Thu Oct 23 12:32:02 2008
@@ -263,7 +263,9 @@
_protocolSession = new AMQProtocolSession(this, _connection);
_stateManager.setProtocolSession(_protocolSession);
IoTransport.connect_0_9(getProtocolSession(),
- brokerDetail.getHost(), brokerDetail.getPort());
+ brokerDetail.getHost(),
+ brokerDetail.getPort(),
+ brokerDetail.useSSL());
_protocolSession.init();
}
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java Thu Oct 23 12:32:02 2008
@@ -52,7 +52,7 @@
public static final void main(String[] args)
{
Connection conn = new Connection();
- conn.connect("0.0.0.0", 5672, null, "guest", "guest");
+ conn.connect("0.0.0.0", 5672, null, "guest", "guest", false);
Session ssn = conn.createSession();
ssn.setSessionListener(new ToyClient());
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Thu Oct 23 12:32:02 2008
@@ -155,7 +155,7 @@
return saslClient;
}
- public void connect(String host, int port, String vhost, String username, String password)
+ public void connect(String host, int port, String vhost, String username, String password,boolean ssl)
{
synchronized (lock)
{
@@ -163,7 +163,7 @@
delegate = new ClientDelegate(vhost, username, password);
- IoTransport.connect(host, port, ConnectionBinding.get(this));
+ IoTransport.connect(host, port, ConnectionBinding.get(this),ssl);
send(new ProtocolHeader(1, 0, 10));
Waiter w = new Waiter(lock, timeout);
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java Thu Oct 23 12:32:02 2008
@@ -26,6 +26,8 @@
import java.net.SocketException;
import java.nio.ByteBuffer;
+import javax.net.ssl.SSLSocketFactory;
+
import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
import org.apache.qpid.transport.Binding;
import org.apache.qpid.transport.Connection;
@@ -98,22 +100,24 @@
}
public static final <E> E connect(String host, int port,
- Binding<E,ByteBuffer> binding)
+ Binding<E,ByteBuffer> binding,
+ boolean ssl)
{
- Socket socket = createSocket(host, port);
+ Socket socket = createSocket(host, port,ssl);
IoTransport<E> transport = new IoTransport<E>(socket, binding);
return transport.endpoint;
}
public static final Connection connect(String host, int port,
- ConnectionDelegate delegate)
+ ConnectionDelegate delegate,
+ boolean ssl)
{
- return connect(host, port, ConnectionBinding.get(delegate));
+ return connect(host, port, ConnectionBinding.get(delegate),ssl);
}
- public static void connect_0_9(AMQVersionAwareProtocolSession session, String host, int port)
+ public static void connect_0_9(AMQVersionAwareProtocolSession session, String host, int port, boolean ssl)
{
- connect(host, port, new Binding_0_9(session));
+ connect(host, port, new Binding_0_9(session),ssl);
}
private static class Binding_0_9
@@ -140,12 +144,21 @@
}
- private static Socket createSocket(String host, int port)
+ private static Socket createSocket(String host, int port, boolean ssl)
{
try
{
InetAddress address = InetAddress.getByName(host);
- Socket socket = new Socket();
+ Socket socket;
+ if (ssl)
+ {
+ SSLSocketFactory sslSocketfactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
+ socket = sslSocketfactory.createSocket();
+ }
+ else
+ {
+ socket = new Socket();
+ }
socket.setReuseAddress(true);
socket.setTcpNoDelay(Boolean.getBoolean("amqj.tcpNoDelay"));
Modified: incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java Thu Oct 23 12:32:02 2008
@@ -139,7 +139,7 @@
}
}
});
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest",false);
return conn;
}
@@ -170,7 +170,7 @@
public void testResume() throws Exception
{
Connection conn = new Connection();
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest",false);
conn.setConnectionListener(new ConnectionListener()
{
@@ -182,7 +182,7 @@
public void closed(Connection conn)
{
queue = true;
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest",false);
conn.resume();
}
});
Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java (original)
+++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java Thu Oct 23 12:32:02 2008
@@ -137,7 +137,8 @@
_connectionData.getPort(),
_connectionData.getVirtualHost(),
_connectionData.getUsername(),
- _connectionData.getPassword());
+ _connectionData.getPassword(),
+ false);
return connection;
}
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java?rev=707453&r1=707452&r2=707453&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java Thu Oct 23 12:32:02 2008
@@ -82,7 +82,7 @@
Connection conn = new Connection();
if (!_broker.equals(QpidTestCase.EXTERNAL) && !isBroker08())
{
- conn.connect("localhost", 5672, "test", "guest", "guest");
+ conn.connect("localhost", 5672, "test", "guest", "guest",false);
}
else
{