Revision 4084
Added by daigle almost 16 years ago
PropertiesAdmin.java | ||
---|---|---|
44 | 44 |
import edu.ucsb.nceas.utilities.FileUtil; |
45 | 45 |
import edu.ucsb.nceas.utilities.GeneralPropertyException; |
46 | 46 |
import edu.ucsb.nceas.utilities.PropertiesMetaData; |
47 |
import edu.ucsb.nceas.utilities.PropertyNotFoundException; |
|
48 | 47 |
import edu.ucsb.nceas.utilities.SortedProperties; |
49 | 48 |
|
50 | 49 |
/** |
... | ... | |
140 | 139 |
RequestUtil.forwardRequest(request, response, |
141 | 140 |
"/admin/properties-configuration.jsp"); |
142 | 141 |
|
143 |
} catch (PropertyNotFoundException pnfe) {
|
|
144 |
throw new AdminException("Problem getting property while initializing "
|
|
145 |
+ "system properties page: " + pnfe.getMessage());
|
|
142 |
} catch (GeneralPropertyException gpe) {
|
|
143 |
throw new AdminException("Problem getting or setting property while "
|
|
144 |
+ "initializing system properties page: " + gpe.getMessage());
|
|
146 | 145 |
} catch (IOException ioe) { |
147 | 146 |
throw new AdminException("IO problem while initializing " |
148 | 147 |
+ "system properties page:" + ioe.getMessage()); |
... | ... | |
222 | 221 |
DBVersion dbVersion = DBAdmin.getInstance().getDBVersion(); |
223 | 222 |
if (dbVersion != null && metacatVersion != null && |
224 | 223 |
dbVersion.compareTo(metacatVersion) == 0) { |
225 |
PropertyService.setProperty("databaseConfigured", |
|
224 |
PropertyService.setProperty("configutil.databaseConfigured",
|
|
226 | 225 |
PropertyService.CONFIGURED); |
227 | 226 |
} |
228 | 227 |
|
... | ... | |
240 | 239 |
} catch (IOException ioe) { |
241 | 240 |
throw new AdminException("IO problem while processing system " |
242 | 241 |
+ "properties page: " + ioe.getMessage()); |
242 |
} catch (GeneralPropertyException gpe) { |
|
243 |
throw new AdminException("problem with properties while " |
|
244 |
+ "processing system properties page: " + gpe.getMessage()); |
|
243 | 245 |
} |
244 | 246 |
} |
245 | 247 |
} |
Also available in: Unified diff
Add GeneralPropertyException to property setters