Author: rgodfrey
Date: Sun Apr 13 09:22:31 2014
New Revision: 1586944
URL: http://svn.apache.org/r1586944
Log:
QPID-5687 : [Java Broker] change to explicitly use the port in a connection
url, and avoid the issue of differing vhosts in the test config and initial
config (revert last commit 1586942 and modify correct file instead)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1586944&r1=1586943&r2=1586944&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
Sun Apr 13 09:22:31 2014
@@ -32,7 +32,7 @@ import org.apache.qpid.server.security.S
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-@ManagedObject( defaultType = "Broker" )
+@ManagedObject( defaultType = "adapter" )
public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>,
EventLoggerProvider, StatisticsGatherer
{
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1586944&r1=1586943&r2=1586944&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
Sun Apr 13 09:22:31 2014
@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedEr
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.server.logging.AbstractTestLogging;
import org.apache.qpid.util.LogMonitor;
@@ -52,8 +53,6 @@ public class BrokerStartupTest extends A
* This test simply tests that the broker will startup even if there is no
config file (i.e. that it can use the
* currently packaged initial config file (all system tests by default
generate their own config file).
*
- * It makes the assumption that setting the system property qpid.amqp_port
- * to the value of getPort(0) will allow a connection to be established
with getConnection()
*
* @throws Exception
*/
@@ -70,7 +69,12 @@ public class BrokerStartupTest extends A
setTestSystemProperty("qpid.rmi_port",String.valueOf(connectorServerPort));
startBroker(port, null);
- Connection conn = getConnection();
+ AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"
+ +
GUEST_USERNAME
+ + ":"
+ +
GUEST_PASSWORD
+ +
"@clientid/?brokerlist='localhost:%d'", port));
+ Connection conn = getConnection(url);
assertNotNull(conn);
conn.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
