diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java index 3fec39a99..1c6205ab8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java @@ -15,6 +15,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -205,14 +206,12 @@ public class DashboardPropertyListController extends VitroHttpServlet { } req.setAttribute("entity",subject); - RequestDispatcher rd = req.getRequestDispatcher(Controllers.DASHBOARD_PROP_LIST_JSP); - rd.include(req,res); + JSPPageHandler.renderPlainInclude(req, res, Controllers.DASHBOARD_PROP_LIST_JSP); } catch (HelpException help){ doHelp(res); } catch (Throwable e) { req.setAttribute("javax.servlet.jsp.jspException",e); - RequestDispatcher rd = req.getRequestDispatcher("/error.jsp"); - rd.forward(req, res); + JSPPageHandler.renderPlainPage(req, res, "/error.jsp"); } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java index 0be39a34c..ed0c0dfe8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java @@ -19,6 +19,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -191,9 +192,7 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons req.setAttribute("dataseturi", datasetUri); boolean success = deleteFile(req, entity, iwDao, sessionOntModel); req.setAttribute("deletesuccess", (success)?"success":"error"); - req.setAttribute("bodyJsp", "/edit/fileDeleteConfirm.jsp"); - RequestDispatcher rd = req.getRequestDispatcher(Controllers.BASIC_JSP); - rd.forward(req, res); + JSPPageHandler.renderBasicPage(req, res, "/edit/fileDeleteConfirm.jsp"); } else{ //check if the data stream exists in the fedora repository @@ -206,14 +205,11 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons //forward to form - req.setAttribute("bodyJsp","/fileupload/datastreamModification.jsp"); - RequestDispatcher rd = req.getRequestDispatcher(Controllers.BASIC_JSP); - rd.forward(req, res); + JSPPageHandler.renderBasicPage(req, res, "/fileupload/datastreamModification.jsp"); } }catch(FdcException ex){ req.setAttribute("errors", ex.getMessage()); - RequestDispatcher rd = req.getRequestDispatcher("/edit/fileUploadError.jsp"); - rd.forward(req, res); + JSPPageHandler.renderPlainPage(req, res, "/edit/fileUploadError.jsp"); return; } } @@ -470,13 +466,10 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons } //forward to form - req.setAttribute("bodyJsp","/fileupload/datastreamModificationSuccess.jsp"); - RequestDispatcher rd = req.getRequestDispatcher(Controllers.BASIC_JSP); - rd.forward(req, res); + JSPPageHandler.renderBasicPage(req, res, "/fileupload/datastreamModificationSuccess.jsp"); }catch(FdcException ex){ rawRequest.setAttribute("errors", ex.getMessage()); - RequestDispatcher rd = rawRequest.getRequestDispatcher("/edit/fileUploadError.jsp"); - rd.forward(rawRequest, res); + JSPPageHandler.renderPlainPage(rawRequest, res, "/edit/fileUploadError.jsp"); return; } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java index ccac5da24..583dfdefe 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java @@ -12,6 +12,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -245,10 +246,7 @@ public class OntologyController extends VitroHttpServlet{ + ""; req.setAttribute("css",css); - req.setAttribute("bodyJsp","/"+Controllers.ENTITY_NOT_FOUND_JSP); - - RequestDispatcher rd = req.getRequestDispatcher(Controllers.BASIC_JSP); - rd.forward(req,res); + JSPPageHandler.renderBasicPage(req, res, "/"+Controllers.ENTITY_NOT_FOUND_JSP); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java index aefbe136a..d291be496 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java @@ -11,6 +11,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -100,10 +101,8 @@ public class SparqlQueryBuilderServlet extends BaseEditController { } private void doHelp(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { - req.setAttribute("title","SPARQL Query Builder"); - req.setAttribute("bodyJsp", "/admin/sparql.jsp"); - - RequestDispatcher rd = req.getRequestDispatcher("/"+Controllers.BASIC_JSP); - rd.forward(req,res); + req.setAttribute("title","SPARQL Query Builder"); + + JSPPageHandler.renderBasicPage(req, res, "/admin/sparql.jsp"); } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java index 96b1453de..3dd61d816 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; /** * Controller for comments ("contact us") page @@ -33,12 +34,10 @@ public class UserMailController extends VitroHttpServlet{ //this try block passes any errors to error.jsp if (!FreemarkerEmailFactory.isConfigured(request)) { request.setAttribute("title", "Mail All Users Form"); - request.setAttribute("bodyJsp", "/contact_err.jsp");// <<< this is where the body gets set request.setAttribute("ERR", "This application has not yet been configured to send mail. " + "Email properties must be specified in the configuration properties file."); - RequestDispatcher errd = request.getRequestDispatcher(Controllers.BASIC_JSP); - errd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/contact_err.jsp");// <<< this is where the body gets set } ApplicationBean appBean=vreq.getAppBean(); @@ -51,19 +50,13 @@ public class UserMailController extends VitroHttpServlet{ request.getSession().setAttribute("commentsFormReferer",request.getHeader("Referer")); request.setAttribute("title", appBean.getApplicationName()+" Mail Users Form"); - request.setAttribute("bodyJsp", "/templates/parts/emailUsers.jsp");// <<< this is where the body gets set - - RequestDispatcher rd = - request.getRequestDispatcher(Controllers.BASIC_JSP); - rd.forward(request, response); - + JSPPageHandler.renderBasicPage(request, response, "/templates/parts/emailUsers.jsp");// <<< this is where the body gets set } catch (Throwable e) { // This is how we use an error.jsp //it expects javax.servlet.jsp.jspException to be set to the //exception so that it can display the info out of that. request.setAttribute("javax.servlet.jsp.jspException", e); - RequestDispatcher rd = request.getRequestDispatcher("/error.jsp"); - rd.include(request, response); + JSPPageHandler.renderPlainInclude(request, response, "/error.jsp"); } } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java index f4a5ebd70..bb5138f78 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java @@ -12,6 +12,7 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -85,8 +86,6 @@ public class ApplicationBeanRetryController extends BaseEditController { epo.setFormObject(foo); FormUtils.populateFormFromBean(applicationForEditing, epo.getAction(), foo); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formContact.jsp"); request.setAttribute("formJsp","/templates/edit/specific/applicationBean_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Site Information"); @@ -95,7 +94,7 @@ public class ApplicationBeanRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formContact.jsp"); } catch (Exception e) { log.error(e, e); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java index 7a4b8a0d0..f45d13cf2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java @@ -8,6 +8,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,8 +69,6 @@ public class Classes2ClassesRetryController extends BaseEditController { epo.setFormObject(foo); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); String modeStr = request.getParameter("opMode"); if (modeStr != null && modeStr.equals("disjointWith")) { @@ -89,7 +88,7 @@ public class Classes2ClassesRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("Classes2ClassesRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java index f19b47e21..ef6142b25 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -105,8 +106,6 @@ public class ClassgroupRetryController extends BaseEditController { FormUtils.populateFormFromBean(vclassGroupForEditing,action,foo,epo.getBadValueMap()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/classgroup_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Classgroup Editing Form"); @@ -115,7 +114,7 @@ public class ClassgroupRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("VclassGroupRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java index 5414369c6..5a5baf5bc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -87,8 +88,6 @@ public class DataPropertyStatementRetryController extends BaseEditController { FormUtils.populateFormFromBean(objectForEditing,action,foo); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/ents2data_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Individual Data Editing Form"); @@ -97,7 +96,7 @@ public class DataPropertyStatementRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error(this.getClass().getName() + " could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java index e213150b8..c4fcf3067 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java @@ -12,6 +12,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,8 +76,6 @@ public class DatapropEditController extends BaseEditController { results.add("URI"); // column 17 results.add("publish level"); // column 18 - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - results.add(dp.getPickListName()); // column 1 results.add(dp.getPublicName() == null ? "(no public label)" : dp.getPublicName()); // column 2 @@ -180,12 +179,11 @@ public class DatapropEditController extends BaseEditController { request.setAttribute("epoKey",epo.getKey()); request.setAttribute("datatypeProperty", dp); - request.setAttribute("bodyJsp","/templates/edit/specific/dataprops_edit.jsp"); request.setAttribute("title","Data Property Control Panel"); request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/dataprops_edit.jsp"); } catch (Exception e) { log.error("DatapropEditController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java index 115f84f74..9bb418ae1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java @@ -13,6 +13,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -180,8 +181,6 @@ public class DatapropRetryController extends BaseEditController { foo.setErrorMap(epo.getErrMsgMap()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("colspan","4"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("formJsp","/templates/edit/specific/dataprop_retry.jsp"); @@ -191,7 +190,7 @@ public class DatapropRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("DatatypeRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java index 4127c4fa9..a52ede543 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java @@ -8,6 +8,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -86,8 +87,6 @@ public class DatatypeRetryController extends BaseEditController { //for now, this is also making the value hash - need to separate this out - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("formJsp","/templates/edit/specific/datatype_retry.jsp"); request.setAttribute("title","Datatype Editing Form"); @@ -96,7 +95,7 @@ public class DatatypeRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("VclassRetryContro" + "ller could not forward to view."); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java index 74648713a..eebf6bbb8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java @@ -14,6 +14,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -52,11 +53,9 @@ public class EntityEditController extends BaseEditController { Individual ent = vreq.getUnfilteredAssertionsWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI); if (ent == null) { try { - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/jenaIngest/notfound.jsp"); request.setAttribute("title","Individual Not Found"); request.setAttribute("css", ""); - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/jenaIngest/notfound.jsp"); } catch (Exception e) { log.error("EntityEditController could not forward to view."); log.error(e.getMessage()); @@ -194,16 +193,14 @@ public class EntityEditController extends BaseEditController { epo.setFormObject(foo); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("epoKey",epo.getKey()); request.setAttribute("entityWebapp", ent); - request.setAttribute("bodyJsp","/templates/edit/specific/ents_edit.jsp"); request.setAttribute("title","Individual Control Panel"); request.setAttribute("css", ""); request.setAttribute("scripts", "/templates/edit/specific/ents_edit_head.jsp"); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/ents_edit.jsp"); } catch (Exception e) { log.error("EntityEditController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java index 6ea84cb5a..1419b39cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java @@ -19,6 +19,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.collections.map.ListOrderedMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -290,8 +291,6 @@ public class EntityRetryController extends BaseEditController { ApplicationBean appBean = vreq.getAppBean(); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/entity_retry.jsp"); request.setAttribute("epoKey",epo.getKey()); request.setAttribute("title","Individual Editing Form"); @@ -303,7 +302,7 @@ public class EntityRetryController extends BaseEditController { request.setAttribute("unqualifiedClassName","Individual"); setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("EntityRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java index 7516ac914..e53bce737 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java @@ -20,6 +20,7 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,7 +66,6 @@ public class FauxPropertyRetryController extends BaseEditController { EpoPopulator populator = new EpoPopulator(req, epo); populator.populate(); - req.setAttribute("bodyJsp", "/templates/edit/formBasic.jsp"); req.setAttribute("colspan", "5"); req.setAttribute("formJsp", "/templates/edit/specific/fauxProperty_retry.jsp"); @@ -75,9 +75,7 @@ public class FauxPropertyRetryController extends BaseEditController { setRequestAttributes(req, epo); try { - RequestDispatcher rd = req - .getRequestDispatcher(Controllers.BASIC_JSP); - rd.forward(req, response); + JSPPageHandler.renderBasicPage(req, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("Could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java index 52d2a9f20..6ee62ff9c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java @@ -13,6 +13,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,9 +94,7 @@ public class IndividualTypeRetryController extends BaseEditController { optionMap.put("types",typeOptionList); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("editAction","individualTypeOp"); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("formJsp","/templates/edit/specific/individualType_retry.jsp"); request.setAttribute("title","Individual Type Editing Form"); @@ -103,7 +102,7 @@ public class IndividualTypeRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error(this.getClass().getName()+" could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java index 81e996db4..3e72fa2cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java @@ -6,6 +6,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,16 +36,14 @@ public class NamespacePrefixRetryController extends BaseEditController { request.setAttribute("_action","insert"); } - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("editAction","namespacePrefixOp"); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("formJsp","/templates/edit/specific/namespacePrefix_retry.jsp"); request.setAttribute("title","Edit Namespace Prefix Mapping"); setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error(this.getClass().getName()+" could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java index b74b3b307..02a253517 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java @@ -12,6 +12,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -142,8 +143,6 @@ public class ObjectPropertyStatementRetryController extends BaseEditController { FormUtils.populateFormFromBean(objectForEditing,action,foo); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/ents2ents_retry_domainSide.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Object Property Instance Editing Form"); @@ -152,7 +151,7 @@ public class ObjectPropertyStatementRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("ObjectPropertyStatementRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java index cfcf2c892..9e7e013cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -84,14 +85,12 @@ public class OntologyEditController extends BaseEditController { request.setAttribute("realURI", realURI); request.setAttribute("exportURL", request.getContextPath() + Controllers.EXPORT_RDF); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("epoKey",epo.getKey()); - request.setAttribute("bodyJsp","/templates/edit/specific/ontologies_edit.jsp"); request.setAttribute("title","Ontology Control Panel"); request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/ontologies_edit.jsp"); } catch (Exception e) { log.error("OntologyEditController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java index 211d54b4d..1c2efc88c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java @@ -11,6 +11,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -113,8 +114,6 @@ public class OntologyRetryController extends BaseEditController { FormUtils.populateFormFromBean(ontologyForEditing,action,foo,epo.getBadValueMap()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/ontology_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Ontology Editing Form"); @@ -123,7 +122,7 @@ public class OntologyRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("OntologyRetryContro" + "ller could not forward to view."); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java index 03b4fb508..874e6cdd8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java @@ -9,6 +9,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,8 +76,6 @@ public class Properties2PropertiesRetryController extends BaseEditController { request.setAttribute("operation","add"); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); String modeStr = request.getParameter("opMode"); if (modeStr != null && ( modeStr.equals("superproperty") || modeStr.equals("subproperty") || modeStr.equals("equivalentProperty") ) ) { @@ -90,7 +89,7 @@ public class Properties2PropertiesRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error(this.getClass().getName() + " could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java index b98688fa1..0baaf5afb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java @@ -12,6 +12,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -224,15 +225,13 @@ public class PropertyEditController extends BaseEditController { sortForPickList(fauxProps, vreq); request.setAttribute("fauxproperties", fauxProps); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("epoKey",epo.getKey()); request.setAttribute("propertyWebapp", p); - request.setAttribute("bodyJsp","/templates/edit/specific/props_edit.jsp"); request.setAttribute("title","Object Property Control Panel"); request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/props_edit.jsp"); } catch (Exception e) { log.error("PropertyEditController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java index a66883510..3dcd11d34 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -104,8 +105,6 @@ public class PropertyGroupRetryController extends BaseEditController { FormUtils.populateFormFromBean(propertyGroupForEditing,action,foo,epo.getBadValueMap()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/propertyGroup_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Property Group Editing Form"); @@ -114,7 +113,7 @@ public class PropertyGroupRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("PropertyGroupRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java index 63c2a2e15..d560eed54 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java @@ -13,6 +13,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -181,8 +182,6 @@ public class PropertyRetryController extends BaseEditController { FormUtils.populateFormFromBean(propertyForEditing,action,foo,epo.getBadValueMap()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("colspan","5"); request.setAttribute("formJsp","/templates/edit/specific/property_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); @@ -191,7 +190,7 @@ public class PropertyRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("PropertyRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java index f722f5a09..0be2622a6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java @@ -17,6 +17,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,8 +72,6 @@ public class RefactorOperationController extends BaseEditController { } VitroRequest vreq = new VitroRequest(request); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp", Controllers.CHECK_DATATYPE_PROPERTIES); request.setAttribute("title","Check Datatype Properties"); request.setAttribute("css", ""); @@ -172,7 +171,7 @@ public class RefactorOperationController extends BaseEditController { } request.setAttribute("results", results); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, Controllers.CHECK_DATATYPE_PROPERTIES); } catch (Exception e) { log.error(this.getClass().getName()+" could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java index 25252962f..ce5966599 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -107,7 +108,7 @@ public class RefactorRetryController extends BaseEditController { VitroRequest vreq = new VitroRequest(request); String modeStr = request.getParameter("mode"); - + if (modeStr != null) { if (modeStr.equals("renameResource")) { doRenameResource(vreq, response, epo); @@ -118,11 +119,10 @@ public class RefactorRetryController extends BaseEditController { } } - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error(this.getClass().getName()+" could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java index 5e96d6f82..bfb18c28d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -91,8 +92,6 @@ public class RestrictionRetryController extends BaseEditController { request.setAttribute("specificRestrictionForm", "cardinalityRestriction_retry.jsp"); } - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/restriction_retry.jsp"); request.setAttribute("scripts","/templates/edit/formBasic.js"); request.setAttribute("title","Add Restriction"); @@ -100,7 +99,7 @@ public class RestrictionRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error(this.getClass().getName()+"PropertyRetryController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index fc84e79a8..946dfe4bb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java @@ -13,6 +13,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -180,16 +181,14 @@ public class VclassEditController extends BaseEditController { boolean instantiable = (vcl.getURI().equals(OWL.Nothing.getURI())) ? false : true; - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("epoKey",epo.getKey()); request.setAttribute("vclassWebapp", vcl); request.setAttribute("instantiable", instantiable); - request.setAttribute("bodyJsp","/templates/edit/specific/classes_edit.jsp"); request.setAttribute("title","Class Control Panel"); //request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/classes_edit.jsp"); } catch (Exception e) { log.error("VclassEditController could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java index dcbd4a5ab..351e0e9cb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java @@ -13,6 +13,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -159,8 +160,6 @@ public class VclassRetryController extends BaseEditController { FormUtils.populateFormFromBean(vclassForEditing,action,foo,epo.getBadValueMap()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp"); request.setAttribute("formJsp","/templates/edit/specific/vclass_retry.jsp"); request.setAttribute("colspan","4"); request.setAttribute("scripts","/templates/edit/formBasic.js"); @@ -170,7 +169,7 @@ public class VclassRetryController extends BaseEditController { setRequestAttributes(request,epo); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp"); } catch (Exception e) { log.error("VclassRetryController could not forward to view.", e); throw new RuntimeException(e); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java index b79ce3f6c..3e375f678 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java @@ -11,6 +11,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.lang.StringUtils; import edu.cornell.mannlib.vedit.controller.BaseEditController; @@ -97,13 +98,11 @@ public class AllClassGroupsListingController extends BaseEditController { request.setAttribute("columncount",new Integer(5)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Class Groups"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); request.setAttribute("horizontalJspAddButtonUrl", Controllers.RETRY_URL); request.setAttribute("horizontalJspAddButtonText", "Add new class group"); request.setAttribute("horizontalJspAddButtonControllerParam", "Classgroup"); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java index 8368a21fd..67d587d34 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java @@ -19,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; public class DataPropertyStatementListingController extends BaseEditController { @@ -101,10 +102,8 @@ public class DataPropertyStatementListingController extends BaseEditController { request.setAttribute("columncount",new Integer(4)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Data Property Statements"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java index 424a15331..e121b89c2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java @@ -22,6 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; public class IndividualsListingController extends BaseEditController { @@ -102,7 +103,6 @@ public class IndividualsListingController extends BaseEditController { request.setAttribute("columncount",new Integer(3)); request.setAttribute("suppressquery","true"); request.setAttribute("title", "Individuals in Class "+ ( (vc != null) ? vc.getName() : vclassURI ) ); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); // new individual button List buttons = new ArrayList(); @@ -113,9 +113,8 @@ public class IndividualsListingController extends BaseEditController { buttons.add(newIndividualButton); request.setAttribute("topButtons", buttons); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java index d98c1299e..aedefb46a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java @@ -22,6 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; public class ObjectPropertyStatementListingController extends BaseEditController { @@ -156,7 +157,6 @@ public class ObjectPropertyStatementListingController extends } request.setAttribute("suppressquery","true"); request.setAttribute("title","Object Property Statements"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); // new way of adding more than one button List buttons = new ArrayList(); HashMap newPropParams=new HashMap(); @@ -173,9 +173,8 @@ public class ObjectPropertyStatementListingController extends request.setAttribute("horizontalJspAddButtonText", "Add new object property"); request.setAttribute("horizontalJspAddButtonControllerParam", "Property"); */ - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java index 9028a6370..4b4260806 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java @@ -16,6 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; public class OntologiesListingController extends BaseEditController { @@ -66,13 +67,11 @@ public class OntologiesListingController extends BaseEditController { request.setAttribute("columncount",new Integer(4)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Ontologies"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); request.setAttribute("horizontalJspAddButtonUrl", Controllers.RETRY_URL); request.setAttribute("horizontalJspAddButtonText", "Add new ontology"); request.setAttribute("horizontalJspAddButtonControllerParam", "Ontology"); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java index 6df029061..32681f6af 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java @@ -14,6 +14,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -123,13 +124,11 @@ public class PropertyGroupsListingController extends BaseEditController { request.setAttribute("columncount",new Integer(5)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Property Groups"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); request.setAttribute("horizontalJspAddButtonUrl", Controllers.RETRY_URL); request.setAttribute("horizontalJspAddButtonText", "Add new property group"); request.setAttribute("horizontalJspAddButtonControllerParam", "PropertyGroup"); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java index 2320635bd..6f8bcf304 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java @@ -19,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; public class VClassWebappWithInstancesListingController extends BaseEditController { @@ -102,10 +103,8 @@ public class VClassWebappWithInstancesListingController extends BaseEditControll request.setAttribute("columncount",new Integer(NUM_COLS)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Class Groups"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java index 286b41015..cd069cbc0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java @@ -10,6 +10,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.jena.ontology.Individual; import org.apache.jena.ontology.OntModel; import org.apache.jena.rdf.model.Literal; @@ -90,10 +91,8 @@ public class NamespacesListingController extends BaseEditController { request.setAttribute("columncount",new Integer(3)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Recognized Namespaces"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java index ba386facf..15816e247 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java @@ -9,6 +9,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.jena.ontology.AllValuesFromRestriction; import org.apache.jena.ontology.CardinalityRestriction; import org.apache.jena.ontology.HasValueRestriction; @@ -107,10 +108,8 @@ public class RestrictionsListingController extends BaseEditController { request.setAttribute("columncount",new Integer(5)); request.setAttribute("suppressquery","true"); request.setAttribute("title","Restrictions"); - request.setAttribute("bodyJsp", Controllers.HORIZONTAL_JSP); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); try { - rd.forward(request,response); + JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP); } catch (Throwable t) { t.printStackTrace(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java index e9756c6df..035ea9714 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java @@ -15,6 +15,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -67,7 +68,8 @@ public class JenaCsv2RdfController extends JenaIngestController { String actionStr = request.getParameter("action"); actionStr = (actionStr != null) ? actionStr : ""; - + + String bodyJsp = CSV2RDF_JSP; if ("csv2rdf".equals(actionStr)) { String csvUrl = request.getParameter("csvUrl"); if (!csvUrl.isEmpty() || !filePath.isEmpty()) { @@ -92,19 +94,18 @@ public class JenaCsv2RdfController extends JenaIngestController { request.setAttribute("csv2rdf", csv2rdf); request.setAttribute("destinationModelName", destinationModelNameStr); request.setAttribute("title","URI Select"); - request.setAttribute("bodyJsp", CSV2RDF_SELECT_URI_JSP); + bodyJsp = CSV2RDF_SELECT_URI_JSP; } else { request.setAttribute("title","Convert CSV to RDF"); - request.setAttribute("bodyJsp",CSV2RDF_JSP); + bodyJsp = CSV2RDF_JSP; } } - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, bodyJsp); } catch (Exception e) { throw new RuntimeException(e); } @@ -127,15 +128,13 @@ public class JenaCsv2RdfController extends JenaIngestController { throws ServletException { VitroRequest vreq = new VitroRequest(req); req.setAttribute("title", "CSV to RDF Error "); - req.setAttribute("bodyJsp", "/jsp/fileUploadError.jsp"); req.setAttribute("errors", errrorMsg); - RequestDispatcher rd = req.getRequestDispatcher(Controllers.BASIC_JSP); req.setAttribute("css", ""); try { - rd.forward(req, response); + JSPPageHandler.renderBasicPage(req, response, "/jsp/fileUploadError.jsp"); } catch (IOException e1) { log.error(e1); throw new ServletException(e1); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java index 9a79a7fa3..4df67127c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java @@ -18,6 +18,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -256,10 +257,8 @@ public class JenaExportController extends BaseEditController { } private void prepareExportSelectionPage( VitroRequest vreq, HttpServletResponse response ) { - vreq.setAttribute( "bodyJsp", Controllers.EXPORT_SELECTION_JSP ); - RequestDispatcher dispatcher = vreq.getRequestDispatcher( Controllers.BASIC_JSP ); try { - dispatcher.forward( vreq, response ); + JSPPageHandler.renderBasicPage(vreq, response, Controllers.EXPORT_SELECTION_JSP ); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index df80be7b0..65737277d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -33,6 +33,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -125,56 +126,58 @@ public class JenaIngestController extends BaseEditController { String actionStr = vreq.getParameter("action"); actionStr = (actionStr != null) ? actionStr : ""; + + String bodyJsp; if("listModels".equals(actionStr)) { - processListModelsRequest(vreq, maker, modelType); + bodyJsp = processListModelsRequest(vreq, maker, modelType); } else if("configModels".equals(actionStr)){ - processConfigModelsRequest(vreq); + bodyJsp = processConfigModelsRequest(vreq); } else if("contentModels".equals(actionStr)){ - processContentModelsRequest(vreq); + bodyJsp = processContentModelsRequest(vreq); } else if("createModel".equals(actionStr)) { - processCreateModelRequest(vreq, maker, modelType); + bodyJsp = processCreateModelRequest(vreq, maker, modelType); } else if("removeModel".equals(actionStr)) { - processRemoveModelRequest(vreq, maker, modelType); + bodyJsp = processRemoveModelRequest(vreq, maker, modelType); } else if("loadRDFData".equals(actionStr)) { - processLoadRDFDataRequest(vreq, maker); + bodyJsp = processLoadRDFDataRequest(vreq, maker); } else if("cleanLiterals".equals(actionStr)) { - processCleanLiteralsRequest(vreq); + bodyJsp = processCleanLiteralsRequest(vreq); } else if("outputModel".equals(actionStr)) { processOutputModelRequest(vreq, response); return; // don't attempt to display a JSP } else if("clearModel".equals(actionStr)) { - processClearModelRequest(vreq, maker, modelType); + bodyJsp = processClearModelRequest(vreq, maker, modelType); } else if("attachModel".equals(actionStr)) { - processAttachModelRequest(vreq, maker, modelType); + bodyJsp = processAttachModelRequest(vreq, maker, modelType); } else if("detachModel".equals(actionStr)) { - processDetachModelRequest(vreq, maker, modelType); + bodyJsp = processDetachModelRequest(vreq, maker, modelType); } else if("renameBNodes".equals(actionStr)) { - processRenameBNodesRequest(vreq, maker); + bodyJsp = processRenameBNodesRequest(vreq, maker); } else if("renameBNodesURISelect".equals(actionStr)){ - processRenameBNodesURISelectRequest(vreq, maker); + bodyJsp = processRenameBNodesURISelectRequest(vreq, maker); } else if("smushSingleModel".equals(actionStr)) { - processSmushSingleModelRequest(vreq); + bodyJsp = processSmushSingleModelRequest(vreq); } else if("csv2rdf".equals(actionStr)) { - processCsv2rdfRequest(vreq); + bodyJsp = processCsv2rdfRequest(vreq); } else if("processStrings".equals(actionStr)) { - processProcessStringsRequest(vreq); + bodyJsp = processProcessStringsRequest(vreq); } else if("splitPropertyValues".equals(actionStr)) { - processSplitPropertyValuesRequest(vreq); + bodyJsp = processSplitPropertyValuesRequest(vreq); } else if("subtractModels".equals(actionStr)) { - processSubtractModelRequest(vreq); + bodyJsp = processSubtractModelRequest(vreq); } else if("executeWorkflow".equals(actionStr)) { - processExecuteWorkflowRequest(vreq); + bodyJsp = processExecuteWorkflowRequest(vreq); } else if("executeSparql".equals(actionStr)) { - processExecuteSparqlRequest(vreq); + bodyJsp = processExecuteSparqlRequest(vreq); } else if ("generateTBox".equals(actionStr)) { - processGenerateTBoxRequest(vreq); + bodyJsp = processGenerateTBoxRequest(vreq); } else if("permanentURI".equals(actionStr)){ - processPermanentURIRequest(vreq, maker); + bodyJsp = processPermanentURIRequest(vreq, maker); } else if("mergeResources".equals(actionStr)){ - processMergeResourceRequest(vreq); + bodyJsp = processMergeResourceRequest(vreq); } else if("renameResource".equals(actionStr)){ - processRenameResourceRequest(vreq); + bodyJsp = processRenameResourceRequest(vreq); } else if("mergeResult".equals(actionStr)){ processMergeResultRequest(vreq, response); return; @@ -185,7 +188,7 @@ public class JenaIngestController extends BaseEditController { else { request.setAttribute("title","Ingest Menu"); - request.setAttribute("bodyJsp",INGEST_MENU_JSP); + bodyJsp = INGEST_MENU_JSP; } maker = getModelMaker(vreq); @@ -198,10 +201,8 @@ public class JenaIngestController extends BaseEditController { request.setAttribute("modelNames", modelNames); - RequestDispatcher rd = request.getRequestDispatcher( - Controllers.BASIC_JSP); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, bodyJsp); } catch (Exception e) { log.error(e,e); throw new ServletException(e); @@ -209,27 +210,27 @@ public class JenaIngestController extends BaseEditController { } - private void processListModelsRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { - showModelList(vreq, maker, modelType); + private String processListModelsRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + return showModelList(vreq, maker, modelType); } protected static boolean isUsingMainStoreForIngest(HttpServletRequest req) { return CONFIGURATION != req.getSession().getAttribute(WHICH_MODEL_MAKER); } - private void processConfigModelsRequest(VitroRequest vreq) { + private String processConfigModelsRequest(VitroRequest vreq) { ModelMaker vjmm = ModelAccess.on(getServletContext()).getModelMaker(CONFIGURATION); vreq.getSession().setAttribute(WHICH_MODEL_MAKER, CONFIGURATION); - showModelList(vreq, vjmm, CONFIGURATION); + return showModelList(vreq, vjmm, CONFIGURATION); } - private void processContentModelsRequest(VitroRequest vreq) { + private String processContentModelsRequest(VitroRequest vreq) { ModelMaker vsmm = ModelAccess.on(getServletContext()).getModelMaker(CONTENT); vreq.getSession().setAttribute(WHICH_MODEL_MAKER, CONTENT); - showModelList(vreq, vsmm, CONTENT); + return showModelList(vreq, vsmm, CONTENT); } - private void processCreateModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + private String processCreateModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { String modelName = vreq.getParameter("modelName"); if (modelName != null) { @@ -243,34 +244,34 @@ public class JenaIngestController extends BaseEditController { } doCreateModel(modelName, maker); - showModelList(vreq, maker, modelType); + return showModelList(vreq, maker, modelType); } catch (URISyntaxException e) { throw new RuntimeException("the model name must be a valid URI"); } } else { vreq.setAttribute("modelType", modelType.toString()); vreq.setAttribute("title","Create New Model"); - vreq.setAttribute("bodyJsp",CREATE_MODEL_JSP); + return CREATE_MODEL_JSP; } } - private void processRemoveModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + private String processRemoveModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { String modelName = vreq.getParameter("modelName"); if (modelName!=null) { doRemoveModel(modelName, maker); } - showModelList(vreq, maker, modelType); + return showModelList(vreq, maker, modelType); } - private void processClearModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + private String processClearModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { String modelName = vreq.getParameter("modelName"); if (modelName != null) { doClearModel(modelName,maker); } - showModelList(vreq, maker, modelType); + return showModelList(vreq, maker, modelType); } - private void processLoadRDFDataRequest(VitroRequest vreq, ModelMaker maker) { + private String processLoadRDFDataRequest(VitroRequest vreq, ModelMaker maker) { String docLoc = vreq.getParameter("docLoc"); String filePath = vreq.getParameter("filePath"); String modelName = vreq.getParameter("modelName"); @@ -279,10 +280,10 @@ public class JenaIngestController extends BaseEditController { if (docLoc!=null && modelName != null) { doLoadRDFData(modelName,docLoc,filePath,language,maker); vreq.setAttribute("title","Ingest Menu"); - vreq.setAttribute("bodyJsp",INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title","Load RDF Data"); - vreq.setAttribute("bodyJsp",LOAD_RDF_DATA_JSP); + return LOAD_RDF_DATA_JSP; } } @@ -314,31 +315,31 @@ public class JenaIngestController extends BaseEditController { } } - private void processCleanLiteralsRequest(VitroRequest vreq) { + private String processCleanLiteralsRequest(VitroRequest vreq) { String modelNameStr = vreq.getParameter("modelName"); Model model = getModel(modelNameStr,vreq); doCleanLiterals(model); vreq.setAttribute("title","Ingest Menu"); - vreq.setAttribute("bodyJsp",INGEST_MENU_JSP); + return INGEST_MENU_JSP; } - private void processAttachModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + private String processAttachModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { String modelName = vreq.getParameter("modelName"); if (modelName != null) { doAttachModel(modelName,maker); } - showModelList(vreq, maker, modelType); + return showModelList(vreq, maker, modelType); } - private void processDetachModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + private String processDetachModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) { String modelName = vreq.getParameter("modelName"); if (modelName != null) { doDetachModel(modelName); } - showModelList(vreq, maker, modelType); + return showModelList(vreq, maker, modelType); } - private void processRenameBNodesRequest(VitroRequest vreq, ModelMaker maker) { + private String processRenameBNodesRequest(VitroRequest vreq, ModelMaker maker) { String[] sourceModel = vreq.getParameterValues("sourceModelName"); JenaIngestUtils utils = new JenaIngestUtils(); if(sourceModel != null && sourceModel.length != 0) { @@ -356,14 +357,14 @@ public class JenaIngestController extends BaseEditController { vreq.setAttribute("propertyMap", propertyMap); vreq.setAttribute("enablePropertyPatternURIs", !propertyMap.isEmpty()); vreq.setAttribute("title","URI Select"); - vreq.setAttribute("bodyJsp",RENAME_BNODES_URI_SELECT_JSP); + return RENAME_BNODES_URI_SELECT_JSP; } else { vreq.setAttribute("title","Rename Blank Nodes"); - vreq.setAttribute("bodyJsp",RENAME_BNODES_JSP); + return RENAME_BNODES_JSP; } } - private void processRenameBNodesURISelectRequest(VitroRequest vreq, ModelMaker maker) { + private String processRenameBNodesURISelectRequest(VitroRequest vreq, ModelMaker maker) { String namespaceEtcStr = vreq.getParameter("namespaceEtcStr"); String pattern = vreq.getParameter("pattern"); String concatenate = vreq.getParameter("concatenate"); @@ -371,12 +372,10 @@ public class JenaIngestController extends BaseEditController { if(namespaceEtcStr != null) { if (namespaceEtcStr.isEmpty()) { if ("true".equals(vreq.getParameter("csv2rdf"))) { - processCsv2rdfRequest(vreq); - return; + return processCsv2rdfRequest(vreq); } else { vreq.setAttribute("errorMsg", "Please enter a value."); - processRenameBNodesRequest(vreq, maker); - return; + return processRenameBNodesRequest(vreq, maker); } } if (concatenate.equals("integer")) { @@ -386,81 +385,81 @@ public class JenaIngestController extends BaseEditController { doRenameBNodes(vreq,namespaceEtcStr, true, pattern, sourceModel); } vreq.setAttribute("title", "Ingest Menu"); - vreq.setAttribute("bodyJsp", INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else{ vreq.setAttribute("title", "URI Select"); - vreq.setAttribute("bodyJsp", RENAME_BNODES_URI_SELECT_JSP); + return RENAME_BNODES_URI_SELECT_JSP; } } - private void processSmushSingleModelRequest(VitroRequest vreq) { + private String processSmushSingleModelRequest(VitroRequest vreq) { String propertyURIStr = vreq.getParameter("propertyURI"); if (propertyURIStr != null) { doSmushSingleModel(vreq); vreq.setAttribute("title","Ingest Menu"); - vreq.setAttribute("bodyJsp",INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title","Smush Resources"); - vreq.setAttribute("bodyJsp",SMUSH_JSP); + return SMUSH_JSP; } } - private void processCsv2rdfRequest(VitroRequest vreq) { + private String processCsv2rdfRequest(VitroRequest vreq) { String csvUrl = vreq.getParameter("csvUrl"); if (csvUrl != null) { /*doExecuteCsv2Rdf(vreq);*/ vreq.setAttribute("title","IngestMenu"); - vreq.setAttribute("bodyJsp", INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title","Convert CSV to RDF"); - vreq.setAttribute("bodyJsp",CSV2RDF_JSP); + return CSV2RDF_JSP; } } - private void processProcessStringsRequest(VitroRequest vreq) { + private String processProcessStringsRequest(VitroRequest vreq) { String className = vreq.getParameter("className"); if (className != null) { doProcessStrings(vreq); vreq.setAttribute("title","IngestMenu"); - vreq.setAttribute("bodyJsp", INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title","Process Strings"); - vreq.setAttribute("bodyJsp",PROCESS_STRINGS_JSP); + return PROCESS_STRINGS_JSP; } } - private void processSplitPropertyValuesRequest(VitroRequest vreq) { + private String processSplitPropertyValuesRequest(VitroRequest vreq) { String splitRegex = vreq.getParameter("splitRegex"); if (splitRegex != null) { doSplitPropertyValues(vreq); vreq.setAttribute("title","IngestMenu"); - vreq.setAttribute("bodyJsp", INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title","Split PropertyValues"); - vreq.setAttribute("bodyJsp",SPLIT_PROPERTY_VALUES_JSP); + return SPLIT_PROPERTY_VALUES_JSP; } } - private void processSubtractModelRequest(VitroRequest vreq) { + private String processSubtractModelRequest(VitroRequest vreq) { String modela = vreq.getParameter("modela"); if (modela != null) { doSubtractModels(vreq); vreq.setAttribute("title","IngestMenu"); - vreq.setAttribute("bodyJsp", INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title", "Subtract Models"); - vreq.setAttribute("bodyJsp",SUBTRACT_MODELS_JSP); + return SUBTRACT_MODELS_JSP; } } - private void processExecuteWorkflowRequest(VitroRequest vreq) { + private String processExecuteWorkflowRequest(VitroRequest vreq) { String workflowURIStr = vreq.getParameter("workflowURI"); String workflowStepURIStr = vreq.getParameter("workflowStepURI"); if (workflowURIStr != null && workflowStepURIStr != null) { doExecuteWorkflow(vreq); vreq.setAttribute("title","IngestMenu"); - vreq.setAttribute("bodyJsp", INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else if (workflowURIStr != null) { // Select the workflow step at which to start OntModel jenaOntModel = (OntModel) getModel("vitro:jenaOntModel",vreq); @@ -468,7 +467,7 @@ public class JenaIngestController extends BaseEditController { jenaOntModel.getIndividual(workflowURIStr), getModelMaker(vreq)).getWorkflowSteps(null)); vreq.setAttribute("title", "Choose Workflow Step"); - vreq.setAttribute("bodyJsp", WORKFLOW_STEP_JSP); + return WORKFLOW_STEP_JSP; } else { OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel(); jenaOntModel.enterCriticalSection(Lock.READ); @@ -481,11 +480,11 @@ public class JenaIngestController extends BaseEditController { } vreq.setAttribute("workflows",savedQueryList); vreq.setAttribute("title", "Execute Workflow"); - vreq.setAttribute("bodyJsp", EXECUTE_WORKFLOW_JSP); + return EXECUTE_WORKFLOW_JSP; } } - private void processExecuteSparqlRequest(VitroRequest vreq) { + private String processExecuteSparqlRequest(VitroRequest vreq) { String sparqlQueryStr = vreq.getParameter("sparqlQueryStr"); OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel(); jenaOntModel.enterCriticalSection(Lock.READ); @@ -545,27 +544,27 @@ public class JenaIngestController extends BaseEditController { } vreq.setAttribute("savedQueries",savedQueryList); vreq.setAttribute("title","SPARQL CONSTRUCT result"); - vreq.setAttribute("bodyJsp",EXECUTE_SPARQL_JSP); + return EXECUTE_SPARQL_JSP; } else { vreq.setAttribute("savedQueries",savedQueryList); vreq.setAttribute("title","Execute SPARQL Construct"); - vreq.setAttribute("bodyJsp",EXECUTE_SPARQL_JSP); + return EXECUTE_SPARQL_JSP; } } - private void processGenerateTBoxRequest(VitroRequest vreq) { + private String processGenerateTBoxRequest(VitroRequest vreq) { String testParam = vreq.getParameter("sourceModelName"); if (testParam != null) { doGenerateTBox(vreq); vreq.setAttribute("title","Ingest Menu"); - vreq.setAttribute("bodyJsp",INGEST_MENU_JSP); + return INGEST_MENU_JSP; } else { vreq.setAttribute("title","Generate TBox from Assertions Data"); - vreq.setAttribute("bodyJsp",GENERATE_TBOX_JSP); + return GENERATE_TBOX_JSP; } } - private void processPermanentURIRequest(VitroRequest vreq, ModelMaker maker) { + private String processPermanentURIRequest(VitroRequest vreq, ModelMaker maker) { String modelName = vreq.getParameter("modelName"); String oldModel = vreq.getParameter("oldModel"); String newModel = vreq.getParameter("newModel"); @@ -593,16 +592,19 @@ public class JenaIngestController extends BaseEditController { vreq.setAttribute("defaultNamespace", defaultNamespace); vreq.setAttribute("namespaceList", namespaceList); vreq.setAttribute("title","Permanent URI"); - vreq.setAttribute("bodyJsp",PERMANENT_URI); + return PERMANENT_URI; } else if(oldModel != null) { JenaIngestUtils utils = new JenaIngestUtils(); utils.doPermanentURI(oldModel, newModel, oldNamespace, newNamespace, maker, vreq); vreq.setAttribute("title","Ingest Menu"); - vreq.setAttribute("bodyJsp",INGEST_MENU_JSP); + return INGEST_MENU_JSP; } + + vreq.setAttribute("title","Ingest Menu"); + return INGEST_MENU_JSP; } - private void processMergeResourceRequest(VitroRequest vreq) { + private String processMergeResourceRequest(VitroRequest vreq) { String uri1 = vreq.getParameter("uri1"); // get primary uri String uri2 = vreq.getParameter("uri2"); // get secondary uri String usePrimaryLabelOnlyStr = vreq.getParameter("usePrimaryLabelOnly");; @@ -626,14 +628,14 @@ public class JenaIngestController extends BaseEditController { "leftoverModel", result.getLeftoverModel()); vreq.setAttribute("result", result); vreq.setAttribute("title", "Merge Resources"); - vreq.setAttribute("bodyJsp", MERGE_RESULT); + return MERGE_RESULT; } else{ vreq.setAttribute("title","Merge Resources"); - vreq.setAttribute("bodyJsp",MERGE_RESOURCES); + return MERGE_RESOURCES; } } - private void processRenameResourceRequest(VitroRequest vreq) { + private String processRenameResourceRequest(VitroRequest vreq) { String oldNamespace = vreq.getParameter("oldNamespace"); String newNamespace = vreq.getParameter("newNamespace"); String errorMsg = ""; @@ -652,16 +654,16 @@ public class JenaIngestController extends BaseEditController { vreq.setAttribute("oldNamespace", oldNamespace); vreq.setAttribute("newNamespace", newNamespace); vreq.setAttribute("title","Rename Resource"); - vreq.setAttribute("bodyJsp",RENAME_RESOURCE); + return RENAME_RESOURCE; } else { String result = doRename(oldNamespace, newNamespace); vreq.setAttribute("result",result); vreq.setAttribute("title","Rename Resources"); - vreq.setAttribute("bodyJsp",RENAME_RESULT); + return RENAME_RESULT; } } else{ vreq.setAttribute("title","Rename Resource"); - vreq.setAttribute("bodyJsp",RENAME_RESOURCE); + return RENAME_RESOURCE; } } @@ -1165,7 +1167,7 @@ public class JenaIngestController extends BaseEditController { } } - protected void showModelList(VitroRequest vreq, ModelMaker maker, WhichService modelType) { + protected String showModelList(VitroRequest vreq, ModelMaker maker, WhichService modelType) { vreq.setAttribute("modelType", modelType.toString()); if(modelType == CONTENT){ vreq.setAttribute("infoLine", "Main Store models"); @@ -1175,12 +1177,12 @@ public class JenaIngestController extends BaseEditController { vreq.setAttribute("modelNames", maker.listModels().toList()); vreq.setAttribute("bodyAttr", "onLoad=\"init()\""); vreq.setAttribute("title","Available Models"); - vreq.setAttribute("bodyJsp",LIST_MODELS_JSP); + return LIST_MODELS_JSP; } private void processDumpRestore(VitroRequest vreq, HttpServletResponse response) throws ServletException, IOException { - vreq.getRequestDispatcher("/dumpRestore").forward(vreq, response); + JSPPageHandler.renderPlainPage(vreq, response, "/dumpRestore"); } public static Model getModel(String name, HttpServletRequest request) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java index 24a0ff9df..3b1f122ad 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.transform.stream.StreamSource; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.Serializer; @@ -142,15 +143,13 @@ public class JenaXMLFileUpload extends JenaIngestController { request.setAttribute("statementCount", count); request.setAttribute("title","Uploaded files and converted to RDF"); - request.setAttribute("bodyJsp","/jenaIngest/xmlFileUploadSuccess.jsp"); - + request.setAttribute("fileItems",vreq.getFiles()); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("css", ""); try { - rd.forward(request, resp); + JSPPageHandler.renderBasicPage(request, resp, "/jenaIngest/xmlFileUploadSuccess.jsp"); } catch (Exception e) { System.out.println(this.getClass().getName()+" could not forward to view."); System.out.println(e.getMessage()); @@ -170,16 +169,14 @@ public class JenaXMLFileUpload extends JenaIngestController { //make a form for uploading a file request.setAttribute("title","Upload file and convert to RDF"); - request.setAttribute("bodyJsp","/jenaIngest/xmlFileUpload.jsp"); - + request.setAttribute("modelNames", getModelMaker(vreq).listModels().toList()); request.setAttribute("models", null); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/jenaIngest/xmlFileUpload.jsp"); } catch (Exception e) { System.out.println(this.getClass().getName()+" could not forward to view."); System.out.println(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java index ab1a37b4b..9829387c7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java @@ -20,6 +20,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -223,15 +224,11 @@ public class RDFUploadController extends JenaIngestController { } else { request.setAttribute("uploadDesc", "RDF upload successful."); } - - RequestDispatcher rd = request.getRequestDispatcher( - Controllers.BASIC_JSP); - request.setAttribute( - "bodyJsp", "/templates/edit/specific/upload_rdf_result.jsp"); + request.setAttribute("title","Ingest RDF Data"); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/upload_rdf_result.jsp"); } catch (Exception e) { log.error("Could not forward to view: " + e.getLocalizedMessage()); } @@ -274,10 +271,11 @@ public class RDFUploadController extends JenaIngestController { String docLoc = request.getParameter("docLoc"); String languageStr = request.getParameter("language"); ModelMaker maker = getModelMaker(request); - + + String bodyJsp; if (modelName == null) { request.setAttribute("title","Load RDF Data"); - request.setAttribute("bodyJsp",LOAD_RDF_DATA_JSP); + bodyJsp = LOAD_RDF_DATA_JSP; } else { RDFService rdfService = getRDFService(request, maker, modelName); try { @@ -286,14 +284,11 @@ public class RDFUploadController extends JenaIngestController { rdfService.close(); } WhichService modelType = getModelType(request); - showModelList(request, maker, modelType); + bodyJsp = showModelList(request, maker, modelType); } - RequestDispatcher rd = request.getRequestDispatcher( - Controllers.BASIC_JSP); - try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, bodyJsp); } catch (Exception e) { String errMsg = " could not forward to view."; log.error(errMsg, e); @@ -448,16 +443,13 @@ public class RDFUploadController extends JenaIngestController { throws ServletException{ VitroRequest vreq = new VitroRequest(req); req.setAttribute("title","RDF Upload Error "); - req.setAttribute("bodyJsp","/jsp/fileUploadError.jsp"); req.setAttribute("errors", errrorMsg); - RequestDispatcher rd = req.getRequestDispatcher( - Controllers.BASIC_JSP); - req.setAttribute("css", + req.setAttribute("css", ""); try { - rd.forward(req, response); + JSPPageHandler.renderBasicPage(req, response, "/jsp/fileUploadError.jsp"); } catch (IOException e1) { log.error(e1); throw new ServletException(e1); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java index b8ea16f30..e13d7a28b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java @@ -6,6 +6,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,15 +27,13 @@ public class RDFUploadFormController extends BaseEditController { return; } - VitroRequest vreq = new VitroRequest(request); + VitroRequest vreq = new VitroRequest(request); - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/specific/upload_rdf.jsp"); request.setAttribute("title","Ingest RDF Data"); request.setAttribute("css", ""); try { - rd.forward(request, response); + JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/upload_rdf.jsp"); } catch (Exception e) { log.error(this.getClass().getName()+" could not forward to view."); log.error(e.getMessage()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JSPPageHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JSPPageHandler.java new file mode 100644 index 000000000..b8315dfcf --- /dev/null +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JSPPageHandler.java @@ -0,0 +1,29 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.utils; + +import edu.cornell.mannlib.vitro.webapp.controller.Controllers; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class JSPPageHandler { + public static void renderBasicPage(HttpServletRequest req, HttpServletResponse res, String bodyJsp) throws ServletException, IOException { + req.setAttribute("bodyJsp", bodyJsp); + RequestDispatcher rd = req.getRequestDispatcher(Controllers.BASIC_JSP); + rd.forward(req, res); + } + + public static void renderPlainInclude(HttpServletRequest req, HttpServletResponse res, String pageJsp) throws ServletException, IOException { + RequestDispatcher rd = req.getRequestDispatcher(pageJsp); + rd.include(req, res); + } + + public static void renderPlainPage(HttpServletRequest req, HttpServletResponse res, String pageJsp) throws ServletException, IOException { + RequestDispatcher rd = req.getRequestDispatcher(pageJsp); + rd.forward(req, res); + } +}