[Archive-access-cvs] SF.net SVN: archive-access:[2519] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF/replay

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

Revision: 2519
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2519&view=rev
Author:   bradtofel
Date:     2008-07-29 02:18:10 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
TWEAK: now uses WaybackRequest.getContextPrefix() instead of assembling it from HttpServletRequest fields.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp	2008-07-29 02:16:35 UTC (rev 2518)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp	2008-07-29 02:18:10 UTC (rev 2519)
@@ -8,12 +8,9 @@
 UIResults results = UIResults.extractReplay(request);
 String requestDate = results.getResult().getCaptureTimestamp();
 String contextPath = results.getURIConverter().makeReplayURI(requestDate,"");
-String contextRoot = request.getScheme() + "://" + request.getServerName() + ":" 
-  + request.getServerPort() + request.getContextPath();
-
-String jsUrl = contextRoot + "/replay/client-rewrite.js";
+String contextRoot = results.getWbRequest().getContextPrefix();
 %>
 <script type="text/javascript">
   var sWayBackCGI = "<%= contextPath %>";
 </script>
-<script type="text/javascript" src="<%= jsUrl %>" ></script>
+<script type="text/javascript" src="<%= contextRoot %>js/client-rewrite.js" ></script>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp	2008-07-29 02:16:35 UTC (rev 2518)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp	2008-07-29 02:18:10 UTC (rev 2519)
@@ -30,13 +30,10 @@
 
 String wmNotice = fmt.format("ReplayView.banner", resultUrl, resultDate);
 String wmHideNotice = fmt.format("ReplayView.bannerHideLink");
-
-String contextRoot = request.getScheme() + "://" + request.getServerName() + ":"
-+ request.getServerPort() + request.getContextPath();
-String jsUrl = contextRoot + "/replay/disclaim.js";
+String contextRoot = results.getWbRequest().getContextPrefix();
 %>
 <script type="text/javascript">
   var wmNotice = "<%= wmNotice %><%= dupeMsg %>";
   var wmHideNotice = "<%= wmHideNotice %>";
 </script>
-<script type="text/javascript" src="<%= jsUrl %>"></script>
+<script type="text/javascript" src="<%= contextRoot %>js/disclaim.js"></script>


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