diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-10-03 09:19:43 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-10-03 09:19:43 +0000 |
| commit | 5e98bae5a6207aa32ed2602f5fe5a2c3f3b5266f (patch) | |
| tree | b0edb062c2956b7db446beebfc78ceb4f26ef6df /java | |
| parent | 9d89689729ef1386e1a52ebb5d56c7752d37682b (diff) | |
| download | qpid-python-5e98bae5a6207aa32ed2602f5fe5a2c3f3b5266f.tar.gz | |
QPID-1101 : Merge of changes from M2 to allow Configuration to be loaded and modified before being given the the ApplicationRegistry
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@701328 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java | 6 |
1 files changed, 5 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 baab56a4a4..815299da4c 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 @@ -48,6 +48,10 @@ import org.apache.qpid.AMQException; public class ConfigurationFileApplicationRegistry extends ApplicationRegistry { + public ConfigurationFileApplicationRegistry(Configuration configuration) + { + super(configuration); + } public ConfigurationFileApplicationRegistry(File configurationURL) throws ConfigurationException { @@ -64,7 +68,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 |