Author: aidan
Date: Thu Apr 23 17:36:25 2009
New Revision: 767990
URL: http://svn.apache.org/viewvc?rev=767990&view=rev
Log:
QPID-1826: brown paper bag commit
Modified:
qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Modified:
qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml?rev=767990&r1=767989&r2=767990&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml
(original)
+++ qpid/branches/0.5-release/qpid/java/broker/etc/sample-parsed-config.xml Thu
Apr 23 17:36:25 2009
@@ -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>
Modified:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=767990&r1=767989&r2=767990&view=diff
==============================================================================
---
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Thu Apr 23 17:36:25 2009
@@ -155,7 +155,7 @@
while (keys.hasNext())
{
String key = (String) keys.next();
- conf.setProperty(key, vhostConfiguration.getProperty(key));
+ conf.setProperty("virtualhosts."+key,
vhostConfiguration.getProperty(key));
}
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
