--- projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/FilterManager.java 2000/11/16 18:14:05 1.3 +++ projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/FilterManager.java 2000/11/20 18:55:24 1.4 @@ -11,7 +11,7 @@ import org.omg.PortableServer.*; * A FilterManager * * @author $Author: tdb $ - * @version $Id: FilterManager.java,v 1.3 2000/11/16 18:14:05 tdb Exp $ + * @version $Id: FilterManager.java,v 1.4 2000/11/20 18:55:24 tdb Exp $ */ class FilterManager { @@ -20,7 +20,7 @@ class FilterManager { /** * The current CVS revision of this class */ - public static final String REVISION = "$Revision: 1.3 $"; + public static final String REVISION = "$Revision: 1.4 $"; //---STATIC METHODS--- @@ -46,8 +46,8 @@ class FilterManager { NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef); // get a ref to the Configurator & the Logger - objRef = ncRef.resolve(ncRef.to_name("iscream.Configurator")); - Configurator configurator = ConfiguratorHelper.narrow(objRef); + objRef = ncRef.resolve(ncRef.to_name("iscream.ConfigurationManager")); + ConfigurationManager configManager = ConfigurationManagerHelper.narrow(objRef); objRef = ncRef.resolve(ncRef.to_name("iscream.Logger")); Logger logger = LoggerHelper.narrow(objRef); @@ -64,7 +64,7 @@ class FilterManager { poa.the_POAManager().activate(); // get the config - Configuration myConfig = configurator.getConfiguration("filterManager"); + Configuration myConfig = configManager.getConfiguration("filterManager"); // some place holders for the configuration int port = 0; @@ -86,7 +86,7 @@ class FilterManager { logger.write(toString, Logger.SYSINIT, "configured"); logger.write(toString, Logger.SYSINIT, "starting listener"); - FilterManagerListener fml = new FilterManagerListener(logger, configurator, port); + FilterManagerListener fml = new FilterManagerListener(logger, configManager, port); fml.start(); logger.write(toString, Logger.SYSINIT, "started");