1 |
|
//---PACKAGE DECLARATION--- |
2 |
< |
package uk.ac.ukc.iscream.filter; |
2 |
> |
package uk.org.iscream.cms.server.filter; |
3 |
|
|
4 |
|
//---IMPORTS--- |
5 |
|
import java.io.*; |
6 |
|
import java.net.*; |
7 |
|
import java.util.*; |
8 |
< |
import uk.ac.ukc.iscream.core.*; |
9 |
< |
import uk.ac.ukc.iscream.componentmanager.*; |
10 |
< |
import uk.ac.ukc.iscream.filter.*; |
11 |
< |
import uk.ac.ukc.iscream.util.*; |
8 |
> |
import uk.org.iscream.cms.server.core.*; |
9 |
> |
import uk.org.iscream.cms.server.componentmanager.*; |
10 |
> |
import uk.org.iscream.cms.server.filter.*; |
11 |
> |
import uk.org.iscream.cms.server.util.*; |
12 |
|
|
13 |
|
/** |
14 |
|
* Handle an incoming packet as a separate thread. |
38 |
|
* Constructs an instance of a FilterThread |
39 |
|
* |
40 |
|
* @param queue the Queue this filter is using |
41 |
– |
* @param parent a CORBA reference to our parent filter |
41 |
|
*/ |
42 |
< |
public FilterThread(Queue queue, Filter parent){ |
43 |
< |
_parent = parent; |
42 |
> |
public FilterThread(Queue queue){ |
43 |
> |
// set the Thread name |
44 |
> |
setName("filter.FilterThread"); |
45 |
> |
|
46 |
|
_queue = queue; |
47 |
|
_logger.write(toString(), Logger.SYSINIT, "created"); |
48 |
|
} |
54 |
|
* sending it on to the parent filter. |
55 |
|
*/ |
56 |
|
public void run(){ |
57 |
+ |
// setup the XMLPacketMaker |
58 |
+ |
XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(); |
59 |
|
// get a queue for ourselves |
60 |
|
int n = _queue.getQueue(); |
61 |
|
// keep these out here, saves recreating the object |
62 |
|
String xml = null; |
63 |
+ |
String parentFilterName = ""; |
64 |
+ |
Filter parent = null; |
65 |
|
while(true) { |
66 |
|
// get a String of xml |
67 |
|
try { |
76 |
|
if (xml.indexOf(0) != -1) { |
77 |
|
xml = xml.substring(0, xml.indexOf(0)); |
78 |
|
} |
74 |
– |
else { |
75 |
– |
xml = xml.substring(0, xml.length()); |
76 |
– |
} |
79 |
|
|
80 |
|
// Bundle the XML all on one line (saves space and simplifies |
81 |
|
// the protocol between clientinterface and client). |
86 |
|
} |
87 |
|
|
88 |
|
// Use XMLPacketMaker to make an XMLPacket object. |
89 |
< |
XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml); |
90 |
< |
XMLPacket packet = xmlPacketMaker.createXMLPacket(); |
91 |
< |
|
92 |
< |
if(packet != null) { |
93 |
< |
// packet is not null |
94 |
< |
// packet was not dropped by a plugin |
95 |
< |
// ... best pass it on ! |
96 |
< |
if(PluginFilterManager.getInstance().runFilters(packet)) { |
97 |
< |
_parent.receiveXML(xml); |
89 |
> |
XMLPacket packet = null; |
90 |
> |
try { |
91 |
> |
packet = xmlPacketMaker.createXMLPacket(xml); |
92 |
> |
} catch(InvalidXMLException e) { |
93 |
> |
_logger.write(toString(), Logger.ERROR, "Invalid XML: "+e); |
94 |
> |
// skip the rest of this loop iteration |
95 |
> |
continue; |
96 |
> |
} |
97 |
> |
|
98 |
> |
// get parent |
99 |
> |
try { |
100 |
> |
String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter"); |
101 |
> |
if(!parentFilterName.equals(newParent)) { |
102 |
> |
parentFilterName = newParent; |
103 |
> |
parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName)); |
104 |
> |
_logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName); |
105 |
|
} |
106 |
< |
else { |
107 |
< |
// we filtered it |
99 |
< |
_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system."); |
100 |
< |
} |
106 |
> |
} catch (PropertyNotFoundException e) { |
107 |
> |
continue; |
108 |
|
} |
109 |
+ |
|
110 |
+ |
// XMLPacket is ok, run filters... |
111 |
+ |
if(PluginFilterManager.getInstance().runFilters(packet)) { |
112 |
+ |
// and pass it on... |
113 |
+ |
parent.receiveXML(xml); |
114 |
+ |
} |
115 |
|
else { |
116 |
< |
// we had a null |
117 |
< |
_logger.write(toString(), Logger.DEBUG, "An XML packet containing ill-parsing XML was rejected."); |
116 |
> |
// ... or filtered it |
117 |
> |
_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system."); |
118 |
|
} |
119 |
|
} |
120 |
|
} |
123 |
|
* Overrides the {@link java.lang.Object#toString() Object.toString()} |
124 |
|
* method to provide clean logging (every class should have this). |
125 |
|
* |
126 |
< |
* This uses the uk.ac.ukc.iscream.util.NameFormat class |
126 |
> |
* This uses the uk.org.iscream.cms.server.util.NameFormat class |
127 |
|
* to format the toString() |
128 |
|
* |
129 |
|
* @return the name of this class and its CVS revision |
140 |
|
//---ACCESSOR/MUTATOR METHODS--- |
141 |
|
|
142 |
|
//---ATTRIBUTES--- |
130 |
– |
|
131 |
– |
/** |
132 |
– |
* Our parent filter |
133 |
– |
*/ |
134 |
– |
Filter _parent; |
143 |
|
|
144 |
|
/** |
145 |
|
* The Queue object |
162 |
|
* system logger that is being used. |
163 |
|
*/ |
164 |
|
private Logger _logger = ReferenceManager.getInstance().getLogger(); |
165 |
+ |
|
166 |
+ |
/** |
167 |
+ |
* A reference to the reference manager in use |
168 |
+ |
*/ |
169 |
+ |
private ReferenceManager _refman = ReferenceManager.getInstance(); |
170 |
|
|
171 |
|
//---STATIC ATTRIBUTES--- |
172 |
|
|