Simple refactoring: changed name of freemarker base classes
This commit is contained in:
parent
6bfb37d127
commit
4a5cc2e365
4 changed files with 9 additions and 9 deletions
|
@ -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>
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
%>
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
%>
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue