Revision 4084
Added by daigle over 16 years ago
| src/edu/ucsb/nceas/metacat/admin/SkinsAdmin.java | ||
|---|---|---|
| 173 | 173 |
PropertyService.setProperty("configutil.skinsConfigured",
|
| 174 | 174 |
PropertyService.CONFIGURED); |
| 175 | 175 |
|
| 176 |
} catch (IOException ioe) {
|
|
| 177 |
String errorMessage = "IO problem while processing skins "
|
|
| 178 |
+ "properties page: " + ioe.getMessage();
|
|
| 176 |
} catch (GeneralPropertyException gpe) {
|
|
| 177 |
String errorMessage = "problem setting property while processing skins "
|
|
| 178 |
+ "properties page: " + gpe.getMessage();
|
|
| 179 | 179 |
logMetacat.error(errorMessage); |
| 180 | 180 |
processingErrors.add(errorMessage); |
| 181 | 181 |
} |
| ... | ... | |
| 204 | 204 |
} catch (IOException ioe) {
|
| 205 | 205 |
throw new AdminException("IO problem while processing skins "
|
| 206 | 206 |
+ "properties page: " + ioe.getMessage()); |
| 207 |
} catch (GeneralPropertyException gpe) {
|
|
| 208 |
String errorMessage = "problem setting property while processing skins " |
|
| 209 |
+ "properties page: " + gpe.getMessage(); |
|
| 210 |
logMetacat.error(errorMessage); |
|
| 211 |
processingErrors.add(errorMessage); |
|
| 207 | 212 |
} |
| 208 | 213 |
} |
| 209 | 214 |
} |
| src/edu/ucsb/nceas/metacat/admin/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 |
} |
| src/edu/ucsb/nceas/metacat/admin/LDAPAdmin.java | ||
|---|---|---|
| 34 | 34 |
import javax.servlet.ServletException; |
| 35 | 35 |
import javax.servlet.http.HttpServletRequest; |
| 36 | 36 |
import javax.servlet.http.HttpServletResponse; |
| 37 |
import javax.servlet.http.HttpSession; |
|
| 38 | 37 |
|
| 39 | 38 |
import org.apache.log4j.Logger; |
| 40 | 39 |
|
| ... | ... | |
| 251 | 250 |
} catch (IOException ioe) {
|
| 252 | 251 |
throw new AdminException("IO problem while processing LDAP "
|
| 253 | 252 |
+ "properties page: " + ioe.getMessage()); |
| 253 |
} catch (GeneralPropertyException gpe) {
|
|
| 254 |
String errorMessage = "Problem getting or setting property while " |
|
| 255 |
+ "processing LDAP properties page: " + gpe.getMessage(); |
|
| 256 |
logMetacat.error(errorMessage); |
|
| 257 |
processingErrors.add(errorMessage); |
|
| 254 | 258 |
} |
| 255 | 259 |
} |
| 256 | 260 |
} |
| src/edu/ucsb/nceas/metacat/admin/AuthAdmin.java | ||
|---|---|---|
| 27 | 27 |
package edu.ucsb.nceas.metacat.admin; |
| 28 | 28 |
|
| 29 | 29 |
import java.io.IOException; |
| 30 |
import java.util.Set; |
|
| 31 |
import java.util.SortedMap; |
|
| 32 | 30 |
import java.util.Vector; |
| 33 | 31 |
|
| 34 | 32 |
import javax.servlet.ServletException; |
| ... | ... | |
| 37 | 35 |
|
| 38 | 36 |
import org.apache.log4j.Logger; |
| 39 | 37 |
|
| 40 |
import edu.ucsb.nceas.metacat.service.PropertyService; |
|
| 41 | 38 |
import edu.ucsb.nceas.metacat.util.LDAPUtil; |
| 42 | 39 |
import edu.ucsb.nceas.metacat.util.RequestUtil; |
| 43 | 40 |
import edu.ucsb.nceas.metacat.util.UtilException; |
| 44 |
import edu.ucsb.nceas.utilities.FileUtil; |
|
| 45 |
import edu.ucsb.nceas.utilities.GeneralPropertyException; |
|
| 46 |
import edu.ucsb.nceas.utilities.MetaDataProperty; |
|
| 47 |
import edu.ucsb.nceas.utilities.PropertiesMetaData; |
|
| 48 |
import edu.ucsb.nceas.utilities.PropertyNotFoundException; |
|
| 49 |
import edu.ucsb.nceas.utilities.SortedProperties; |
|
| 50 | 41 |
|
| 51 | 42 |
/** |
| 52 | 43 |
* Control the display of the LDAP configuration page and the processing |
| src/edu/ucsb/nceas/metacat/admin/DBAdmin.java | ||
|---|---|---|
| 175 | 175 |
RequestUtil.clearRequestMessages(request); |
| 176 | 176 |
RequestUtil.forwardRequest(request, response, |
| 177 | 177 |
"/admin/database-configuration.jsp"); |
| 178 |
} catch (PropertyNotFoundException pnfe) {
|
|
| 179 |
throw new AdminException("Problem getting property while initializing "
|
|
| 180 |
+ "system properties page: " + pnfe.getMessage());
|
|
| 178 |
} catch (GeneralPropertyException gpe) {
|
|
| 179 |
throw new AdminException("Problem getting or setting property while "
|
|
| 180 |
+ "initializing system properties page: " + gpe.getMessage());
|
|
| 181 | 181 |
} catch (IOException ioe) {
|
| 182 | 182 |
throw new AdminException("IO problem while initializing "
|
| 183 | 183 |
+ "system properties page:" + ioe.getMessage()); |
Also available in: Unified diff
Add GeneralPropertyException to property setters