diff --git a/webapp/config/web.xml b/webapp/config/web.xml index adf9df7a1..a2e999d5b 100644 --- a/webapp/config/web.xml +++ b/webapp/config/web.xml @@ -154,7 +154,7 @@ - edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerSetup + edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup @@ -323,11 +323,11 @@ - FreeMarkerTestController + FreemarkerTestController edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController - FreeMarkerTestController + FreemarkerTestController /freemarkertest 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 a8191ef50..82b3374f0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -14,9 +14,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; - public class VitroHttpServlet extends HttpServlet { private static final long serialVersionUID = 1L; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java index 32eb67034..d541dbd8f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java @@ -29,7 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.RoleBasedPolicy.AuthRole; import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; @@ -38,7 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginLogoutEvent; -public class Authenticate extends FreeMarkerHttpServlet { +public class Authenticate extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(Authenticate.class .getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java index a0de40955..070b16425 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java @@ -27,7 +27,7 @@ import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena; @@ -35,7 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils; import freemarker.template.Configuration; -public class PrimitiveRdfEdit extends FreeMarkerHttpServlet{ +public class PrimitiveRdfEdit extends FreemarkerHttpServlet{ private static final long serialVersionUID = 1L; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java index 055a5ffcd..2365975c1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java @@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import freemarker.template.Configuration; -public class AboutController extends FreeMarkerHttpServlet { +public class AboutController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(AboutController.class.getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java index 2814d245b..4a85c391e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java @@ -35,7 +35,7 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; -public class BrowseController extends FreeMarkerHttpServlet { +public class BrowseController extends FreemarkerHttpServlet { static final long serialVersionUID=2006030721126L; private transient ConcurrentHashMap _groupListMap diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java index f6733d69d..e269c6543 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java @@ -26,7 +26,7 @@ import freemarker.template.Configuration; * Controller for comments ("contact us") page * * @author bjl23 */ -public class ContactFormController extends FreeMarkerHttpServlet { +public class ContactFormController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(ContactFormController.class.getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 5f972cac5..a408c7a0f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import freemarker.template.Configuration; -public class ContactMailController extends FreeMarkerHttpServlet { +public class ContactMailController extends FreemarkerHttpServlet { private static final Log log = LogFactory .getLog(ContactMailController.class); private static final long serialVersionUID = 1L; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerComponentGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java similarity index 91% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerComponentGenerator.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java index f4b57aa71..1d7797a6b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerComponentGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java @@ -21,14 +21,14 @@ import freemarker.template.Configuration; * @author rjy7 * */ -public class FreeMarkerComponentGenerator extends FreeMarkerHttpServlet { +public class FreemarkerComponentGenerator extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(FreeMarkerHttpServlet.class.getName()); + private static final Log log = LogFactory.getLog(FreemarkerHttpServlet.class.getName()); private static ServletContext context = null; - FreeMarkerComponentGenerator(HttpServletRequest request) { + FreemarkerComponentGenerator(HttpServletRequest request) { VitroRequest vreq = new VitroRequest(request); Configuration config = getConfig(vreq); 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 similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 62139785f..4f57a6234 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 @@ -47,10 +47,10 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -public class FreeMarkerHttpServlet extends VitroHttpServlet { +public class FreemarkerHttpServlet extends VitroHttpServlet { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(FreeMarkerHttpServlet.class.getName()); + private static final Log log = LogFactory.getLog(FreemarkerHttpServlet.class.getName()); private static final int FILTER_SECURITY_LEVEL = LoginFormBean.EDITOR; public void doGet( HttpServletRequest request, HttpServletResponse response ) @@ -429,10 +429,10 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { // TEMPORARY method for transition from JSP to FreeMarker. // 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) { + public static void getFreemarkerComponentsForJsp(HttpServletRequest request) { // We need to create a FreeMarkerHttpServlet object in order to call the instance methods // to set up the data model. - new FreeMarkerComponentGenerator(request); + new FreemarkerComponentGenerator(request); } } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java similarity index 82% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java index bbcb9ce24..1f203b594 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java @@ -14,16 +14,16 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; import freemarker.template.Configuration; -public class FreeMarkerSetup implements ServletContextListener { +public class FreemarkerSetup implements ServletContextListener { - private static final Log log = LogFactory.getLog(FreeMarkerSetup.class); + private static final Log log = LogFactory.getLog(FreemarkerSetup.class); public void contextInitialized(ServletContextEvent event) { ServletContext sc = event.getServletContext(); sc.setAttribute("themeToConfigMap", new HashMap()); BaseTemplateModel.setServletContext(sc); - FreeMarkerComponentGenerator.setServletContext(sc); + FreemarkerComponentGenerator.setServletContext(sc); UrlBuilder.contextPath = sc.getContextPath(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java index 0f654837d..381ab6fc2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java @@ -36,7 +36,7 @@ import freemarker.template.Configuration; /** * Handle adding, replacing or deleting the main image on an Individual. */ -public class ImageUploadController extends FreeMarkerHttpServlet { +public class ImageUploadController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory .getLog(ImageUploadController.class); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java index 9aa2039fe..fefd9da56 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java @@ -69,7 +69,7 @@ build up the list of actually rendered items first. Only then, if there are any, */ -public class IndividualController extends FreeMarkerHttpServlet { +public class IndividualController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(IndividualController.class.getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java index af9c3d0f5..bfacd7cf5 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java @@ -21,7 +21,7 @@ import freemarker.template.Configuration; /** * Generates a list of individuals for display in a template */ -public class IndividualListController extends FreeMarkerHttpServlet { +public class IndividualListController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(IndividualListController.class.getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java index 9f99673ab..09b01c68e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java @@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.web.DisplayVocabulary; import freemarker.template.Configuration; -public class NavigationController extends FreeMarkerHttpServlet { +public class NavigationController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(NavigationController.class.getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java index 89a402d94..db99bf462 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java @@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import freemarker.template.Configuration; -public class TermsOfUseController extends FreeMarkerHttpServlet { +public class TermsOfUseController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(TermsOfUseController.class.getName()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java index b652720d5..c9cb30460 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java @@ -20,7 +20,7 @@ import freemarker.template.Configuration; * @author rjy7 * */ -public class TestController extends FreeMarkerHttpServlet { +public class TestController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(TestController.class); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java index a31740025..5bf61902e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java @@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; import freemarker.template.Configuration; @@ -27,7 +27,7 @@ import freemarker.template.Configuration; * * This class contains stuff that I swiped from {@link Authenticate}. The base * class, {@link LoginTemplateHelperBase}, contains stuff that I swiped from - * {@link FreeMarkerHttpServlet}. + * {@link FreemarkerHttpServlet}. */ public class LoginTemplateHelper extends LoginTemplateHelperBase { private static final Log log = LogFactory.getLog(LoginTemplateHelper.class); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelperBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelperBase.java index 6eac3cf89..732aa74c2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelperBase.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelperBase.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.login; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; /** * A temporary means of displaying the Login templates within the SiteAdmin @@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServ * * The constructor insures that the ServletContext is set. */ -public class LoginTemplateHelperBase extends FreeMarkerHttpServlet { +public class LoginTemplateHelperBase extends FreemarkerHttpServlet { private final ServletContext servletContext; LoginTemplateHelperBase(HttpServletRequest req) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java index 94be56ec9..10c754894 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java @@ -40,7 +40,7 @@ import org.apache.lucene.store.FSDirectory; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag; import edu.cornell.mannlib.vitro.webapp.search.SearchException; @@ -59,7 +59,7 @@ import freemarker.template.Configuration; * through a Lucene search. */ -public class AutocompleteController extends FreeMarkerHttpServlet implements Searcher{ +public class AutocompleteController extends FreemarkerHttpServlet implements Searcher{ private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(AutocompleteController.class); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java index 1cd284696..b02fc8823 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder; import freemarker.template.Configuration; @@ -33,7 +33,7 @@ import freemarker.template.Configuration; * @author bdc34 * */ -public class IndexController extends FreeMarkerHttpServlet { +public class IndexController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(IndexController.class.getName());