| 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.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.org.iscream.core.*; |
| 29 |
< |
import uk.org.iscream.componentmanager.*; |
| 30 |
< |
import uk.org.iscream.filter.*; |
| 31 |
< |
import uk.org.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.server.util.*; |
| 32 |
|
|
| 33 |
|
/** |
| 34 |
|
* Handle an incoming packet as a separate thread. |
| 80 |
|
int n = _queue.getQueue(); |
| 81 |
|
// keep these out here, saves recreating the object |
| 82 |
|
String xml = null; |
| 83 |
+ |
String parentFilterName = ""; |
| 84 |
+ |
Filter parent = null; |
| 85 |
|
while(true) { |
| 86 |
|
// get a String of xml |
| 87 |
|
try { |
| 96 |
|
if (xml.indexOf(0) != -1) { |
| 97 |
|
xml = xml.substring(0, xml.indexOf(0)); |
| 98 |
|
} |
| 77 |
– |
else { |
| 78 |
– |
xml = xml.substring(0, xml.length()); |
| 79 |
– |
} |
| 99 |
|
|
| 100 |
|
// Bundle the XML all on one line (saves space and simplifies |
| 101 |
|
// the protocol between clientinterface and client). |
| 116 |
|
} |
| 117 |
|
|
| 118 |
|
// get parent |
| 100 |
– |
Filter parent; |
| 119 |
|
try { |
| 120 |
< |
String parentFilterName = ConfigurationProxy.getInstance().getProperty(FilterMain.NAME, "Filter.parentFilter"); |
| 121 |
< |
parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName)); |
| 120 |
> |
String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter"); |
| 121 |
> |
if(!parentFilterName.equals(newParent)) { |
| 122 |
> |
parentFilterName = newParent; |
| 123 |
> |
parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter\\." + parentFilterName)); |
| 124 |
> |
_logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName); |
| 125 |
> |
} |
| 126 |
|
} catch (PropertyNotFoundException e) { |
| 127 |
|
continue; |
| 128 |
|
} |
| 143 |
|
* Overrides the {@link java.lang.Object#toString() Object.toString()} |
| 144 |
|
* method to provide clean logging (every class should have this). |
| 145 |
|
* |
| 146 |
< |
* This uses the uk.org.iscream.util.NameFormat class |
| 146 |
> |
* This uses the uk.org.iscream.cms.server.util.NameFormat class |
| 147 |
|
* to format the toString() |
| 148 |
|
* |
| 149 |
|
* @return the name of this class and its CVS revision |
