From 4aa300e5a3476cf216db481ef50779c72e6afe2b Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 21 May 2010 18:26:17 +0000 Subject: [PATCH] Changed FreeMarkerHttpServlet static variables from public to protected. Moved files into the freemarker package as needed to support access to those variables. --- webapp/config/web.xml | 2 +- .../vitro/webapp/controller/VitroHttpServlet.java | 2 +- .../controller/freemarker/FreeMarkerHttpServlet.java | 11 +++++++---- .../freemarker}/FreeMarkerSetup.java | 2 +- .../{ => freemarker}/FreeMarkerHttpServletTest.java | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{servlet/setup => controller/freemarker}/FreeMarkerSetup.java (97%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/controller/{ => freemarker}/FreeMarkerHttpServletTest.java (96%) diff --git a/webapp/config/web.xml b/webapp/config/web.xml index 6148b1e90..7ecc60bbc 100644 --- a/webapp/config/web.xml +++ b/webapp/config/web.xml @@ -140,7 +140,7 @@ - edu.cornell.mannlib.vitro.webapp.servlet.setup.FreeMarkerSetup + edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerSetup 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 93edcd2af..9c65656dd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -69,7 +69,7 @@ public class VitroHttpServlet extends HttpServlet // 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.config != null && !(this instanceof FreeMarkerHttpServlet) ) { + 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 3e632e1e5..6e67e86f3 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 @@ -55,9 +55,9 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { private static final Log log = LogFactory.getLog(FreeMarkerHttpServlet.class.getName()); private static final int FILTER_SECURITY_LEVEL = LoginFormBean.EDITOR; - public static Configuration config = null; - public static String contextPath = null; - public static ServletContext context = null; + protected static Configuration config = null; + protected static String contextPath = null; + protected static ServletContext context = null; protected VitroRequest vreq; protected HttpServletResponse response; @@ -345,7 +345,10 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { request.setAttribute("ftl_search", fcg.getSearch()); request.setAttribute("ftl_footer", fcg.getFooter()); } - + + public static boolean isConfigured() { + return config != null; + } /* ******************** Utilities ******************* */ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FreeMarkerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FreeMarkerSetup.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java index c9768783f..73621fdeb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FreeMarkerSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.servlet.setup; +package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServletTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServletTest.java similarity index 96% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServletTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServletTest.java index 63ff06989..688b3eddc 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServletTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServletTest.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller; +package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.HashMap; import java.util.Map;