You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/04/05 17:17:13 UTC
svn commit: r930877 - in /qpid/trunk/qpid/java/broker/src:
main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Author: robbie
Date: Mon Apr 5 15:17:11 2010
New Revision: 930877
URL: http://svn.apache.org/viewvc?rev=930877&view=rev
Log:
QPID-2361: Fix to correctly set default virtualhost name in external configuration file
Applied patch from Andrew Kennedy <an...@gmail.com>
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=930877&r1=930876&r2=930877&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Mon Apr 5 15:17:11 2010
@@ -180,6 +180,10 @@ public class ServerConfiguration impleme
// Open the vhosts XML file and copy values from it to our config
_vhostsFile = new File(fileName);
vhostConfiguration = parseConfig(new File(fileName));
+
+ // save the default virtualhost name
+ String defaultVirtualHost = vhostConfiguration.getString("default");
+ _config.setProperty("virtualhosts.default", defaultVirtualHost);
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=930877&r1=930876&r2=930877&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Mon Apr 5 15:17:11 2010
@@ -933,6 +933,7 @@ public class ServerConfigurationTest ext
if (includeVhosts)
{
out.write("\t<virtualhosts>\n");
+ out.write("\t\t<default>test</default>\n");
out.write("\t\t<virtualhost>\n");
out.write(String.format("\t\t\t<name>%s</name>\n", name));
out.write(String.format("\t\t<%s> \n", name));
@@ -1242,9 +1243,11 @@ public class ServerConfigurationTest ext
// Test config
VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry();
+ String defaultVirtualHost = reg.getConfiguration().getDefaultVirtualHost();
VirtualHost virtualHost = virtualHostRegistry.getVirtualHost("test");
Exchange exchange = virtualHost.getExchangeRegistry().getExchange(new AMQShortString("test.topic"));
+ assertEquals("Incorrect default host", "test", defaultVirtualHost);
assertEquals("Incorrect virtualhost count", 1, virtualHostRegistry.getVirtualHosts().size());
assertEquals("Incorrect virtualhost name", "test", virtualHost.getName());
assertEquals("Incorrect exchange type", "topic", exchange.getType().getName().toString());
@@ -1272,9 +1275,11 @@ public class ServerConfigurationTest ext
// Test config
VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry();
+ String defaultVirtualHost = reg.getConfiguration().getDefaultVirtualHost();
VirtualHost virtualHost = virtualHostRegistry.getVirtualHost("test");
Exchange exchange = virtualHost.getExchangeRegistry().getExchange(new AMQShortString("test.topic"));
+ assertEquals("Incorrect default host", "test", defaultVirtualHost);
assertEquals("Incorrect virtualhost count", 1, virtualHostRegistry.getVirtualHosts().size());
assertEquals("Incorrect virtualhost name", "test", virtualHost.getName());
assertEquals("Incorrect exchange type", "topic", exchange.getType().getName().toString());
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org