Author: robbie
Date: Sun Feb 5 20:53:37 2012
New Revision: 1240812
URL: http://svn.apache.org/viewvc?rev=1240812&view=rev
Log:
NO-JIRA: remove test-only and unused connect methods
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java?rev=1240812&r1=1240811&r2=1240812&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
Sun Feb 5 20:53:37 2012
@@ -65,7 +65,7 @@ public class ClientDelegate extends Conn
{
Map<String,Object> clientProperties = new HashMap<String,Object>();
- if(this._connectionSettings.getClientProperties() != null)
+ if(_connectionSettings.getClientProperties() != null)
{
clientProperties.putAll(_connectionSettings.getClientProperties());
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=1240812&r1=1240811&r2=1240812&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
Sun Feb 5 20:53:37 2012
@@ -200,23 +200,12 @@ public class Connection extends Connecti
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, String saslMechs)
{
- connect(host, port, vhost, username, password, false);
+ connect(host, port, vhost, username, password, ssl, saslMechs, null);
}
- public void connect(String host, int port, String vhost, String username,
String password, boolean ssl)
- {
- connect(host, port, vhost, username, password, ssl,"PLAIN");
- }
-
- public void connect(String host, int port, String vhost, String username,
String password, boolean ssl,String saslMechs)
- {
- connect(host, port, vhost, username, password, ssl,saslMechs,
Collections.EMPTY_MAP);
- }
-
-
- public void connect(String host, int port, String vhost, String username,
String password, boolean ssl,String saslMechs,Map<String,Object> clientProps)
+ public void connect(String host, int port, String vhost, String username,
String password, boolean ssl, String saslMechs, Map<String,Object> clientProps)
{
ConnectionSettings settings = new ConnectionSettings();
settings.setHost(host);
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=1240812&r1=1240811&r2=1240812&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
(original)
+++
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
Sun Feb 5 20:53:37 2012
@@ -170,7 +170,7 @@ public class ConnectionTest extends Qpid
}
}
});
- conn.connect("localhost", port, null, "guest", "guest", false);
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
return conn;
}
@@ -275,7 +275,7 @@ public class ConnectionTest extends Qpid
Connection conn = new Connection();
conn.addConnectionListener(new FailoverConnectionListener());
conn.setConnectionDelegate(new ClientDelegate(new
ConnectionSettings()));
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
Session ssn = conn.createSession(1);
ssn.setSessionListener(new TestSessionListener());
@@ -331,7 +331,7 @@ public class ConnectionTest extends Qpid
Connection conn = new Connection();
conn.setConnectionDelegate(new ClientDelegate(new
ConnectionSettings()));
conn.addConnectionListener(new FailoverConnectionListener());
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
Session ssn = conn.createSession(1);
ssn.setSessionListener(new TestSessionListener());
@@ -353,7 +353,7 @@ public class ConnectionTest extends Qpid
Connection conn = new Connection();
conn.setConnectionDelegate(new ClientDelegate(new
ConnectionSettings()));
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
Session ssn = conn.createSession();
ssn.sessionFlush(EXPECTED);
send(ssn, "SINK 0");
@@ -367,7 +367,7 @@ public class ConnectionTest extends Qpid
startServer();
Connection conn = new Connection();
conn.setConnectionDelegate(new ClientDelegate(new
ConnectionSettings()));
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
conn.connectionHeartbeat();
conn.close();
}
@@ -378,7 +378,7 @@ public class ConnectionTest extends Qpid
Connection conn = new Connection();
conn.setConnectionDelegate(new ClientDelegate(new
ConnectionSettings()));
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
Session ssn = conn.createSession();
send(ssn, "EXCP 0");
Thread.sleep(3000);
@@ -398,7 +398,7 @@ public class ConnectionTest extends Qpid
Connection conn = new Connection();
conn.setConnectionDelegate(new ClientDelegate(new
ConnectionSettings()));
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false, null);
Session ssn = conn.createSession();
send(ssn, "EXCP 0", true);
try
@@ -424,7 +424,7 @@ public class ConnectionTest extends Qpid
public void closed(Connection conn)
{
queue = true;
- conn.connect("localhost", port, null, "guest", "guest");
+ conn.connect("localhost", port, null, "guest", "guest", false,
null);
conn.resume();
}
}
Modified:
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java?rev=1240812&r1=1240811&r2=1240812&view=diff
==============================================================================
---
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
(original)
+++
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
Sun Feb 5 20:53:37 2012
@@ -689,7 +689,7 @@ public class QpidBench
{
org.apache.qpid.transport.Connection conn =
new org.apache.qpid.transport.Connection();
- conn.connect(opts.broker, opts.port, null, "guest", "guest",false);
+ conn.connect(opts.broker, opts.port, null, "guest", "guest", false,
null);
return conn;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
