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

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

Revision: 2461
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2461&view=rev
Author:   bradtofel
Date:     2008-07-21 23:15:24 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
MOVE: webapp/exception -> webapp/WEB-INF/exception

Added Paths:
-----------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp

Removed Paths:
-------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp

Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/CSSError.jsp	2008-07-02 00:17:37 UTC (rev 2386)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -1,18 +0,0 @@
-<%@ 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" %>
-<%
-
-WaybackException e = (WaybackException) request.getAttribute("exception");
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-response.setStatus(e.getStatus());
-
-%>
-/* CSS wayback retrieval error:
-
- Title:   <%= fmt.format(e.getTitleKey()) %>
- Message: <%= fmt.format(e.getMessageKey()) %>
- 
- */

Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/CSSError.jsp)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -0,0 +1,17 @@
+<%@ 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" %>
+<%
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+StringFormatter fmt = results.getWbRequest().getFormatter();
+response.setStatus(e.getStatus());
+
+%>
+/* CSS wayback retrieval error:
+
+ Title:   <%= fmt.format(e.getTitleKey()) %>
+ Message: <%= fmt.format(e.getMessageKey()) %>
+ 
+ */

Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/HTMLError.jsp	2008-07-02 00:17:37 UTC (rev 2386)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -1,19 +0,0 @@
-<%@ 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" %>
-<%
-WaybackException e = (WaybackException) request.getAttribute("exception");
-e.setupResponse(response);
-%>
-<jsp:include page="/template/UI-header.jsp" flush="true" />
-<%
-
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-
-%>
-
-<h2><%= fmt.format(e.getTitleKey()) %></h2>
-<p><b><%= fmt.format(e.getMessageKey(),e.getMessage()) %></b></p>
-<jsp:include page="/template/UI-footer.jsp" flush="true" />

Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/HTMLError.jsp)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -0,0 +1,19 @@
+<%@ 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" %>
+<%
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+e.setupResponse(response);
+%>
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
+<%
+
+StringFormatter fmt = results.getWbRequest().getFormatter();
+
+%>
+
+<h2><%= fmt.format(e.getTitleKey()) %></h2>
+<p><b><%= fmt.format(e.getMessageKey(),e.getMessage()) %></b></p>
+<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />

Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/JavaScriptError.jsp	2008-07-02 00:17:37 UTC (rev 2386)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -1,16 +0,0 @@
-<%@ 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" %>
-<%
-
-WaybackException e = (WaybackException) request.getAttribute("exception");
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-response.setStatus(e.getStatus());
-
-%>
-// Javascript wayback retrieval error:
-//
-// Title:   <%= fmt.format(e.getTitleKey()) %>
-// Message: <%= fmt.format(e.getMessageKey()) %>

Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/JavaScriptError.jsp)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -0,0 +1,16 @@
+<%@ 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" %>
+<%
+
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+StringFormatter fmt = results.getWbRequest().getFormatter();
+response.setStatus(e.getStatus());
+
+%>
+// Javascript wayback retrieval error:
+//
+// Title:   <%= fmt.format(e.getTitleKey()) %>
+// Message: <%= fmt.format(e.getMessageKey()) %>

Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/XMLError.jsp	2008-07-02 00:17:37 UTC (rev 2386)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<%@ 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" %>
-<%
-
-WaybackException e = (WaybackException) request.getAttribute("exception");
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-//response.setStatus(e.getStatus());
-
-%>
-<wayback>
-	<error>
-		<title><%= UIResults.encodeXMLContent(fmt.format(e.getTitleKey())) %></title>
-		<message><%= UIResults.encodeXMLContent(fmt.format(e.getMessageKey())) %></message>
-	</error>
-</wayback>

Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/XMLError.jsp)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp	2008-07-21 23:15:24 UTC (rev 2461)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<%@ 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" %>
+<%
+
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+StringFormatter fmt = results.getWbRequest().getFormatter();
+//response.setStatus(e.getStatus());
+
+%>
+<wayback>
+	<error>
+		<title><%= UIResults.encodeXMLContent(fmt.format(e.getTitleKey())) %></title>
+		<message><%= UIResults.encodeXMLContent(fmt.format(e.getMessageKey())) %></message>
+	</error>
+</wayback>


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