ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/ClientInterfaceMain.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/ClientInterfaceMain.java (file contents):
Revision 1.7 by tdb, Thu Jan 18 23:07:00 2001 UTC vs.
Revision 1.19 by tdb, Tue Mar 13 18:37:08 2001 UTC

# Line 16 | Line 16 | import uk.ac.ukc.iscream.util.*;
16   * @author  $Author$
17   * @version $Id$
18   */
19 < public class ClientInterfaceMain implements uk.ac.ukc.iscream.util.Component {
19 > public class ClientInterfaceMain implements Component {
20  
21   //---FINAL ATTRIBUTES---
22  
# Line 35 | Line 35 | public class ClientInterfaceMain implements uk.ac.ukc.
35       * This method starts the ClientInterface
36       */
37      public void start() throws ComponentStartException {
38 <                        
38 >        // get references to key objects
39 >        _refman = ReferenceManager.getInstance();
40 >        _logger = ReferenceManager.getInstance().getLogger();
41 >        
42          _logger.write(toString(), Logger.SYSINIT, "coming up");
40            
41        // configuration variables we require
42        String ourName = null;
43        int listenPort = 0;
43          
44 <        Configuration config = _refman.getCM().getConfiguration("ClientInterface");
45 <        if (config == null) {
46 <            System.err.println("CRITICAL:Unable to obtain configuration" +
47 <                               "\n         Advise you check the i-scream log for more information.");
48 <            _logger.write(toString(), Logger.FATAL, "ERROR - unable to obtain configuration");
49 <            System.exit(1);
50 <        } else {
51 <            try {
52 <                ourName = config.getProperty("RootFilter.realtimeInterfaceName");
53 <                listenPort = Integer.parseInt(config.getProperty("ClientInterface.listenPort"));
55 <            } catch (org.omg.CORBA.MARSHAL e) {
56 <                System.err.println ("CRITICAL:Unable to obtain required configuration property" +
57 <                                    "\n         Advise you check the i-scream log for more information.");
58 <                _logger.write(toString(), Logger.FATAL, "ERROR - required configuration property not present");
59 <                System.exit(1);
60 <
61 <            }
44 >        
45 >        ConfigurationProxy cp = ConfigurationProxy.getInstance();
46 >        String configName = "ClientInterface";
47 >        
48 >        // set our name
49 >        try {
50 >            NAME = cp.getProperty(configName, "RootFilter.realtimeInterfaceName");
51 >        } catch (PropertyNotFoundException e) {
52 >            NAME = null;
53 >            _logger.write(toString(), Logger.WARNING, "ClientInterface name not set: "+e);
54          }
63        // now we have the name of the interface we set it
64        NAME = ourName;
55          
56          _logger.write(toString(), Logger.SYSINIT, "configured");
57 <                
57 >        
58 >        // Setup a PacketSorter
59 >        PacketSorter ps = new PacketSorter();
60 >        ps.start();
61 >        
62          // ClientInterfaceServant start (for inbound data)
63          _logger.write(toString(), Logger.DEBUG, "starting servant for inbound data");
64 <        ClientInterfaceServant ciServant = new ClientInterfaceServant();
64 >        ClientInterfaceServant ciServant = new ClientInterfaceServant(ps);
65          _refman.bindToOrb(ciServant, "iscream.ClientInterface." + ClientInterfaceMain.NAME);
66          
67 <        ClientListener clientListener = new ClientListener(listenPort, ciServant);
68 <        clientListener.start();
67 >        // Startup the TCPListener
68 >        TCPClientListener tcpClientListener = new TCPClientListener(ps);
69 >        tcpClientListener.start();
70          
71 +        // Startup the CORBA Listener
72 +        _logger.write(toString(), Logger.DEBUG, "starting servant for inbound clients");
73 +        CorbaClientListenerServant corbaServant = new CorbaClientListenerServant(ps);
74 +        // !!! verify this name is correct at some point !!!
75 +        _refman.bindToOrb(corbaServant, "iscream.ClientInterface.CorbaListener");
76 +        
77          _logger.write(toString(), Logger.SYSINIT, "started");
78      }
79  
# Line 102 | Line 103 | public class ClientInterfaceMain implements uk.ac.ukc.
103       * This holds a reference to the
104       * system logger that is being used.
105       */
106 <    private Logger _logger = ReferenceManager.getInstance().getLogger();
106 >    private Logger _logger;
107  
108      /**
109       * A reference to the reference manager in use
110       */
111 <    private ReferenceManager _refman = ReferenceManager.getInstance();
111 >    private ReferenceManager _refman;
112  
113   //---STATIC ATTRIBUTES---
114  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines