diff --git a/api/pom.xml b/api/pom.xml index 7917eba4e..f44774ea8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -44,8 +44,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.1.0 provided diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java index 07e8ee09f..98e0e03c0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java +++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java @@ -3,6 +3,8 @@ package edu.cornell.mannlib.vedit.controller; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; + +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -21,6 +23,7 @@ import java.io.IOException; * @author bjl23 * */ +@WebServlet(name = "EditFrontController", urlPatterns = {"/editForm"} ) public class EditFrontController extends VitroHttpServlet { private static final Log log = LogFactory.getLog(EditFrontController.class.getName()); private static final String CONTROLLER_PKG = "edu.cornell.mannlib.vitro.webapp.controller.edit"; diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java index e688e4661..6547be004 100644 --- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java @@ -11,6 +11,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,6 +28,7 @@ import edu.cornell.mannlib.vedit.util.OperationUtils; import edu.cornell.mannlib.vedit.validator.ValidationObject; import edu.cornell.mannlib.vedit.validator.Validator; +@WebServlet(name = "OperationController", urlPatterns = {"/doEdit"} ) public class OperationController extends BaseEditController { private static final Log log = LogFactory.getLog(OperationController.class.getName()); 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 e2fe2df68..274bec982 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 @@ -11,6 +11,7 @@ import java.util.List; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; * @author bdc34 * */ +@WebServlet(name = "DashboardPropertyListController", urlPatterns = {"/dashboardPropList"} ) public class DashboardPropertyListController extends VitroHttpServlet { /** diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java index 6d1124394..06ce8c50e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java @@ -12,6 +12,7 @@ import java.io.IOException; import java.util.Collection; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -37,6 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.utils.http.AcceptHeaderParsingException; import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException; +@WebServlet(name = "IndividualListRdf", urlPatterns = {"/listrdf/*"} ) public class IndividualListRdfController extends VitroApiServlet { private static final Log log = LogFactory .getLog(IndividualListRdfController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java index f01aea93c..612dc6203 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java @@ -17,6 +17,7 @@ import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao; import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory; +@WebServlet(name = "mailusers", urlPatterns = {"/mailusers"}, loadOnStartup = 5) public class MailUsersServlet extends VitroHttpServlet { private static final Log log = LogFactory.getLog(MailUsersServlet.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java index f64ceccc6..2e3773b22 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java @@ -233,7 +233,7 @@ public class MultipartRequestWrapper extends HttpServletRequestWrapper { * Look in the map of parsed parameters. Make a protective copy. */ @Override - public Enumeration getParameterNames() { + public Enumeration getParameterNames() { return Collections.enumeration(new HashSet<>(parameters.keySet())); } 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 5f93836f9..ce3cd1c64 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 @@ -8,6 +8,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; 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.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils; import edu.cornell.mannlib.vitro.webapp.web.ContentType; +@WebServlet(name = "ontology", urlPatterns = {"/ontology/*"}) public class OntologyController extends VitroHttpServlet{ private static final Log log = LogFactory.getLog(OntologyController.class.getName()); 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 412355438..acf738b3d 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 @@ -7,6 +7,7 @@ import java.util.HashMap; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +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.auth.permissions.SimplePermission; * This servlet works as a RequestDispatcher to direct to the sparl query builder page. * @author yuysun */ +@WebServlet(name = "SparlQueryBuilder", urlPatterns = {"/admin/sparqlquerybuilder"}) public class SparqlQueryBuilderServlet extends BaseEditController { private static final Log log = LogFactory.getLog(SparqlQueryBuilderServlet.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java index bcf5d3a5f..0b850b590 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java @@ -15,10 +15,13 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import javax.servlet.annotation.WebServlet; + /** * Parcel out the different actions required of the Administrators portion of * the UserAccounts GUI. */ +@WebServlet(name = "AccountsAdmin", urlPatterns = {"/accountsAdmin/*"} ) public class UserAccountsAdminController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(UserAccountsAdminController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java index 8b6894747..d671962fc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.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; @@ -18,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; /** * Handle the AJAX functions that are specific to the UserAccounts pages. */ +@WebServlet(name = "AccountsAjax", urlPatterns = {"/accountsAjax/*"} ) public class UserAccountsAjaxController extends VitroAjaxController { private static final Log log = LogFactory .getLog(UserAccountsAjaxController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java index 3074b33f7..bfd135034 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java @@ -15,9 +15,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import javax.servlet.annotation.WebServlet; + /** * Parcel out the different actions required of the ManageProxies GUI. */ +@WebServlet(name = "ManageProxies", urlPatterns = {"/manageProxies/*"} ) public class ManageProxiesController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(ManageProxiesController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java index c1e936419..97d2e1ce2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.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; @@ -18,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; /** * Handle the AJAX functions that are specific to the ManageProxies pages. */ +@WebServlet(name = "ProxiesAjax", urlPatterns = {"/proxiesAjax/*"} ) public class ManageProxiesAjaxController extends VitroAjaxController { private static final Log log = LogFactory .getLog(ManageProxiesAjaxController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java index de90d217d..0fa6d4903 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts.user; import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.EXTERNAL; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; @@ -26,6 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n; /** * Parcel out the different actions required of the UserAccounts GUI. */ +@WebServlet(name = "AccountsUser", urlPatterns = {"/accounts/*"} ) public class UserAccountsUserController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(UserAccountsUserController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java index 86ba316db..88a437dd2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java @@ -18,10 +18,13 @@ 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.i18n.I18n; +import javax.servlet.annotation.WebServlet; + /** * Offer the user the ability to apply a RestrictedAuthenticator or revert to a * BasicAuthenticator. */ +@WebServlet(name = "RestrictLogins", urlPatterns = {"/admin/restrictLogins"} ) public class RestrictLoginsController extends FreemarkerHttpServlet { public static final String PARAMETER_RESTRICT = "restrict"; public static final String PARAMETER_OPEN = "open"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java index 7d8f5274e..b3ee6af2d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.TreeMap; import javax.servlet.ServletContext; +import javax.servlet.annotation.WebServlet; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories; @@ -36,6 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem * Show a summary of who is logged in and how they are to be treated by the * authorization system. */ +@WebServlet(name = "ShowAuth", urlPatterns = {"/admin/showAuth"} ) public class ShowAuthController extends FreemarkerHttpServlet { @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java index 7f6780e78..dcd7b5487 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java @@ -17,10 +17,13 @@ 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.utils.threads.VitroBackgroundThread; +import javax.servlet.annotation.WebServlet; + /** * Show the list of living background threads (instances of * VitroBackgroundThread), and their status. */ +@WebServlet(name = "ShowBackgroundThreads", urlPatterns = {"/admin/showThreads"} ) public class ShowBackgroundThreadsController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "admin-showThreads.ftl"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java index b496384a8..e345445ac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java @@ -16,9 +16,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ 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; + /** * Show the current ConfigurationProperties and the Java system properties. */ +@WebServlet(name = "ShowConfiguration", urlPatterns = {"/admin/showConfiguration"} ) public class ShowConfiguration extends FreemarkerHttpServlet { @Override protected AuthorizationRequest requiredActions(VitroRequest vreq) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java index 5df2d68bb..c04199160 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java @@ -34,6 +34,8 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.RequestModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.logging.ComplexStringFormatter; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; +import javax.servlet.annotation.WebServlet; + /** * Show the details of where our RDF data is coming from. What are the * structures that supply the triples? @@ -103,6 +105,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; * At the same time, write these to the log as INFO messages, without the fancy formatting. * */ +@WebServlet(name = "ShowRDFSources", urlPatterns = {"/admin/showSources"} ) public class ShowSourcesController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(ShowSourcesController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java index 5879fcb55..df1fb7440 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -43,6 +44,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparql.SparqlQueryUtils; /** * Present the SPARQL Query form, and execute the queries. */ +@WebServlet(name = "SparqlQuery", urlPatterns = {"/admin/sparqlquery"}) public class SparqlQueryController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(SparqlQueryController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java index 388a76215..2a755d1d3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java @@ -14,9 +14,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.i18n.I18n; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; +import javax.servlet.annotation.WebServlet; + /** * Display the startup status page. */ +@WebServlet(name = "StartupStatus", urlPatterns = {"/startupStatus"} ) public class StartupStatusController extends FreemarkerHttpServlet { @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java index 585f31d94..69ea5ed4d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java @@ -14,6 +14,7 @@ import java.util.Enumeration; import java.util.List; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -41,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread.Work * * Otherwise, the result will be 200 (OK), with a brief message. */ +@WebServlet(name = "WaitForBackgroundThreads", urlPatterns = {"/admin/wait"} ) public class WaitForBackgroundThreadsController extends VitroHttpServlet { private static final Log log = LogFactory .getLog(WaitForBackgroundThreadsController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java index b13c4b4a2..03fbc4f5a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.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; @@ -29,6 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; * * The result is delivered in JSON format. */ +@WebServlet(name = "ajaxSparqlQuery", urlPatterns = {"/ajax/sparqlQuery"} ) public class SparqlQueryAjaxController extends VitroAjaxController { private static final Log log = LogFactory .getLog(SparqlQueryAjaxController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java index dfe79d767..16e75d06b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java @@ -10,6 +10,7 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE; import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -40,6 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException; * 500 Unknown error * */ +@WebServlet(name = "SparqlQueryApi", urlPatterns = {"/api/sparqlQuery"}) public class SparqlQueryApiController extends VitroApiServlet { private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_SPARQL_QUERY_API.ACTION; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java index 08f83a2b6..682d73281 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java @@ -11,6 +11,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; @@ -48,6 +49,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer; * 500 Unknown error * */ +@WebServlet(name = "SparqlUpdateApi", urlPatterns = {"/api/sparqlUpdate"}) public class SparqlUpdateApiController extends VitroApiServlet { private static final Log log = LogFactory .getLog(SparqlUpdateApiController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java index 1b044a58a..d7efcd82a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java @@ -23,6 +23,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Red 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; + /** * Provide a "hidden" login page for systems where the Login Widget has been * modified to only show the link to an External Authentication system. @@ -30,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem * This page is only hidden because there is no link to it. Anyone who knows the * URL can come here, but they need to pass Internal Authentication to proceed. */ +@WebServlet(name = "adminLogin", urlPatterns = {"/admin/login"}) public class AdminLoginController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(AdminLoginController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java index 56d1f965d..1db8c4c16 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.util.Enumeration; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Messag * Handle the return from the external authorization login server. If we are * successful, record the login. Otherwise, display the failure. */ +@WebServlet(name = "loginExternalAuthReturn", urlPatterns = {"/loginExternalAuthReturn"}) public class LoginExternalAuthReturn extends BaseLoginServlet { private static final Log log = LogFactory .getLog(LoginExternalAuthReturn.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java index e64980db7..5dbd4b069 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.Enumeration; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -22,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean; * Send a request to the external authorization server that will return us to * the LoginExternalAuthReturn servlet for further processing. */ +@WebServlet(name = "loginExternalAuthSetup", urlPatterns = {"/loginExternalAuth"}) public class LoginExternalAuthSetup extends BaseLoginServlet { private static final Log log = LogFactory .getLog(LoginExternalAuthSetup.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java index 664a7d557..1c775f1a0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.io.PrintWriter; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -24,6 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.Lo * Provide a means for programmatic login If they provide the right parameters, * log them in and send 200. Otherwise, send 403 error. */ +@WebServlet(name = "programLogin", urlPatterns = {"/programLogin"}) public class ProgramLogin extends HttpServlet { private static final Log log = LogFactory.getLog(ProgramLogin.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java index 3c2302266..45fabe992 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -35,6 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; * The first request, the selection and the redirected dump should all be GET * requests. A restore should be a POST request. */ +@WebServlet(name = "DumpRestoreController", urlPatterns = {"/dumpRestore/*"} ) public class DumpRestoreController extends FreemarkerHttpServlet { private static final RequestedAction REQUIRED_ACTION = SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java index c9e155466..da38df6a4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java @@ -18,6 +18,7 @@ import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -42,6 +43,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginLogoutEvent; +@WebServlet(name = "authenticate", urlPatterns = {"/authenticate"}) public class Authenticate extends VitroHttpServlet { private static final Log log = LogFactory.getLog(Authenticate.class .getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java index 44f6cf343..7f8310d4e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import java.io.IOException; import java.util.HashMap; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -18,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; +@WebServlet(name = "Classes2ClassesOperationController", urlPatterns = {"/classes2ClassesOp"} ) public class Classes2ClassesOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(Classes2ClassesOperationController.class.getName()); 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 6ee09beb5..4c300fb39 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 @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,6 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; +@WebServlet(name = "DatapropEditController", urlPatterns = {"/datapropEdit"} ) public class DatapropEditController extends BaseEditController { private static final Log log = LogFactory.getLog(DatapropEditController.class.getName()); 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 22d711f61..54c99473e 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 @@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import java.io.IOException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -22,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao; +@WebServlet(name = "DatatypeRetryController", urlPatterns = {"/datatype_retry"} ) public class DatatypeRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(DatatypeRetryController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java index e7d64d410..a557308af 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.StringWriter; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; /** *Process deletions for page, deleting page, data getters and any associated menu items. */ +@WebServlet(name = "DeletePageController", urlPatterns = {"/deletePageController"} ) public class DeletePageController extends VitroHttpServlet { private final static String REDIRECT_URL = "/pageList"; 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 9a3dfee95..6f39b35e1 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 @@ -10,6 +10,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,6 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao; +@WebServlet(name = "EntityEditController", urlPatterns = {"/entityEdit"} ) public class EntityEditController extends BaseEditController { private static final Log log = LogFactory.getLog(EntityEditController.class.getName()); 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 211faeb5f..c3d1641ed 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 @@ -14,6 +14,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,6 +52,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.listener.impl.IndividualDataPropertyStatementProcessor; +@WebServlet(name = "EntityRetryController", urlPatterns = {"/entity_retry"} ) public class EntityRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(EntityRetryController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java index 312e6ac25..2592969c7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import java.io.IOException; import java.util.HashMap; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; +@WebServlet(name = "IndividualTypeOperationController", urlPatterns = {"/individualTypeOp"} ) public class IndividualTypeOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeOperationController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java index dc2dd3acf..faf883375 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n; /** * Provide a means for programmatic logout. */ +@WebServlet(name = "logout", urlPatterns = {"/logout"}) public class Logout extends HttpServlet { private static final Log log = LogFactory.getLog(Logout.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java index 53480cc0d..978f35f3c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java @@ -8,6 +8,7 @@ import java.io.StringWriter; import java.io.Writer; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; *Process edits from display model editing, so form should submit to this page which should *then process the parameters and then make the necessary changes to the model. */ +@WebServlet(name = "MenuManagementEdit", urlPatterns = {"/menuManagementEdit"} ) public class MenuManagementEdit extends VitroHttpServlet { private static final String CMD_PARAM = "cmd"; private final static String REORDER_PARAM_VALUE = "Reorder"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java index 93a30468f..af5997efa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.HashSet; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; +@WebServlet(name = "NamespacePrefixOperationController", urlPatterns = {"/namespacePrefixOp"} ) public class NamespacePrefixOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeOperationController.class.getName()); 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 de78b9097..8a588f391 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 @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +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.dao.OntologyDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntologyDaoJena; +@WebServlet(name = "OntologyEditController", urlPatterns = {"/ontologyEdit"} ) public class OntologyEditController extends BaseEditController { private static final Log log = LogFactory.getLog(OntologyEditController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java index ada1dbe5e..aeea323ee 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java @@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; @@ -18,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +@WebServlet(name = "primitiveDelete", urlPatterns = {"/edit/primitiveDelete"}) public class PrimitiveDelete extends VitroAjaxController { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java index ce4868322..1e4b4ee22 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java @@ -12,6 +12,7 @@ import java.util.HashSet; import java.util.Set; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -30,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardModelSelector; +@WebServlet(name = "primitiveRdfEdit", urlPatterns = {"/edit/primitiveRdfEdit"}) public class PrimitiveRdfEdit extends VitroAjaxController { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java index 40e9c019f..166a89b4e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import java.io.IOException; import java.util.HashMap; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao; +@WebServlet(name = "Properties2PropertiesOperationController", urlPatterns = {"/props2PropsOp"} ) public class Properties2PropertiesOperationController extends BaseEditController { 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 fb10dd860..97620f9be 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 @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +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.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; +@WebServlet(name = "PropertyEditController", urlPatterns = {"/propertyEdit"} ) public class PropertyEditController extends BaseEditController { private static final Log log = LogFactory.getLog(PropertyEditController.class.getName()); 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 1db540d9c..c8b212faf 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 @@ -13,6 +13,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,6 +58,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup; +@WebServlet(name = "RefactorOperationController", urlPatterns = {"/refactorOp"} ) public class RefactorOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(RefactorOperationController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java index c5a859193..550bb851a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java @@ -7,6 +7,7 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -42,6 +43,7 @@ import java.io.IOException; * @author rjy7 * */ +@WebServlet(name = "ReorderController", urlPatterns = {"/edit/reorder"} ) public class ReorderController extends VitroAjaxController { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java index d19d451cc..f9c51db71 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java @@ -7,6 +7,7 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSER import java.util.HashMap; import java.util.Iterator; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,6 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +@WebServlet(name = "RestrictionOperationController", urlPatterns = {"/addRestriction"} ) public class RestrictionOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(RestrictionOperationController.class.getName()); 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 b5a6899a8..9e5c682be 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 @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +@WebServlet(name = "VclassEditController", urlPatterns = {"/vclassEdit"} ) public class VclassEditController extends BaseEditController { private static final Log log = LogFactory.getLog(VclassEditController.class.getName()); 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 b037c35b3..5cc9ba747 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 @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +@WebServlet(name = "VclassRetryController", urlPatterns = {"/vclass_retry"} ) public class VclassRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(VclassRetryController.class.getName()); 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 1738db01e..eef50a63b 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 @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit.listing; import java.util.ArrayList; import java.util.Iterator; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -20,6 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; +@WebServlet(name = "DataPropertyStatementListingController", urlPatterns = {"/listDataPropertyStatements"} ) public class DataPropertyStatementListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { 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 7f8678653..fc94aee2a 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 @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -23,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; +@WebServlet(name = "IndividualsListingController", urlPatterns = {"/listIndividuals"} ) public class IndividualsListingController extends BaseEditController { //private static final int MAX_INDIVIDUALS = 50; 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 f8ff7189d..ba56b401c 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 @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -23,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; +@WebServlet(name = "ObjectPropertyStatementListingController", urlPatterns = {"/listObjectPropertyStatements"} ) public class ObjectPropertyStatementListingController extends BaseEditController { 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 4b5025f1b..522d2d6e1 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 @@ -6,6 +6,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao; import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler; +@WebServlet(name = "OntologiesListingController", urlPatterns = {"/listOntologies"} ) public class OntologiesListingController extends BaseEditController { @Override 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 502df6c7a..c6a09d0d2 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 @@ -6,6 +6,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.Iterator; +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.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +@WebServlet(name = "NamespacesListingController", urlPatterns = {"/listNamespaces"} ) public class NamespacesListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { 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 64e04b6fa..4072bd835 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 @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena; import java.util.ArrayList; import java.util.Iterator; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -37,6 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +@WebServlet(name = "RestrictionsListingController", urlPatterns = {"/listRestrictions"} ) public class RestrictionsListingController extends BaseEditController { private static String LAMBDA = ""; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java index 83c9d9150..545c62299 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java @@ -13,6 +13,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "AboutController", urlPatterns = {"/about"} ) public class AboutController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java index 998106d64..dacaa2a4b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -36,6 +37,46 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { protected static final String TEMPLATE_DEFAULT = "siteAdmin-main.ftl"; public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.SEE_SITE_ADMIN_PAGE.ACTION; + + private static final List siteMaintenanceUrls = new ArrayList<>(); + private static final List siteConfigData = new ArrayList<>(); + + public static void registerSiteMaintenanceUrl(String key, String url, AuthorizationRequest permission) { + AdminUrl adminUrl = new AdminUrl(); + + adminUrl.key = key; + adminUrl.url = url; + adminUrl.permission = permission; + + siteMaintenanceUrls.add(adminUrl); + } + + public static void registerSiteConfigData(String key, String url, AuthorizationRequest permission) { + AdminUrl adminUrl = new AdminUrl(); + + adminUrl.key = key; + adminUrl.url = url; + adminUrl.permission = permission; + + siteConfigData.add(adminUrl); + } + + static { + registerSiteMaintenanceUrl("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences"), SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION); + registerSiteMaintenanceUrl("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex"), IndexController.REQUIRED_ACTIONS); + registerSiteMaintenanceUrl("startupStatus", UrlBuilder.getUrl("/startupStatus"), SimplePermission.SEE_STARTUP_STATUS.ACTION); + registerSiteMaintenanceUrl("restrictLogins", UrlBuilder.getUrl("/admin/restrictLogins"), SimplePermission.LOGIN_DURING_MAINTENANCE.ACTION); + registerSiteMaintenanceUrl("activateDeveloperPanel", "javascript:new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel({developer_enabled: true});", SimplePermission.ENABLE_DEVELOPER_PANEL.ACTION); + + registerSiteConfigData("userAccounts", UrlBuilder.getUrl("/accountsAdmin"), SimplePermission.MANAGE_USER_ACCOUNTS.ACTION); + registerSiteConfigData("manageProxies", UrlBuilder.getUrl("/manageProxies"), SimplePermission.MANAGE_PROXIES.ACTION); + registerSiteConfigData("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean"), SimplePermission.EDIT_SITE_INFORMATION.ACTION); + //TODO: Add specific permissions for page management + registerSiteConfigData("menuManagement", UrlBuilder.getUrl("/individual", + "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu", + "switchToDisplayModel", "true"), SimplePermission.MANAGE_MENUS.ACTION); + registerSiteConfigData("pageManagement", UrlBuilder.getUrl("/pageList"), SimplePermission.MANAGE_MENUS.ACTION); + } @Override protected AuthorizationRequest requiredActions(VitroRequest vreq) { @@ -65,27 +106,16 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map urls = new HashMap<>(); - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { - urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences")); + for (AdminUrl adminUrl : siteMaintenanceUrls) { + if (adminUrl.permission == null || PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { + urls.put(adminUrl.key, adminUrl.url); + } } - - if (PolicyHelper.isAuthorizedForActions(vreq, IndexController.REQUIRED_ACTIONS)) { - urls.put("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex")); - } - + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTION)) { - urls.put("startupStatus", UrlBuilder.getUrl("/startupStatus")); urls.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear()); } - - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.LOGIN_DURING_MAINTENANCE.ACTION)) { - urls.put("restrictLogins", UrlBuilder.getUrl("/admin/restrictLogins")); - } - - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.ENABLE_DEVELOPER_PANEL.ACTION)) { - urls.put("activateDeveloperPanel", "javascript:new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel({developer_enabled: true});"); - } - + return urls; } @@ -130,27 +160,13 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { protected Map getSiteConfigData(VitroRequest vreq) { Map data = new HashMap(); - - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_USER_ACCOUNTS.ACTION)) { - data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin")); + + for (AdminUrl adminUrl : siteConfigData) { + if (adminUrl.permission == null || PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { + data.put(adminUrl.key, adminUrl.url); + } } - - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_PROXIES.ACTION)) { - data.put("manageProxies", UrlBuilder.getUrl("/manageProxies")); - } - - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_SITE_INFORMATION.ACTION)) { - data.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean")); - } - - //TODO: Add specific permissions for page management - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_MENUS.ACTION)) { - data.put("menuManagement", UrlBuilder.getUrl("/individual", - "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu", - "switchToDisplayModel", "true")); - data.put("pageManagement", UrlBuilder.getUrl("/pageList")); - } - + return data; } @@ -211,4 +227,9 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { return urls; } + final static class AdminUrl { + String key; + String url; + AuthorizationRequest permission; + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java index 46c22e56e..5b97f51f1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java @@ -18,6 +18,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "browsecontroller", urlPatterns = {"/browse"}, loadOnStartup = 5) public class BrowseController extends FreemarkerHttpServlet { static final long serialVersionUID=2006030721126L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java index 84a315fab..b442f61fa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java @@ -15,10 +15,13 @@ 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.email.FreemarkerEmailFactory; +import javax.servlet.annotation.WebServlet; + /** * Controller for comments ("contact us") page * * @author bjl23 */ +@WebServlet(name = "ContactFormController", urlPatterns = {"/contact"} ) public class ContactFormController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 71b36a534..fdb706414 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -21,6 +21,7 @@ import javax.mail.Transport; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; @@ -34,6 +35,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.email.FreemarkerEmailFactory; +@WebServlet(name = "sendMail", urlPatterns = {"/submitFeedback"}, loadOnStartup = 5) public class ContactMailController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(ContactMailController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java index a292b639a..e53e257c4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java @@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.HashMap; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -28,6 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; * Custom deletion controller to which deletion requests from default property form are sent. May be replaced * later with additional features in process rdf form controller or alternative location. */ +@WebServlet(name = "DeletePropertyController", urlPatterns = {"/deletePropertyController"} ) public class DeletePropertyController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(DeletePropertyController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java index d09d1a10d..d327571e2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java @@ -17,6 +17,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter; import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "HomePageController", urlPatterns = {"/home"} ) public class HomePageController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java index f94f3a1e0..1ffe091ce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.UNAUTHORIZED; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import org.apache.commons.fileupload.FileItem; @@ -38,6 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil; /** * Handle adding, replacing or deleting the main image on an Individual. */ +@WebServlet(name = "ImageUploadController", urlPatterns = {"/uploadImages"} ) public class ImageUploadController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java index afa6e4b20..f2aab469e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java @@ -28,9 +28,12 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery; import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchQueryUtils; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; +import javax.servlet.annotation.WebServlet; + /** * Generates a list of individuals for display in a template */ +@WebServlet(name = "IndividualListController", urlPatterns = {"/individuallist"} ) public class IndividualListController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java index 1ed6b5d8d..d4275b280 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java @@ -22,7 +22,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ListClassGroupsController", urlPatterns = {"/listGroups"} ) public class ListClassGroupsController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ListClassGroupsController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java index 9dfa6eb54..a85f68224 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java @@ -29,6 +29,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ListDatatypePropertiesController", urlPatterns = {"/listDatatypeProperties"} ) public class ListDatatypePropertiesController extends FreemarkerHttpServlet { private static Log log = LogFactory.getLog( ListDatatypePropertiesController.class ); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java index eba0f1c7f..8675d4d6b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java @@ -23,6 +23,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ListFauxPropertiesController", urlPatterns = {"/listFauxProperties"} ) public class ListFauxPropertiesController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ListFauxPropertiesController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java index b6e4704ee..a522829cd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java @@ -24,6 +24,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ListPropertyGroupsController", urlPatterns = {"/listPropertyGroups"} ) public class ListPropertyGroupsController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java index 48f63f8a5..a60e16ac2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java @@ -33,6 +33,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ListPropertyWebappsController", urlPatterns = {"/listPropertyWebapps"} ) public class ListPropertyWebappsController extends FreemarkerHttpServlet { private static Log log = LogFactory.getLog( ListPropertyWebappsController.class ); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java index caa2251a5..465c43b65 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java @@ -26,7 +26,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ListVClassWebappsController", urlPatterns = {"/listVClassWebapps"} ) public class ListVClassWebappsController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ListVClassWebappsController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java index af568e6c7..29ac5e1b8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletContext; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -40,6 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils; * * See implementations of PageDataGetter for more variables. */ +@WebServlet(name = "PageController", urlPatterns = "/pageController") public class PageController extends FreemarkerHttpServlet{ private static final Log log = LogFactory.getLog(PageController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java index 3ca3e0356..a07e8c0b4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java @@ -12,9 +12,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import javax.servlet.annotation.WebServlet; + /** * Display the detailed revision information. */ +@WebServlet(name = "RevisionInfoController", urlPatterns = {"/revisionInfo"} ) public class RevisionInfoController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final String TEMPLATE_DEFAULT = "revisionInfo.ftl"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java index 9107e30ac..af100c6ad 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java @@ -14,11 +14,14 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import javax.servlet.annotation.WebServlet; + /** * Freemarker controller and template samples. * @author rjy7 * */ +@WebServlet(name = "FreemarkerSamplesController", urlPatterns = {"/freemarkersamples"} ) public class SamplesController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java index a969c3fd3..f66163b7e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java @@ -28,7 +28,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ShowClassHierarchyController", urlPatterns = {"/showClassHierarchy"} ) public class ShowClassHierarchyController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ShowClassHierarchyController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java index 089bba107..5aaa0479f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java @@ -28,6 +28,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ShowDataPropertyHierarchyController", urlPatterns = {"/showDataPropertyHierarchy"} ) public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ShowDataPropertyHierarchyController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java index 62d3981a2..8dc204dc0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java @@ -29,6 +29,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "ShowObjectPropertyHierarchyController", urlPatterns = {"/showObjectPropertyHierarchy"} ) public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(ShowObjectPropertyHierarchyController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java index 25e1b87cd..fb4158988 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java @@ -18,6 +18,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "SimpleReasonerRecomputeController", urlPatterns = {"/RecomputeInferences"} ) public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog( diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java index 425d34c4b..4827cd259 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java @@ -5,6 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "SiteAdminController", urlPatterns = {"/siteAdmin","/siteAdmin.jsp"} ) public class SiteAdminController extends BaseSiteAdminController { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java index 92a64134a..e7c9d7a63 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java @@ -14,10 +14,13 @@ 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.i18n.I18n; +import javax.servlet.annotation.WebServlet; + /* * Servlet that only specifies a template, without putting any data * into the template model. Page content is fully specified in the template. */ +@WebServlet(name = "StaticPageController", urlPatterns = {"/login"} ) public class StaticPageController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java index 5f0ea4f34..7de7bec51 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java @@ -13,6 +13,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import javax.servlet.annotation.WebServlet; + +@WebServlet(name = "TermsOfUseController", urlPatterns = {"/termsOfUse"} ) public class TermsOfUseController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java index 29abf3d1e..d1eadbfe8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; +import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -12,11 +13,17 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Freemarker controller and template sandbox. * @author rjy7 * */ +@WebServlet(name = "FreemarkerTestController", displayName = "FreemarkerTestController", urlPatterns = {"/freemarkertest"} ) public class TestController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java index cc01b5e8f..2f573188c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java @@ -13,6 +13,7 @@ import java.util.Locale; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -39,6 +40,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataProper /*Servlet to view all labels in various languages for individual*/ +@WebServlet(name = "ViewLabelsServlet", urlPatterns = {"/viewLabels"} ) public class ViewLabelsServlet extends FreemarkerHttpServlet{ private static final Log log = LogFactory.getLog(ViewLabelsServlet.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java index fb07a0b1e..303d6869e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java @@ -10,6 +10,7 @@ import java.util.Map; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,6 +35,7 @@ import org.apache.jena.rdf.model.Literal; * @author Eliza Chan (elc2013@med.cornell.edu) * */ +@WebServlet(name = "Google Refine Mqlread Service", urlPatterns = {"/grefineMqlread"} ) public class GrefineMqlreadServlet extends VitroHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java index 68b9eddf0..be06db3d7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java @@ -14,6 +14,7 @@ import java.util.List; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -40,6 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; * @author Eliza Chan (elc2013@med.cornell.edu) * */ +@WebServlet(name = "Google Refine Property List Service", urlPatterns = {"/get_properties_of_type"} ) public class GrefinePropertyListServlet extends VitroHttpServlet { private int MAXDEPTH = 7; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java index c8ace7803..38a39b2e8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java @@ -12,6 +12,7 @@ import java.util.Map; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -41,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; * @author Eliza Chan (elc2013@med.cornell.edu) * */ +@WebServlet(name = "JSON Reconcile Service", urlPatterns = {"/reconcile"} ) public class JSONReconcileServlet extends VitroHttpServlet { private static final String PARAM_QUERY = "term"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java index e3bf884e2..35a8ed89b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,6 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n; /** * Handles requests for entity information. */ +@WebServlet(name = "individual", urlPatterns = {"/display","/display/*","/entity","/entity/*","/individual","/individual/*"}) public class IndividualController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(IndividualController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java index 6a97e736a..3273ed93f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,6 +52,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule; +@WebServlet(name = "JenaAdminServlet", urlPatterns = {"/jenaAdmin"} ) public class JenaAdminActions extends BaseEditController { private static final Log log = LogFactory.getLog(JenaAdminActions.class.getName()); 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 1824c2a7e..d8a1f9099 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 @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,6 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.Csv2Rdf; import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils; +@WebServlet(name = "JenaCsv2RdfController", urlPatterns = {"/csv2rdf"} ) public class JenaCsv2RdfController extends JenaIngestController { Log log = LogFactory.getLog( JenaCsv2RdfController.class ); 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 4d7db548f..0edc02bbd 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 @@ -14,6 +14,7 @@ import java.io.OutputStream; import java.util.HashMap; import java.util.Map; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -41,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils; +@WebServlet(name = "JenaExportController", urlPatterns = {"/export/*"} ) public class JenaExportController extends BaseEditController { private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION .or(SimplePermission.EDIT_ONTOLOGY.ACTION); 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 50014cf4e..e5dfac058 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 @@ -29,6 +29,7 @@ import java.util.regex.Pattern; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -80,6 +81,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils; import edu.cornell.mannlib.vitro.webapp.utils.jena.WorkflowOntology; import edu.cornell.mannlib.vitro.webapp.utils.sparql.SparqlQueryUtils; +@WebServlet(name = "JenaIngestController", urlPatterns = {"/ingest"} ) public class JenaIngestController extends BaseEditController { private static final Log log = LogFactory.getLog(JenaIngestController.class); 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 97729606d..d5cf345f8 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 @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.transform.stream.StreamSource; @@ -36,7 +37,8 @@ import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -public class JenaXMLFileUpload extends JenaIngestController { +@WebServlet(name = "JenaXMLFileUpload", urlPatterns = {"/jenaXmlFileUpload/*"} ) +public class JenaXMLFileUpload extends JenaIngestController { Log log = LogFactory.getLog(JenaXMLFileUpload.class); private String baseDirectoryForFiles; private int maxFileSize = 1024 * 1024 * 500; 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 ec0fc9884..748e4a248 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 @@ -16,6 +16,7 @@ import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -50,6 +51,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel; +@WebServlet(name = "RDFUploadController", urlPatterns = {"/uploadRDF"} ) public class RDFUploadController extends JenaIngestController { private static int maxFileSizeInBytes = 1024 * 1024 * 2000; //2000mb 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 1e2c79c0f..39f9d1230 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 @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.jena; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -13,6 +14,7 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +@WebServlet(name = "RDFUploadFormController", urlPatterns = {"/uploadRDFForm"} ) public class RDFUploadFormController extends BaseEditController { private static final Log log = LogFactory.getLog(RDFUploadFormController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java index 6b7a32543..5e67f4d56 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java @@ -7,6 +7,7 @@ import java.util.Collections; import java.util.List; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.log.LogUtils; * * Moved most of the logic into a group of JsonProducer classes. jeb228 */ +@WebServlet(name = "JSONService", urlPatterns = {"/dataservice"} ) public class JsonServlet extends VitroHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(JsonServlet.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java index 2674b3dc9..d1708939b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java @@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller; import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -30,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.log.LogUtils; * form. Try adding the behavior logic to the code that generates the * EditConfiguration for the form. */ +@WebServlet(name = "EditRequestAJAX", urlPatterns = {"/editRequestAJAX"} ) public class EditRequestAJAXController extends VitroHttpServlet { private static final long serialVersionUID = 1L; public static Log log = LogFactory.getLog(EditRequestDispatchController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index 3c2f7c1f4..f3f98dbd1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -7,6 +7,7 @@ import static edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigura import java.util.HashMap; import java.util.Map; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -47,6 +48,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit.MultiValueEditSu * form. Try adding the behavior logic to the code that generates the * EditConfiguration for the form. */ +@WebServlet(name = "EditRequestDispatch", urlPatterns = {"/editRequestDispatch"} ) public class EditRequestDispatchController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; public static Log log = LogFactory.getLog(EditRequestDispatchController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java index 40ef5e169..6e4932098 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -27,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController.Utilities; +@WebServlet(name = "PostEditCleanupController", urlPatterns = {"/postEditCleanupController"} ) public class PostEditCleanupController extends FreemarkerHttpServlet{ private static Log log = LogFactory.getLog(PostEditCleanupController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java index 3e447cbe9..6998738fa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java @@ -38,12 +38,15 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.ProcessRdfForm; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.RdfLiteralHash; +import javax.servlet.annotation.WebServlet; + /** * This servlet will convert a request to an EditSubmission, * find the EditConfiguration associated with the request, * use ProcessRdfForm to process these to a set of RDF additions and retractions, * the apply these to the models. */ +@WebServlet(name = "ProcessRdfFormController", urlPatterns = {"/edit/process"} ) public class ProcessRdfFormController extends FreemarkerHttpServlet{ private Log log = LogFactory.getLog(ProcessRdfFormController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java index 2737dc25e..9a647f345 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java @@ -12,6 +12,7 @@ import java.net.URLDecoder; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +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.modules.fileStorage.FileStorage; * the file system, return a 500. *

*/ +@WebServlet(name = "serveFiles", urlPatterns = {"/file/*"}) public class FileServingServlet extends VitroHttpServlet { /** If we can't locate the requested image, use this one instead. */ private static final String PATH_MISSING_LINK_IMAGE = "/images/missingLink.png"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java index e1119c82d..78124ea4b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java @@ -15,6 +15,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -67,6 +68,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchResultsParser; * An unconditional request may mean that there is no external cache, or that * the cache doesn't have a copy of this particular page. */ +@WebFilter(filterName = "Caching Response filter", urlPatterns = {"/*"}) public class CachingResponseFilter implements Filter { private static final Log log = LogFactory .getLog(CachingResponseFilter.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java index 015520cfd..f801a3c82 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java @@ -11,10 +11,12 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import org.apache.commons.fileupload.servlet.ServletFileUpload; +@WebFilter(filterName = "Character Set Encoding Filter", urlPatterns = {"/*"}) public class CharsetEncodingFilter implements Filter { @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java index 8491e4c81..1846db2f0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java @@ -4,12 +4,14 @@ package edu.cornell.mannlib.vitro.webapp.filters; import java.io.IOException; +import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletResponse; /** @@ -20,6 +22,7 @@ import javax.servlet.http.HttpServletResponse; * http://blogs.msdn.com/sdl/archive/2009/02/05/clickjacking-defense-in-ie8.aspx, * https://www.owasp.org/index.php/ClickjackFilter_for_Java_EE */ +@WebFilter(filterName = "ClickjackFilter", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST, DispatcherType.FORWARD}) public class ClickjackFilter implements Filter { @Override public void doFilter(ServletRequest request, ServletResponse response, diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/JSessionStripFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/JSessionStripFilter.java index 276e6a67b..556f47081 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/JSessionStripFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/JSessionStripFilter.java @@ -10,6 +10,7 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; @@ -36,6 +37,7 @@ import org.apache.commons.logging.LogFactory; } * some of this code is from URLRewriteFilter */ +@WebFilter(filterName = "JSession Strip Filter", urlPatterns = {"/*"}) public class JSessionStripFilter implements Filter { private FilterConfig filterConfig = null; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java index d2a4e738a..3dd4f0b95 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -15,6 +16,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -32,6 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; * * It should only be applied to requests, not forwards, includes or errors. */ +@WebFilter(filterName = "PageRoutingFilter", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST}) public class PageRoutingFilter implements Filter{ protected FilterConfig filterConfig; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java index 25c3cb377..6c9c55e8e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java @@ -7,12 +7,14 @@ import java.text.Collator; import java.util.Enumeration; import java.util.Locale; +import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; * * This is done in a filter, so it applies to both Servlets and JSPs. */ +@WebFilter(filterName = "RequestModelsPrep", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST, DispatcherType.FORWARD}) public class RequestModelsPrep implements Filter { private final static Log log = LogFactory.getLog(RequestModelsPrep.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java index 343411b07..960212b7b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java @@ -10,6 +10,7 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -23,6 +24,7 @@ import edu.cornell.mannlib.vedit.beans.LoginStatusBean; *
  • Other sessions are trivial, and should have a short interval.
    • * */ +@WebFilter(filterName = "Session Timeout Limiting Filter", urlPatterns = {"/*"}) public class SessionTimeoutLimitingFilter implements Filter { /** Maximum inactive interval for a trivial session object, in seconds. */ private static final int TRIVIAL_SESSION_LIFETIME = 120; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java index d27973112..c82d2f0ef 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java @@ -15,6 +15,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -38,6 +39,7 @@ import freemarker.template.TemplateException; * requests will display normally. However, if the status contains a fatal * error, this filter will hijack every request, and will not let you proceed. */ +@WebFilter(filterName = "Startup Status Display Filter", urlPatterns = {"/*"}) public class StartupStatusDisplayFilter implements Filter { private static final String TEMPLATE_PATH = "/templates/freemarker/body/admin/startupStatus-displayRaw.ftl"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java index e41be326f..7f79879c8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java @@ -11,6 +11,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletResponse; * @author bjl23 * */ +@WebFilter(filterName = "URL Rewriter Filter", urlPatterns = {"/*"}) public class URLRewriterFilter implements Filter { private ServletContext _context; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java index cdbe9a855..b1845b7a1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Locale; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n; * Set the new Locale in the Session using SelectedLocale and return to the * referrer. */ +@WebServlet(name = "LocaleSelectionController", urlPatterns = {"/selectLocale"}) public class LocaleSelectionController extends HttpServlet { private static final Log log = LogFactory .getLog(LocaleSelectionController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java index f9af6a537..07e68c9a8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java @@ -14,6 +14,7 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; @@ -29,6 +30,7 @@ import org.apache.commons.logging.LogFactory; * * Otherwise, just process the request as usual. */ +@WebFilter(filterName = "Locale selection filter", urlPatterns = {"/*"}) public class LocaleSelectionFilter implements Filter { private static final Log log = LogFactory .getLog(LocaleSelectionFilter.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java index 9d988b927..ad6b893ce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -42,6 +43,7 @@ import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; * via the search index. */ +@WebServlet(name = "AutocompleteController", urlPatterns = {"/autocomplete","/populateselect"} ) public class AutocompleteController extends VitroAjaxController { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java index 6545fb978..8e10c8c01 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -38,6 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; * . */ +@WebServlet(name = "DataAutocompleteController", urlPatterns = {"/dataautocomplete"} ) public class DataAutocompleteController extends VitroAjaxController { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java index d7dbf91d2..52610773b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.Map; 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.services.freemarker.FreemarkerProcessing * can maintain a history of activity. This will provide the contents of the * display. */ +@WebServlet(name = "IndexController", urlPatterns = {"/SearchIndex"} ) public class IndexController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(IndexController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index bc997adf6..2edd8599c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,6 +58,7 @@ import edu.ucsf.vitro.opensocial.OpenSocialManager; * Paged search controller that uses the search engine */ +@WebServlet(name = "SearchController", urlPatterns = {"/search","/search.jsp","/fedsearch","/searchcontroller"} ) public class PagedSearchController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java index 8ab1cf278..2cfceb28e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Enumeration; import javax.servlet.RequestDispatcher; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -30,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +@WebServlet(name = "SearchHelpController", urlPatterns = {"/searchHelp"} ) public class SearchHelpController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(SearchHelpController.class.getName()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java index 5406969cc..e129bbfa1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; @@ -30,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer; * Accepts requests to update a set of URIs in the search index. */ @SuppressWarnings("serial") +@WebServlet(name = "SearchServiceController", urlPatterns = {"/searchService/*"}) public class SearchServiceController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(SearchServiceController.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java index 5be57117a..9e5c2c7c1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java @@ -7,6 +7,7 @@ import java.util.Iterator; import java.util.List; 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.VitroRequest; * @author yuysun */ +@WebServlet(name = "GetAllClasses", urlPatterns = {"/admin/getAllClasses"}) public class GetAllClasses extends BaseEditController { private static final Log log = LogFactory.getLog(GetAllClasses.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java index 866c75b36..6e3998b54 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; * @author yuysun */ +@WebServlet(name = "GetAllPrefix", urlPatterns = {"/admin/getAllPrefix"}) public class GetAllPrefix extends BaseEditController { private static final Log log = LogFactory.getLog(GetAllPrefix.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java index 4aa4bd02e..ba27c6136 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -35,6 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; * This servlet gets all the properties for a given subject. */ +@WebServlet(name = "GetClazzAllProperties", urlPatterns = {"/admin/getClazzAllProperties"}) public class GetClazzAllProperties extends BaseEditController { private static final Log log = LogFactory.getLog(GetClazzAllProperties.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java index df4efd566..fdd7a0458 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.Iterator; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -24,6 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; * This servlet gets all the data properties for a given subject. */ +@WebServlet(name = "GetClazzDataProperties", urlPatterns = {"/admin/getClazzDataProperties"}) public class GetClazzDataProperties extends BaseEditController { private static final Log log = LogFactory.getLog(GetClazzDataProperties.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java index 1bc63c21d..9a8fa1497 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Map; 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.dao.VClassDao; * This servlet gets all the object properties for a given subject. */ +@WebServlet(name = "GetClazzObjectProperties", urlPatterns = {"/admin/getClazzObjectProperties"}) public class GetClazzObjectProperties extends BaseEditController { private static final Log log = LogFactory.getLog(GetClazzObjectProperties.class); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java index 474194afb..db83a2f0a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java @@ -7,6 +7,7 @@ import java.util.Iterator; import java.util.List; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,6 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; * This servlet gets all the range classes for a given predicate. */ +@WebServlet(name = "GetObjectClasses", urlPatterns = {"/admin/getObjectClasses"}) public class GetObjectClasses extends BaseEditController { private static final Log log = LogFactory.getLog(GetObjectClasses.class); 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 index ac7dd7d1e..ee7184ce4 100644 --- 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 @@ -11,6 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; @@ -68,6 +69,16 @@ public class JSPPageHandler { @Override public ServletOutputStream getOutputStream() throws IOException { return new ServletOutputStream() { + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + + } + @Override public void write(int b) throws IOException { byteArray.write(b); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java index e5458c57a..b28b2d568 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -35,6 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.services.freemarker.FreemarkerProcessing * is only a statement that developer mode is enabled. Otherwise, it * is a full panel (collapsed at first). */ +@WebServlet(name = "DeveloperAjax", urlPatterns = {"/admin/developerAjax"} ) public class DeveloperSettingsServlet extends VitroAjaxController { private static final Log log = LogFactory .getLog(DeveloperSettingsServlet.class); diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java index 7326925af..dd61dcb6b 100644 --- a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java +++ b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java @@ -16,6 +16,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Red 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 = "GadgetController", urlPatterns = {"/orng/*"}) public class GadgetController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java index 3e326e772..e2bd34a14 100644 --- a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java +++ b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java @@ -29,6 +29,7 @@ import org.vivoweb.linkeddatafragments.datasource.rdfservice.RDFServiceDataSourc import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -46,6 +47,7 @@ import java.util.Map.Entry; /** * Servlet that responds with a Linked Data Fragment. */ +@WebServlet(name = "TpfServlet", urlPatterns = {"/tpf/*"}) public class VitroLinkedDataFragmentServlet extends VitroHttpServlet { private final static long serialVersionUID = 1L; diff --git a/api/src/test/java/stubs/javax/servlet/ServletContextStub.java b/api/src/test/java/stubs/javax/servlet/ServletContextStub.java index 91a0a9416..89d6e96bc 100644 --- a/api/src/test/java/stubs/javax/servlet/ServletContextStub.java +++ b/api/src/test/java/stubs/javax/servlet/ServletContextStub.java @@ -9,14 +9,21 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collections; import java.util.Enumeration; +import java.util.EventListener; import java.util.HashMap; import java.util.Map; import java.util.Set; +import javax.servlet.Filter; +import javax.servlet.FilterRegistration; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; +import javax.servlet.SessionCookieConfig; +import javax.servlet.SessionTrackingMode; +import javax.servlet.descriptor.JspConfigDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -150,6 +157,11 @@ public class ServletContextStub implements ServletContext { "ServletContextStub.getInitParameterNames() not implemented."); } + @Override + public boolean setInitParameter(String s, String s1) { + return false; + } + @Override public int getMajorVersion() { throw new RuntimeException( @@ -168,6 +180,16 @@ public class ServletContextStub implements ServletContext { "ServletContextStub.getMinorVersion() not implemented."); } + @Override + public int getEffectiveMajorVersion() { + return 0; + } + + @Override + public int getEffectiveMinorVersion() { + return 0; + } + @Override public RequestDispatcher getNamedDispatcher(String arg0) { throw new RuntimeException( @@ -212,6 +234,126 @@ public class ServletContextStub implements ServletContext { "ServletContextStub.getServletContextName() not implemented."); } + @Override + public ServletRegistration.Dynamic addServlet(String s, String s1) { + return null; + } + + @Override + public ServletRegistration.Dynamic addServlet(String s, Servlet servlet) { + return null; + } + + @Override + public ServletRegistration.Dynamic addServlet(String s, Class aClass) { + return null; + } + + @Override + public T createServlet(Class aClass) throws ServletException { + return null; + } + + @Override + public ServletRegistration getServletRegistration(String s) { + return null; + } + + @Override + public Map getServletRegistrations() { + return null; + } + + @Override + public FilterRegistration.Dynamic addFilter(String s, String s1) { + return null; + } + + @Override + public FilterRegistration.Dynamic addFilter(String s, Filter filter) { + return null; + } + + @Override + public FilterRegistration.Dynamic addFilter(String s, Class aClass) { + return null; + } + + @Override + public T createFilter(Class aClass) throws ServletException { + return null; + } + + @Override + public FilterRegistration getFilterRegistration(String s) { + return null; + } + + @Override + public Map getFilterRegistrations() { + return null; + } + + @Override + public SessionCookieConfig getSessionCookieConfig() { + return null; + } + + @Override + public void setSessionTrackingModes(Set set) { + + } + + @Override + public Set getDefaultSessionTrackingModes() { + return null; + } + + @Override + public Set getEffectiveSessionTrackingModes() { + return null; + } + + @Override + public void addListener(String s) { + + } + + @Override + public void addListener(T t) { + + } + + @Override + public void addListener(Class aClass) { + + } + + @Override + public T createListener(Class aClass) throws ServletException { + return null; + } + + @Override + public JspConfigDescriptor getJspConfigDescriptor() { + return null; + } + + @Override + public ClassLoader getClassLoader() { + return null; + } + + @Override + public void declareRoles(String... strings) { + + } + + @Override + public String getVirtualServerName() { + return null; + } + @Override @SuppressWarnings("rawtypes") @Deprecated diff --git a/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java b/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java index 03368c2f5..fb216bc60 100644 --- a/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java +++ b/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java @@ -8,6 +8,7 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.security.Principal; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -15,11 +16,20 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import javax.servlet.AsyncContext; +import javax.servlet.DispatcherType; import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; +import javax.servlet.http.Part; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; @@ -156,6 +166,11 @@ public class HttpServletRequestStub implements HttpServletRequest { return getSession(true); } + @Override + public String changeSessionId() { + return null; + } + @Override public HttpSession getSession(boolean create) { if (create && (session == null)) { @@ -369,6 +384,36 @@ public class HttpServletRequestStub implements HttpServletRequest { "HttpServletRequestStub.isRequestedSessionIdFromUrl() not implemented."); } + @Override + public boolean authenticate(HttpServletResponse httpServletResponse) throws IOException, ServletException { + return false; + } + + @Override + public void login(String s, String s1) throws ServletException { + + } + + @Override + public void logout() throws ServletException { + + } + + @Override + public Collection getParts() throws IOException, ServletException { + return null; + } + + @Override + public Part getPart(String s) throws IOException, ServletException { + return null; + } + + @Override + public T upgrade(Class aClass) throws IOException, ServletException { + return null; + } + @Override public boolean isRequestedSessionIdValid() { throw new RuntimeException( @@ -393,6 +438,11 @@ public class HttpServletRequestStub implements HttpServletRequest { "HttpServletRequestStub.getContentLength() not implemented."); } + @Override + public long getContentLengthLong() { + return 0; + } + @Override public String getContentType() { throw new RuntimeException( @@ -423,6 +473,41 @@ public class HttpServletRequestStub implements HttpServletRequest { "HttpServletRequestStub.getLocalPort() not implemented."); } + @Override + public ServletContext getServletContext() { + return null; + } + + @Override + public AsyncContext startAsync() throws IllegalStateException { + return null; + } + + @Override + public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException { + return null; + } + + @Override + public boolean isAsyncStarted() { + return false; + } + + @Override + public boolean isAsyncSupported() { + return false; + } + + @Override + public AsyncContext getAsyncContext() { + return null; + } + + @Override + public DispatcherType getDispatcherType() { + return null; + } + @Override public Locale getLocale() { throw new RuntimeException( diff --git a/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java b/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java index 3edd787e6..eeaaeeb5b 100644 --- a/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java +++ b/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.StringWriter; +import java.util.Collection; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -14,6 +15,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -62,6 +64,16 @@ public class HttpServletResponseStub implements HttpServletResponse { return headers.get(name); } + @Override + public Collection getHeaders(String s) { + return null; + } + + @Override + public Collection getHeaderNames() { + return null; + } + // ---------------------------------------------------------------------- // Stub methods // ---------------------------------------------------------------------- @@ -115,6 +127,16 @@ public class HttpServletResponseStub implements HttpServletResponse { } return new ServletOutputStream() { + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + + } + @Override public void write(int thisChar) throws IOException { outputStream.write(thisChar); @@ -214,6 +236,11 @@ public class HttpServletResponseStub implements HttpServletResponse { "HttpServletResponseStub.setContentLength() not implemented."); } + @Override + public void setContentLengthLong(long l) { + + } + @Override public void setLocale(Locale arg0) { throw new RuntimeException( diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 93d65c786..3297931ec 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -2,10 +2,11 @@ - + @@ -41,7 +42,10 @@ - + edu.cornell.mannlib.vitro.webapp.startup.StartupManager @@ -53,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 /* @@ -176,798 +128,7 @@ REQUEST - - - - - IndexController - edu.cornell.mannlib.vitro.webapp.search.controller.IndexController - - - IndexController - /SearchIndex - - - - SimpleReasonerRecomputeController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.SimpleReasonerRecomputeController - - - SimpleReasonerRecomputeController - /RecomputeInferences - - - - MenuManagementEdit - edu.cornell.mannlib.vitro.webapp.controller.edit.MenuManagementEdit - - - MenuManagementEdit - /menuManagementEdit - - - - ajaxSparqlQuery - edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlQueryAjaxController - - - ajaxSparqlQuery - /ajax/sparqlQuery - - - - AboutController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController - - - AboutController - /about - - - - HomePageController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController - - - HomePageController - /home - - - - PageController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.PageController - - - - - 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.SiteAdminController - - - 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 - - - - ProcessRdfFormController - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController - - - ProcessRdfFormController - /edit/process - - - - 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 - - - - EditRequestDispatch - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.EditRequestDispatchController - - - EditRequestDispatch - /editRequestDispatch - - - - EditRequestAJAX - edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.EditRequestAJAXController - - - EditRequestAJAX - /editRequestAJAX - - - - 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/* - - - - ViewLabelsServlet - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ViewLabelsServlet - - - ViewLabelsServlet - /viewLabels - - - - 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/* - - - - ShowAuth - edu.cornell.mannlib.vitro.webapp.controller.admin.ShowAuthController - - - ShowAuth - /admin/showAuth - - - - ShowConfiguration - edu.cornell.mannlib.vitro.webapp.controller.admin.ShowConfiguration - - - ShowConfiguration - /admin/showConfiguration - - - - 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 - - - - - ShowClassHierarchyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowClassHierarchyController - - - ShowClassHierarchyController - /showClassHierarchy - - - - ShowObjectPropertyHierarchyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowObjectPropertyHierarchyController - - - ShowObjectPropertyHierarchyController - /showObjectPropertyHierarchy - - - - ShowDataPropertyHierarchyController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowDataPropertyHierarchyController - - - ShowDataPropertyHierarchyController - /showDataPropertyHierarchy - - - - ListFauxPropertiesController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListFauxPropertiesController - - - ListFauxPropertiesController - /listFauxProperties - - - - 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 - - - - DashboardPropertyListController - edu.cornell.mannlib.vitro.webapp.controller.DashboardPropertyListController - - - DashboardPropertyListController - /dashboardPropList - - + dwr-invoker org.directwebremoting.servlet.DwrServlet @@ -985,304 +146,17 @@ /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 - - - - primitiveRdfEdit - edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveRdfEdit - - - primitiveRdfEdit - /edit/primitiveRdfEdit - - - - primitiveDelete - edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveDelete - - - primitiveDelete - /edit/primitiveDelete - - - - - mailusers - /mailusers - - - - individual - /entity - - - individual - /entity/* - - - individual - /individual - - - individual - /individual/* - - - individual - /display - - - individual - /display/* - - - - ontology - /ontology/* - - - 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/* - - - - - 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 - - - - TpfServlet - TpfServlet - org.vivoweb.linkeddatafragments.servlet.VitroLinkedDataFragmentServlet - - - TpfServlet - /tpf/* - +--> @@ -1338,9 +212,8 @@ xml application/xml - + - /WEB-INF/tlds/database.tld @@ -1373,16 +246,4 @@ - - - - - - - -