--- projects/cms/source/server/uk/org/iscream/cms/server/client/ClientMain.java	2001/02/25 22:22:16	1.6
+++ projects/cms/source/server/uk/org/iscream/cms/server/client/ClientMain.java	2001/02/27 01:01:33	1.7
@@ -11,7 +11,7 @@ import uk.ac.ukc.iscream.util.*;
  * A startup component for the Local Clients.
  *
  * @author  $Author: tdb $
- * @version $Id: ClientMain.java,v 1.6 2001/02/25 22:22:16 tdb Exp $
+ * @version $Id: ClientMain.java,v 1.7 2001/02/27 01:01:33 tdb Exp $
  */
 public class ClientMain implements Component {
 
@@ -20,7 +20,7 @@ public class ClientMain implements Component {
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.6 $";
+    public static final String REVISION = "$Revision: 1.7 $";
     
     /**
      * The friendly name for this component, used by
@@ -62,15 +62,18 @@ public class ClientMain implements Component {
                
         _logger.write(toString(), Logger.SYSINIT, "configured");
         
-        // setup the servant
-        _logger.write(toString(), Logger.SYSINIT, "starting servant");           
+        // setup a Queue for the servant -> monitor manager
+        Queue queue = new Queue();
+        // startup a monitor on this queue
+        String queueName = NAME + " ServantToMonMan";
+        queue.startMonitor(queueMonitorInterval*1000, queueName);
         
-        Client client;
-        
+        // setup the servant and connect
+        _logger.write(toString(), Logger.SYSINIT, "starting servant and connecting");           
         try {
-            ClientServant ref = new ClientServant();
+            ClientServant ref = new ClientServant(queue);
             org.omg.CORBA.Object objRef = _refman.getRootPOA().servant_to_reference(ref);
-            client = ClientHelper.narrow(objRef);
+            Client client = ClientHelper.narrow(objRef);
             
             // this name maybe shouldn't be static
             objRef = _refman.getCORBARef("iscream.ClientInterface.CorbaListener");
@@ -85,6 +88,9 @@ public class ClientMain implements Component {
             // so we just log the error
             _logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
         }
+        
+        // setup the MonitorManager
+        MonitorManager monMan = new MonitorManager(queue);
         
         _logger.write(toString(), Logger.SYSINIT, "started");