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/FilterServant.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterServant.java (file contents):
Revision 1.10 by ajm, Thu Nov 30 02:38:09 2000 UTC vs.
Revision 1.23 by tdb, Sun Aug 1 10:40:58 2004 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org
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.filter;
22 > package uk.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25 < import uk.ac.ukc.iscream.core.*;
26 < import uk.ac.ukc.iscream.filter.*;
27 < import uk.ac.ukc.iscream.util.*;
25 > import uk.org.iscream.cms.server.core.*;
26 > import uk.org.iscream.cms.server.componentmanager.*;
27 > import uk.org.iscream.cms.server.filter.*;
28 > import uk.org.iscream.cms.util.*;
29   import java.net.InetAddress;
30  
31   /**
32 < * A test FilterServant, just prints it out.
32 > * Passes inbound data from other Filters to a FilterThread
33   *
34   * @author  $Author$
35   * @version $Id$
# Line 27 | Line 48 | class FilterServant extends FilterPOA {
48   //---CONSTRUCTORS---
49  
50      /**
51 <     * Creates a new Filter.
51 >     * Creates a new FilterServant.
52       *
53 <     * @param logger a Logger to use
53 >     * @param queue the Queue this filter is using
54       */
55 <    public FilterServant(Filter parent, int TCPListenPort, int UDPListenPort) {    
56 <        _TCPListenPort = TCPListenPort;
57 <        _UDPListenPort = UDPListenPort;
37 <        _parent = parent;
55 >    public FilterServant(Queue queue) {
56 >        _queue = queue;
57 >        _logger.write(toString(), Logger.SYSINIT, "started");
58      }
59      
60   //---PUBLIC METHODS---
# Line 42 | Line 62 | class FilterServant extends FilterPOA {
62      /**
63       * Method to receive a string over corba.
64       *
65 <     * @param xml the String of XML to print out
65 >     * @param xml the String of XML to queue
66       */
67      public void receiveXML(String xml) {
68 <        FilterThread t = new FilterThread(xml, _parent);
49 <        t.start();
68 >        _queue.add(xml);
69      }
70      
71      /**
72       * Overrides the {@link java.lang.Object#toString() Object.toString()}
73       * method to provide clean logging (every class should have this).
74       *
75 +     * This uses the uk.org.iscream.cms.util.NameFormat class
76 +     * to format the toString()
77 +     *
78       * @return the name of this class and its CVS revision
79       */
80      public String toString() {
81 <        return this.getClass().getName() + "{" + _name + "}(" + REVISION.substring(11, REVISION.length() - 2) + ")";
81 >        return FormatName.getName(
82 >            _name,
83 >            getClass().getName(),
84 >            REVISION);
85      }
86  
87   //---PRIVATE METHODS---
88  
89   //---ACCESSOR/MUTATOR METHODS---
90  
66    public String getUDPPort() {
67        return new Integer(_UDPListenPort).toString();
68    }
69    
70    public String getTCPPort() {
71        return new Integer(_TCPListenPort).toString();
72    }
73    
74    public String getHostName() {
75        try {
76            return InetAddress.getLocalHost().getHostName();
77        } catch (java.net.UnknownHostException e) {
78            _logger.write(toString(), Logger.ERROR, e.getMessage());
79        }
80        return null;
81    }
82
83
91   //---ATTRIBUTES---
92  
93      /**
94 <     * Reference to a Logger
94 >     * This is the friendly identifier of the
95 >     * component this class is running in.
96 >     * eg, a Filter may be called "filter1",
97 >     * If this class does not have an owning
98 >     * component,  a name from the configuration
99 >     * can be placed here.  This name could also
100 >     * be changed to null for utility classes.
101       */
102 <    private Logger _logger = ReferenceManager.getInstance().getLogger();
103 <    
102 >    private String _name = FilterMain.NAME;
103 >
104      /**
105 <     * Our name
105 >     * This holds a reference to the
106 >     * system logger that is being used.
107       */
108 <    private String _name = ReferenceManager.getInstance().getName();
108 >    private Logger _logger = ReferenceManager.getInstance().getLogger();
109  
110      /**
111 <     * Our parent filter
111 >     * Our Queue object
112       */
113 <    private Filter _parent;
100 <    
101 <    private int _UDPListenPort;
102 <    private int _TCPListenPort;
113 >    private Queue _queue;
114      
115   //---STATIC ATTRIBUTES---
116  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines