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.10 by ajm, Thu Mar 1 19:36:08 2001 UTC vs.
Revision 1.12 by tdb, Thu Mar 1 20:22:21 2001 UTC

#	Line 99 | Line 99 | class ConfigurationManagerServant extends Configuratio
99		String fileList = "";
100		while (i.hasNext()) {
101		String groupName = (String) i.next();
102	<
102	>	_logger.write(toString(), Logger.DEBUG, "looking for config entry for - " + groupName);
103		// we look for this entry in the systemConfig
104		String configFile = _systemConfig.getProperty("config." + groupName);
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	<	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);
115	<	}
116	<	if (groupFileList != null) {
117	<	fileList += groupFileList;
105	>	// if there is a config entry then
106	>	if (configFile != null) {
107	>	_logger.write(toString(), Logger.DEBUG, "looking for config tree in - " + configFile);
108	>
109	>	// get the file list of includes etc + the system config
110	>	String groupFileList = null;
111	>	try {
112	>	groupFileList = getIncludedFiles(configFile, "") + ";";
113	>	} catch (Exception e) {
114	>	// not sure what to do here
115	>	// so we just log the error
116	>	_logger.write(toString(), Logger.ERROR, "ERROR - " + e);
117	>	}
118	>	if (groupFileList != null) {
119	>	fileList += groupFileList;
120	>	}
121	>	} else {
122	>	_logger.write(toString(), Logger.DEBUG, "no config entry for - " + groupName);
123		}
124		}
125		// add the system config as the final check

Diff Legend

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