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.20 by tdb, Wed Mar 14 01:34:22 2001 UTC vs.
Revision 1.28 by tdb, Fri Sep 6 15:10:48 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22 < package uk.ac.ukc.iscream.clientinterface;
22 > package uk.org.iscream.cms.server.clientinterface;
23  
24   //---IMPORTS---
25 < import uk.ac.ukc.iscream.componentmanager.*;
26 < import uk.ac.ukc.iscream.core.*;
27 < import uk.ac.ukc.iscream.util.*;
25 > import uk.org.iscream.cms.server.componentmanager.*;
26 > import uk.org.iscream.cms.server.core.*;
27 > import uk.org.iscream.cms.server.util.*;
28  
29   /**
30   * This class starts the real time clients
# Line 36 | Line 56 | public class ClientInterfaceMain implements Component
56       */
57      public void start() throws ComponentStartException {
58          // get references to key objects
59 <        _refman = ReferenceManager.getInstance();
40 <        _logger = ReferenceManager.getInstance().getLogger();
59 >        _logger = _refman.getLogger();
60          
61          _logger.write(toString(), Logger.SYSINIT, "coming up");
62          
# Line 47 | Line 66 | public class ClientInterfaceMain implements Component
66          
67          // set our name
68          try {
69 <            NAME = cp.getProperty(configName, "RootFilter.realtimeInterfaceName");
69 >            NAME = cp.getProperty(configName, "ClientInterface.name");
70          } catch (PropertyNotFoundException e) {
71              NAME = null;
72              _logger.write(toString(), Logger.WARNING, "ClientInterface name not set: "+e);
# Line 62 | Line 81 | public class ClientInterfaceMain implements Component
81          // ClientInterfaceServant start (for inbound data)
82          _logger.write(toString(), Logger.DEBUG, "starting servant for inbound data");
83          ClientInterfaceServant ciServant = new ClientInterfaceServant(ps);
84 <        _refman.bindToOrb(ciServant, "iscream.ClientInterface." + ClientInterfaceMain.NAME);
84 >        _refman.bindToOrb(ciServant, "iscream.ClientInterface\\." + ClientInterfaceMain.NAME);
85          
86          // Startup the TCPListener
87          TCPClientListener tcpClientListener = new TCPClientListener(ps);
# Line 72 | Line 91 | public class ClientInterfaceMain implements Component
91          _logger.write(toString(), Logger.DEBUG, "starting servant for inbound clients");
92          CorbaClientListenerServant corbaServant = new CorbaClientListenerServant(ps);
93          // !!! verify this name is correct at some point !!!
94 <        _refman.bindToOrb(corbaServant, "iscream.ClientInterface.CorbaListener");
94 >        _refman.bindToOrb(corbaServant, "iscream.ClientInterface\\.CorbaListener");
95          
96          _logger.write(toString(), Logger.SYSINIT, "started");
97      }
# Line 90 | Line 109 | public class ClientInterfaceMain implements Component
109              obj = _refman.getCORBARef("iscream.Logger");
110              obj = _refman.getCORBARef("iscream.ConfigurationManager");
111          } catch(ComponentCORBAException e) {
112 <            _logger.write(toString(), Logger.WARNING, "Dependency Failure: "+e);
112 >            System.err.println(toString() + ": Dependency Failure: "+e);
113              return false;
114          }
115          // dependency check suceeded
# Line 101 | Line 120 | public class ClientInterfaceMain implements Component
120       * Overrides the {@link java.lang.Object#toString() Object.toString()}
121       * method to provide clean logging (every class should have this).
122       *
123 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
123 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
124       * to format the toString()
125       *
126       * @return the name of this class and its CVS revision
# Line 128 | Line 147 | public class ClientInterfaceMain implements Component
147      /**
148       * A reference to the reference manager in use
149       */
150 <    private ReferenceManager _refman;
150 >    private ReferenceManager _refman = ReferenceManager.getInstance();
151  
152   //---STATIC ATTRIBUTES---
153  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines