Project

General

Profile

« Previous | Next » 

Revision 5027

Added by daigle over 14 years ago

Change MetaCatVersion to MetacatVersion

View differences:

PropertiesAdmin.java
35 35

  
36 36
import org.apache.log4j.Logger;
37 37

  
38
import edu.ucsb.nceas.metacat.MetaCatVersion;
38
import edu.ucsb.nceas.metacat.MetacatVersion;
39 39
import edu.ucsb.nceas.metacat.database.DBVersion;
40 40
import edu.ucsb.nceas.metacat.service.PropertyService;
41 41
import edu.ucsb.nceas.metacat.service.ServiceService;
......
53 53
 * Control the display of the main properties configuration page and the 
54 54
 * processing of the configuration values.
55 55
 */
56
public class PropertiesAdmin extends MetaCatAdmin {
56
public class PropertiesAdmin extends MetacatAdmin {
57 57

  
58 58
	private static PropertiesAdmin propertiesAdmin = null;
59 59
	private static Logger logMetacat = Logger.getLogger(PropertiesAdmin.class);
......
157 157

  
158 158
				// Forward the request to the JSP page
159 159
				RequestUtil.forwardRequest(request, response,
160
						"/admin/properties-configuration.jsp");
160
						"/admin/properties-configuration.jsp", null);
161 161

  
162 162
			} catch (GeneralPropertyException gpe) {
163 163
				throw new AdminException("Problem getting or setting property while " 
......
179 179
			Vector<String> processingErrors = new Vector<String>();
180 180
			Vector<String> processingSuccess = new Vector<String>();
181 181

  
182
			MetaCatVersion metacatVersion = null;
182
			MetacatVersion metacatVersion = null;
183 183
			
184 184
			try {
185 185
				metacatVersion = SystemUtil.getMetacatVersion();
......
273 273
					RequestUtil.clearRequestMessages(request);
274 274
					RequestUtil.setRequestFormErrors(request, validationErrors);
275 275
					RequestUtil.setRequestErrors(request, processingErrors);
276
					RequestUtil.forwardRequest(request, response, "/admin");
276
					RequestUtil.forwardRequest(request, response, "/admin", null);
277 277
				} else {
278 278
					// Now that the options have been set, change the
279 279
					// 'propertiesConfigured' option to 'true'
......
295 295
					RequestUtil.clearRequestMessages(request);
296 296
					RequestUtil.setRequestSuccess(request, processingSuccess);
297 297
					RequestUtil.forwardRequest(request, response, 
298
							"/admin?configureType=configure&processForm=false");
298
							"/admin?configureType=configure&processForm=false", null);
299 299
				}
300 300

  
301 301
			} catch (ServletException se) {

Also available in: Unified diff