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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java (file contents):
Revision 1.24 by tdb, Mon Feb 12 00:45:57 2001 UTC vs.
Revision 1.39 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.ac.ukc.iscream.filter;
22 > package uk.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25   import java.io.*;
26   import java.net.*;
27   import java.util.*;
28 < import uk.ac.ukc.iscream.core.*;
29 < import uk.ac.ukc.iscream.componentmanager.*;
30 < import uk.ac.ukc.iscream.filter.*;
31 < import uk.ac.ukc.iscream.util.*;
28 > import uk.org.iscream.cms.server.core.*;
29 > import uk.org.iscream.cms.server.componentmanager.*;
30 > import uk.org.iscream.cms.server.filter.*;
31 > import uk.org.iscream.cms.util.*;
32  
33   /**
34   * Handle an incoming packet as a separate thread.
# Line 38 | Line 58 | public class FilterThread extends Thread{
58       * Constructs an instance of a FilterThread
59       *
60       * @param queue the Queue this filter is using
41 –     * @param parent a CORBA reference to our parent filter
61       */
62 <    public FilterThread(Queue queue, Filter parent){
63 <        _parent = parent;
62 >    public FilterThread(Queue queue){
63 >        // set the Thread name
64 >        setName("filter.FilterThread");
65 >        
66          _queue = queue;
67          _logger.write(toString(), Logger.SYSINIT, "created");
68      }
# Line 57 | Line 78 | public class FilterThread extends Thread{
78          int n = _queue.getQueue();
79          // keep these out here, saves recreating the object
80          String xml = null;
81 +        String parentFilterName = "";
82 +        Filter parent = null;
83          while(true) {
84              // get a String of xml
85              try {
# Line 71 | Line 94 | public class FilterThread extends Thread{
94              if (xml.indexOf(0) != -1) {
95                  xml = xml.substring(0, xml.indexOf(0));
96              }
74 –            else {
75 –                xml = xml.substring(0, xml.length());
76 –            }
97              
98              // Bundle the XML all on one line (saves space and simplifies
99              // the protocol between clientinterface and client).
# Line 83 | Line 103 | public class FilterThread extends Thread{
103                  xml += tokenizer.nextToken();
104              }
105              
106 <            // Use XMLPacketMaker to make an XMLPacket object.
107 <            XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
108 <            XMLPacket packet = xmlPacketMaker.createXMLPacket();
109 <                  
110 <            if(packet != null) {
111 <                // packet is not null
112 <                // packet was not dropped by a plugin
113 <                // ... best pass it on !
114 <                if(PluginFilterManager.getInstance().runFilters(packet)) {
115 <                    _parent.receiveXML(xml);
106 >            // Get an XMLPacket from the XMLCache.
107 >            XMLPacket packet = null;
108 >            try {
109 >                packet = _xmlCache.getXMLPacket(xml);
110 >            } catch(InvalidXMLException e) {
111 >                _logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
112 >                // skip the rest of this loop iteration
113 >                continue;
114 >            }
115 >            
116 >            // get parent
117 >            try {
118 >                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
119 >                if(!parentFilterName.equals(newParent)) {
120 >                    parentFilterName = newParent;
121 >                    parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter\\." + parentFilterName));
122 >                    _logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
123                  }
124 <                else {
125 <                    // we filtered it
99 <                    _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
100 <                }
124 >            } catch (PropertyNotFoundException e) {
125 >                continue;
126              }
127 +                    
128 +            // XMLPacket is ok, run filters...
129 +            if(PluginFilterManager.getInstance().runFilters(packet)) {
130 +                // and pass it on...
131 +                parent.receiveXML(xml);
132 +            }
133              else {
134 <                // we had a null
135 <                _logger.write(toString(), Logger.DEBUG, "A packet containing ill-parsing XML was rejected.");
134 >                // ... or filtered it
135 >                _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
136              }
137          }
138      }
# Line 110 | Line 141 | public class FilterThread extends Thread{
141       * Overrides the {@link java.lang.Object#toString() Object.toString()}
142       * method to provide clean logging (every class should have this).
143       *
144 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
144 >     * This uses the uk.org.iscream.cms.util.NameFormat class
145       * to format the toString()
146       *
147       * @return the name of this class and its CVS revision
# Line 127 | Line 158 | public class FilterThread extends Thread{
158   //---ACCESSOR/MUTATOR METHODS---
159  
160   //---ATTRIBUTES---
130 –
131 –    /**
132 –     * Our parent filter
133 –     */
134 –    Filter _parent;
161      
162      /**
163       * The Queue object
# Line 154 | Line 180 | public class FilterThread extends Thread{
180       * system logger that is being used.
181       */
182      private Logger _logger = ReferenceManager.getInstance().getLogger();
183 +
184 +    /**
185 +     * A reference to the reference manager in use
186 +     */
187 +    private ReferenceManager _refman = ReferenceManager.getInstance();
188 +    
189 +    /**
190 +     * A reference to the XMLCache in use
191 +     */
192 +    private XMLCache _xmlCache = XMLCache.getInstance();
193  
194   //---STATIC ATTRIBUTES---
195  

Diff Legend

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