[Archive-access-cvs] SF.net SVN: archive-access:[2478] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp

[<bra...@us...>]

Revision: 2478
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2478&view=rev
Author:   bradtofel
Date:     2008-07-22 02:31:44 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
TWEAK: moved /webapp/template/ => /webapp/WEB-INF/template/

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp	2008-07-22 02:12:22 UTC (rev 2477)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp	2008-07-22 02:31:44 UTC (rev 2478)
@@ -8,7 +8,7 @@
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.core.WaybackRequest" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/template/UI-header.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
 <%
 
 UIResults results = UIResults.extractCaptureQuery(request);
@@ -110,4 +110,4 @@
 }
 %>
 
-<jsp:include page="/template/UI-footer.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2008-07-22 02:12:22 UTC (rev 2477)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2008-07-22 02:31:44 UTC (rev 2478)
@@ -9,7 +9,7 @@
 <%@ page import="org.archive.wayback.core.UrlSearchResults" %>
 <%@ page import="org.archive.wayback.core.WaybackRequest" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/template/UI-header.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
 <%
 
 UIResults results = UIResults.extractUrlQuery(request);
@@ -114,4 +114,4 @@
 }
 %>
 
-<jsp:include page="/template/UI-footer.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp	2008-07-22 02:12:22 UTC (rev 2477)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp	2008-07-22 02:31:44 UTC (rev 2478)
@@ -1,10 +1,10 @@
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/template/UI-header.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
 <%
 
 UIResults results = UIResults.getGeneric(request);
-StringFormatter fmt = results.getFormatter();
+StringFormatter fmt = results.getWbRequest().getFormatter();
 
 %>
 <form action="../../replay">
@@ -23,4 +23,4 @@
 <input type="HIDDEN" name="type" value="replay">
 <input type="SUBMIT" value="<%= fmt.format("AdvancedSearch.submitButton") %>">
 </form>
-<jsp:include page="/template/UI-footer.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp	2008-07-22 02:12:22 UTC (rev 2477)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp	2008-07-22 02:31:44 UTC (rev 2478)
@@ -1,10 +1,10 @@
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/template/UI-header.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
 <%
 UIResults results = UIResults.getGeneric(request);
-StringFormatter fmt = results.getFormatter();
+StringFormatter fmt = results.getWbRequest().getFormatter();
 String url = "http://archive-access.sourceforge.net/projects/wayback/faq.html";
 %>
 <%= fmt.format("UIGlobal.helpPage",url) %>
-<jsp:include page="/template/UI-footer.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp	2008-07-22 02:12:22 UTC (rev 2477)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp	2008-07-22 02:31:44 UTC (rev 2478)
@@ -1,7 +1,7 @@
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="template/UI-header.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
 <%
 UIResults results = UIResults.getGeneric(request);
 StringFormatter fmt = results.getFormatter();
@@ -25,4 +25,4 @@
 <p>
 	<%= fmt.format("UIGlobal.indexPage") %>
 </p>
-<jsp:include page="template/UI-footer.jsp" flush="true" />
+<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.