litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-761 Use RequestedAction instead of Actions

Browse source 
Modify VitroHttpServlet, similar classes, and all subclasses to use RequestedAction instead of Actions. Modify PolicyHelper also.
This commit is contained in:
j2blake 2014-04-25 14:42:23 -04:00
parent 3ace8cdb2a
commit 02e93858de
21 changed files with 52 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java
View file

@ -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<String, String> localNamespaces = new HashMap<String, String>();
private static HashMap<String, String> localNamespaceClasses = new HashMap<String, String>();
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;
}

6
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
View file

@ -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

6
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
View file

@ -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

6
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
View file

@ -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

6
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java
View file

@ -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;
}

8
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
View file

@ -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;
}

6
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java
View file

@ -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;
}

11
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteDataPropertyFormGenerator.java
View file

@ -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.

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
View file

@ -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));
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java
View file

@ -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;
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java
View file

@ -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;
}
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -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;
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java
View file

@ -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;
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java
View file

@ -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;
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
View file

@ -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;
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
View file

@ -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;
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
View file

@ -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;
}
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
View file

@ -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;
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java
View file

@ -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;
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
View file

@ -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;
}

4
src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java
View file

@ -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,