From 4926c771e378a82d20a4e5b295d35e58064ba519 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Thu, 23 Apr 2009 17:35:43 +0000
Subject: QPID-1826: brown paper bag commit

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@767989 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/broker/etc/sample-parsed-config.xml      | 26 +++++++++-------------
 .../server/configuration/ServerConfiguration.java  |  2 +-
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'qpid')

diff --git a/qpid/java/broker/etc/sample-parsed-config.xml b/qpid/java/broker/etc/sample-parsed-config.xml
index 6c4366a84a..37dfae4d2e 100644
--- a/qpid/java/broker/etc/sample-parsed-config.xml
+++ b/qpid/java/broker/etc/sample-parsed-config.xml
@@ -41,27 +41,15 @@
 <principal-database>passwordfile</principal-database>
 </jmx>
 </security>
-<virtualhosts>${conf}/virtualhosts-config-test.xml<virtualhost>
+<virtualhosts>${conf}/virtualhosts-config-test.xml
+<default>dev-only</default>
+<virtualhost>
 <name>dev-only</name>
 <dev-only>
 <store>
 <class>org.apache.qpid.server.store.MemoryMessageStore</class>
 <environment-path>${work}/bdbstore/dev-only-store</environment-path>
 </store>
-</dev-only>
-</virtualhost>
-</virtualhosts>
-<heartbeat>
-<delay>0</delay>
-<timeoutFactor>2.0</timeoutFactor>
-</heartbeat>
-<queue>
-<auto_register>true</auto_register>
-</queue>
-<default>dev-only</default>
-<virtualhost>
-<name>dev-only</name>
-<dev-only>
 <queues>
 <exchange>amq.direct</exchange>
 <maximumQueueDepth>102400</maximumQueueDepth>
@@ -73,4 +61,12 @@
 </queues>
 </dev-only>
 </virtualhost>
+</virtualhosts>
+<heartbeat>
+<delay>0</delay>
+<timeoutFactor>2.0</timeoutFactor>
+</heartbeat>
+<queue>
+<auto_register>true</auto_register>
+</queue>
 </configuration>
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 9d7936f0c6..e0d325a5b0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -155,7 +155,7 @@ public class ServerConfiguration implements SignalHandler
                 while (keys.hasNext())
                 {
                     String key = (String) keys.next();
-                    conf.setProperty(key, vhostConfiguration.getProperty(key));
+                    conf.setProperty("virtualhosts."+key, vhostConfiguration.getProperty(key));
                 }
             }
         }
-- 
cgit v1.2.1