Project

General

Profile

« Previous | Next » 

Revision 6669

Added by ben leinfelder over 12 years ago

move replication configuration actions to the admin servlet and out of the replication servlet
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=5528

View differences:

MetacatAdminServlet.java
42 42 
import edu.ucsb.nceas.metacat.properties.PropertyService;
43 43 
import edu.ucsb.nceas.metacat.service.SessionService;
44 44 
import edu.ucsb.nceas.metacat.shared.MetacatUtilException;
45 
import edu.ucsb.nceas.metacat.shared.ServiceException;
45 46 
import edu.ucsb.nceas.metacat.util.AuthUtil;
46 47 
import edu.ucsb.nceas.metacat.util.ConfigurationUtil;
47 48 
import edu.ucsb.nceas.metacat.util.RequestUtil;
......
185 186 
				// process dataone config
186 187 
				D1Admin.getInstance().configureDataONE(request, response);
187 188 
				return;
189 
			} else if (action.equals("replication")) {
190 
				// process replication config
191 
				ReplicationAdmin.getInstance().handleRequest(request, response);
192 
				return;
188 193 
			} else {
189 194 
				String errorMessage = "MetacatAdminServlet.handleGetOrPost - Invalid action in configuration request: " + action;
190 195 
				logMetacat.error(errorMessage);
......
218 223 
				"MetacatAdminServlet.handleGetOrPost - Utility problem while handling request: " + ue.getMessage();
219 224 
			logMetacat.error(errorMessage);
220 225 
			processingErrors.add(errorMessage);
226 
		} catch (ServiceException e) {
227 
			String errorMessage =
228 
				"MetacatAdminServlet.handleGetOrPost - Service problem while handling request: " + e.getMessage();
229 
			logMetacat.error(errorMessage);
230 
			processingErrors.add(errorMessage);
221 231 
		}
222 232 
	}
223 233 
}

Also available in: Unified diff