Revision 5076
Added by daigle over 14 years ago
| GeoserverAdmin.java | ||
|---|---|---|
| 26 | 26 |
|
| 27 | 27 |
package edu.ucsb.nceas.metacat.admin; |
| 28 | 28 |
|
| 29 |
import java.io.IOException; |
|
| 30 | 29 |
import java.util.Vector; |
| 31 | 30 |
|
| 32 |
import javax.servlet.ServletException; |
|
| 33 | 31 |
import javax.servlet.http.HttpServletRequest; |
| 34 | 32 |
import javax.servlet.http.HttpServletResponse; |
| 35 | 33 |
|
| ... | ... | |
| 109 | 107 |
} catch (GeneralPropertyException gpe) {
|
| 110 | 108 |
throw new AdminException("GeoserverAdmin.configureGeoserver - Problem getting or " +
|
| 111 | 109 |
"setting property while initializing system properties page: " + gpe.getMessage()); |
| 112 |
} catch (IOException ioe) {
|
|
| 113 |
throw new AdminException("GeoserverAdmin.configureGeoserver - IO problem while initializing "
|
|
| 114 |
+ "system properties page:" + ioe.getMessage()); |
|
| 115 |
} catch (ServletException se) {
|
|
| 116 |
throw new AdminException("GeoserverAdmin.configureGeoserver - problem forwarding request while "
|
|
| 117 |
+ "initializing system properties page: " + se.getMessage()); |
|
| 118 |
} |
|
| 110 |
} catch (MetacatUtilException mue) {
|
|
| 111 |
throw new AdminException("GeoserverAdmin.configureGeoserver - utility problem while initializing "
|
|
| 112 |
+ "system properties page:" + mue.getMessage()); |
|
| 113 |
} |
|
| 119 | 114 |
} else if (bypass != null && bypass.equals("true")) {
|
| 120 | 115 |
Vector<String> processingErrors = new Vector<String>(); |
| 121 | 116 |
Vector<String> processingSuccess = new Vector<String>(); |
| ... | ... | |
| 145 | 140 |
RequestUtil.forwardRequest(request, response, |
| 146 | 141 |
"/admin?configureType=configure&processForm=false", null); |
| 147 | 142 |
} |
| 148 |
} catch (ServletException se) {
|
|
| 149 |
throw new AdminException("GeoserverAdmin.configureGeoserver - problem forwarding request while "
|
|
| 150 |
+ "processing geoservices configuration page: " + se.getMessage()); |
|
| 151 |
} catch (IOException ioe) {
|
|
| 152 |
throw new AdminException("GeoserverAdmin.configureGeoserver - IO problem while processing geoservices "
|
|
| 153 |
+ "geoservices page: " + ioe.getMessage()); |
|
| 143 |
} catch (MetacatUtilException mue) {
|
|
| 144 |
throw new AdminException("GeoserverAdmin.configureGeoserver - utility problem while processing geoservices "
|
|
| 145 |
+ "geoservices page: " + mue.getMessage()); |
|
| 154 | 146 |
} |
| 155 | 147 |
|
| 156 | 148 |
} else {
|
| ... | ... | |
| 220 | 212 |
RequestUtil.forwardRequest(request, response, |
| 221 | 213 |
"/admin?configureType=configure&processForm=false", null); |
| 222 | 214 |
} |
| 223 |
} catch (ServletException se) {
|
|
| 224 |
throw new AdminException("GeoserverAdmin.configureGeoserver - problem forwarding request while "
|
|
| 225 |
+ "processing geoservices configuration page: " + se.getMessage()); |
|
| 226 |
} catch (IOException ioe) {
|
|
| 227 |
throw new AdminException("GeoserverAdmin.configureGeoserver - IO problem while processing geoservices "
|
|
| 228 |
+ "geoservices page: " + ioe.getMessage()); |
|
| 215 |
} catch (MetacatUtilException mue) {
|
|
| 216 |
throw new AdminException("GeoserverAdmin.configureGeoserver - utility problem while processing geoservices "
|
|
| 217 |
+ "geoservices page: " + mue.getMessage()); |
|
| 229 | 218 |
} catch (GeneralPropertyException gpe) {
|
| 230 | 219 |
throw new AdminException("GeoserverAdmin.configureGeoserver - problem with properties while "
|
| 231 | 220 |
+ "processing geoservices configuration page: " + gpe.getMessage()); |
Also available in: Unified diff
Change RequestUtil forwardRequest() method to throw MetacatUtilException.