diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-04-23 17:36:25 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-04-23 17:36:25 +0000 |
| commit | 9509f9dcb9a45fe63fe7f82fbeaedbd2839ad7fe (patch) | |
| tree | 24642d320b2b40505f369972fbf38bca78e3f0f3 | |
| parent | 9a8b1019f111c597ceebdc1f40d4d92bdaa284c9 (diff) | |
| download | qpid-python-9509f9dcb9a45fe63fe7f82fbeaedbd2839ad7fe.tar.gz | |
QPID-1826: brown paper bag commit
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@767990 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/etc/sample-parsed-config.xml | 26 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java | 2 |
2 files changed, 12 insertions, 16 deletions
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)); } } } |