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 | 88bd4b814b7d9ba395c59493d47292a1b4d15dcd (patch) | |
| tree | 7043a1566cbe1c072e2b136641af2e6fa2a55547 /qpid/java | |
| parent | 9b99bf71e6f2ee38cb1a18cf6100923149393172 (diff) | |
| download | qpid-python-88bd4b814b7d9ba395c59493d47292a1b4d15dcd.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@701328 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java index baab56a4a4..815299da4c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java +++ b/qpid/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 |