Author: ritchiem
Date: Fri Oct 3 02:19:43 2008
New Revision: 701328
URL: http://svn.apache.org/viewvc?rev=701328&view=rev
Log:
QPID-1101 : Merge of changes from M2 to allow Configuration to be loaded and
modified before being given the the ApplicationRegistry
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java?rev=701328&r1=701327&r2=701328&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
Fri Oct 3 02:19:43 2008
@@ -48,6 +48,10 @@
public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
{
+ public ConfigurationFileApplicationRegistry(Configuration configuration)
+ {
+ super(configuration);
+ }
public ConfigurationFileApplicationRegistry(File configurationURL) throws
ConfigurationException
{
@@ -64,7 +68,7 @@
}
}
- 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
