Project

General

Profile

« Previous | Next » 

Revision 5027

Added by daigle almost 15 years ago

Change MetaCatVersion to MetacatVersion

View differences:

GeoserverAdmin.java
46 46
 * Control the display of the database configuration page and the processing
47 47
 * of the configuration values.
48 48
 */
49
public class GeoserverAdmin extends MetaCatAdmin {
49
public class GeoserverAdmin extends MetacatAdmin {
50 50

  
51 51
	private static GeoserverAdmin geoserverAdmin = null;
52 52
	private Logger logMetacat = Logger.getLogger(GeoserverAdmin.class);
......
105 105

  
106 106
				// Forward the request to the JSP page
107 107
				RequestUtil.forwardRequest(request, response,
108
						"/admin/geoserver-configuration.jsp");
108
						"/admin/geoserver-configuration.jsp", null);
109 109
			} catch (GeneralPropertyException gpe) {
110 110
				throw new AdminException("Problem getting or setting property while " 
111 111
						+ "initializing system properties page: " + gpe.getMessage());
......
136 136
				if (processingErrors.size() > 0) {
137 137
					RequestUtil.clearRequestMessages(request);
138 138
					RequestUtil.setRequestErrors(request, processingErrors);
139
					RequestUtil.forwardRequest(request, response, "/admin");
139
					RequestUtil.forwardRequest(request, response, "/admin", null);
140 140
				} else {			
141 141
					// Reload the main metacat configuration page
142 142
					processingSuccess.add("Geoserver configuration successfully bypassed");
143 143
					RequestUtil.clearRequestMessages(request);
144 144
					RequestUtil.setRequestSuccess(request, processingSuccess);
145 145
					RequestUtil.forwardRequest(request, response, 
146
							"/admin?configureType=configure&processForm=false");
146
							"/admin?configureType=configure&processForm=false", null);
147 147
				}
148 148
			} catch (ServletException se) {
149 149
				throw new AdminException("problem forwarding request while "
......
207 207
					RequestUtil.clearRequestMessages(request);
208 208
					RequestUtil.setRequestFormErrors(request, validationErrors);
209 209
					RequestUtil.setRequestErrors(request, processingErrors);
210
					RequestUtil.forwardRequest(request, response, "/admin");
210
					RequestUtil.forwardRequest(request, response, "/admin", null);
211 211
				} else {
212 212
					// Now that the options have been set, change the
213 213
					// 'propertiesConfigured' option to 'true'
......
219 219
					RequestUtil.clearRequestMessages(request);
220 220
					RequestUtil.setRequestSuccess(request, processingSuccess);
221 221
					RequestUtil.forwardRequest(request, response, 
222
							"/admin?configureType=configure&processForm=false");
222
							"/admin?configureType=configure&processForm=false", null);
223 223
				}
224 224
			} catch (ServletException se) {
225 225
				throw new AdminException("problem forwarding request while "

Also available in: Unified diff