ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ComponentManager.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ComponentManager.java (file contents):
Revision 1.33 by tdb, Wed Mar 14 01:34:25 2001 UTC vs.
Revision 1.34 by tdb, Wed Mar 14 23:25:29 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.componentmanager;
2 > package uk.org.iscream.componentmanager;
3  
4   //---IMPORTS---
5   import java.util.*;
6   import java.io.*;
7 < import uk.ac.ukc.iscream.util.*;
7 > import uk.org.iscream.util.*;
8  
9   /**
10   * The component manager is the starting point for all
# Line 12 | Line 12 | import uk.ac.ukc.iscream.util.*;
12   * It loads its initial system configuration from the
13   * default properties file, it then starts all the iscream
14   * components as specified in the default.properties under
15 < * uk.ac.ukc.iscream.ComponentList
15 > * uk.org.iscream.ComponentList
16   *
17   * @author  $Author$
18   * @version $Id$
# Line 96 | Line 96 | public class ComponentManager {
96          refman.activatePOA();
97          
98          // get the list of components
99 <        String componentList = System.getProperty("uk.ac.ukc.iscream.ComponentList");
99 >        String componentList = System.getProperty("uk.org.iscream.ComponentList");
100          StringTokenizer st = new StringTokenizer(componentList, ";");
101          _componentsToStart = new LinkedList();
102          
# Line 109 | Line 109 | public class ComponentManager {
109              
110              // ### This is where the list of supported components is checked! ###
111              if (componentName.equalsIgnoreCase("core")) {
112 <                component = new uk.ac.ukc.iscream.core.Core();
112 >                component = new uk.org.iscream.core.Core();
113              } else if (componentName.equalsIgnoreCase("filtermanager")) {
114 <                component = new uk.ac.ukc.iscream.filtermanager.FilterManager();
114 >                component = new uk.org.iscream.filtermanager.FilterManager();
115              } else if (componentName.equalsIgnoreCase("rootfilter")) {
116 <                component = new uk.ac.ukc.iscream.rootfilter.RootFilter();
116 >                component = new uk.org.iscream.rootfilter.RootFilter();
117              } else if (componentName.equalsIgnoreCase("dbinterface")) {
118 <                component = new uk.ac.ukc.iscream.dbinterface.DBInterface();
118 >                component = new uk.org.iscream.dbinterface.DBInterface();
119              } else if (componentName.equalsIgnoreCase("clientinterface")) {
120 <                component = new uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain();
120 >                component = new uk.org.iscream.clientinterface.ClientInterfaceMain();
121              // note the passing of the Filter's name in its constructor
122              } else if (componentName.equalsIgnoreCase("filter")) {
123 <                component = new uk.ac.ukc.iscream.filter.FilterMain(filterName);
123 >                component = new uk.org.iscream.filter.FilterMain(filterName);
124              } else if (componentName.equalsIgnoreCase("client")) {
125 <                component = new uk.ac.ukc.iscream.client.ClientMain();
125 >                component = new uk.org.iscream.client.ClientMain();
126              }
127              // ###  Add new component constructors in the above section! ###
128              
# Line 140 | Line 140 | public class ComponentManager {
140          
141          String confTimeout = null;
142          try {
143 <            confTimeout = System.getProperty("uk.ac.ukc.iscream.ComponentTimeout");
143 >            confTimeout = System.getProperty("uk.org.iscream.ComponentTimeout");
144              confTimeout.trim();
145              _startTimeout = Integer.parseInt(confTimeout);
146          } catch (NumberFormatException e) {
147              _startTimeout = DEFAULT_COMPONENT_START_TIMEOUT;
148 <            System.err.println(toString + ": unable to read uk.ac.ukc.iscream.ComponentTimeout value (" + confTimeout + "), using default!");
148 >            System.err.println(toString + ": unable to read uk.org.iscream.ComponentTimeout value (" + confTimeout + "), using default!");
149          }
150          System.out.println(toString + ": using component start timeout of " + _startTimeout + " seconds");
151          
# Line 171 | Line 171 | public class ComponentManager {
171       * This method calls the start() methods on all the components.
172       * If a component fails to start due to a CORBA communication
173       * problem, then it catches this and tries to start it again
174 <     * according to uk.ac.ukc.iscream.ComponentTimeout time.
174 >     * according to uk.org.iscream.ComponentTimeout time.
175       *
176       * If the server dies and CORBA connections are lost, this method
177       * is called again.
# Line 249 | Line 249 | public class ComponentManager {
249       * properly.
250       */
251      public static void usage() {
252 <        System.out.println("USAGE: java uk.ac.ukc.iscream.componentmanager.ComponentManager <option>");
252 >        System.out.println("USAGE: java uk.org.iscream.componentmanager.ComponentManager <option>");
253          System.out.println("   or: java -jar iscream.jar <option>");
254          System.out.println("WHERE <option>:");
255          System.out.println("      -l <filename> - the location of initial system properties");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines