From 94a2d9327ce36575d4b3dcd14c4ecd8fb8599504 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 21 Dec 2011 23:02:31 +0000
Subject: [PATCH] NIHVIVO-3523 Oops. Some of the JSPs were using those
 RequestedAction classes that I converted to SimplePermissions.

---
 .../webapp/controller/admin/ShowAuthController.java  | 12 +++++++++++-
 webapp/web/admin/conceptRepair.jsp                   |  4 ++--
 webapp/web/admin/gotoIndividual.jsp                  |  4 ++--
 webapp/web/admin/log4j.jsp                           |  4 ++--
 webapp/web/admin/removeBadRestrictions.jsp           |  4 ++--
 webapp/web/admin/removeResourceDescription.jsp       |  4 ++--
 webapp/web/admin/sparql.jsp                          |  4 ++--
 webapp/web/admin/sparqlquery/sparqlForm.jsp          |  4 ++--
 webapp/web/admin/syncSesame.jsp                      |  4 ++--
 webapp/web/edit/forms/datapropStmtDelete.jsp         |  4 ++--
 webapp/web/edit/forms/propDelete.jsp                 |  4 ++--
 webapp/web/jenaIngest/connectDB.jsp                  |  4 ++--
 webapp/web/jenaIngest/createModel.jsp                |  4 ++--
 webapp/web/jenaIngest/csv2rdf.jsp                    |  4 ++--
 webapp/web/jenaIngest/csv2rdfSelectUri.jsp           |  4 ++--
 webapp/web/jenaIngest/executeWorkflow.jsp            |  4 ++--
 webapp/web/jenaIngest/generateTBox.jsp               |  4 ++--
 webapp/web/jenaIngest/ingestMenu.jsp                 |  4 ++--
 webapp/web/jenaIngest/listModels.jsp                 |  4 ++--
 webapp/web/jenaIngest/loadRDFData.jsp                |  4 ++--
 webapp/web/jenaIngest/mergeResources.jsp             |  4 ++--
 webapp/web/jenaIngest/merge_result.jsp               |  4 ++--
 webapp/web/jenaIngest/permanentURI.jsp               |  4 ++--
 webapp/web/jenaIngest/processStrings.jsp             |  4 ++--
 webapp/web/jenaIngest/renameBNodes.jsp               |  4 ++--
 webapp/web/jenaIngest/renameBNodesURISelect.jsp      |  4 ++--
 webapp/web/jenaIngest/renameResource.jsp             |  4 ++--
 webapp/web/jenaIngest/renameResult.jsp               |  4 ++--
 webapp/web/jenaIngest/smushSingleModel.jsp           |  4 ++--
 webapp/web/jenaIngest/sparqlConstruct.jsp            |  4 ++--
 webapp/web/jenaIngest/splitPropertyValues.jsp        |  4 ++--
 webapp/web/jenaIngest/subtractModels.jsp             |  4 ++--
 webapp/web/jenaIngest/workflowStep.jsp               |  4 ++--
 webapp/web/jenaIngest/xmlFileUpload.jsp              |  4 ++--
 webapp/web/jenaIngest/xmlFileUploadSuccess.jsp       |  4 ++--
 .../edit/specific/applicationBean_retry.jsp          |  4 ++--
 webapp/web/templates/edit/specific/ents_edit.jsp     |  4 ++--
 webapp/web/templates/edit/specific/upload_rdf.jsp    |  4 ++--
 38 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java
index 5a82419bd..2e83489b9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java
@@ -6,11 +6,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.servlet.ServletContext;
 
 import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
@@ -42,7 +44,7 @@ public class ShowAuthController extends FreemarkerHttpServlet {
 
 		Map<String, Object> body = new HashMap<String, Object>();
 
-		body.put("identifiers", RequestIdentifiers.getIdBundleForRequest(vreq));
+		body.put("identifiers", getSortedIdentifiers(vreq));
 		body.put("currentUser", LoginStatusBean.getCurrentUser(vreq));
 		body.put("associatedIndividuals", getAssociatedIndividuals(vreq));
 		body.put("factories", getIdentifierFactoryNames(vreq));
@@ -52,6 +54,14 @@ public class ShowAuthController extends FreemarkerHttpServlet {
 		return new TemplateResponseValues("admin-showAuth.ftl", body);
 	}
 
+	private List<Identifier> getSortedIdentifiers(VitroRequest vreq) {
+		Map<String, Identifier> idMap = new TreeMap<String, Identifier>();
+		for (Identifier id: RequestIdentifiers.getIdBundleForRequest(vreq)) {
+			idMap.put(id.toString(), id);
+		}
+		return new ArrayList<Identifier>(idMap.values());
+	}
+
 	private List<String> getIdentifierFactoryNames(VitroRequest vreq) {
 		ServletContext ctx = vreq.getSession().getServletContext();
 		return ActiveIdentifierBundleFactories.getFactoryNames(ctx);
diff --git a/webapp/web/admin/conceptRepair.jsp b/webapp/web/admin/conceptRepair.jsp
index e319337e1..87361de87 100644
--- a/webapp/web/admin/conceptRepair.jsp
+++ b/webapp/web/admin/conceptRepair.jsp
@@ -5,8 +5,8 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousCuratorPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 
diff --git a/webapp/web/admin/gotoIndividual.jsp b/webapp/web/admin/gotoIndividual.jsp
index 4add94bb8..11786d02f 100644
--- a/webapp/web/admin/gotoIndividual.jsp
+++ b/webapp/web/admin/gotoIndividual.jsp
@@ -6,8 +6,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
diff --git a/webapp/web/admin/log4j.jsp b/webapp/web/admin/log4j.jsp
index f0136f9df..8fbe984cf 100644
--- a/webapp/web/admin/log4j.jsp
+++ b/webapp/web/admin/log4j.jsp
@@ -13,8 +13,8 @@
   based on work by Volker Mentzner. --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
diff --git a/webapp/web/admin/removeBadRestrictions.jsp b/webapp/web/admin/removeBadRestrictions.jsp
index 0b7c7f254..ba059de7f 100644
--- a/webapp/web/admin/removeBadRestrictions.jsp
+++ b/webapp/web/admin/removeBadRestrictions.jsp
@@ -3,8 +3,8 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousCuratorPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
diff --git a/webapp/web/admin/removeResourceDescription.jsp b/webapp/web/admin/removeResourceDescription.jsp
index 05567853c..d2868c80c 100644
--- a/webapp/web/admin/removeResourceDescription.jsp
+++ b/webapp/web/admin/removeResourceDescription.jsp
@@ -5,8 +5,8 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousCuratorPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
diff --git a/webapp/web/admin/sparql.jsp b/webapp/web/admin/sparql.jsp
index ef084a792..64e0dab96 100644
--- a/webapp/web/admin/sparql.jsp
+++ b/webapp/web/admin/sparql.jsp
@@ -6,8 +6,8 @@
 <%@page import="java.util.List"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <script type="text/javascript" src="../js/sparql/prototype.js">
diff --git a/webapp/web/admin/sparqlquery/sparqlForm.jsp b/webapp/web/admin/sparqlquery/sparqlForm.jsp
index 6d62b12e0..b66e3ff98 100644
--- a/webapp/web/admin/sparqlquery/sparqlForm.jsp
+++ b/webapp/web/admin/sparqlquery/sparqlForm.jsp
@@ -6,8 +6,8 @@
 <%@page import="java.util.List"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" %>
-<% request.setAttribute("requestedActions", new ManagePortals()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.MANAGE_PORTALS.ACTION); %>
 <vitro:confirmAuthorization />
 
 <body>
diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp
index 35738085f..d65966109 100644
--- a/webapp/web/admin/syncSesame.jsp
+++ b/webapp/web/admin/syncSesame.jsp
@@ -14,8 +14,8 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%!
diff --git a/webapp/web/edit/forms/datapropStmtDelete.jsp b/webapp/web/edit/forms/datapropStmtDelete.jsp
index a5530bb90..1f69e9960 100644
--- a/webapp/web/edit/forms/datapropStmtDelete.jsp
+++ b/webapp/web/edit/forms/datapropStmtDelete.jsp
@@ -24,8 +24,8 @@
 <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp
index da2d0658c..fff79808f 100644
--- a/webapp/web/edit/forms/propDelete.jsp
+++ b/webapp/web/edit/forms/propDelete.jsp
@@ -36,8 +36,8 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jstl/functions" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %>
-<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%! 
diff --git a/webapp/web/jenaIngest/connectDB.jsp b/webapp/web/jenaIngest/connectDB.jsp
index 3f655d860..dabf67a66 100644
--- a/webapp/web/jenaIngest/connectDB.jsp
+++ b/webapp/web/jenaIngest/connectDB.jsp
@@ -3,8 +3,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%@page import="java.util.List"%><h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Connect to Jena Database</h2>
diff --git a/webapp/web/jenaIngest/createModel.jsp b/webapp/web/jenaIngest/createModel.jsp
index 154485119..e7794d232 100644
--- a/webapp/web/jenaIngest/createModel.jsp
+++ b/webapp/web/jenaIngest/createModel.jsp
@@ -1,8 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Create New Model</h2>
diff --git a/webapp/web/jenaIngest/csv2rdf.jsp b/webapp/web/jenaIngest/csv2rdf.jsp
index fea2116d9..130adc920 100644
--- a/webapp/web/jenaIngest/csv2rdf.jsp
+++ b/webapp/web/jenaIngest/csv2rdf.jsp
@@ -11,8 +11,8 @@
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Convert CSV to RDF</h2>
diff --git a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp
index 31ea30d93..bcaa75aa0 100644
--- a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp
+++ b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp
@@ -16,8 +16,8 @@
 <%@ page import="java.util.Set" %>
 <%@ page import="java.util.Map.Entry" %>
 
-<%@ page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/webapp/web/jenaIngest/executeWorkflow.jsp b/webapp/web/jenaIngest/executeWorkflow.jsp
index eeda6cc24..46aeeecc2 100644
--- a/webapp/web/jenaIngest/executeWorkflow.jsp
+++ b/webapp/web/jenaIngest/executeWorkflow.jsp
@@ -9,8 +9,8 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Execute RDF-Encoded Ingest Workflow</h2>
diff --git a/webapp/web/jenaIngest/generateTBox.jsp b/webapp/web/jenaIngest/generateTBox.jsp
index 626a591d3..d262debb1 100644
--- a/webapp/web/jenaIngest/generateTBox.jsp
+++ b/webapp/web/jenaIngest/generateTBox.jsp
@@ -10,8 +10,8 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Generate TBox from Assertions Data</h2>
diff --git a/webapp/web/jenaIngest/ingestMenu.jsp b/webapp/web/jenaIngest/ingestMenu.jsp
index 40541f742..ff837b83a 100644
--- a/webapp/web/jenaIngest/ingestMenu.jsp
+++ b/webapp/web/jenaIngest/ingestMenu.jsp
@@ -1,8 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <h2>Ingest Menu</h2>
diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp
index dae46f082..ab2ded164 100644
--- a/webapp/web/jenaIngest/listModels.jsp
+++ b/webapp/web/jenaIngest/listModels.jsp
@@ -6,8 +6,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <script type="text/javascript">
diff --git a/webapp/web/jenaIngest/loadRDFData.jsp b/webapp/web/jenaIngest/loadRDFData.jsp
index dfbb9b19a..1acd5e8f5 100644
--- a/webapp/web/jenaIngest/loadRDFData.jsp
+++ b/webapp/web/jenaIngest/loadRDFData.jsp
@@ -1,8 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Load RDF Data</h2>
diff --git a/webapp/web/jenaIngest/mergeResources.jsp b/webapp/web/jenaIngest/mergeResources.jsp
index b597fe289..5fe31a8eb 100644
--- a/webapp/web/jenaIngest/mergeResources.jsp
+++ b/webapp/web/jenaIngest/mergeResources.jsp
@@ -8,8 +8,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/webapp/web/jenaIngest/merge_result.jsp b/webapp/web/jenaIngest/merge_result.jsp
index bc15bb33f..c8752ee46 100644
--- a/webapp/web/jenaIngest/merge_result.jsp
+++ b/webapp/web/jenaIngest/merge_result.jsp
@@ -4,8 +4,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%@ page import="com.hp.hpl.jena.rdf.model.Model"%>
diff --git a/webapp/web/jenaIngest/permanentURI.jsp b/webapp/web/jenaIngest/permanentURI.jsp
index 30e83dfae..242088415 100644
--- a/webapp/web/jenaIngest/permanentURI.jsp
+++ b/webapp/web/jenaIngest/permanentURI.jsp
@@ -8,8 +8,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Assign Permanent URIs To Resources</h2>
diff --git a/webapp/web/jenaIngest/processStrings.jsp b/webapp/web/jenaIngest/processStrings.jsp
index b9d243ad6..836d39fbb 100644
--- a/webapp/web/jenaIngest/processStrings.jsp
+++ b/webapp/web/jenaIngest/processStrings.jsp
@@ -10,8 +10,8 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Process Property Value Strings</h2>
diff --git a/webapp/web/jenaIngest/renameBNodes.jsp b/webapp/web/jenaIngest/renameBNodes.jsp
index f88677350..98440ca06 100644
--- a/webapp/web/jenaIngest/renameBNodes.jsp
+++ b/webapp/web/jenaIngest/renameBNodes.jsp
@@ -10,8 +10,8 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Convert Blank Nodes to Named Resources</h2>
diff --git a/webapp/web/jenaIngest/renameBNodesURISelect.jsp b/webapp/web/jenaIngest/renameBNodesURISelect.jsp
index 0381acb9e..644238679 100644
--- a/webapp/web/jenaIngest/renameBNodesURISelect.jsp
+++ b/webapp/web/jenaIngest/renameBNodesURISelect.jsp
@@ -15,8 +15,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/webapp/web/jenaIngest/renameResource.jsp b/webapp/web/jenaIngest/renameResource.jsp
index 74687ad34..c26f2c65d 100644
--- a/webapp/web/jenaIngest/renameResource.jsp
+++ b/webapp/web/jenaIngest/renameResource.jsp
@@ -8,8 +8,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/webapp/web/jenaIngest/renameResult.jsp b/webapp/web/jenaIngest/renameResult.jsp
index 0a972c3ab..00125114a 100644
--- a/webapp/web/jenaIngest/renameResult.jsp
+++ b/webapp/web/jenaIngest/renameResult.jsp
@@ -3,8 +3,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Rename Resource</h2>
diff --git a/webapp/web/jenaIngest/smushSingleModel.jsp b/webapp/web/jenaIngest/smushSingleModel.jsp
index 8942beb5a..9c8e852be 100644
--- a/webapp/web/jenaIngest/smushSingleModel.jsp
+++ b/webapp/web/jenaIngest/smushSingleModel.jsp
@@ -10,8 +10,8 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
   
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Smush Resources</h2>
diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp
index 673c4f0d3..13101bab0 100644
--- a/webapp/web/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/web/jenaIngest/sparqlConstruct.jsp
@@ -11,8 +11,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
diff --git a/webapp/web/jenaIngest/splitPropertyValues.jsp b/webapp/web/jenaIngest/splitPropertyValues.jsp
index d98297d88..ebc48f56c 100644
--- a/webapp/web/jenaIngest/splitPropertyValues.jsp
+++ b/webapp/web/jenaIngest/splitPropertyValues.jsp
@@ -10,8 +10,8 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Split Property Value Strings into Multiple Property Values</h2>
diff --git a/webapp/web/jenaIngest/subtractModels.jsp b/webapp/web/jenaIngest/subtractModels.jsp
index 5fa3705e1..8f19c1b0d 100644
--- a/webapp/web/jenaIngest/subtractModels.jsp
+++ b/webapp/web/jenaIngest/subtractModels.jsp
@@ -10,8 +10,8 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Subtract One Model from Another</h2>
diff --git a/webapp/web/jenaIngest/workflowStep.jsp b/webapp/web/jenaIngest/workflowStep.jsp
index f3b20679a..9ea99e7ae 100644
--- a/webapp/web/jenaIngest/workflowStep.jsp
+++ b/webapp/web/jenaIngest/workflowStep.jsp
@@ -9,8 +9,8 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Execute RDF-Encoded Ingest Workflow</h2>
diff --git a/webapp/web/jenaIngest/xmlFileUpload.jsp b/webapp/web/jenaIngest/xmlFileUpload.jsp
index 8741cd257..903e4e8d1 100644
--- a/webapp/web/jenaIngest/xmlFileUpload.jsp
+++ b/webapp/web/jenaIngest/xmlFileUpload.jsp
@@ -6,8 +6,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Load XML and convert to RDF</h2>
diff --git a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp
index 5556da354..88b32006e 100644
--- a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp
+++ b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp
@@ -6,8 +6,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <p>Uploaded XML files and converted to RDF.</p>
diff --git a/webapp/web/templates/edit/specific/applicationBean_retry.jsp b/webapp/web/templates/edit/specific/applicationBean_retry.jsp
index f3af1cad1..0d9ca94f5 100644
--- a/webapp/web/templates/edit/specific/applicationBean_retry.jsp
+++ b/webapp/web/templates/edit/specific/applicationBean_retry.jsp
@@ -6,8 +6,8 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" %>
-<% request.setAttribute("requestedActions", new ManagePortals()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.MANAGE_PORTALS.ACTION); %>
 <vitro:confirmAuthorization />
 
 <c:set var="appNameLabel" value="Site name"/> 
diff --git a/webapp/web/templates/edit/specific/ents_edit.jsp b/webapp/web/templates/edit/specific/ents_edit.jsp
index 0c9374d72..cc5df1e7f 100644
--- a/webapp/web/templates/edit/specific/ents_edit.jsp
+++ b/webapp/web/templates/edit/specific/ents_edit.jsp
@@ -9,10 +9,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper" %>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousEditorPages" %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
 
 <%
-	if (PolicyHelper.isAuthorizedForActions(request, new UseMiscellaneousEditorPages())) {
+	if (PolicyHelper.isAuthorizedForActions(request, SimplePermission.USE_MISCELLANEOUS_EDITOR_PAGES.ACTIONS)) {
 		request.setAttribute("isEditor", Boolean.TRUE);
 	}
 %>
diff --git a/webapp/web/templates/edit/specific/upload_rdf.jsp b/webapp/web/templates/edit/specific/upload_rdf.jsp
index 026b9fbdd..6bd745da1 100644
--- a/webapp/web/templates/edit/specific/upload_rdf.jsp
+++ b/webapp/web/templates/edit/specific/upload_rdf.jsp
@@ -3,8 +3,8 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
-<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <div class="staticPageBackground">