diff --git a/api/pom.xml b/api/pom.xml index 67f8daa3..f31e77ce 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -38,12 +38,12 @@ org.springframework spring-beans - 2.5.6 + 4.3.10.RELEASE org.springframework spring-context - 2.5.6 + 4.3.10.RELEASE @@ -59,8 +59,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.1.0 provided diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java index eefdf3ac..1ac27292 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AboutQrCodesController.java @@ -14,6 +14,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Exc import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "AboutQrCodesController", urlPatterns = {"/qrcode/about"}) public class AboutQrCodesController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java index d17d303d..e748994a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ExportQrCodeController.java @@ -28,6 +28,9 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndivi import freemarker.ext.beans.BeansWrapper; import freemarker.template.DefaultObjectWrapper; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ExportQrCodeController", urlPatterns = {"/qrcode"}) public class ExportQrCodeController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java index 70b980da..bfc02d10 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/HomePageAjaxController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.ajax; import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -17,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; * Handle the AJAX functions that are specific to the "new" home page sections, at * this point just the mapping of geographic locations. */ +@WebServlet(name = "HomePageAjax", urlPatterns = {"/homePageAjax"} ) public class HomePageAjaxController extends VitroAjaxController { private static final Log log = LogFactory .getLog(HomePageAjaxController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java index 7e48f205..9f523f60 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeAjaxController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.ajax; import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -17,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; * Handle the AJAX functions that are specific to the "new" home page sections, at * this point just the mapping of geographic locations. */ +@WebServlet(name = "QrCodeAjax", urlPatterns = {"/qrCodeAjax"} ) public class QrCodeAjaxController extends VitroAjaxController { private static final Log log = LogFactory .getLog(QrCodeAjaxController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java index 1c67d93f..f2de9d4c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/InstitutionalInternalClassController.java @@ -7,6 +7,7 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSER import java.util.HashMap; import java.util.Map; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -34,6 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; * Custom controller for menu management. This will be replaced later once N3 Editing * has been successfully refactored and integrated with menu management. */ +@WebServlet(name = "InstitutionalInternalClassController", urlPatterns = {"/processInstitutionalInternalClass"} ) public class InstitutionalInternalClassController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(InstitutionalInternalClassController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java index 2a47f84d..37da3f2b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java @@ -24,7 +24,10 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ManageGrantsForIndividualController", urlPatterns = {"/manageGrants"} ) public class ManageGrantsForIndividualController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ManageGrantsForIndividualController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java index 3ba32c45..2029d788 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java @@ -24,7 +24,10 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ManagePeopleForOrganizationController", urlPatterns = {"/managePeople"} ) public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ManagePeopleForOrganizationController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java index 7daa4aee..dd4f339d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java @@ -24,7 +24,10 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ManagePublicationsForIndividualController", urlPatterns = {"/managePublications"} ) public class ManagePublicationsForIndividualController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ManagePublicationsForIndividualController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java deleted file mode 100644 index 5163fd9e..00000000 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java +++ /dev/null @@ -1,42 +0,0 @@ -/* $This file is distributed under the terms of the license in LICENSE$ */ - -package edu.cornell.mannlib.vitro.webapp.controller.freemarker; - -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler; - -public class VIVOSiteAdminController extends BaseSiteAdminController { - - private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(VIVOSiteAdminController.class); - - @Override - protected Map getSiteMaintenanceUrls(VitroRequest vreq) { - - Map urls = super.getSiteMaintenanceUrls(vreq); - - if (PolicyHelper.isAuthorizedForActions(vreq, ToolsRequestHandler.REQUIRED_ACTIONS)) { - urls.put("rebuildVisCache", UrlBuilder.getUrl("/vis/tools")); - } - - return urls; - } - - @Override - protected Map getSiteConfigData(VitroRequest vreq) { - - Map data = super.getSiteConfigData(vreq); - - if (PolicyHelper.isAuthorizedForActions(vreq, InstitutionalInternalClassController.REQUIRED_ACTIONS)) { - data.put("internalClass", UrlBuilder.getUrl("/processInstitutionalInternalClass")); - } - - return data; - } -} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java index 8477b64d..38551135 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java @@ -20,6 +20,7 @@ import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilderFactory; @@ -44,6 +45,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Res import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.filestorage.impl.FileStorageImplWrapper; +@WebServlet(name = "FileHarvestController", urlPatterns = {"/harvester/harvest"}) public class FileHarvestController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java index 17d498a1..1aa8f67b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java @@ -6,6 +6,7 @@ import java.io.IOException; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -32,6 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ * @author cdtank */ @SuppressWarnings("serial") +@WebServlet(name = "AjaxVisualizationController", urlPatterns = {"/visualizationAjax"}) public class AjaxVisualizationController extends FreemarkerHttpServlet { public static final String URL_ENCODING_SCHEME = "UTF-8"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java index e61a0902..b65435ec 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ * @author cdtank */ @SuppressWarnings("serial") +@WebServlet(name = "DataVisualizationController", urlPatterns = {"/visualizationData"}) public class DataVisualizationController extends VitroHttpServlet { public static final String URL_ENCODING_SCHEME = "UTF-8"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java index d0545387..8085f5cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletContext; +import javax.servlet.annotation.WebServlet; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.logging.Log; @@ -33,6 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ * @author cdtank */ @SuppressWarnings("serial") +@WebServlet(name = "ShortURLVisualizationController", urlPatterns = {"/vis/*"}) public class ShortURLVisualizationController extends FreemarkerHttpServlet { public static final String URL_ENCODING_SCHEME = "UTF-8"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java index fef6d7bc..eec09bc6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.visualization; import javax.servlet.ServletContext; +import javax.servlet.annotation.WebServlet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ * @author cdtank */ @SuppressWarnings("serial") +@WebServlet(name = "StandardVisualizationController", urlPatterns = {"/visualizationfm","/visualization"}) public class StandardVisualizationController extends FreemarkerHttpServlet { public static final String URL_ENCODING_SCHEME = "UTF-8"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java index 2c62e774..942fdf17 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java @@ -8,6 +8,7 @@ import java.util.List; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -25,6 +26,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils; +@WebServlet(name = "ConceptSearchService", urlPatterns = {"/conceptSearchService"} ) public class ConceptSearchServlet extends VitroHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java index 941b811c..4a93377f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidIntegrationController.java @@ -8,6 +8,7 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -45,6 +46,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Res * show orcidSuccess.ftl with "return to profile" and "view profile" links. * */ +@WebServlet(name = "OrcidIntegrationController", urlPatterns = {"/orcid/*"}) public class OrcidIntegrationController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(OrcidIntegrationController.class); diff --git a/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java b/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java index b7682c92..b7337bd1 100644 --- a/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java +++ b/api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java @@ -14,6 +14,7 @@ import org.apache.commons.io.IOUtils; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -21,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +@WebServlet(name = "SiteMapServlet", urlPatterns = {"/robots.txt","/sitemap.xml"}) public class SiteMapServlet extends VitroHttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java new file mode 100644 index 00000000..a762b332 --- /dev/null +++ b/api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java @@ -0,0 +1,24 @@ +package org.vivoweb.webapp.startup; + +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.InstitutionalInternalClassController; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.SiteAdminController; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.MenuManagementDataUtils; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.VIVOMenuManagementDataUtils; +import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +public class SiteAdminSetup implements ServletContextListener { + @Override + public void contextInitialized(ServletContextEvent servletContextEvent) { + SiteAdminController.registerSiteMaintenanceUrl("rebuildVisCache", UrlBuilder.getUrl("/vis/tools"), ToolsRequestHandler.REQUIRED_ACTIONS); + SiteAdminController.registerSiteConfigData("internalClass", UrlBuilder.getUrl("/processInstitutionalInternalClass"), InstitutionalInternalClassController.REQUIRED_ACTIONS); + } + + @Override + public void contextDestroyed(ServletContextEvent servletContextEvent) { + + } +} diff --git a/webapp/src/main/webapp/WEB-INF/applicationContext.xml b/webapp/src/main/webapp/WEB-INF/applicationContext.xml new file mode 100644 index 00000000..057a92fe --- /dev/null +++ b/webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt index e4964492..06042885 100644 --- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt +++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt @@ -61,6 +61,7 @@ org.vivoweb.webapp.startup.DataGetterN3Setup org.vivoweb.webapp.startup.GeneratorSetup org.vivoweb.webapp.startup.JSONWrapperSetup org.vivoweb.webapp.startup.MenuManagementSetup +org.vivoweb.webapp.startup.SiteAdminSetup org.vivoweb.webapp.startup.TemplateModelSetup org.vivoweb.webapp.startup.SearchResultTemplateModelSetup diff --git a/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml b/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml new file mode 100644 index 00000000..057a92fe --- /dev/null +++ b/webapp/src/main/webapp/WEB-INF/springmvc-beans.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index a4ab2c2a..3297931e 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -2,10 +2,11 @@ - + @@ -56,101 +57,49 @@ - + - - Startup Status Display Filter - edu.cornell.mannlib.vitro.webapp.filters.StartupStatusDisplayFilter - Startup Status Display Filter /* - - - Session Timeout Limiting Filter - edu.cornell.mannlib.vitro.webapp.filters.SessionTimeoutLimitingFilter - Session Timeout Limiting Filter /* - - - Character Set Encoding Filter - edu.cornell.mannlib.vitro.webapp.filters.CharsetEncodingFilter - Character Set Encoding Filter /* - - - Override the Locale in the HttpRequest, if appropriate. - Locale selection filter - edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionFilter - Locale selection filter /* - - - Recognize conditional requests, and generate Cache-Control headers. - Caching Response filter - edu.cornell.mannlib.vitro.webapp.filters.CachingResponseFilter - Caching Response filter /* - - - JSession Strip Filter - edu.cornell.mannlib.vitro.webapp.filters.JSessionStripFilter - JSession Strip Filter /* - - - URL Rewriter Filter - edu.cornell.mannlib.vitro.webapp.filters.URLRewriterFilter - URL Rewriter Filter /* - - - RequestModelsPrep - edu.cornell.mannlib.vitro.webapp.filters.RequestModelsPrep - RequestModelsPrep /* REQUEST FORWARD - - - ClickjackFilter - edu.cornell.mannlib.vitro.webapp.filters.ClickjackFilter - ClickjackFilter /* REQUEST FORWARD - - - PageRoutingFilter - edu.cornell.mannlib.vitro.webapp.filters.PageRoutingFilter - PageRoutingFilter /* @@ -179,907 +128,7 @@ REQUEST - - - - - - - ProcessRdfFormController - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController - - - ProcessRdfFormController - /edit/process - - - - EditRequestDispatch - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.EditRequestDispatchController - - - EditRequestDispatch - /editRequestDispatch - - - - EditRequestAJAX - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.EditRequestAJAXController - - - EditRequestAJAX - /editRequestAJAX - - - - IndexController - edu.cornell.mannlib.vitro.webapp.search.controller.IndexController - - - IndexController - /SearchIndex - - - - SimpleReasonerRecomputeController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.SimpleReasonerRecomputeController - - - SimpleReasonerRecomputeController - /RecomputeInferences - - - - DeletePropertyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController - - - DeletePropertyController - /deletePropertyController - - - - PostEditCleanupController - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.PostEditCleanupController - - - PostEditCleanupController - /postEditCleanupController - - - - DeletePageController - edu.cornell.mannlib.vitro.webapp.controller.edit.DeletePageController - - - DeletePageController - /deletePageController - - - - MenuManagementEdit - edu.cornell.mannlib.vitro.webapp.controller.edit.MenuManagementEdit - - - MenuManagementEdit - /menuManagementEdit - - - - InstitutionalInternalClassController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.InstitutionalInternalClassController - - - InstitutionalInternalClassController - /processInstitutionalInternalClass - - - - ajaxSparqlQuery - edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlQueryAjaxController - - - ajaxSparqlQuery - /ajax/sparqlQuery - - - - AboutController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController - - - AboutController - /about - - - - FreemarkerTestController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController - - - FreemarkerTestController - /freemarkertest - - - - FreemarkerSamplesController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.SamplesController - - - FreemarkerSamplesController - /freemarkersamples - - - - SiteAdminController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.VIVOSiteAdminController - - - SiteAdminController - /siteAdmin - - - SiteAdminController - /siteAdmin.jsp - - - - StaticPageController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.StaticPageController - - - StaticPageController - /login - - - - RevisionInfoController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.RevisionInfoController - - - RevisionInfoController - /revisionInfo - - - - ImageUploadController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController - - - ImageUploadController - /uploadImages - - - - RDFUploadFormController - edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadFormController - - - RDFUploadFormController - /uploadRDFForm - - - - RDFUploadController - edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadController - - - RDFUploadController - /uploadRDF - - - - JenaIngestController - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaIngestController - - - JenaIngestController - /ingest - - - - JenaCsv2RdfController - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaCsv2RdfController - - - JenaCsv2RdfController - /csv2rdf - - - - - JenaExportController - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaExportController - - - JenaExportController - /export/* - - - - JenaXMLFileUpload - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaXMLFileUpload - - - JenaXMLFileUpload - /jenaXmlFileUpload/* - - - - JenaAdminServlet - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaAdminActions - - - JenaAdminServlet - /jenaAdmin - - - - DumpRestoreController - edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore.DumpRestoreController - - - DumpRestoreController - /dumpRestore/* - - - - EditFrontController - edu.cornell.mannlib.vedit.controller.EditFrontController - - - EditFrontController - /editForm - - - - OperationController - edu.cornell.mannlib.vedit.controller.OperationController - - - OperationController - /doEdit - - - - EntityEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.EntityEditController - - - EntityEditController - /entityEdit - - - - VclassEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.VclassEditController - - - VclassEditController - /vclassEdit - - - - Classes2ClassesOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.Classes2ClassesOperationController - - - Classes2ClassesOperationController - /classes2ClassesOp - - - - Properties2PropertiesOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.Properties2PropertiesOperationController - - - Properties2PropertiesOperationController - /props2PropsOp - - - - NamespacePrefixOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.NamespacePrefixOperationController - - - NamespacePrefixOperationController - /namespacePrefixOp - - - - RefactorOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.RefactorOperationController - - - RefactorOperationController - /refactorOp - - - - IndividualTypeOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.IndividualTypeOperationController - - - IndividualTypeOperationController - /individualTypeOp - - - - DatapropEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.DatapropEditController - - - DatapropEditController - /datapropEdit - - - - OntologyEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController - - - OntologyEditController - /ontologyEdit - - - - PropertyEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.PropertyEditController - - - PropertyEditController - /propertyEdit - - - - EntityRetryController - edu.cornell.mannlib.vitro.webapp.controller.edit.EntityRetryController - - - EntityRetryController - /entity_retry - - - - VclassRetryController - edu.cornell.mannlib.vitro.webapp.controller.edit.VclassRetryController - - - VclassRetryController - /vclass_retry - - - - DatatypeRetryController - edu.cornell.mannlib.vitro.webapp.controller.edit.DatatypeRetryController - - - DatatypeRetryController - /datatype_retry - - - - ListClassGroupsController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListClassGroupsController - - - ListClassGroupsController - /listGroups - - - - ListPropertyGroupsController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListPropertyGroupsController - - - ListPropertyGroupsController - /listPropertyGroups - - - - OntologiesListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.OntologiesListingController - - - OntologiesListingController - /listOntologies - - - - NamespacesListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.NamespacesListingController - - - NamespacesListingController - /listNamespaces - - - - RestrictionsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.RestrictionsListingController - - - RestrictionsListingController - /listRestrictions - - - - RestrictionOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.RestrictionOperationController - - - RestrictionOperationController - /addRestriction - - - - AccountsAdmin - edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.UserAccountsAdminController - - - AccountsAdmin - /accountsAdmin/* - - - - AccountsAjax - edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax.UserAccountsAjaxController - - - AccountsAjax - /accountsAjax/* - - - - AccountsUser - edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsUserController - - - AccountsUser - /accounts/* - - - - ManageProxies - edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.ManageProxiesController - - - ManageProxies - /manageProxies/* - - - - ProxiesAjax - edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.ajax.ManageProxiesAjaxController - - - ProxiesAjax - /proxiesAjax/* - - - - HomePageAjax - edu.cornell.mannlib.vitro.webapp.controller.ajax.HomePageAjaxController - - - HomePageAjax - /homePageAjax - - - - QrCodeAjax - edu.cornell.mannlib.vitro.webapp.controller.ajax.QrCodeAjaxController - - - QrCodeAjax - /qrCodeAjax - - - - ShowAuth - edu.cornell.mannlib.vitro.webapp.controller.admin.ShowAuthController - - - ShowAuth - /admin/showAuth - - - - ShowConfiguration - edu.cornell.mannlib.vitro.webapp.controller.admin.ShowConfiguration - - - ShowConfiguration - /admin/showConfiguration - - - - ShowRDFSources - edu.cornell.mannlib.vitro.webapp.controller.admin.ShowSourcesController - - - ShowRDFSources - /admin/showSources - - - - StartupStatus - edu.cornell.mannlib.vitro.webapp.controller.admin.StartupStatusController - - - StartupStatus - /startupStatus - - - - RestrictLogins - edu.cornell.mannlib.vitro.webapp.controller.admin.RestrictLoginsController - - - RestrictLogins - /admin/restrictLogins - - - - ShowBackgroundThreads - edu.cornell.mannlib.vitro.webapp.controller.admin.ShowBackgroundThreadsController - - - ShowBackgroundThreads - /admin/showThreads - - - - WaitForBackgroundThreads - edu.cornell.mannlib.vitro.webapp.controller.admin.WaitForBackgroundThreadsController - - - WaitForBackgroundThreads - /admin/wait - - - - ListVClassWebappsController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController - - - ListVClassWebappsController - /listVClassWebapps - - - - IndividualsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.IndividualsListingController - - - IndividualsListingController - /listIndividuals - - - - ManageGrantsForIndividualController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManageGrantsForIndividualController - - - ManageGrantsForIndividualController - /manageGrants - - - - ViewLabelsServlet - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ViewLabelsServlet - - - ViewLabelsServlet - /viewLabels - - - - ManagePublicationsForIndividualController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManagePublicationsForIndividualController - - - ManagePublicationsForIndividualController - /managePublications - - - - ManagePeopleForOrganizationController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManagePeopleForOrganizationController - - - ManagePeopleForOrganizationController - /managePeople - - - - ShowClassHierarchyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowClassHierarchyController - - - ShowClassHierarchyController - /showClassHierarchy - - - - ShowObjectPropertyHierarchyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowObjectPropertyHierarchyController - - - ShowObjectPropertyHierarchyController - /showObjectPropertyHierarchy - - - - ListFauxPropertiesController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListFauxPropertiesController - - - ListFauxPropertiesController - /listFauxProperties - - - - ShowDataPropertyHierarchyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowDataPropertyHierarchyController - - - ShowDataPropertyHierarchyController - /showDataPropertyHierarchy - - - - ListPropertyWebappsController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListPropertyWebappsController - - - ListPropertyWebappsController - /listPropertyWebapps - - - - ListDatatypePropertiesController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListDatatypePropertiesController - - - ListDatatypePropertiesController - /listDatatypeProperties - - - - DataPropertyStatementListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DataPropertyStatementListingController - - - DataPropertyStatementListingController - /listDataPropertyStatements - - - - ObjectPropertyStatementListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ObjectPropertyStatementListingController - - - ObjectPropertyStatementListingController - /listObjectPropertyStatements - - - - IndividualListController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController - - - IndividualListController - /individuallist - - - - IndividualListRdf - edu.cornell.mannlib.vitro.webapp.controller.IndividualListRdfController - - - IndividualListRdf - /listrdf/* - - - - SearchController - edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController - - - SearchController - /search - - - - SearchHelpController - edu.cornell.mannlib.vitro.webapp.search.controller.SearchHelpController - - - SearchHelpController - /searchHelp - - - - DeveloperAjax - edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettingsServlet - - - DeveloperAjax - /admin/developerAjax - - - - - SearchController - /search.jsp - - - SearchController - /fedsearch - - - SearchController - /searchcontroller - - - - AutocompleteController - edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController - - - - AutocompleteController - /autocomplete - - - AutocompleteController - /populateselect - - - - DataAutocompleteController - edu.cornell.mannlib.vitro.webapp.search.controller.DataAutocompleteController - - - DataAutocompleteController - /dataautocomplete - - - - ReorderController - edu.cornell.mannlib.vitro.webapp.controller.edit.ReorderController - - - ReorderController - /edit/reorder - - - - TermsOfUseController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.TermsOfUseController - - - TermsOfUseController - /termsOfUse - - - - ContactFormController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ContactFormController - - - ContactFormController - /contact - - - - - JSON Service - edu.cornell.mannlib.vitro.webapp.controller.json.JsonServlet - - - JSON Service - /dataservice - - - - ConceptSearchService - edu.cornell.mannlib.vitro.webapp.servlet.ConceptSearchServlet - - - ConceptSearchService - /conceptSearchService - - - - - - JSON Reconcile Service - edu.cornell.mannlib.vitro.webapp.controller.grefine.JSONReconcileServlet - - - - JSON Reconcile Service - /reconcile - - - - Google Refine Property List Service - edu.cornell.mannlib.vitro.webapp.controller.grefine.GrefinePropertyListServlet - - - - Google Refine Property List Service - /get_properties_of_type - - - - Google Refine Mqlread Service - edu.cornell.mannlib.vitro.webapp.controller.grefine.GrefineMqlreadServlet - - - - Google Refine Mqlread Service - /grefineMqlread - - - - - - HomePageController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController - - - HomePageController - /home - - - - DashboardPropertyListController - edu.cornell.mannlib.vitro.webapp.controller.DashboardPropertyListController - - - DashboardPropertyListController - /dashboardPropList - - + dwr-invoker org.directwebremoting.servlet.DwrServlet @@ -1096,72 +145,8 @@ dwr-invoker /dwr/* - - - sendMail - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ContactMailController - 5 - - - sendMail - /submitFeedback - - - - mailusers - edu.cornell.mannlib.vitro.webapp.controller.MailUsersServlet - 5 - - - - ontology - edu.cornell.mannlib.vitro.webapp.controller.OntologyController - - - - individual - edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualController - - - authenticate - edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate - - - - loginExternalAuthSetup - edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginExternalAuthSetup - - - - loginExternalAuthReturn - edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginExternalAuthReturn - - - - programLogin - edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin - - - programLogin - /programLogin - - - - adminLogin - edu.cornell.mannlib.vitro.webapp.controller.authenticate.AdminLoginController - - - adminLogin - /admin/login - - - - logout - edu.cornell.mannlib.vitro.webapp.controller.edit.Logout - - - - - - browsecontroller - edu.cornell.mannlib.vitro.webapp.controller.freemarker.BrowseController - 5 - - - browsecontroller - /browse - - - - serveFiles - edu.cornell.mannlib.vitro.webapp.filestorage.serving.FileServingServlet - - - serveFiles - /file/* - - - - SparqlQuery - edu.cornell.mannlib.vitro.webapp.controller.admin.SparqlQueryController - - - - SparqlQuery - /admin/sparqlquery - - - - SparqlQueryApi - edu.cornell.mannlib.vitro.webapp.controller.api.SparqlQueryApiController - - - - SparqlQueryApi - /api/sparqlQuery - - - - SparqlUpdateApi - edu.cornell.mannlib.vitro.webapp.controller.api.SparqlUpdateApiController - - - - SparqlUpdateApi - /api/sparqlUpdate - - - - StandardVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.StandardVisualizationController - - - - ShortURLVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.ShortURLVisualizationController - - - - StandardVisualizationController - /visualizationfm - - - - StandardVisualizationController - /visualization - - - - - ShortURLVisualizationController - /vis/* - - - - AjaxVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.AjaxVisualizationController - - - - AjaxVisualizationController - /visualizationAjax - - - - DataVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController - - - - DataVisualizationController - /visualizationData - - - - primitiveRdfEdit - edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveRdfEdit - - - primitiveRdfEdit - /edit/primitiveRdfEdit - - - - primitiveDelete - edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveDelete - - - primitiveDelete - /edit/primitiveDelete - - - - PageController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.PageController - - - - - ExportQrCodeController - edu.cornell.mannlib.vitro.webapp.controller.ExportQrCodeController - - - ExportQrCodeController - /qrcode - - - - AboutQrCodesController - edu.cornell.mannlib.vitro.webapp.controller.AboutQrCodesController - - - AboutQrCodesController - /qrcode/about - - - - FileHarvestController - edu.cornell.mannlib.vitro.webapp.controller.harvester.FileHarvestController - - - FileHarvestController - /harvester/harvest - - - - - GadgetController - edu.ucsf.vitro.opensocial.GadgetController - - - GadgetController - /orng/* - - - - Multiple-language support. Allows user to select his preferred langauge - LocaleSelectionController - edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionController - - - LocaleSelectionController - /selectLocale - - - - SiteMap support - SiteMapServlet - org.vivoweb.webapp.sitemap.SiteMapServlet - - - SiteMapServlet - /robots.txt - - - SiteMapServlet - /sitemap.xml - - - - - - mailusers - /mailusers - - - - ontology - /ontology/* - - - - individual - /entity - - - individual - /entity/* - - - individual - /individual - - - individual - /individual/* - - - individual - /display - - - individual - /display/* - - - - authenticate - /authenticate - - - loginExternalAuthSetup - /loginExternalAuth - - - loginExternalAuthReturn - /loginExternalAuthReturn - - - logout - /logout - - - - - - SparlQueryBuilder - edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryBuilderServlet - - - SparlQueryBuilder - /admin/sparqlquerybuilder - - - - GetAllClasses - edu.cornell.mannlib.vitro.webapp.sparql.GetAllClasses - - - GetAllClasses - /admin/getAllClasses - - - - GetAllPrefix - edu.cornell.mannlib.vitro.webapp.sparql.GetAllPrefix - - - GetAllPrefix - /admin/getAllPrefix - - - - GetClazzDataProperties - edu.cornell.mannlib.vitro.webapp.sparql.GetClazzDataProperties - - - GetClazzDataProperties - /admin/getClazzDataProperties - - - - GetClazzAllProperties - edu.cornell.mannlib.vitro.webapp.sparql.GetClazzAllProperties - - - GetClazzAllProperties - /admin/getClazzAllProperties - - - - GetClazzObjectProperties - edu.cornell.mannlib.vitro.webapp.sparql.GetClazzObjectProperties - - - GetClazzObjectProperties - /admin/getClazzObjectProperties - - - - GetObjectClasses - edu.cornell.mannlib.vitro.webapp.sparql.GetObjectClasses - - - GetObjectClasses - /admin/getObjectClasses - - - - SearchServiceController - edu.cornell.mannlib.vitro.webapp.search.controller.SearchServiceController - - - SearchServiceController - /searchService/* - - - - OrcidIntegrationController - edu.cornell.mannlib.vivo.orcid.controller.OrcidIntegrationController - - - OrcidIntegrationController - /orcid/* - - - - - TpfServlet - TpfServlet - org.vivoweb.linkeddatafragments.servlet.VitroLinkedDataFragmentServlet - - - TpfServlet - /tpf/* - @@ -1596,15 +246,4 @@ - - - - - - -