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.37 by tdb, Mon Mar 19 19:14:25 2001 UTC vs.
Revision 1.38 by tdb, Tue May 29 17:02:34 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.org.iscream.componentmanager;
2 > package uk.org.iscream.cms.server.componentmanager;
3  
4   //---IMPORTS---
5   import java.util.*;
6   import java.io.*;
7 < import uk.org.iscream.util.*;
7 > import uk.org.iscream.cms.server.util.*;
8  
9   /**
10   * The component manager is the starting point for all
# Line 12 | Line 12 | import uk.org.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.org.iscream.ComponentList
15 > * uk.org.iscream.cms.server.ComponentList
16   *
17   * @author  $Author$
18   * @version $Id$
# Line 100 | Line 100 | public class ComponentManager {
100          refman.activatePOA();
101          
102          // get the list of components
103 <        String componentList = System.getProperty("uk.org.iscream.ComponentList");
103 >        String componentList = System.getProperty("uk.org.iscream.cms.server.ComponentList");
104          StringTokenizer st = new StringTokenizer(componentList, ";");
105          _componentsToStart = new LinkedList();
106          
# Line 113 | Line 113 | public class ComponentManager {
113              
114              // ### This is where the list of supported components is checked! ###
115              if (componentName.equalsIgnoreCase("core")) {
116 <                component = new uk.org.iscream.core.Core();
116 >                component = new uk.org.iscream.cms.server.core.Core();
117              } else if (componentName.equalsIgnoreCase("filtermanager")) {
118 <                component = new uk.org.iscream.filtermanager.FilterManager();
118 >                component = new uk.org.iscream.cms.server.filtermanager.FilterManager();
119              } else if (componentName.equalsIgnoreCase("rootfilter")) {
120 <                component = new uk.org.iscream.rootfilter.RootFilter();
120 >                component = new uk.org.iscream.cms.server.rootfilter.RootFilter();
121              } else if (componentName.equalsIgnoreCase("dbinterface")) {
122 <                component = new uk.org.iscream.dbinterface.DBInterface();
122 >                component = new uk.org.iscream.cms.server.dbinterface.DBInterface();
123              } else if (componentName.equalsIgnoreCase("clientinterface")) {
124 <                component = new uk.org.iscream.clientinterface.ClientInterfaceMain();
124 >                component = new uk.org.iscream.cms.server.clientinterface.ClientInterfaceMain();
125              // note the passing of the Filter's name in its constructor
126              } else if (componentName.equalsIgnoreCase("filter")) {
127 <                component = new uk.org.iscream.filter.FilterMain(filterName);
127 >                component = new uk.org.iscream.cms.server.filter.FilterMain(filterName);
128              } else if (componentName.equalsIgnoreCase("client")) {
129 <                component = new uk.org.iscream.client.ClientMain();
129 >                component = new uk.org.iscream.cms.server.client.ClientMain();
130              }
131              // ###  Add new component constructors in the above section! ###
132              
# Line 144 | Line 144 | public class ComponentManager {
144          
145          String confTimeout = null;
146          try {
147 <            confTimeout = System.getProperty("uk.org.iscream.ComponentTimeout");
147 >            confTimeout = System.getProperty("uk.org.iscream.cms.server.ComponentTimeout");
148              confTimeout.trim();
149              _startTimeout = Integer.parseInt(confTimeout);
150          } catch (NumberFormatException e) {
151              _startTimeout = DEFAULT_COMPONENT_START_TIMEOUT;
152 <            System.err.println(toString + ": unable to read uk.org.iscream.ComponentTimeout value (" + confTimeout + "), using default!");
152 >            System.err.println(toString + ": unable to read uk.org.iscream.cms.server.ComponentTimeout value (" + confTimeout + "), using default!");
153          }
154          System.out.println(toString + ": using component start timeout of " + _startTimeout + " seconds");
155          
# Line 175 | Line 175 | public class ComponentManager {
175       * This method calls the start() methods on all the components.
176       * If a component fails to start due to a CORBA communication
177       * problem, then it catches this and tries to start it again
178 <     * according to uk.org.iscream.ComponentTimeout time.
178 >     * according to uk.org.iscream.cms.server.ComponentTimeout time.
179       *
180       * If the server dies and CORBA connections are lost, this method
181       * is called again.
# Line 254 | Line 254 | public class ComponentManager {
254       * properly.
255       */
256      public static void usage() {
257 <        System.out.println("USAGE: java uk.org.iscream.componentmanager.ComponentManager <option>");
257 >        System.out.println("USAGE: java uk.org.iscream.cms.server.componentmanager.ComponentManager <option>");
258          System.out.println("   or: java -jar iscream.jar <option>");
259          System.out.println("WHERE <option>:");
260          System.out.println("      -l <filename> - the location of initial system properties");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines