NIHVIVO-336 Create StartupStatusController, so admins can see the startup status from a link on the site admin page.

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java

@@ -25,6 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.RefreshVis
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeIndividualEditingPanel;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeRevisionInfo;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeSiteAdminPage;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeStartupStatus;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeVerbosePropertyInformation;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseBasicAjaxControllers;
@@ -70,6 +71,15 @@ public class UseRestrictedPagesByRoleLevelPolicy implements PolicyIface {
 		} else if (whatToAuth instanceof AccessSpecialDataModels) {
 			result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole);
 			
+		} else if (whatToAuth instanceof RebuildVClassGroupCache) {
+            result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole);
+
+		} else if (whatToAuth instanceof RefreshVisualizationCacheAction) {
+			result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole);
+		
+		} else if (whatToAuth instanceof SeeStartupStatus) {
+			result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole);
+			
 		} else if (whatToAuth instanceof EditOntology) {
 			result = isAuthorized(whatToAuth, RoleLevel.CURATOR, userRole);
 
@@ -112,10 +122,6 @@ public class UseRestrictedPagesByRoleLevelPolicy implements PolicyIface {
 		} else if (whatToAuth instanceof EditOwnAccount) {
 			result = isAuthorized(whatToAuth, RoleLevel.SELF, userRole);
 
-		} else if (whatToAuth instanceof RebuildVClassGroupCache) {
-            result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole);
-		} else if (whatToAuth instanceof RefreshVisualizationCacheAction) {
-			result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole);
 		} else {
 			result = defaultDecision("Unrecognized action");
 		}

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/SeeStartupStatus.java

@@ -0,0 +1,11 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/** Should we allow the user to use the Startup Status page? */
+public class SeeStartupStatus extends RequestedAction implements
+		UsePagesRequestedAction {
+	// no fields
+}

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java

@@ -0,0 +1,36 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.admin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeStartupStatus;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Display the startup status page.
+ */
+public class StartupStatusController extends FreemarkerHttpServlet {
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		return new Actions(new SeeStartupStatus());
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("title", "Startup Status");
+		body.put("status", StartupStatus.getBean(getServletContext()));
+
+		return new TemplateResponseValues("startupStatus-display.ftl", body);
+	}
+
+}

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java

@@ -21,11 +21,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOntolo
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditSiteInformation;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageMenus;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.RefreshVisualizationCacheAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeSiteAdminPage;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeStartupStatus;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
@@ -139,6 +138,10 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
                     "switchToDisplayModel", "true"));
         }
         
+        if (PolicyHelper.isAuthorizedForActions(vreq, new SeeStartupStatus())) {
+        	urls.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
+        }
+        
         return urls;
     }