You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/05/20 17:26:44 UTC
svn commit: r658278 - in /incubator/qpid/branches/M2.1.x: ./
java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
Author: ritchiem
Date: Tue May 20 08:26:44 2008
New Revision: 658278
URL: http://svn.apache.org/viewvc?rev=658278&view=rev
Log:
Merged revisions 648740 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x
........
r648740 | ritchiem | 2008-04-16 17:29:07 +0100 (Wed, 16 Apr 2008) | 1 line
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.
........
Modified:
incubator/qpid/branches/M2.1.x/ (props changed)
incubator/qpid/branches/M2.1.x/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
Propchange: incubator/qpid/branches/M2.1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/qpid/branches/M2.1.x/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.x/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java?rev=658278&r1=658277&r2=658278&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.x/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java (original)
+++ incubator/qpid/branches/M2.1.x/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java Tue May 20 08:26:44 2008
@@ -61,6 +61,11 @@
private PluginManager _pluginManager;
+ public ConfigurationFileApplicationRegistry(Configuration configuration)
+ {
+ super(configuration);
+ }
+
public ConfigurationFileApplicationRegistry(File configurationURL) throws ConfigurationException
{
super(config(configurationURL));
@@ -76,7 +81,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