NIHVIVO-2492 convert JSPs from <vitro:requiresAuthorizationFor> and <vitro:confirmLoginStatus> to <vitro:confirmAuthorization>

webapp/config/tlds/VitroUtils.tld

@@ -16,47 +16,15 @@
 -->
 
 	<tag>
-		<name>confirmLoginStatus</name>
-        <display-name>Confirm that the user is logged in as required</display-name>
-        <description>
-            Check to see that the user is logged in (optionally at a certain minimum level).
-            If not, then redirect them to the login page, with the current request stored as
-            a post-login destination.
-            
-            If "level" is specified, then the user must be logged in at least at that level
-            in order to avoid being redirected. "level" may be a String like "DBA" or "EDITOR",
-            or it may be an integer like 50 or 4.
-            
-            If "bean" is specified, it is taken as the name of a request attribute where the
-            LoginStatusBean will be stored. 
-        </description>
-        <tag-class>edu.cornell.mannlib.vitro.webapp.web.jsptags.ConfirmLoginStatus</tag-class>
-		<body-content>empty</body-content>
-		<attribute>
-			<name>level</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>   
-		<attribute>
-			<name>allowSelfEditing</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>   
-		<attribute>
-			<name>bean</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>   
-	</tag>
-
-	<tag>
-		<name>requiresAuthorizationFor</name>
+		<name>confirmAuthorization</name>
         <display-name>Confirm that the user is authorized for the actions that this page requires.</display-name>
         <description>
         	Confirm that the user is authorized to perform all of the RequestedActions that
-        	this page requires. A check is done for each such action, to see whether the 
-        	current policy will authorize that action for the current user. If any of the 
-        	actions is not authorized, the user will be redirected to the appropriate page.
+        	this page requires. If any of the actions is not authorized, the user will be 
+        	redirected to the appropriate page.
+        	
+        	The actions must be found in the "requestedActions" attribute of the request. 
+        	The attribute may be a RequestedAction or an array of RequestedActions. 
         	
         	If the user is not authorized because he is not logged in, he will be directed
         	to the login page, with the current request stored as a post-login destination.
@@ -64,18 +32,9 @@
         	If the user is logged in but without sufficient authorization, he will be
         	directed to the home page, which will display an "insufficient authorization" 
         	message.
-        	
-        	The requested actions are specified as a comma delimited list of class names.
-        	These must be RequestedAction classes, each with a no-argument public 
-        	constructor.
         </description>
-        <tag-class>edu.cornell.mannlib.vitro.webapp.web.jsptags.RequiresAuthorizationFor</tag-class>
+        <tag-class>edu.cornell.mannlib.vitro.webapp.web.jsptags.ConfirmAuthorization</tag-class>
 		<body-content>empty</body-content>
-		<attribute>
-			<name>classNames</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>   
 	</tag>
 
 </taglib>

webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java

@@ -0,0 +1,134 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.web.jsptags;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+
+/**
+ * Confirm that the user is authorized to perform each of the RequestedActions.
+ * 
+ * The user specifies the actions as the "requestedActions" attribute of the
+ * HTTP request. The attribute must contain either a RequestedAction or an array
+ * of RequestedActions.
+ */
+public class ConfirmAuthorization extends BodyTagSupport {
+	private static final Log log = LogFactory
+			.getLog(ConfirmAuthorization.class);
+
+	/**
+	 * This is all of it. If they are authorized, continue. Otherwise, redirect.
+	 */
+	@Override
+	public int doEndTag() throws JspException {
+		if (isAuthorized()) {
+			return EVAL_PAGE;
+		} else if (isLoggedIn()) {
+			return showInsufficientAuthorizationMessage();
+		} else {
+			return redirectToLoginPage();
+		}
+	}
+
+	/**
+	 * They are authorized if the request contains no actions, or if they are
+	 * authorized for the actions it contains.
+	 */
+	private boolean isAuthorized() {
+		Set<RequestedAction> actionSet = getActionsFromRequestAttribute();
+		return PolicyHelper.isAuthorizedForActions(getRequest(), new Actions(
+				actionSet));
+	}
+
+	/**
+	 * The attribute may be either a single RequestedAction or an array of
+	 * RequestedActions. It may also be empty, but in that case why call this
+	 * tag?
+	 * 
+	 * When we are done, clear the attribute, so any included or forwarded page
+	 * will not see it.
+	 */
+	private Set<RequestedAction> getActionsFromRequestAttribute() {
+		Set<RequestedAction> actionSet = new HashSet<RequestedAction>();
+		Object attribute = getRequest().getAttribute("requestedActions");
+		getRequest().removeAttribute("requestedActions");
+
+		if (attribute == null) {
+			log.warn("<vitro:confirmAuthorization /> was called, but nothing "
+					+ "was found at request.getAttribute(\"requestedActions\")");
+		} else if (attribute instanceof RequestedAction) {
+			RequestedAction ra = (RequestedAction) attribute;
+			log.debug("requested action was " + ra.getClass().getSimpleName());
+			actionSet.add(ra);
+		} else if (attribute instanceof RequestedAction[]) {
+			RequestedAction[] array = (RequestedAction[]) attribute;
+			List<RequestedAction> raList = Arrays.asList(array);
+			if (log.isDebugEnabled()) {
+				log.debug("requested actions were "
+						+ formatRequestedActions(raList));
+			}
+			actionSet.addAll(raList);
+		} else {
+			throw new IllegalStateException(
+					"Expected request.getAttribute(\"requestedActions\") "
+							+ "to be either a RequestedAction or a "
+							+ "RequestedAction[], but found "
+							+ attribute.getClass().getCanonicalName());
+		}
+
+		return actionSet;
+	}
+
+	private String formatRequestedActions(List<RequestedAction> raList) {
+		StringBuffer buff = new StringBuffer();
+		for (Iterator<RequestedAction> it = raList.iterator(); it.hasNext();) {
+			buff.append("'").append(it.next().getClass().getSimpleName())
+					.append("'");
+			if (it.hasNext()) {
+				buff.append(", ");
+			}
+		}
+		return buff.toString();
+	}
+
+	private boolean isLoggedIn() {
+		return LoginStatusBean.getBean(getRequest()).isLoggedIn();
+	}
+
+	private int showInsufficientAuthorizationMessage() {
+		VitroHttpServlet.redirectToInsufficientAuthorizationPage(getRequest(),
+				getResponse());
+		return SKIP_PAGE;
+	}
+
+	private int redirectToLoginPage() {
+		VitroHttpServlet.redirectToLoginPage(getRequest(), getResponse());
+		return SKIP_PAGE;
+	}
+
+	private HttpServletRequest getRequest() {
+		return ((HttpServletRequest) pageContext.getRequest());
+	}
+
+	private HttpServletResponse getResponse() {
+		return (HttpServletResponse) pageContext.getResponse();
+	}
+}

webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmLoginStatus.java

@@ -1,115 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.web.jsptags;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LogoutRedirector;
-import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
-
-/**
- * TODO This should go away as it is replaced by vitro:requiresAuthorizationFor
- */
-public class ConfirmLoginStatus extends BodyTagSupport {
-	private static final Log log = LogFactory.getLog(ConfirmLoginStatus.class);
-
-	int level = LoginStatusBean.NON_EDITOR;
-	boolean allowSelfEditing;
-	String beanAttributeName;
-
-	public String getLevel() {
-		return String.valueOf(level);
-	}
-
-	public void setLevel(String levelString) {
-		if ("DBA".equals(levelString)) {
-			this.level = LoginStatusBean.DBA;
-		} else if ("CURATOR".equals(levelString)) {
-			this.level = LoginStatusBean.CURATOR;
-		} else if ("EDITOR".equals(levelString)) {
-			this.level = LoginStatusBean.EDITOR;
-		} else if ("NON_EDITOR".equals(levelString)) {
-			this.level = LoginStatusBean.NON_EDITOR;
-		} else {
-			throw new IllegalArgumentException("Level attribute '"
-					+ levelString + "' is not valid.");
-		}
-	}
-
-	public void setAllowSelfEditing(boolean allowSelfEditing) {
-		this.allowSelfEditing = allowSelfEditing;
-	}
-
-	public boolean getAllowSelfEditing() {
-		return this.allowSelfEditing;
-	}
-
-	public String getBean() {
-		return this.beanAttributeName;
-	}
-
-	public void setbean(String beanAttributeName) {
-		this.beanAttributeName = beanAttributeName;
-	}
-
-	@Override
-	public int doEndTag() throws JspException {
-		LogoutRedirector.recordRestrictedPageUri(getRequest());
-
-		LoginStatusBean loginBean = LoginStatusBean.getBean(getRequest());
-		boolean isLoggedIn = loginBean.isLoggedIn();
-		boolean isSufficient = loginBean.isLoggedInAtLeast(level);
-
-		boolean isSelfEditing = VitroRequestPrep.isSelfEditing(getRequest());
-
-		log.debug("loginLevel=" + loginBean.getSecurityLevel()
-				+ ", requiredLevel=" + level + ", selfEditingAllowed="
-				+ allowSelfEditing + ", isSelfEditing=" + isSelfEditing);
-
-		if (isSufficient || (allowSelfEditing && isSelfEditing)) {
-			log.debug("Login status confirmed.");
-			return setBeanAndReturn(loginBean);
-		} else if (isLoggedIn) {
-			log.debug("Logged in, but not sufficient.");
-			return showInsufficientAuthorizationMessage();
-		} else {
-			log.debug("Login status not confirmed.");
-			return redirectAndSkipPage();
-		}
-
-	}
-
-	private int setBeanAndReturn(LoginStatusBean loginBean) {
-		if (beanAttributeName != null) {
-			getRequest().setAttribute(beanAttributeName, loginBean);
-		}
-		return EVAL_PAGE;
-	}
-
-	private int showInsufficientAuthorizationMessage() {
-		VitroHttpServlet.redirectToInsufficientAuthorizationPage(getRequest(),
-				getResponse());
-		return SKIP_PAGE;
-	}
-
-	private int redirectAndSkipPage() throws JspException {
-		VitroHttpServlet.redirectToLoginPage(getRequest(), getResponse());
-		return SKIP_PAGE;
-	}
-
-	private HttpServletRequest getRequest() {
-		return ((HttpServletRequest) pageContext.getRequest());
-	}
-
-	private HttpServletResponse getResponse() {
-		return (HttpServletResponse) pageContext.getResponse();
-	}
-}

webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/RequiresAuthorizationFor.java

@@ -1,151 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.web.jsptags;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-
-/**
- * Confirm that the user is authorized to perform each of the RequestedActions.
- * 
- * The user specifies the actions as a comma delimited list of class names (with
- * optional spaces). The classes named must be extensions of RequestedAction
- * (usually implementations of UsePagesRequestedAction), and each class must
- * have a no-argument public constructor.
- */
-public class RequiresAuthorizationFor extends BodyTagSupport {
-	private static final Log log = LogFactory
-			.getLog(RequiresAuthorizationFor.class);
-
-	String classNamesString = "";
-
-	public void setClassNames(String classNamesString) {
-		this.classNamesString = classNamesString;
-	}
-
-	/**
-	 * This is all of it. If they are authorized, continue. Otherwise, redirect.
-	 */
-	@Override
-	public int doEndTag() throws JspException {
-		if (isAuthorized()) {
-			return EVAL_PAGE;
-		} else if (isLoggedIn()) {
-			return showInsufficientAuthorizationMessage();
-		} else {
-			return redirectToLoginPage();
-		}
-	}
-
-	/**
-	 * They are authorized if we recognize the actions they ask for, and they
-	 * are authorized for those actions.
-	 */
-	private boolean isAuthorized() {
-		Set<Class<? extends RequestedAction>> classes = instantiateActionClasses();
-		if (classes == null) {
-			return false;
-		}
-		Set<RequestedAction> actionSet = getInstancesFromClasses(classes);
-		return PolicyHelper.isAuthorizedForActions(getRequest(), new Actions(actionSet));
-	}
-
-	/**
-	 * Break the string into class names. Confirm that each class is
-	 * RequestedAction or a subclass of it. Create an instance of each class.
-	 * 
-	 * If we can't do all of that, complain and return null.
-	 */
-	private Set<Class<? extends RequestedAction>> instantiateActionClasses() {
-		Set<String> classNames = parseClassNames();
-		if (classNames.isEmpty()) {
-			return Collections.emptySet();
-		}
-
-		return loadClassesAndCheckTypes(classNames);
-	}
-
-	private Set<String> parseClassNames() {
-		Set<String> names = new HashSet<String>();
-		for (String part : classNamesString.split("[\\s],[\\s]")) {
-			String name = part.trim();
-			if (!name.isEmpty()) {
-				names.add(name);
-			}
-		}
-		return names;
-	}
-
-	private Set<Class<? extends RequestedAction>> loadClassesAndCheckTypes(
-			Set<String> classNames) {
-		Set<Class<? extends RequestedAction>> classes = new HashSet<Class<? extends RequestedAction>>();
-		for (String className : classNames) {
-			try {
-				Class<?> clazz = Class.forName(className);
-				classes.add(clazz.asSubclass(RequestedAction.class));
-			} catch (ClassNotFoundException e) {
-				log.error("Can't load action class: '" + className + "'");
-				return null;
-			} catch (ClassCastException e) {
-				log.error("Action class is not a subclass of RequestedAction: '"
-						+ className + "'");
-				return null;
-			}
-		}
-		return classes;
-	}
-
-	private Set<RequestedAction> getInstancesFromClasses(
-			Set<Class<? extends RequestedAction>> actionClasses) {
-		Set<RequestedAction> actions = new HashSet<RequestedAction>();
-		for (Class<? extends RequestedAction> actionClass : actionClasses) {
-			try {
-				RequestedAction action = actionClass.newInstance();
-				actions.add(action);
-			} catch (Exception e) {
-				log.error("Failed to create an instance of '"
-						+ actionClass.getName()
-						+ "'. Does it have a public zero-argument constructor?");
-			}
-		}
-		return actions;
-	}
-
-	private boolean isLoggedIn() {
-		return LoginStatusBean.getBean(getRequest()).isLoggedIn();
-	}
-
-	private int showInsufficientAuthorizationMessage() {
-		VitroHttpServlet.redirectToInsufficientAuthorizationPage(getRequest(),
-				getResponse());
-		return SKIP_PAGE;
-	}
-
-	private int redirectToLoginPage() {
-		VitroHttpServlet.redirectToLoginPage(getRequest(), getResponse());
-		return SKIP_PAGE;
-	}
-
-	private HttpServletRequest getRequest() {
-		return ((HttpServletRequest) pageContext.getRequest());
-	}
-
-	private HttpServletResponse getResponse() {
-		return (HttpServletResponse) pageContext.getResponse();
-	}
-}

webapp/web/admin/conceptRepair.jsp

@@ -5,8 +5,10 @@
 <%@ 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()); %>
+<vitro:confirmAuthorization />
 
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" />
 
 <%
     String conceptIdStr = request.getParameter("conceptId");

webapp/web/admin/gotoIndividual.jsp

@@ -4,9 +4,11 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
 if( request.getParameter("uri") != null ){

webapp/web/admin/log4j.jsp

@@ -13,8 +13,9 @@
   based on work by Volker Mentzner. --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %>
+<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 try {

webapp/web/admin/removeBadRestrictions.jsp

@@ -1,9 +1,11 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     if (request.getParameter("execute") != null) {

webapp/web/admin/removeResourceDescription.jsp

@@ -3,9 +3,11 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     String resourceURIStr = request.getParameter("resourceURI");

webapp/web/admin/showids.jsp

@@ -5,7 +5,7 @@
 <%@page
    import="java.util.List"%>
 
-<%-- doesn't use vitro:requiresAuthorizationFor becuase the we want to be able to see IDs for any user. --%>
+<%-- doesn't use vitro:confirmAuthorization becuase the we want to be able to see IDs for any user. --%>
 <%-- uses "security through obscurity", and doesn't give away much information. --%>
 
 <%

webapp/web/admin/sparql.jsp

@@ -5,7 +5,9 @@
 <%@page import="java.util.List"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <script type="text/javascript" src="../js/sparql/prototype.js">
 </script>

webapp/web/admin/sparqlquery/sparqlForm.jsp

@@ -6,7 +6,9 @@
 <%@page import="java.util.List"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" %>
+<% request.setAttribute("requestedActions", new ManagePortals()); %>
+<vitro:confirmAuthorization />
 
 <body>
 <div id="content" class="sparqlform">

webapp/web/admin/syncSesame.jsp

@@ -12,9 +12,11 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%!
 

webapp/web/edit/editDatapropStmtRequestDispatch.jsp

@@ -16,14 +16,16 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="org.apache.commons.logging.Log" %>
 <%@ page import="org.apache.commons.logging.LogFactory" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
 <%
     //org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.editDatapropStmtRequestDispatch.jsp");
     final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.editDatapropStmtRequestDispatch.jsp");
 %>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     // Decide which form to forward to, set subjectUri, subjectUriJson, predicateUri, predicateUriJson in request

webapp/web/edit/editRequestDispatch.jsp

@@ -14,13 +14,15 @@
 <%@ page import="org.apache.commons.logging.LogFactory" %>
 <%@ page errorPage="/error.jsp" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"  %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
 <%! 
 public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.editRequestDispatch.jsp");
 %>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     /*

webapp/web/edit/forms/datapropStmtDelete.jsp

@@ -22,9 +22,11 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jstl/functions" %>
 <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("edu.cornell.mannlib.vitro.jsp.edit.forms.datapropStmtDelete");

webapp/web/edit/forms/propDelete.jsp

@@ -37,9 +37,11 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jstl/functions" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%! 
 public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.propDelete.jsp");

webapp/web/edit/messages/datapropertyBackButtonProblems.jsp

@@ -24,7 +24,6 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.RdfLiteralHash"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.beans.DataProperty"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
 <%--
 Current stop gap solution for back button problems
@@ -42,7 +41,10 @@ and set a flag in the request to indicate "back button confusion"
     log.debug("Starting datapropertyBackButtonProblems.jsp");
 %>
 
-<vitro:confirmLoginStatus level="CURATOR" allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     List<String> errorMessages = new ArrayList<String>();

webapp/web/edit/n3Delete.jsp

@@ -37,7 +37,6 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
 <%-- N3 based deletion.
  
@@ -48,7 +47,10 @@
  
 --%>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%    
     /* the post parameters seem to get consumed by the parsing so

webapp/web/edit/processDatapropRdfForm.jsp

@@ -29,7 +29,6 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
 <%-- 2nd prototype of processing, adapted for data property editing
 
@@ -61,11 +60,13 @@ and set a flag in the request to indicate "back button confusion"
  
 --%>
 <%! 
-
     final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.processDatapropRdfForm.jsp");
 %>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%    
     log.debug("Starting processDatapropRdfForm.jsp");

webapp/web/edit/processRdfForm2.jsp

@@ -47,7 +47,6 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.InsertException"%>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 
 <%-- 2nd prototype of processing.
 
@@ -58,7 +57,10 @@ The optional n3 blocks will proccessed if their variables are bound and
 are well formed.
 --%>
 
-<vitro:confirmLoginStatus allowSelfEditing="true" />
+<%@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()); %>
+<vitro:confirmAuthorization />
 
 <%
     VitroRequest vreq = new VitroRequest(request);

webapp/web/jenaIngest/connectDB.jsp

@@ -1,8 +1,11 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%@page import="java.util.List"%><h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Connect to Jena Database</h2>
 

webapp/web/jenaIngest/createModel.jsp

@@ -1,7 +1,9 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Create New Model</h2>
 

webapp/web/jenaIngest/csv2rdf.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/csv2rdfSelectUri.jsp

@@ -12,8 +12,11 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Set" %>
 <%@ page import="java.util.Map.Entry" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/executeWorkflow.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/generateTBox.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/ingestMenu.jsp

@@ -1,7 +1,9 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <h2>Ingest Menu</h2>
 

webapp/web/jenaIngest/listModels.jsp

@@ -4,8 +4,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.net.URLEncoder" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <script type="text/javascript">
 function init(){

webapp/web/jenaIngest/loadRDFData.jsp

@@ -1,7 +1,9 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Load RDF Data</h2>
 

webapp/web/jenaIngest/mergeIndividuals.jsp

@@ -6,8 +6,11 @@
 <%@ page import="java.net.URLEncoder"%>
 <%@ page import="java.util.List"%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/merge_result.jsp

@@ -1,8 +1,11 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%@ page import="com.hp.hpl.jena.rdf.model.Model"%>
 

webapp/web/jenaIngest/permanentURI.jsp

@@ -6,8 +6,11 @@
 <%@ page import="java.net.URLEncoder"%>
 <%@ page import="java.util.List"%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/processStrings.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/renameBNodes.jsp

@@ -9,7 +9,9 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/renameBNodesURISelect.jsp

@@ -12,8 +12,11 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Set" %>
 <%@ page import="java.util.Map.Entry" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/renameResource.jsp

@@ -6,8 +6,11 @@
 <%@ page import="java.net.URLEncoder"%>
 <%@ page import="java.util.List"%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/jenaIngest/ingestUtils.js"></script>

webapp/web/jenaIngest/renameResult.jsp

@@ -1,8 +1,11 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Rename Resource</h2>
 

webapp/web/jenaIngest/smushSingleModel.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/sparqlConstruct.jsp

@@ -9,8 +9,11 @@
 <%@ page import="java.net.URLEncoder"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/splitPropertyValues.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/subtractModels.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/workflowStep.jsp

@@ -7,8 +7,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.net.URLEncoder" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/xmlFileUpload.jsp

@@ -4,8 +4,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.net.URLEncoder" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <%
 

webapp/web/jenaIngest/xmlFileUploadSuccess.jsp

@@ -4,8 +4,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.net.URLEncoder" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <p>Uploaded XML files and converted to RDF.</p>
 <p>Loaded <%= request.getAttribute("statementCount") %> statements to the model <%= request.getAttribute("targetModel") %>.</p>

webapp/web/templates/edit/specific/portal_retry.jsp

@@ -4,8 +4,11 @@
 
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" %>
+<% request.setAttribute("requestedActions", new ManagePortals()); %>
+<vitro:confirmAuthorization />
 
 <c:set var="singlePortal" value="${requestScope.singlePortal}"/>
 <c:set var="creatingNewPortal" value="${requestScope.creatingNewPortal}"/>

webapp/web/templates/edit/specific/tabs2tabs_retry.jsp

@@ -2,8 +2,11 @@
 
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> 
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs" %>
+<% request.setAttribute("requestedActions", new ManageTabs()); %>
+<vitro:confirmAuthorization />
 
 <div class="editingForm">
 

webapp/web/templates/edit/specific/tabs_edit.jsp

@@ -2,8 +2,12 @@
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs" %>
+<% request.setAttribute("requestedActions", new ManageTabs()); %>
+<vitro:confirmAuthorization />
+
 <div class="editingForm">
 
 <jsp:include page="/templates/edit/fetch/vertical.jsp"/>

webapp/web/templates/edit/specific/upload_rdf.jsp

@@ -1,8 +1,11 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
+<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
+<vitro:confirmAuthorization />
 
 <div class="staticPageBackground">
 

webapp/web/templates/edit/specific/user_edit.jsp

@@ -7,7 +7,10 @@
 <jsp:directive.page import="edu.cornell.mannlib.vitro.webapp.beans.User"/>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
-<vitro:requiresAuthorizationFor classNames="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts" />
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts" %>
+<% request.setAttribute("requestedActions", new ManageUserAccounts()); %>
+<vitro:confirmAuthorization />
+
 
 <div class="editingForm">