--- projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java	2003/02/05 16:43:47	1.38
+++ projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java	2003/02/24 20:18:49	1.39
@@ -32,7 +32,7 @@ import uk.org.iscream.cms.server.filter.*;
  * A filter is an iscream component.
  *
  * @author  $Author: tdb $
- * @version $Id: FilterMain.java,v 1.38 2003/02/05 16:43:47 tdb Exp $
+ * @version $Id: FilterMain.java,v 1.39 2003/02/24 20:18:49 tdb Exp $
  */
 public class FilterMain implements Component {
 
@@ -41,7 +41,7 @@ public class FilterMain implements Component {
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.38 $";
+    public static final String REVISION = "$Revision: 1.39 $";
     
 //---STATIC METHODS---
 
@@ -71,19 +71,9 @@ public class FilterMain implements Component {
         
         // which input methods do we need to activate?
         // default to activating them
-        boolean activateTCPReader = true;
         boolean activateUDPReader = true;
         boolean activateCORBAReader = true;
         
-        // check for TCP Reader
-        try {
-            int tcp = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.ActivateTCPReader"));
-            activateTCPReader = (tcp == 1);
-        } catch (PropertyNotFoundException e) {
-            activateTCPReader = false;
-        } catch (NumberFormatException e) {
-            activateTCPReader = false;
-        }
         // check for UDP Reader
         try {
             int udp = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.ActivateUDPReader"));
@@ -108,7 +98,7 @@ public class FilterMain implements Component {
         
         // there's little point starting a Queue and a FilterThread
         // if nothing is going to be giving us any data
-        if(activateTCPReader || activateUDPReader || activateCORBAReader) {
+        if(activateUDPReader || activateCORBAReader) {
             // see if this Queue needs a size limit
             try {
                 int queueSizeLimit = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Queue.SizeLimit"));
@@ -157,25 +147,8 @@ public class FilterMain implements Component {
         
         // the corba listener needs these to be set, so lets
         // make them something obviously invalid initially
-        int TCPListenPort = -1;
         int UDPListenPort = -1;
         
-        // TCP Reader start (for heartbeats)
-        if(activateTCPReader) {
-            try {
-                // get the port number from the configuration
-                TCPListenPort = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.TCPListenPort"));
-                // start the TCPReader
-                _logger.write(toString(), Logger.SYSINIT, "starting Filter TCP listener");
-                TCPReader tcpReader = new TCPReader(TCPListenPort, queue);
-                tcpReader.start();
-            } catch (PropertyNotFoundException e) {
-                _logger.write(toString(), Logger.WARNING, "Unable to start TCPReader due to missing configuration: " + e);
-            } catch (NumberFormatException e) {
-                _logger.write(toString(), Logger.WARNING, "Unable to start TCPReader due to invalid configuration: " + e);
-            }
-        }
-        
         // UDP Reader start (for inbound host data)
         if(activateUDPReader) {
             try {
@@ -202,7 +175,7 @@ public class FilterMain implements Component {
         
         // FilterInfoServant start (to provide filter information to the server)
         _logger.write(toString(), Logger.SYSINIT, "starting Servant to provide filter information");
-        FilterInfoServant filterInfoServant = new FilterInfoServant(TCPListenPort, UDPListenPort);
+        FilterInfoServant filterInfoServant = new FilterInfoServant(UDPListenPort);
         _refman.bindToOrb(filterInfoServant, "iscream.FilterInfo\\." + FilterMain.NAME);
         
         _logger.write(toString(), Logger.SYSINIT, "started");