From 02e93858dee173d13a7ab3886ad2c4130539d4b6 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 25 Apr 2014 14:42:23 -0400 Subject: [PATCH] VIVO-761 Use RequestedAction instead of Actions Modify VitroHttpServlet, similar classes, and all subclasses to use RequestedAction instead of Actions. Modify PolicyHelper also. --- .../InstitutionalInternalClassController.java | 6 +++--- .../ManageGrantsForIndividualController.java | 6 +++--- .../ManagePeopleForOrganizationController.java | 6 +++--- .../ManagePublicationsForIndividualController.java | 6 +++--- .../visualization/AjaxVisualizationController.java | 6 +++--- .../ShortURLVisualizationController.java | 8 ++++---- .../StandardVisualizationController.java | 6 +++--- .../AutocompleteDataPropertyFormGenerator.java | 11 ----------- .../generators/ManageLabelsForPersonGenerator.java | 4 +--- .../coauthorship/CoAuthorshipRequestHandler.java | 6 +++--- .../CoPIGrantCountRequestHandler.java | 6 +++--- .../MapOfScienceVisualizationRequestHandler.java | 4 ++-- .../ModelConstructorRequestHandler.java | 6 +++--- .../PersonGrantCountRequestHandler.java | 4 ++-- .../personlevel/PersonLevelRequestHandler.java | 4 ++-- .../PersonPublicationCountRequestHandler.java | 6 +++--- .../TemporalGrantVisualizationRequestHandler.java | 4 ++-- ...emporalPublicationVisualizationRequestHandler.java | 4 ++-- .../visualization/tools/ToolsRequestHandler.java | 6 +++--- .../utilities/UtilitiesRequestHandler.java | 4 ++-- .../visutils/VisualizationRequestHandler.java | 4 ++-- 21 files changed, 52 insertions(+), 65 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java index 4fe421c0..7d360dfc 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.LocalNamespaceClassUtils; @@ -37,14 +37,14 @@ public class InstitutionalInternalClassController extends FreemarkerHttpServlet private static final Log log = LogFactory.getLog(InstitutionalInternalClassController.class); private static final String EDIT_FORM = "/processInstitutionalInternalClass"; - public final static Actions REQUIRED_ACTIONS = SimplePermission.MANAGE_MENUS.ACTIONS; + public final static AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.MANAGE_MENUS.ACTION; private static final String DISPLAY_FORM = "/institutionalInternalClassForm.ftl"; private static HashMap localNamespaces = new HashMap(); private static HashMap localNamespaceClasses = new HashMap(); private static final String CREATE_CLASS_PARAM = "createClass"; private static final String REDIRECT_PAGE = "/siteAdmin"; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { return REQUIRED_ACTIONS; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java index 7dd811b8..5b43372a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java @@ -15,7 +15,7 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -31,8 +31,8 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "manageGrantsForIndividual.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java index b6e068ce..9c26b70f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java @@ -15,7 +15,7 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -31,8 +31,8 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet private static final String TEMPLATE_NAME = "managePeopleForOrganization.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java index 7ef5932a..9b187abc 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java @@ -15,7 +15,7 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -31,8 +31,8 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer private static final String TEMPLATE_NAME = "managePublicationsForIndividual.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java index 64e6991c..4f52baa9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java @@ -16,7 +16,7 @@ import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Model; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; 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.TemplateProcessingHelper.TemplateProcessingException; @@ -43,7 +43,7 @@ public class AjaxVisualizationController extends FreemarkerHttpServlet { public static ServletContext servletContext; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { /* * Based on the query parameters passed via URI get the appropriate visualization @@ -54,7 +54,7 @@ public class AjaxVisualizationController extends FreemarkerHttpServlet { if (visRequestHandler != null) { - Actions requiredPrivileges = visRequestHandler.getRequiredPrivileges(); + AuthorizationRequest requiredPrivileges = visRequestHandler.getRequiredPrivileges(); if (requiredPrivileges != null) { return requiredPrivileges; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java index 32305d6a..18ff3b7e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java @@ -9,15 +9,15 @@ import java.util.Map; import javax.servlet.ServletContext; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.lang.StringEscapeUtils; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Model; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; 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; @@ -44,7 +44,7 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet { public static ServletContext servletContext; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { /* * Based on the query parameters passed via URI get the appropriate visualization * request handler. @@ -54,7 +54,7 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet { if (visRequestHandler != null) { - Actions requiredPrivileges = visRequestHandler.getRequiredPrivileges(); + AuthorizationRequest requiredPrivileges = visRequestHandler.getRequiredPrivileges(); if (requiredPrivileges != null) { return requiredPrivileges; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java index 21a61b86..67e57a09 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java @@ -11,7 +11,7 @@ import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Model; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; 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; @@ -38,7 +38,7 @@ public class StandardVisualizationController extends FreemarkerHttpServlet { public static ServletContext servletContext; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { /* * Based on the query parameters passed via URI get the appropriate visualization * request handler. @@ -48,7 +48,7 @@ public class StandardVisualizationController extends FreemarkerHttpServlet { if (visRequestHandler != null) { - Actions requiredPrivileges = visRequestHandler.getRequiredPrivileges(); + AuthorizationRequest requiredPrivileges = visRequestHandler.getRequiredPrivileges(); if (requiredPrivileges != null) { return requiredPrivileges; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java index 90ab4546..73bfb45d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java @@ -3,27 +3,16 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils; -import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; /** * Generates the edit configuration for a default property form. diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java index dc35b45b..c1c4d9bc 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java @@ -26,8 +26,6 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.Literal; 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.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -324,7 +322,7 @@ public class ManageLabelsForPersonGenerator extends BaseEditConfigurationGenerat AddObjectPropertyStatement aops = new AddObjectPropertyStatement( vreq.getJenaOntModel(), individual.getURI(), SOME_PREDICATE, SOME_URI); - return PolicyHelper.isAuthorizedForActions(vreq, new Actions(adps).or(aops)); + return PolicyHelper.isAuthorizedForActions(vreq, adps.or(aops)); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java index 46858c61..e5e8c76e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java @@ -4,9 +4,9 @@ package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import java.util.Map.Entry; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; @@ -14,7 +14,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; @@ -296,7 +296,7 @@ public class CoAuthorshipRequestHandler implements VisualizationRequestHandler { } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index 12315336..af314ef1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -13,7 +13,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; @@ -290,8 +290,8 @@ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler } @Override - public Actions getRequiredPrivileges() { - return null; + public AuthorizationRequest getRequiredPrivileges() { + return AuthorizationRequest.AUTHORIZED; } } \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index 5c7a8935..292cf771 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -19,7 +19,7 @@ import org.apache.commons.logging.Log; import com.google.gson.Gson; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -686,7 +686,7 @@ public class MapOfScienceVisualizationRequestHandler implements } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { // TODO Auto-generated method stub return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java index ffe180a9..af6bc40c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java @@ -15,7 +15,7 @@ import com.google.gson.Gson; import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ public class ModelConstructorRequestHandler implements VisualizationRequestHandler { - public static final Actions REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTIONS; + public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTION; @Override public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, @@ -137,7 +137,7 @@ public class ModelConstructorRequestHandler implements } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { return REQUIRED_ACTIONS; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java index 74c7a12a..a0a4927b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -259,7 +259,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { // TODO Auto-generated method stub return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index e3d3718e..3f52e325 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -10,7 +10,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -296,7 +296,7 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { // TODO Auto-generated method stub return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java index d90f72a2..7779dbf7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java @@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.HashMap; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; @@ -13,7 +13,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -294,7 +294,7 @@ VisualizationRequestHandler { } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { // TODO Auto-generated method stub return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java index 1decaae6..5a02de66 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java @@ -16,7 +16,7 @@ import org.apache.commons.logging.Log; import com.google.gson.Gson; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -358,7 +358,7 @@ public class TemporalGrantVisualizationRequestHandler implements @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { return null; } } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java index eba08c5b..cd517476 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java @@ -16,7 +16,7 @@ import org.apache.commons.logging.Log; import com.google.gson.Gson; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -353,7 +353,7 @@ public class TemporalPublicationVisualizationRequestHandler implements } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { // TODO Auto-generated method stub return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java index b0a62de6..731ec221 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java @@ -10,7 +10,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ public class ToolsRequestHandler implements VisualizationRequestHandler { - public static final Actions REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTIONS; + public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTION; @Override public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, @@ -50,7 +50,7 @@ public class ToolsRequestHandler implements VisualizationRequestHandler { } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { return REQUIRED_ACTIONS; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java index 85fd35f1..d13624cc 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java @@ -18,7 +18,7 @@ import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.RDFNode; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -496,7 +496,7 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler { } @Override - public Actions getRequiredPrivileges() { + public AuthorizationRequest getRequiredPrivileges() { // TODO Auto-generated method stub return null; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java index f9789f52..00a337ac 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java @@ -7,7 +7,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryP */ public interface VisualizationRequestHandler { - Actions getRequiredPrivileges(); + AuthorizationRequest getRequiredPrivileges(); ResponseValues generateStandardVisualization(VitroRequest vitroRequest, Log log,