summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2008-04-16 16:29:07 +0000
committerMartin Ritchie <ritchiem@apache.org>2008-04-16 16:29:07 +0000
commit99f76bc7b94fd218b23486f0fd809ba2926a88fe (patch)
tree95f19b8c835d7d14180972d0be76a03ceb2afa78
parent1fdfb841a9787d0f5bacee5489a963aaf522c332 (diff)
downloadqpid-python-99f76bc7b94fd218b23486f0fd809ba2926a88fe.tar.gz
QPID-886 : In order to allow the test to be written that highlights the failure we need to be able to provide a Config object not a file. So made the method public that reads the file and added constructor to use the Config object.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@648740 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
index fef958000a..748e33ba7a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
@@ -61,6 +61,11 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
private PluginManager _pluginManager;
+ public ConfigurationFileApplicationRegistry(Configuration configuration)
+ {
+ super(configuration);
+ }
+
public ConfigurationFileApplicationRegistry(File configurationURL) throws ConfigurationException
{
super(config(configurationURL));
@@ -76,7 +81,7 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
}
}
- private static final Configuration config(File url) throws ConfigurationException
+ public static final Configuration config(File url) throws ConfigurationException
{
// We have to override the interpolate methods so that
// interpolation takes place accross the entirety of the