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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java (file contents):
Revision 1.33 by tdb, Wed Mar 20 13:05:49 2002 UTC vs.
Revision 1.38 by tdb, Wed Feb 5 16:43:47 2003 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.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25 < import uk.org.iscream.cms.server.util.*;
25 > import uk.org.iscream.cms.util.*;
26   import uk.org.iscream.cms.server.core.*;
27   import uk.org.iscream.cms.server.componentmanager.*;
28   import uk.org.iscream.cms.server.filter.*;
# Line 176 | Line 196 | public class FilterMain implements Component {
196          if(activateCORBAReader) {
197              // start the FilterServant
198              _logger.write(toString(), Logger.SYSINIT, "starting Servant to listen for downstream filters");
199 <            FilterServant filterServant = new FilterServant(TCPListenPort, UDPListenPort, queue);
200 <            _refman.bindToOrb(filterServant, "iscream.Filter." + FilterMain.NAME);
199 >            FilterServant filterServant = new FilterServant(queue);
200 >            _refman.bindToOrb(filterServant, "iscream.Filter\\." + FilterMain.NAME);
201          }
202          
203 +        // FilterInfoServant start (to provide filter information to the server)
204 +        _logger.write(toString(), Logger.SYSINIT, "starting Servant to provide filter information");
205 +        FilterInfoServant filterInfoServant = new FilterInfoServant(TCPListenPort, UDPListenPort);
206 +        _refman.bindToOrb(filterInfoServant, "iscream.FilterInfo\\." + FilterMain.NAME);
207 +        
208          _logger.write(toString(), Logger.SYSINIT, "started");
209      }
210      
# Line 199 | Line 224 | public class FilterMain implements Component {
224              ConfigurationProxy cp = ConfigurationProxy.getInstance();
225              String parentFilterName = cp.getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
226              // finally check the parent filter is alive
227 <            obj = _refman.getCORBARef("iscream.Filter." + parentFilterName);
227 >            obj = _refman.getCORBARef("iscream.Filter\\." + parentFilterName);
228          } catch(ComponentCORBAException e) {
229              System.err.println(toString() + ": Dependency Failure: "+e);
230              return false;
# Line 215 | Line 240 | public class FilterMain implements Component {
240       * Overrides the {@link java.lang.Object#toString() Object.toString()}
241       * method to provide clean logging (every class should have this).
242       *
243 <     * This uses the uk.org.iscream.cms.server.util.NameFormat class
243 >     * This uses the uk.org.iscream.cms.util.NameFormat class
244       * to format the toString()
245       *
246       * @return the name of this class and its CVS revision

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines