From 4a5cc2e365abc234434f4b4c145fa64d618239d0 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 27 Jul 2010 18:57:39 +0000
Subject: [PATCH] Simple refactoring: changed name of freemarker base classes

---
 productMods/WEB-INF/web.xml                    | 6 +++---
 productMods/themes/vivo-basic/jsp/footer.jsp   | 4 ++--
 productMods/themes/vivo-basic/jsp/identity.jsp | 4 ++--
 productMods/themes/vivo-basic/jsp/menu.jsp     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 04ecd317..1fb5b518 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -159,7 +159,7 @@
  
   <listener>
     <listener-class>
-        edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerSetup
+        edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
     </listener-class>
   </listener>
 
@@ -333,11 +333,11 @@
   </servlet-mapping>
   
   <servlet>
-    <servlet-name>FreeMarkerTestController</servlet-name>
+    <servlet-name>FreemarkerTestController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>FreeMarkerTestController</servlet-name>
+    <servlet-name>FreemarkerTestController</servlet-name>
     <url-pattern>/freemarkertest</url-pattern>
   </servlet-mapping>
   
diff --git a/productMods/themes/vivo-basic/jsp/footer.jsp b/productMods/themes/vivo-basic/jsp/footer.jsp
index 995494d5..be352dda 100644
--- a/productMods/themes/vivo-basic/jsp/footer.jsp
+++ b/productMods/themes/vivo-basic/jsp/footer.jsp
@@ -2,13 +2,13 @@
 
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
-<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
 <% 
     // This is here as a safety net. We should have gotten the values in identity.jsp,
     // since it's the first jsp we hit.
     String footer = (String) request.getAttribute("ftl_footer");
     if (footer == null) {
-        FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request);
+        FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
     } 
 %>
 
diff --git a/productMods/themes/vivo-basic/jsp/identity.jsp b/productMods/themes/vivo-basic/jsp/identity.jsp
index 1a894e12..b5117f15 100644
--- a/productMods/themes/vivo-basic/jsp/identity.jsp
+++ b/productMods/themes/vivo-basic/jsp/identity.jsp
@@ -2,9 +2,9 @@
 
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
-<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
 <% 
-FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request);
+FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
 %>
 
 ${ftl_identity}
diff --git a/productMods/themes/vivo-basic/jsp/menu.jsp b/productMods/themes/vivo-basic/jsp/menu.jsp
index ee1f95cf..21f61ac0 100644
--- a/productMods/themes/vivo-basic/jsp/menu.jsp
+++ b/productMods/themes/vivo-basic/jsp/menu.jsp
@@ -3,13 +3,13 @@
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
 <% 
     // This is here as a safety net. We should have gotten the values in identity.jsp,
     // since it's the first jsp we hit.
     String menu = (String) request.getAttribute("ftl_menu");
     if (menu == null) {
-        FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request);
+        FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
     } 
 %>