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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/ClientMain.java (file contents):
Revision 1.24 by tdb, Wed Feb 5 16:43:44 2003 UTC vs.
Revision 1.25 by tdb, Mon May 5 22:05:04 2003 UTC

# Line 115 | Line 115 | public class ClientMain implements Component {
115              _monitorQueue.startMonitor(queueMonitorInterval*1000, _monitorQueue, NAME + " Monitor");
116          } catch (PropertyNotFoundException e) {
117              _logger.write(toString(), Logger.WARNING, "failed to find queue monitor config, disabling. " + e);
118 <        }        
118 >        }
119          
120          // setup the servant and connect
121 <        _logger.write(toString(), Logger.SYSINIT, "starting servant and connecting");          
121 >        _logger.write(toString(), Logger.SYSINIT, "starting servant and connecting");
122          try {
123              ClientServant ref = new ClientServant(_monitorQueue);
124              org.omg.CORBA.Object objRef = _refman.getRootPOA().servant_to_reference(ref);
125              Client client = ClientHelper.narrow(objRef);
126              
127 <            // this name maybe shouldn't be static
128 <            objRef = _refman.getCORBARef("iscream.ClientInterface\\.CorbaListener");
127 >            String parent = ConfigurationProxy.getInstance().getProperty("Client." + ClientMain.NAME, "Client.parent");
128 >            objRef = _refman.getCORBARef("iscream.ClientInterface\\." + parent);
129              CorbaClientListener listener = CorbaClientListenerHelper.narrow(objRef);
130              
131              _logger.write(toString(), Logger.SYSINIT, "connecting");
# Line 163 | Line 163 | public class ClientMain implements Component {
163              obj = _refman.getCORBARef("iscream.ConfigurationManager");
164              // then get some info on the CLI
165              ConfigurationProxy cp = ConfigurationProxy.getInstance();
166 <            String cli = cp.getProperty("RootFilter", "RootFilter.realtimeInterfaceName");
166 >            String parentName = cp.getProperty("Client." + ClientMain.NAME, "Client.parent");
167              // finally check the CLI is alive
168 <            obj = _refman.getCORBARef("iscream.ClientInterface\\." + cli);
168 >            obj = _refman.getCORBARef("iscream.ClientInterface\\." + parentName);
169          } catch(ComponentCORBAException e) {
170              System.err.println(toString() + ": Dependency Failure: "+e);
171              return false;

Diff Legend

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