diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java index 9c65656dd..411600548 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -64,14 +64,6 @@ public class VitroHttpServlet extends HttpServlet request.getAttribute("webappDaoFactory") == null ){ log.warn("request scope was not prepared by VitroRequestPrep"); } - - // TEMPORARY for transition from JSP to FreeMarker. Once transition - // is complete and no more pages are generated in JSP, this can be removed. - // Do this if FreeMarker is configured (i.e., not Datastar) and if we are not in - // a FreeMarkerHttpServlet, which will generate identity, menu, and footer from the page template. - if ( FreeMarkerHttpServlet.isConfigured() && !(this instanceof FreeMarkerHttpServlet) ) { - FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request, response); - } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java index 6ff00d814..6a08b8759 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java @@ -348,6 +348,7 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { // a FreeMarkerHttpServlet, which will generate identity, menu, and footer from the page template. // It's a static method because it needs to be called from JSPs that don't go through a servlet. public static void getFreeMarkerComponentsForJsp(HttpServletRequest request, HttpServletResponse response) { + System.out.println("IN getFreeMarkerComponentsForJsp"); FreeMarkerComponentGenerator fcg = new FreeMarkerComponentGenerator(request, response); request.setAttribute("ftl_identity", fcg.getIdentity()); request.setAttribute("ftl_menu", fcg.getMenu());