ViewVC Help

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

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationManagerServant.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationManagerServant.java (file contents):
Revision 1.9 by ajm, Thu Mar 1 19:25:41 2001 UTC vs.
Revision 1.10 by ajm, Thu Mar 1 19:36:08 2001 UTC

#	Line 105 | Line 105 | class ConfigurationManagerServant extends Configuratio
105		_logger.write(toString(), Logger.DEBUG, "looking for config tree in - " + configFile);
106
107		// get the file list of includes etc + the system config
108	+	String groupFileList = null;
109		try {
110	<	fileList += getIncludedFiles(configFile, "") + ";";
110	>	groupFileList = getIncludedFiles(configFile, "") + ";";
111		} catch (Exception e) {
112		// not sure what to do here
113		// so we just log the error
114	<	_logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
114	>	_logger.write(toString(), Logger.ERROR, "ERROR - " + e);
115		}
116	+	if (groupFileList != null) {
117	+	fileList += groupFileList;
118	+	}
119		}
120		// add the system config as the final check
121		fileList += _systemConfigFile + ";";
#	Line 298 | Line 302 | class ConfigurationManagerServant extends Configuratio
302		Configuration config = null;
303
304		// if there is an entry
305	<	if (fileList != null) {
305	>	if (!fileList.equals("")) {
306		try {
307
308		// build the properites here from the filelist....
#	Line 338 | Line 342 | class ConfigurationManagerServant extends Configuratio
342		} catch (Exception e) {
343		// not sure what to do here
344		// so we just log the error
345	<	_logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
345	>	_logger.write(toString(), Logger.ERROR, "ERROR - " + e);
346		}
347
348		// if there isn't an entry for the requested config

Diff Legend

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