[Archive-access-cvs] SF.net SVN: archive-access: [2228] trunk/archive-access/projects/wayback

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

Revision: 2228
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2228&view=rev
Author:   bradtofel
Date:     2008-04-10 20:56:08 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
BUGFIX: ACC-18: added @page UTF-8 explicit declaration, changed StringHttpServletResponseWrapper to also be UTF-8 explicitly

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java	2008-04-11 03:56:08 UTC (rev 2228)
@@ -37,7 +37,7 @@
  * @version $Date$, $Revision$
  */
 public class StringHttpServletResponseWrapper extends HttpServletResponseWrapper {
-
+	private final static String WRAPPED_CHAR_ENCODING = "UTF-8";
 	private StringWriter sw = new StringWriter();
 	
 	/**
@@ -45,6 +45,7 @@
 	 */
 	public StringHttpServletResponseWrapper(HttpServletResponse response) {
 		super(response);
+		setCharacterEncoding(WRAPPED_CHAR_ENCODING);
 	}
 	public PrintWriter getWriter() {
 		return new PrintWriter(sw);

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="org.archive.wayback.exception.WaybackException" %>
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Date" %>
 <%@ page import="java.util.Iterator" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="org.archive.wayback.exception.WaybackException" %>
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
@@ -14,5 +15,5 @@
 %>
 
 <h2><%= fmt.format(e.getTitleKey()) %></h2>
-<p><b><%= fmt.format(e.getMessageKey()) %></b></p>
+<p><b><%= fmt.format(e.getMessageKey(),e.getMessage()) %></b></p>
 <jsp:include page="/template/UI-footer.jsp" flush="true" />

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Date" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="org.archive.wayback.exception.WaybackException" %>
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="org.archive.wayback.core.Timestamp" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<%@ page contentType="text/xml" %>
+<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%>
 <%@ page import="org.archive.wayback.exception.WaybackException" %>
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<%@ page contentType="text/xml" %>
+<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Properties" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Date" %>
 <%@ page import="org.archive.wayback.core.Timestamp" %>
 <%@ page import="org.archive.wayback.core.UIResults" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Date" %>
 <%@ page import="org.archive.wayback.ResultURIConverter" %>
 <%@ page import="org.archive.wayback.core.Timestamp" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Date" %>
 <%@ page import="org.archive.wayback.WaybackConstants" %>
 <%@ page import="org.archive.wayback.core.Timestamp" %>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Date" %>
@@ -287,11 +288,11 @@
 				%><input type="checkbox" name="metamode" value="yes" <%=
 					metaChecked 
 				%> onClick="changeMeta()">&nbsp
-				  -->
-				  <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
-					fmt.format("UIGlobal.helpLink")
-				%></a>
 			</form>
+      -->
+      <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
+      fmt.format("UIGlobal.helpLink")
+      %></a>
 		</td>
 		<td>
 			<img wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Date" %>
@@ -309,11 +310,11 @@
 				%><input type="checkbox" name="metamode" value="yes" <%=
 					metaChecked 
 				%> onClick="changeMeta()">&nbsp
-				  -->
-				  <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
-					fmt.format("UIGlobal.helpLink")
-				%></a>
 			</form>
+      -->
+      <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
+      fmt.format("UIGlobal.helpLink")
+      %></a>
 		</td>
 		<td>
 			<img wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp	2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp	2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
 <%@ page import="org.archive.wayback.core.UIResults" %>
 <%@ page import="org.archive.wayback.util.StringFormatter" %>
 <%


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