From 4d9bfd819832116542df008841499649a03e11da Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Tue, 15 Apr 2014 15:37:24 -0400 Subject: [PATCH] VIVO-47 Remove reference to the TabController The controller doesn't exist any more, nor is there any servlet in web.xml by that name. --- .../webapp/filters/PageRoutingFilter.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java index 4c849338a..daa09d735 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java @@ -24,7 +24,6 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.PageController; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.PageDao; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; /** * This filter is intended to route requests to pages defined in the display model. * @@ -41,7 +40,6 @@ public class PageRoutingFilter implements Filter{ protected final static String URL_PART_PATTERN = "(/[^/]*).*"; protected final static String PAGE_CONTROLLER_NAME = "PageController"; protected final static String HOME_CONTROLLER_NAME = "HomePageController"; - protected final static String TAB_CONTROLLER_NAME = "TabController"; protected final Pattern urlPartPattern = Pattern.compile(URL_PART_PATTERN); @@ -112,9 +110,6 @@ public class PageRoutingFilter implements Filter{ protected String getControllerToForwardTo(HttpServletRequest req, String pageUri, PageDao pageDao) { - - if( isTabController(req) ) - return TAB_CONTROLLER_NAME; String homePageUri = pageDao.getHomePageUri(); if( pageUri != null && pageUri.equals(homePageUri) ) return HOME_CONTROLLER_NAME; @@ -122,20 +117,6 @@ public class PageRoutingFilter implements Filter{ return PAGE_CONTROLLER_NAME; } - /** - * Checks to see if this is a request to the old tab controller - */ - protected boolean isTabController( HttpServletRequest req ){ - if( req.getParameter("primary") != null || - req.getParameter("secondary") != null || - req.getParameter("collection") != null || - req.getParameter("subcollection") != null ){ - String path = req.getRequestURI().substring(req.getContextPath().length()); - return "/".equals(path) ; - } - return false; - } - @Override public void destroy() { //nothing to do here