[VIVO-1375] Upgrade to Servlet 3.0 spec

api/pom.xml

@@ -44,8 +44,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
-            <version>2.5</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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";

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());

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 {
 
     /**

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

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

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<String> getParameterNames() {
 		return Collections.enumeration(new HashSet<>(parameters.keySet()));
 	}
 

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());
     

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());

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

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

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

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

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

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";

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

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";

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) {

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.
  * </pre>
  */
+@WebServlet(name = "ShowRDFSources", urlPatterns = {"/admin/showSources"} )
 public class ShowSourcesController extends FreemarkerHttpServlet {
 	private static final Log log = LogFactory
 			.getLog(ShowSourcesController.class);

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

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

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

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

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
  * </pre>
  */
+@WebServlet(name = "SparqlQueryApi", urlPatterns = {"/api/sparqlQuery"})
 public class SparqlQueryApiController extends VitroApiServlet {
 
 	private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_SPARQL_QUERY_API.ACTION;

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
  * </pre>
  */
+@WebServlet(name = "SparqlUpdateApi", urlPatterns = {"/api/sparqlUpdate"})
 public class SparqlUpdateApiController extends VitroApiServlet {
 	private static final Log log = LogFactory
 			.getLog(SparqlUpdateApiController.class);

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

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

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

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

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;

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());

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());

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());

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());

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";

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());

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());

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());

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());
 

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";

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());

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());
 

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;

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;

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 {
 	

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());

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());

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;

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());

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());

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());

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) {

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;

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 {
 	

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

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) {    	

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 = "";

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;

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;
@@ -37,6 +38,46 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
 
     public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.SEE_SITE_ADMIN_PAGE.ACTION;
 
+    private static final List<AdminUrl> siteMaintenanceUrls = new ArrayList<>();
+    private static final List<AdminUrl> 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) {
     	return REQUIRED_ACTIONS;
@@ -65,27 +106,16 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
         
         Map<String, Object> urls = new HashMap<>();
 
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {
+        for (AdminUrl adminUrl : siteMaintenanceUrls) {
-            urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences"));     
+            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;
     }
 
@@ -131,24 +161,10 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
 
         Map<String, Object> data = new HashMap<String, Object>();
 
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_USER_ACCOUNTS.ACTION)) {
+        for (AdminUrl adminUrl : siteConfigData) {
-        	data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin"));
+            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;
+    }
 }

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;
     

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;

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

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

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;

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

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;   

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());

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

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());

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;

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

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());

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

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";

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;

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());

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());

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());

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(

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;

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;

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;

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;

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());
     

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;

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;

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";

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

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());

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

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

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

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,6 +37,7 @@ import org.apache.jena.shared.Lock;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
+@WebServlet(name = "JenaXMLFileUpload", urlPatterns = {"/jenaXmlFileUpload/*"} )
 public class JenaXMLFileUpload  extends JenaIngestController  {
 	Log log = LogFactory.getLog(JenaXMLFileUpload.class);
 	private String baseDirectoryForFiles;

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

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());

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

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

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

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

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