diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java index 4a6644d7f..87bdebda9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java @@ -13,6 +13,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.Classes2ClassesDao; @@ -23,18 +25,13 @@ public class Classes2ClassesOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(Classes2ClassesOperationController.class.getName()); public void doGet(HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); String defaultLandingPage = getDefaultLandingPage(request); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - HashMap epoHash = null; EditProcessObject epo = null; try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java index ce66a1050..cda719c65 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java @@ -15,6 +15,8 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -26,15 +28,11 @@ public class Classes2ClassesRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Classes2ClassesRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("Classes2ClassesRetryController encountered exception calling super.doGet()"); - } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java index e0fb03e0f..2f24aa046 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java @@ -17,6 +17,8 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -29,16 +31,11 @@ public class ClassgroupRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(ClassgroupRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; + } VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("ClassgroupRetryController encountered exception calling super.doGet()"); - } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java index 610a2c3a6..11ba79150 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java @@ -8,11 +8,9 @@ import java.util.Collection; import java.util.Date; import java.util.Iterator; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -20,6 +18,8 @@ import org.joda.time.DateTime; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -42,21 +42,16 @@ public class CloneEntityServlet extends BaseEditController { private static final Log log = LogFactory.getLog(CloneEntityServlet.class.getName()); public void doPost(HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseIndividualEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); - HttpSession session = req.getSession(); - ServletContext context = getServletContext(); try { String portalIdStr = (portalIdStr = request.getParameter("home")) == null ? String .valueOf(DEFAULT_PORTAL_ID) : portalIdStr; - if (!checkLoginStatus(request,response)) { -// getServletConfig().getServletContext().getRequestDispatcher( -// "/index.jsp?home=" + portalIdStr).forward(request, -// response); - return; - } - //attempt to clone a tab but if we don't find the parameter 'tabId' the clone a entity try{ int id = doCloneTab(request, response); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java index cd6acacfb..becb636a1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java @@ -18,6 +18,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; @@ -34,14 +36,8 @@ public class DataPropertyStatementRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(DataPropertyStatementRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("DataPropertyStatementRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; } //create an EditProcessObject for this and put it in the session diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java index e3c4ab8f4..931b04913 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java @@ -2,53 +2,47 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vedit.beans.EditProcessObject; -import edu.cornell.mannlib.vedit.beans.FormObject; -import edu.cornell.mannlib.vedit.controller.BaseEditController; -import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; -import edu.cornell.mannlib.vitro.webapp.beans.Ontology; -import edu.cornell.mannlib.vitro.webapp.beans.Portal; -import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; -import edu.cornell.mannlib.vitro.webapp.controller.Controllers; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; -import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; -import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.RequestDispatcher; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import edu.cornell.mannlib.vedit.beans.EditProcessObject; +import edu.cornell.mannlib.vedit.beans.FormObject; +import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; +import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; +import edu.cornell.mannlib.vitro.webapp.beans.Ontology; +import edu.cornell.mannlib.vitro.webapp.beans.Portal; +import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; +import edu.cornell.mannlib.vitro.webapp.controller.Controllers; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; +import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; public class DatapropEditController extends BaseEditController { private static final Log log = LogFactory.getLog(DatapropEditController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vreq = new VitroRequest(request); final int NUM_COLS=15; - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("DatapropEditController caught exception calling doGet()"); - } - String datapropURI = request.getParameter("uri"); DataPropertyDao dpDao = vreq.getFullWebappDaoFactory().getDataPropertyDao(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java index 35501d8b5..24dbf2a7e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java @@ -26,6 +26,8 @@ import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.validator.impl.IntValidator; import edu.cornell.mannlib.vedit.validator.impl.XMLNameValidator; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -43,15 +45,9 @@ public class DatapropRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("DatapropRetryController encountered exception calling super.doGet()"); - } + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java index dbaf06185..aa9b46e18 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java @@ -16,6 +16,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -27,17 +29,12 @@ public class DatatypeRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(DatatypeRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - - VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("DatatypeRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; } + VitroRequest request = new VitroRequest(req); + //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java index 4f2d52619..d2fb164ad 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java @@ -28,6 +28,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -54,15 +56,9 @@ public class EntityEditController extends BaseEditController { private final static int MIN_SHARED_PORTAL_ID = 16; // will this be available from the AppBean? public void doGet (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("EntityEditController caught exception calling doGet()"); - } + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; + } String entURI = request.getParameter("uri"); VitroRequest vreq = (new VitroRequest(request)); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java index d52603983..e170e98da 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java @@ -35,6 +35,8 @@ import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -57,14 +59,8 @@ public class EntityRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(EntityRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("EntityRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; } VitroRequest vreq = new VitroRequest(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java index 885a62cf9..da667fea0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java @@ -19,6 +19,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -34,16 +36,8 @@ public class ExternalIdRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(ExternalIdRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - - - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("ExternalIdRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; } VitroRequest vreq = new VitroRequest(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FlagUpdateController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FlagUpdateController.java index b8b34b891..9325debfb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FlagUpdateController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FlagUpdateController.java @@ -12,6 +12,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; @@ -25,20 +27,14 @@ public class FlagUpdateController extends BaseEditController { } public void doPost(HttpServletRequest request, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; + } + String defaultLandingPage = getDefaultLandingPage(request); - if(!checkLoginStatus(request,response)) - return; - EditProcessObject epo = super.createEpo(request); - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - VitroRequest vrequest = new VitroRequest(request); String flag1Set = makeCommaSeparatedList(vrequest.getParameterValues("Flag1Value")); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java index 40fd03b3e..f702db6ae 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java @@ -13,6 +13,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; @@ -21,18 +23,13 @@ public class IndividualTypeOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeOperationController.class.getName()); public void doGet(HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseIndividualEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); String defaultLandingPage = getDefaultLandingPage(request); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - HashMap epoHash = null; EditProcessObject epo = null; try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java index dd655ef0f..0fbd82bc2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java @@ -25,6 +25,8 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -39,14 +41,8 @@ public class IndividualTypeRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeRetryController.class.getName()); public void doGet (HttpServletRequest request, HttpServletResponse response) { - - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("Classes2ClassesRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; } //create an EditProcessObject for this and put it in the session diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Keys2EntsRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Keys2EntsRetryController.java index 9d4095092..c2bd0de61 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Keys2EntsRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Keys2EntsRetryController.java @@ -19,6 +19,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Keyword; import edu.cornell.mannlib.vitro.webapp.beans.KeywordIndividualRelation; @@ -28,24 +30,18 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.KeywordDao; import edu.cornell.mannlib.vitro.webapp.dao.KeywordIndividualRelationDao; import edu.cornell.mannlib.vitro.webapp.edit.listener.impl.KeywordSearchReindexer; -import edu.cornell.mannlib.vitro.webapp.web.jsptags.InputElementFormattingTag; public class Keys2EntsRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Keys2EntsRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - - VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("Keys2EntsRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseIndividualEditorPages()))) { + return; } + VitroRequest request = new VitroRequest(req); + //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordEditController.java index b06d61ce1..c604b0016 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordEditController.java @@ -14,6 +14,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Keyword; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -24,15 +26,10 @@ public class KeywordEditController extends BaseEditController { private static final Log log = LogFactory.getLog(KeywordEditController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("KeywordEditController caught exception calling doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; } + VitroRequest vreq = new VitroRequest(request); // we need to extract the keyword id from a Fetch parameter String linkwhereId = request.getParameter("linkwhere"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordRetryController.java index 098b7e146..79e6544f4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordRetryController.java @@ -20,6 +20,8 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.listener.ChangeListener; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Keyword; import edu.cornell.mannlib.vitro.webapp.beans.KeywordIndividualRelation; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -35,16 +37,11 @@ public class KeywordRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(KeywordRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseIndividualEditorPages()))) { + return; + } VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("KeywordRetryController encountered exception calling super.doGet()"); - } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/LinkRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/LinkRetryController.java index 2efd78117..9a44f2607 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/LinkRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/LinkRetryController.java @@ -18,6 +18,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Link; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -33,17 +35,12 @@ public class LinkRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(LinkRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - - VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("LinkRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseIndividualEditorPages()))) { + return; } + VitroRequest request = new VitroRequest(req); + //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); request.setAttribute("epo",epo); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java index edd8306c2..b2e726322 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java @@ -22,6 +22,8 @@ import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; @@ -30,17 +32,12 @@ public class NamespacePrefixOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeOperationController.class.getName()); public void doPost(HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); String defaultLandingPage = getDefaultLandingPage(request); - - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } HashMap epoHash = null; EditProcessObject epo = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java index f1f2db9b4..10b114988 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java @@ -2,16 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -20,27 +10,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; -import edu.cornell.mannlib.vedit.beans.FormObject; -import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.beans.VClass; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; -import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; public class NamespacePrefixRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(NamespacePrefixRetryController.class.getName()); public void doGet(HttpServletRequest request, HttpServletResponse response) { - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("Classes2ClassesRetryController encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; } //create an EditProcessObject for this and put it in the session diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespaceRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespaceRetryController.java index 928dc3b95..4484498a6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespaceRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespaceRetryController.java @@ -16,6 +16,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.beans.Namespace; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -27,18 +29,12 @@ public class NamespaceRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(NamespaceRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - - VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("NamespaceRetryController encountered exception calling super.doGet()"); - e.printStackTrace(); + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; } + VitroRequest request = new VitroRequest(req); + //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java index a5aeecbe9..e6f77e42b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java @@ -23,6 +23,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance; @@ -40,18 +42,12 @@ public class ObjectPropertyStatementRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(ObjectPropertyStatementRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseIndividualEditorPages()))) { + return; + } VitroRequest vreq = new VitroRequest(request); - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("ObjectPropertyStatementRetryController encountered exception calling super.doGet()"); - } - //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); epo.setBeanClass(PropertyInstanceIface.class); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java index a489ceb61..c573116f7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java @@ -17,6 +17,8 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -30,16 +32,11 @@ public class OntologyEditController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("OntologyEditController caught exception calling doGet()"); - } EditProcessObject epo = super.createEpo(request); request.setAttribute("epoKey", epo.getKey()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java index a19bbb188..c0899828a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java @@ -21,6 +21,8 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -33,16 +35,11 @@ public class OntologyRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(OntologyRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("OntologyRetryController encountered exception calling super.doGet()"); - } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalEditController.java index 9379caee2..44c1edf91 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalEditController.java @@ -14,6 +14,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -23,15 +25,9 @@ public class PortalEditController extends BaseEditController { private static final Log log = LogFactory.getLog(PortalEditController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("PortalEditController caught exception calling doGet()"); - } + if (!isAuthorizedToDisplayPage(request, response, new Actions(new ManagePortals()))) { + return; + } // we need to extract the keyword id from a Fetch parameter String linkwhereId = request.getParameter("linkwhere"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java index 2aa0226d6..fded4405a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java @@ -5,8 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import java.io.IOException; import java.util.HashMap; -import javax.management.RuntimeErrorException; -import javax.naming.OperationNotSupportedException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -15,13 +13,10 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; -import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.Classes2ClassesDao; -import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; -import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; public class Properties2PropertiesOperationController extends BaseEditController { @@ -32,20 +27,14 @@ public class Properties2PropertiesOperationController extends private static final boolean REMOVE = true; public void doPost(HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } String defaultLandingPage = getDefaultLandingPage(req); try { - VitroRequest request = new VitroRequest(req); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } HashMap epoHash = null; EditProcessObject epo = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java index d0f1d3373..cf82ad324 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java @@ -2,9 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.text.CollationKey; -import java.util.ArrayList; -import java.util.Collection; import java.text.Collator; import java.util.ArrayList; import java.util.Collections; @@ -13,8 +10,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.TreeMap; -import java.util.ListIterator; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; @@ -23,37 +18,28 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.text.Collator; - import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; -import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; -import edu.cornell.mannlib.vitro.webapp.beans.Property; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.Classes2ClassesDao; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; public class Properties2PropertiesRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Properties2PropertiesRetryController.class.getName()); public void doGet (HttpServletRequest req, HttpServletResponse response) { - VitroRequest request = new VitroRequest(req); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; } + VitroRequest request = new VitroRequest(req); //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java index 64b1aefde..4985b4662 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java @@ -19,6 +19,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; @@ -34,17 +36,12 @@ public class PropertyEditController extends BaseEditController { private static final Log log = LogFactory.getLog(PropertyEditController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - final int NUM_COLS=17; - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("PropertyEditController caught exception calling doGet()"); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; } + final int NUM_COLS=17; + VitroRequest vreq = new VitroRequest(request); Portal portal = vreq.getPortal(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java index 375330219..6d9e58f75 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java @@ -17,6 +17,8 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -28,16 +30,11 @@ public class PropertyGroupRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(PropertyGroupRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; + } VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java index 823c34f5e..0cc31787b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java @@ -29,6 +29,8 @@ import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.validator.impl.XMLNameValidator; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -47,15 +49,11 @@ public class PropertyRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java index 98594ff22..6ba662eaa 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java @@ -41,6 +41,8 @@ import com.hp.hpl.jena.vocabulary.RDF; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -406,36 +408,18 @@ public class RefactorOperationController extends BaseEditController { } public void doPost(HttpServletRequest req, HttpServletResponse response) { - VitroRequest request = new VitroRequest(req); - String defaultLandingPage = getDefaultLandingPage(request); - - if(!checkLoginStatus(request,response)) - { - RequestDispatcher rd = request.getRequestDispatcher(Controllers.SITE_ADMIN); - - try { - rd.forward(request, response); - } catch (Exception e) { - log.error(this.getClass().getName()+" could not forward to view."); - log.error(e.getMessage()); - log.error(e.getStackTrace()); - } - return; + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; } - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - - VitroRequest vreq = new VitroRequest(request); + VitroRequest vreq = new VitroRequest(req); + String defaultLandingPage = getDefaultLandingPage(vreq); + HashMap epoHash = null; EditProcessObject epo = null; try { - epoHash = (HashMap) request.getSession().getAttribute("epoHash"); - epo = (EditProcessObject) epoHash.get(request.getParameter("_epoKey")); + epoHash = (HashMap) vreq.getSession().getAttribute("epoHash"); + epo = (EditProcessObject) epoHash.get(vreq.getParameter("_epoKey")); } catch (NullPointerException e) { //session or edit process expired try { @@ -450,14 +434,14 @@ public class RefactorOperationController extends BaseEditController { if (epo == null) { // Handles the case where we want to a type check on objects of datatype properties - handleConsistencyCheckRequest(request, response); + handleConsistencyCheckRequest(vreq, response); return; } else modeStr = (String)epo.getAttribute("modeStr"); String redirectStr = null; - if (request.getParameter("_cancel") == null) { + if (vreq.getParameter("_cancel") == null) { if (modeStr != null) { if (modeStr.equals("renameResource")) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java index 73ee12a28..8a8ed403e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java @@ -23,6 +23,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -101,15 +103,9 @@ public class RefactorRetryController extends BaseEditController { } public void doGet(HttpServletRequest request, HttpServletResponse response) { - - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java index 7c34edaa0..57870971b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java @@ -24,6 +24,8 @@ import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; @@ -32,19 +34,13 @@ public class RestrictionOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(RestrictionOperationController.class.getName()); public void doPost(HttpServletRequest req, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); String defaultLandingPage = getDefaultLandingPage(request); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - try { OntModel ontModel = getOntModel(request, getServletContext()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java index bc179b142..6f89ee63b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java @@ -21,6 +21,8 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -36,17 +38,12 @@ public class RestrictionRetryController extends BaseEditController { private static final boolean OBJECT = false; public void doGet(HttpServletRequest req, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("PropertyRetryController encountered exception calling super.doGet()"); - } - + try { EditProcessObject epo = createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabIndividualRelationOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabIndividualRelationOperationController.java index 9dd434c1a..de3750d90 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabIndividualRelationOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabIndividualRelationOperationController.java @@ -13,6 +13,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.TabIndividualRelation; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.TabIndividualRelationDao; @@ -23,19 +25,13 @@ public class TabIndividualRelationOperationController extends private static final Log log = LogFactory.getLog(TabIndividualRelationOperationController.class.getName()); public void doGet(HttpServletRequest req, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManagePortals()))) { + return; + } + VitroRequest request = new VitroRequest(req); String defaultLandingPage = getDefaultLandingPage(request); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - HashMap epoHash = null; EditProcessObject epo = null; try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2EntsRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2EntsRetryController.java index 69e1d1e65..f6be4d8cf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2EntsRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2EntsRetryController.java @@ -19,6 +19,8 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Tab; @@ -35,18 +37,12 @@ public class Tabs2EntsRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Tabs2EntsRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManagePortals()))) { + return; + } VitroRequest request = new VitroRequest(req); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("Tabs2EntsRetryController encountered exception calling super.doGet()"); - } - //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesOperationController.java index f377ebf54..ba3a3debb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesOperationController.java @@ -13,6 +13,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.TabVClassRelation; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.TabVClassRelationDao; @@ -22,19 +24,13 @@ public class Tabs2TypesOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(Tabs2TypesOperationController.class.getName()); public void doGet(HttpServletRequest req, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManagePortals()))) { + return; + } + VitroRequest request = new VitroRequest(req); String defaultLandingPage = getDefaultLandingPage(request); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error(this.getClass().getName()+" encountered exception calling super.doGet()"); - } - HashMap epoHash = null; EditProcessObject epo = null; try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesRetryController.java index c7692c838..b8bbda99b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TypesRetryController.java @@ -19,6 +19,8 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Tab; import edu.cornell.mannlib.vitro.webapp.beans.TabVClassRelation; @@ -34,18 +36,12 @@ public class Tabs2TypesRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Tabs2TypesRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManagePortals()))) { + return; + } + VitroRequest request = new VitroRequest(req); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("Tabs2TypesRetryController encountered exception calling super.doGet()"); - } - //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index f0ec52ade..b43124005 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java @@ -20,6 +20,8 @@ import com.hp.hpl.jena.vocabulary.RDF; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; @@ -36,18 +38,12 @@ public class VclassEditController extends BaseEditController { private static final int NUM_COLS = 12; public void doPost (HttpServletRequest req, HttpServletResponse response) { - - VitroRequest request = new VitroRequest(req); - - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("VclassEditController caught exception calling doGet()"); + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; } + VitroRequest request = new VitroRequest(req); + EditProcessObject epo = super.createEpo(request, FORCE_NEW); request.setAttribute("epoKey", epo.getKey()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java index 88a87e948..4c84a187e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java @@ -25,6 +25,8 @@ import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.listener.ChangeListener; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.validator.impl.XMLNameValidator; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -41,18 +43,12 @@ public class VclassRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(VclassRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - log.error("VclassRetryController encountered exception calling super.doGet()"); - } - //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); epo.setDataAccessObject(request.getFullWebappDaoFactory().getVClassDao()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java index c7381f7b5..a279fbbba 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java @@ -10,6 +10,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -23,20 +25,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; public class DataPropertyStatementListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); String noResultsMsgStr = "No data properties found"; - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - int startAt=1; String startAtParam = request.getParameter("startAt"); if (startAtParam!=null && startAtParam.trim().length()>0) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java index 776ffdc50..1c4c46488 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DatatypePropertiesListingController.java @@ -16,6 +16,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -33,20 +35,15 @@ public class DatatypePropertiesListingController extends BaseEditController { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); String noResultsMsgStr = "No data properties found"; - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - String ontologyUri = request.getParameter("ontologyUri"); DataPropertyDao dao = vrequest.getFullWebappDaoFactory().getDataPropertyDao(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java index 72ae6b0d9..fe7311fb0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java @@ -14,6 +14,8 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.beans.ButtonForm; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -28,18 +30,13 @@ public class IndividualsListingController extends BaseEditController { //private static final int MAX_INDIVIDUALS = 50; public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - //need to figure out how to structure the results object to put the classes underneath String assertedOnlyStr = request.getParameter("assertedOnly"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java index ce373c1d3..deb4044de 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java @@ -13,11 +13,12 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.beans.ButtonForm; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Portal; -import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; @@ -28,18 +29,13 @@ public class ObjectPropertyStatementListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - boolean assertedStatementsOnly = false; String assertParam = request.getParameter("assertedStmts"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java index 69dc4c7f1..a89e40aab 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyWebappsListingController.java @@ -23,6 +23,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.ButtonForm; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -44,20 +46,15 @@ public class PropertyWebappsListingController extends BaseEditController { private int NUM_COLS = 9; public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); String noResultsMsgStr = "No object properties found"; - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - String ontologyUri = request.getParameter("ontologyUri"); ObjectPropertyDao dao = vrequest.getFullWebappDaoFactory().getObjectPropertyDao(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java index 8bf10725e..fd5afb8d7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java @@ -14,6 +14,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -28,19 +30,12 @@ public class VClassWebappWithInstancesListingController extends BaseEditControll private int NUM_COLS = 6; public void doGet(HttpServletRequest request, HttpServletResponse response) { - - VitroRequest vrequest = new VitroRequest(request); - Portal portal = vrequest.getPortal(); - - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; } + VitroRequest vrequest = new VitroRequest(request); + Portal portal = vrequest.getPortal(); String uriStr = request.getParameter("uri"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java index 3f7dbfaaf..53361b962 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java @@ -15,6 +15,8 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.beans.ButtonForm; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -32,18 +34,13 @@ public class VClassWebappsListingController extends BaseEditController { private int NUM_COLS = 9; public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - //need to figure out how to structure the results object to put the classes underneath List classes = null; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java index 397fd36dc..22e2df171 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java @@ -19,6 +19,8 @@ import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -27,17 +29,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; public class NamespacesListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java index 530246e4f..c20361716 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java @@ -26,6 +26,8 @@ import com.hp.hpl.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -43,18 +45,13 @@ public class RestrictionsListingController extends BaseEditController { private EditProcessObject epo = null; public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - epo = super.createEpo(request); OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java index 68c0345af..e27ae79c3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java @@ -26,6 +26,8 @@ import com.hp.hpl.jena.rdf.model.Resource; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -45,18 +47,13 @@ public class StatementChangeListingController extends BaseEditController { } public void doGet(HttpServletRequest request, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseOntologyEditorPages()))) { + return; + } + VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - try { LoginStatusBean loginBean = LoginStatusBean.getBean(vrequest); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java index ca12b27d5..fbc7852c9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java @@ -45,6 +45,8 @@ import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.RDFS; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; @@ -252,13 +254,11 @@ public class JenaAdminActions extends BaseEditController { } public void doGet(HttpServletRequest req, HttpServletResponse response) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseMiscellaneousAdminPages()))) { + return; + } - VitroRequest request = new VitroRequest(req); - - if (!checkLoginStatus(request,response)) { - return; - } - + VitroRequest request = new VitroRequest(req); String actionStr = request.getParameter("action"); if (actionStr.equals("printRestrictions")) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java index dd6acccb6..f353c1bae 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java @@ -5,8 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.jena; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Collection; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -19,14 +17,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.fileupload.FileItem; import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.shared.JenaException; -import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -44,6 +41,10 @@ public class JenaCsv2RdfController extends BaseEditController{ public void doPost(HttpServletRequest rawRequest, HttpServletResponse response) throws ServletException, IOException { + if (!isAuthorizedToDisplayPage(rawRequest, response, new Actions(new UseAdvancedDataToolsPages()))) { + return; + } + FileUploadServletRequest req = FileUploadServletRequest.parseRequest(rawRequest, maxFileSizeInBytes); if (req.hasFileUploadException()) { @@ -52,15 +53,6 @@ public class JenaCsv2RdfController extends BaseEditController{ } VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response) ){ - try { - response.sendRedirect(getDefaultLandingPage(request)); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return; - } Map> fileStreams = req.getFiles(); FileItem fileStream = fileStreams.get("filePath").get(0); String filePath = fileStreams.get("filePath").get(0).getName(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java index 0a3f0b17b..e8aa96e00 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java @@ -34,6 +34,8 @@ import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -101,8 +103,10 @@ public class JenaXMLFileUpload extends BaseEditController { throw new ServletException("Must POST a multipart encoded request"); } - if (!checkLoginStatus(request,resp)) - return; + if (!isAuthorizedToDisplayPage(request, resp, new Actions(new UseAdvancedDataToolsPages()))) { + return; + } + VitroRequest vreq = new VitroRequest(request); ModelMaker modelMaker = getVitroJenaModelMaker(vreq); String targetModel = request.getParameter("targetModel"); @@ -153,8 +157,10 @@ public class JenaXMLFileUpload extends BaseEditController { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - if (!checkLoginStatus(request,response)) - return; + if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseAdvancedDataToolsPages()))) { + return; + } + VitroRequest vreq = new VitroRequest(request); //make a form for uploading a file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java index a793db79c..10d8ff5df 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,6 +30,8 @@ import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.controller.BaseEditController; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -51,7 +52,10 @@ public class RDFUploadController extends BaseEditController { public void doPost(HttpServletRequest rawRequest, HttpServletResponse response) throws ServletException, IOException { - + if (!isAuthorizedToDisplayPage(rawRequest, response, new Actions(new UseAdvancedDataToolsPages()))) { + return; + } + FileUploadServletRequest req = FileUploadServletRequest.parseRequest(rawRequest, maxFileSizeInBytes); if (req.hasFileUploadException()) { @@ -62,19 +66,8 @@ public class RDFUploadController extends BaseEditController { Map> fileStreams = req.getFiles(); VitroRequest request = new VitroRequest(req); - if (!checkLoginStatus(request,response) ){ - return; - } - LoginStatusBean loginBean = LoginStatusBean.getBean(request); - try { - super.doGet(request,response); - } catch (Exception e) { - forwardToFileUploadError(e.getLocalizedMessage(), req, response); - return; - } - String modelName = req.getParameter("modelName"); if(modelName!=null){ loadRDF(req,request,response);