ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/HostInit.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/HostInit.java (file contents):
Revision 1.9 by tdb, Wed Nov 29 19:19:12 2000 UTC vs.
Revision 1.11 by tdb, Thu Dec 7 00:02:17 2000 UTC

#	Line 4 | Line 4 | package uk.ac.ukc.iscream.filtermanager;
4		//---IMPORTS---
5		import uk.ac.ukc.iscream.core.*;
6		import uk.ac.ukc.iscream.filter.*;
7	+	import uk.ac.ukc.iscream.util.*;
8		import java.net.Socket;
8	–	import java.io.InputStream;
9	–	import java.io.OutputStream;
10	–	import java.io.IOException;
9		import java.io.*;
12	–	import org.omg.CORBA.*;
13	–	import org.omg.CosNaming.*;
10
11		/**
12	<	* <ONE LINE DESCRIPTION>
17	<	* <DETAILED DESCRIPTION>
12	>	* Handles setting up a host.
13		*
14		* @author  $Author$
15		* @version $Id$
#	Line 32 | Line 27 | class HostInit extends Thread {
27
28		//---CONSTRUCTORS---
29
30	<	public HostInit(Socket socket, ConfigurationManager configManager, Logger logRef, NamingContextExt ncRef) throws IOException {
36	<	_configManager = configManager;
37	<	_logRef = logRef;
30	>	public HostInit(Socket socket) throws IOException {
31		_socket = socket;
39	–	_ncRef = ncRef;
32		_socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
33		_socketOut = new PrintWriter(_socket.getOutputStream());
34	<	_logRef.write(toString(), Logger.SYSINIT, "created");
34	>	_logger.write(toString(), Logger.SYSINIT, "created");
35		}
36
37		//---PUBLIC METHODS---
#	Line 95 | Line 87 | class HostInit extends Thread {
87
88		// get the property
89		try {
90	<	String returnedProperty = myConfig.getProperty(inBound);
90	>	String returnedProperty = myConfig.getProperty("Host."+inBound);
91
92		_socketOut.println(returnedProperty);
93		_socketOut.flush();
#	Line 106 | Line 98 | class HostInit extends Thread {
98		}
99		inBound = _socketIn.readLine();
100		}
101	<	_logRef.write(toString(), Logger.SYSMSG, "configured host");
101	>	_logger.write(toString(), Logger.SYSMSG, "configured host");
102		_socketOut.println("OK");
103		_socketOut.flush();
104
#	Line 121 | Line 113 | class HostInit extends Thread {
113		else {
114		// send info
115		String parentFilter =  myConfig.getProperty("Host.filter");
116	<	_logRef.write(toString(), Logger.DEBUG, " looking for parent - " + parentFilter);
117	<	org.omg.CORBA.Object objRef = _ncRef.resolve(_ncRef.to_name("iscream.Filter." + parentFilter));
126	<	Filter filter = FilterHelper.narrow(objRef);
116	>	_logger.write(toString(), Logger.DEBUG, " looking for parent - " + parentFilter);
117	>	Filter filter = FilterHelper.narrow(ReferenceManager.getInstance().getCORBARef("iscream.Filter." + parentFilter));
118		_socketOut.println(filter.getHostName() + ";"
119		+ filter.getUDPPort() + ";"
120		+ filter.getTCPPort());
#	Line 147 | Line 138 | class HostInit extends Thread {
138		}
139
140		} catch (Exception e) {
141	<	_logRef.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
141	>	_logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
142		}
143
144		_socketOut.flush();
#	Line 157 | Line 148 | class HostInit extends Thread {
148		_socketOut.close();
149		_socket.close();
150		} catch (IOException e) {
151	<	_logRef.write(toString(), Logger.ERROR, "exception on socket close");
151	>	_logger.write(toString(), Logger.ERROR, "exception on socket close");
152		}
153	<	_logRef.write(toString(), Logger.SYSMSG, "finished");
153	>	_logger.write(toString(), Logger.SYSMSG, "finished");
154		}
155
156		/**
#	Line 180 | Line 171 | class HostInit extends Thread {
171
172		//---ATTRIBUTES---
173
174	<	ConfigurationManager _configManager;
175	<	Logger _logRef;
174	>	/**
175	>	* A reference to the logger the system is using
176	>	*/
177	>	Logger _logger = ReferenceManager.getInstance().getLogger();
178	>
179	>	/**
180	>	* A reference to the Configuration Manager the system is using
181	>	*/
182	>	ConfigurationManager _configManager = ReferenceManager.getInstance().getCM();
183	>
184		Socket _socket;
185		BufferedReader _socketIn;
186		PrintWriter _socketOut;
187	<	NamingContextExt _ncRef;
187	>
188		//---STATIC ATTRIBUTES---
189
190		}

Diff Legend

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