Project

General

Profile

« Previous | Next » 

Revision 5030

Added by daigle over 14 years ago

Change location of PropertyService to properties directory

View differences:

GeoserverAdmin.java
36 36
import org.apache.commons.httpclient.HttpClient;
37 37
import org.apache.log4j.Logger;
38 38

  
39
import edu.ucsb.nceas.metacat.service.PropertyService;
39
import edu.ucsb.nceas.metacat.properties.PropertyService;
40 40
import edu.ucsb.nceas.metacat.shared.MetacatUtilException;
41 41
import edu.ucsb.nceas.metacat.util.GeoserverUtil;
42 42
import edu.ucsb.nceas.metacat.util.RequestUtil;
......
107 107
				RequestUtil.forwardRequest(request, response,
108 108
						"/admin/geoserver-configuration.jsp", null);
109 109
			} catch (GeneralPropertyException gpe) {
110
				throw new AdminException("Problem getting or setting property while " 
111
						+ "initializing system properties page: " + gpe.getMessage());
110
				throw new AdminException("GeoserverAdmin.configureGeoserver - Problem getting or " + 
111
						"setting property while initializing system properties page: " + gpe.getMessage());
112 112
			} catch (IOException ioe) {
113
				throw new AdminException("IO problem while initializing "
113
				throw new AdminException("GeoserverAdmin.configureGeoserver - IO problem while initializing "
114 114
						+ "system properties page:" + ioe.getMessage());
115 115
			} catch (ServletException se) {
116
				throw new AdminException("problem forwarding request while "
116
				throw new AdminException("GeoserverAdmin.configureGeoserver - problem forwarding request while "
117 117
						+ "initializing system properties page: " + se.getMessage());
118 118
			}  
119 119
		} else if (bypass != null && bypass.equals("true")) {
......
127 127
						PropertyService.BYPASSED);
128 128
				
129 129
			} catch (GeneralPropertyException gpe) {
130
				String errorMessage = "Problem getting or setting property while "
130
				String errorMessage = "GeoserverAdmin.configureGeoserver - Problem getting or setting property while "
131 131
					+ "processing system properties page: " + gpe.getMessage();
132 132
				logMetacat.error(errorMessage);
133 133
				processingErrors.add(errorMessage);
......
146 146
							"/admin?configureType=configure&processForm=false", null);
147 147
				}
148 148
			} catch (ServletException se) {
149
				throw new AdminException("problem forwarding request while "
149
				throw new AdminException("GeoserverAdmin.configureGeoserver - problem forwarding request while "
150 150
						+ "processing geoservices configuration page: " + se.getMessage());
151 151
			} catch (IOException ioe) {
152
				throw new AdminException("IO problem while processing geoservices "
152
				throw new AdminException("GeoserverAdmin.configureGeoserver - IO problem while processing geoservices "
153 153
						+ "geoservices page: " + ioe.getMessage());
154 154
			} 
155 155
		
......
191 191
					PropertyService.persistMainBackupProperties();
192 192
				}
193 193
			} catch (MetacatUtilException ue) {
194
				String errorMessage = "Error updating geoserver password: " + ue.getMessage();
194
				String errorMessage = "GeoserverAdmin.configureGeoserver - Error updating geoserver password: " + ue.getMessage();
195 195
				logMetacat.error(errorMessage);
196 196
				processingErrors.add(errorMessage);
197 197
			} catch (GeneralPropertyException gpe) {
198
				String errorMessage = "Problem getting or setting property while "
198
				String errorMessage = "GeoserverAdmin.configureGeoserver - Problem getting or setting property while "
199 199
						+ "processing system properties page: " + gpe.getMessage();
200 200
				logMetacat.error(errorMessage);
201 201
				processingErrors.add(errorMessage);
......
221 221
							"/admin?configureType=configure&processForm=false", null);
222 222
				}
223 223
			} catch (ServletException se) {
224
				throw new AdminException("problem forwarding request while "
224
				throw new AdminException("GeoserverAdmin.configureGeoserver - problem forwarding request while "
225 225
						+ "processing geoservices configuration page: " + se.getMessage());
226 226
			} catch (IOException ioe) {
227
				throw new AdminException("IO problem while processing geoservices "
227
				throw new AdminException("GeoserverAdmin.configureGeoserver - IO problem while processing geoservices "
228 228
						+ "geoservices page: " + ioe.getMessage());
229 229
			} catch (GeneralPropertyException gpe) {
230
				throw new AdminException("problem with properties while "
230
				throw new AdminException("GeoserverAdmin.configureGeoserver - problem with properties while "
231 231
						+ "processing geoservices configuration page: " + gpe.getMessage());
232 232
			}
233 233
		}

Also available in: Unified diff