--- projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/FilterManager.java	2000/11/21 22:23:19	1.7
+++ projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/FilterManager.java	2000/11/23 01:44:59	1.8
@@ -5,13 +5,12 @@ import uk.ac.ukc.iscream.core.*;
 import uk.ac.ukc.iscream.filter.*;
 import org.omg.CORBA.*;
 import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
 
 /**
  * A FilterManager
  *
  * @author  $Author: tdb $
- * @version $Id: FilterManager.java,v 1.7 2000/11/21 22:23:19 tdb dead $
+ * @version $Id: FilterManager.java,v 1.8 2000/11/23 01:44:59 tdb Exp $
  */
 class FilterManager {
 
@@ -20,7 +19,7 @@ class FilterManager {
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.7 $";
+    public static final String REVISION = "$Revision: 1.8 $";
     
 //---STATIC METHODS---
 
@@ -36,10 +35,6 @@ class FilterManager {
             
             // something to hold objects
             org.omg.CORBA.Object objRef = null;    
-            
-            // get the Root POA
-            objRef = orb.resolve_initial_references("RootPOA");
-            POA poa = POAHelper.narrow(objRef);
               
             // get a hook to the name service
             objRef = orb.resolve_initial_references("NameService");
@@ -53,15 +48,15 @@ class FilterManager {
             
             logger.write(toString, Logger.SYSINIT, "coming up");
             
-            // create the filterManagerRef to our servant
-            //filterManagerRef = new FilterManagerServant;
+            // create the servant
+            //FilterManagerServant servant = new FilterManagerServant(logger);
             
             // register the servant with the name service
-            //objRef = poa.servant_to_reference(filterManagerRef);
+            //objRef = poa.servant_to_reference(servant);
             //ncRef.bind(ncRef.to_name("iscream.FilterManager"), objRef);
             
             // start the POA off
-            poa.the_POAManager().activate();
+            //poa.the_POAManager().activate();
             
             // get the config
             Configuration myConfig = configManager.getConfiguration("FilterManager");
@@ -83,11 +78,11 @@ class FilterManager {
                     System.exit(1);
                 }
             }
-            logger.write(toString, Logger.SYSINIT, "configured");
+            logger.write(toString, Logger.SYSMSG, "configured");
             logger.write(toString, Logger.SYSINIT, "starting listener");
             
-            FilterManagerListener fml = new FilterManagerListener(logger, configManager, port);
-            fml.start();
+            HostListener hostListener = new HostListener(logger, configManager, port, ncRef);
+            hostListener.start();
             
             logger.write(toString, Logger.SYSINIT, "started");