litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simple refactoring: changed name of freemarker base classes

Browse source
This commit is contained in:
rjy7 2010-07-27 18:57:39 +00:00
parent 6bfb37d127
commit 4a5cc2e365
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
productMods/WEB-INF/web.xml
View file

@ -159,7 +159,7 @@
<listener> <listener>
<listener-class> <listener-class>
edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerSetup edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
</listener-class> </listener-class>
</listener> </listener>
@ -333,11 +333,11 @@
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
<servlet-name>FreeMarkerTestController</servlet-name> <servlet-name>FreemarkerTestController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>FreeMarkerTestController</servlet-name> <servlet-name>FreemarkerTestController</servlet-name>
<url-pattern>/freemarkertest</url-pattern> <url-pattern>/freemarkertest</url-pattern>
</servlet-mapping> </servlet-mapping>

4
productMods/themes/vivo-basic/jsp/footer.jsp
View file

@ -2,13 +2,13 @@
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%> <%-- 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, // This is here as a safety net. We should have gotten the values in identity.jsp,
// since it's the first jsp we hit. // since it's the first jsp we hit.
String footer = (String) request.getAttribute("ftl_footer"); String footer = (String) request.getAttribute("ftl_footer");
if (footer == null) { if (footer == null) {
FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request); FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
} }
%> %>

4
productMods/themes/vivo-basic/jsp/identity.jsp
View file

@ -2,9 +2,9 @@
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%> <%-- 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} ${ftl_identity}

4
productMods/themes/vivo-basic/jsp/menu.jsp
View file

@ -3,13 +3,13 @@
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%> <%-- 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.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, // This is here as a safety net. We should have gotten the values in identity.jsp,
// since it's the first jsp we hit. // since it's the first jsp we hit.
String menu = (String) request.getAttribute("ftl_menu"); String menu = (String) request.getAttribute("ftl_menu");
if (menu == null) { if (menu == null) {
FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request); FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
} }
%> %>