From 69ab12c4bca70af8a69f91c7efbfe78cbd1f04f7 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 7 Jun 2013 15:43:22 -0400 Subject: [PATCH] VIVO-82 Remove the vestiges of VitroRequestPrep Unused imports prevented the compiling of JSPs --- .../mannlib/vitro/webapp/filters/RequestModelsPrep.java | 4 +--- webapp/web/admin/gotoIndividual.jsp | 1 - webapp/web/templates/page/basicPage.jsp | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java index 5b00a6c76..e4973052f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java @@ -57,8 +57,6 @@ public class RequestModelsPrep implements Filter { * The filter will be applied to all incoming urls, this is a list of URI * patterns to skip. These are matched against the requestURI sans query * parameters, e.g. "/vitro/index.jsp" "/vitro/themes/enhanced/css/edit.css" - * - * These patterns are from VitroRequestPrep.java */ private final static Pattern[] skipPatterns = { Pattern.compile(".*\\.(gif|GIF|jpg|jpeg)$"), @@ -109,7 +107,7 @@ public class RequestModelsPrep implements Filter { for (Pattern skipPattern : skipPatterns) { if (skipPattern.matcher(requestURI).matches()) { log.debug("request matched skipPattern '" + skipPattern - + "', skipping VitroRequestPrep"); + + "', skipping RequestModelsPrep"); return false; } } diff --git a/webapp/web/admin/gotoIndividual.jsp b/webapp/web/admin/gotoIndividual.jsp index d01251724..b0311eb3c 100644 --- a/webapp/web/admin/gotoIndividual.jsp +++ b/webapp/web/admin/gotoIndividual.jsp @@ -1,6 +1,5 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> diff --git a/webapp/web/templates/page/basicPage.jsp b/webapp/web/templates/page/basicPage.jsp index e8a4d4754..73fbbecb4 100644 --- a/webapp/web/templates/page/basicPage.jsp +++ b/webapp/web/templates/page/basicPage.jsp @@ -6,7 +6,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page errorPage="/error.jsp"%> <%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> <% /***********************************************