Author: ritchiem
Date: Mon Apr 13 14:18:20 2009
New Revision: 764482
URL: http://svn.apache.org/viewvc?rev=764482&view=rev
Log:
QPID-1776: fix interpolation of variables.
merged from trunk r758730
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/bin/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 14:18:20 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,754934,754958,755256,757258,757270
+/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,754934,754958,755256,757258,757270,758730
Propchange: qpid/branches/0.5-fix/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 14:18:20 2009
@@ -1 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
+/qpid/trunk/qpid/java/broker/bin:758730
Modified:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=764482&r1=764481&r2=764482&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Mon Apr 13 14:18:20 2009
@@ -130,10 +130,16 @@
for (int j = 0; j < hosts.size(); j++)
{
String name = (String) hosts.get(j);
- CompositeConfiguration mungedConf = new
CompositeConfiguration();
-
mungedConf.addConfiguration(conf.subset("virtualhosts.virtualhost."+name));
-
mungedConf.addConfiguration(vhostConfiguration.subset("virtualhost." + name));
- VirtualHostConfiguration vhostConfig = new
VirtualHostConfiguration(name, mungedConf);
+ // Add the keys of the virtual host to the main config
then bail out
+
+ Configuration myConf =
vhostConfiguration.subset("virtualhost." + name);
+ Iterator k = myConf.getKeys();
+ while (k.hasNext())
+ {
+ String key = (String) k.next();
+
conf.setProperty("virtualhosts.virtualhost."+name+"."+key,
myConf.getProperty(key));
+ }
+ VirtualHostConfiguration vhostConfig = new
VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name),
this);
_virtualHosts.put(vhostConfig.getName(), vhostConfig);
}
}
Propchange:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 14:18:20 2009
@@ -1 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management:757268
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:758730
Propchange:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 14:18:20 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757257
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757270
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757270,758730
Modified:
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=764482&r1=764481&r2=764482&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Mon Apr 13 14:18:20 2009
@@ -677,6 +677,24 @@
assertEquals(true, config.getQpidNIO()); // From the second file, not
// present in the first
}
+
+ public void testVariableInterpolation() throws Exception
+ {
+ File mainFile = File.createTempFile(getClass().getName(), null);
+
+ mainFile.deleteOnExit();
+
+ FileWriter out = new FileWriter(mainFile);
+ out.write("<broker>\n");
+ out.write("\t<work>foo</work>\n");
+
out.write("\t<management><ssl><keyStorePath>${work}</keyStorePath></ssl></management>\n");
+ out.write("</broker>\n");
+ out.close();
+
+ ServerConfiguration config = new
ServerConfiguration(mainFile.getAbsoluteFile());
+ assertEquals("Did not get correct interpolated value",
+ "foo", config.getManagementKeyStorePath());
+ }
public void testCombinedConfigurationFirewall() throws Exception
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
