litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-47 Remove reference to the TabController

Browse source 
The controller doesn't exist any more, nor is there any servlet in web.xml by that name.
This commit is contained in:
Jim Blake 2014-04-15 15:37:24 -04:00
parent 8892da74b0
commit 4d9bfd8198
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
View file

@ -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.controller.freemarker.PageController;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.dao.PageDao; 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. * 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 URL_PART_PATTERN = "(/[^/]*).*";
protected final static String PAGE_CONTROLLER_NAME = "PageController"; protected final static String PAGE_CONTROLLER_NAME = "PageController";
protected final static String HOME_CONTROLLER_NAME = "HomePageController"; 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); protected final Pattern urlPartPattern = Pattern.compile(URL_PART_PATTERN);
@ -112,9 +110,6 @@ public class PageRoutingFilter implements Filter{
protected String getControllerToForwardTo(HttpServletRequest req, protected String getControllerToForwardTo(HttpServletRequest req,
String pageUri, PageDao pageDao) { String pageUri, PageDao pageDao) {
if( isTabController(req) )
return TAB_CONTROLLER_NAME;
String homePageUri = pageDao.getHomePageUri(); String homePageUri = pageDao.getHomePageUri();
if( pageUri != null && pageUri.equals(homePageUri) ) if( pageUri != null && pageUri.equals(homePageUri) )
return HOME_CONTROLLER_NAME; return HOME_CONTROLLER_NAME;
@ -122,20 +117,6 @@ public class PageRoutingFilter implements Filter{
return PAGE_CONTROLLER_NAME; 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 @Override
public void destroy() { public void destroy() {
//nothing to do here //nothing to do here