svn commit: r170189 - in /geronimo/trunk/modules: assembly/src/plan/system-plan.xml system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java

[da...@apache.org]

Author: dain
Date: Sat May 14 19:26:54 2005
New Revision: 170189

URL: http://svn.apache.org/viewcvs?rev=170189&view=rev
Log:
FileConfigurationList should use a reference to the ConfigurationManager instead of locating it directly

Modified:
    geronimo/trunk/modules/assembly/src/plan/system-plan.xml
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java

Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=170189&r1=170188&r2=170189&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Sat May 14 19:26:54 2005
@@ -53,6 +53,7 @@
     <!-- Persistent List of running Configurations service -->
     <gbean name="Default" class="org.apache.geronimo.system.configuration.FileConfigurationList">
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="ConfigurationManager"><name>ConfigurationManager</name></reference>
         <attribute name="configFile">var/config/config.list</attribute>
     </gbean>
 

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java?rev=170189&r1=170188&r2=170189&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java Sat May 14 19:26:54 2005
@@ -92,9 +92,9 @@
      */
     private Runnable hook;
 
-    public FileConfigurationList(Kernel kernel, ServerInfo serverInfo, String configDir) {
+    public FileConfigurationList(Kernel kernel, ServerInfo serverInfo, ConfigurationManager configurationManager, String configDir) {
         this.kernel = kernel;
-        configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+        this.configurationManager = configurationManager;
         this.serverInfo = serverInfo;
         this.configFile = configDir;
     }
@@ -197,8 +197,9 @@
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("kernelFullyStarted", boolean.class, false);
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
+        infoFactory.addReference("ConfigurationManager", ConfigurationManager.class, "ConfigurationManager");
         infoFactory.addAttribute("configFile", String.class, true);
-        infoFactory.setConstructor(new String[]{"kernel", "ServerInfo", "configFile"});
+        infoFactory.setConstructor(new String[]{"kernel", "ServerInfo", "ConfigurationManager", "configFile"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }