geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/assembly/src/plan system-plan.xml
Date Sat, 05 Jun 2004 16:29:29 GMT
dain        2004/06/05 09:29:29

  Modified:    modules/system/src/java/org/apache/geronimo/system/configuration
                        FileConfigurationList.java
               modules/assembly/src/plan system-plan.xml
  Log:
  Renamed GBeanContext to GBeanLifecycleController
  
  Revision  Changes    Path
  1.3       +5 -9      incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
  
  Index: FileConfigurationList.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FileConfigurationList.java	5 Jun 2004 14:38:00 -0000	1.2
  +++ FileConfigurationList.java	5 Jun 2004 16:29:29 -0000	1.3
  @@ -19,21 +19,20 @@
   import java.io.BufferedReader;
   import java.io.BufferedWriter;
   import java.io.File;
  +import java.io.FileNotFoundException;
   import java.io.FileReader;
   import java.io.FileWriter;
   import java.io.IOException;
  -import java.io.FileNotFoundException;
   import java.net.URI;
   import java.net.URISyntaxException;
   import java.util.ArrayList;
  +import java.util.Collections;
   import java.util.Iterator;
   import java.util.List;
  -import java.util.Collections;
   import javax.management.ObjectName;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GBeanLifecycle;
  @@ -65,9 +64,6 @@
           this.configFile = configDir;
       }
   
  -    public void setGBeanContext(GBeanContext context) {
  -    }
  -
       public void doStart() throws WaitingException, Exception {
           configList = serverInfo.resolve(configFile);
           File parent = configList.getParentFile();
  @@ -150,10 +146,10 @@
       static {
           GBeanInfoFactory infoFactory = new GBeanInfoFactory(FileConfigurationList.class);
           infoFactory.addInterface(PersistentConfigurationList.class);
  -        infoFactory.addReference("Kernel", Kernel.class);
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
           infoFactory.addReference("ServerInfo", ServerInfo.class);
           infoFactory.addAttribute("ConfigFile", String.class, true);
  -        infoFactory.setConstructor(new String[]{"Kernel", "ServerInfo", "ConfigFile"});
  +        infoFactory.setConstructor(new String[]{"kernel", "ServerInfo", "ConfigFile"});
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  
  
  
  1.9       +0 -1      incubator-geronimo/modules/assembly/src/plan/system-plan.xml
  
  Index: system-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/system-plan.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- system-plan.xml	4 Jun 2004 17:27:00 -0000	1.8
  +++ system-plan.xml	5 Jun 2004 16:29:29 -0000	1.9
  @@ -45,7 +45,6 @@
   
       <!-- Persistent List of running Configurations service -->
       <gbean name="geronimo.boot:role=PersistentConfigurationList" class="org.apache.geronimo.system.configuration.FileConfigurationList">
  -        <reference name="Kernel">geronimo.boot:role=Kernel</reference>
           <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
           <attribute name="ConfigFile" type="java.lang.String">var/config/config.list</attribute>
       </gbean>
  
  
  

Mime
View raw message