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
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationManagerServant.java (file contents):
Revision 1.8 by ajm, Thu Mar 1 19:18:38 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 <            try {
109 <                fileList += getIncludedFiles(configFile, "");
110 <            } catch (Exception e) {
111 <                // not sure what to do here
112 <                // so we just log the error
113 <                _logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
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
# Line 298 | Line 307 | class ConfigurationManagerServant extends Configuratio
307          Configuration config = null;
308  
309          // if there is an entry
310 <        if (fileList != null) {
310 >        if (!fileList.equals("")) {
311              try {
312                  
313                  // build the properites here from the filelist....
# Line 338 | Line 347 | class ConfigurationManagerServant extends Configuratio
347              } catch (Exception e) {
348                  // not sure what to do here
349                  // so we just log the error
350 <                _logger.write(toString(), Logger.ERROR, "ERROR - " + e.getMessage());
350 >                _logger.write(toString(), Logger.ERROR, "ERROR - " + e);
351              }
352              
353          // if there isn't an entry for the requested config

Diff Legend

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