You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/10/07 23:28:56 UTC
svn commit: r1180249 - in
/incubator/rave/trunk/rave-portal-resources/src/main:
resources/messages.properties webapp/WEB-INF/views/error.jsp
webapp/WEB-INF/web.xml webapp/css/default.css
Author: mfranklin
Date: Fri Oct 7 21:28:56 2011
New Revision: 1180249
URL: http://svn.apache.org/viewvc?rev=1180249&view=rev
Log:
Added generic error handler to web.xml (Supports RAVE-291)
Modified:
incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml
incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1180249&r1=1180248&r2=1180249&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties Fri Oct 7 21:28:56 2011
@@ -18,7 +18,7 @@
#
username.required=Username required
-username.invalid.length=Username must be atleast 2 characters long
+username.invalid.length=Username must be at least 2 characters long
username.invalid.pattern=Username must be at least 2 characters long and may only contain letters, numbers, \
_-+.@
username.exists=Username already exists
@@ -36,6 +36,11 @@ email.exists=This email address already
form.some.fields.required=Field marked with * are required
form.all.fields.required=All fields are required.
+page.error.title=Rave has suffered a brief meltdown
+page.error.message=Please bear with us while we fetch some ice cubes. In the meantime please try
+page.error.reload=reloading
+page.error.details=technical details
+
page.general.back=Back to Rave
page.general.addnewpage=Add a New Page
page.general.confirmpassword=Confirm password:
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp?rev=1180249&r1=1180248&r2=1180249&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp Fri Oct 7 21:28:56 2011
@@ -1,35 +1,39 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
+<%@ page isErrorPage="true" %><%--
--%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
---%><rave:rave_generic_page pageTitle="Error: ${errorMessage}">
- <div id="errorPage" >
- <div id="errorContent">
- <div id="errorTitle">Rave has suffered a brief meltdown</div>
+--%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
+--%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
+--%><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %><%--
+--%><%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %><%--
+--%><%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%><%--
+--%><rave:rave_generic_page pageTitle="Error: ${exception.message}">
+ <header>
+ <h1>
+ <fmt:message key="page.error.title" />
+ </h1>
+ </header>
+ <div id="content" >
+ <div id="errorMessage">
<div class="errorLogo"><img src="<spring:url value="images/error_generic.png" />" alt="Error has occurred"
title="Error has occurred"/></div>
<div class="errorMessage">
- Please bear with us while we fetch some ice cubes.<br/><br/>
- In the meantime, please try <a href="javascript: window.location.reload();">reloading</a>.<br/>
- <span style="font-size: 85%;">Interested in <a
- href="javascript: portal.common.displayStackTraceDialog(true);">technical details</a>?</span>
+ <fmt:message key="page.error.message" />
+ <a href="javascript: window.location.reload();"><fmt:message key="page.error.reload" /></a>.<br/>
+ <a onclick="document.getElementById('errorStack').style.display = 'block';"><fmt:message key="page.error.details" /></a>
</div>
</div>
- <button type="button"
- style="margin-bottom: 10px;"
- onClick="document.getElementById('errorStackDialog').style.display = 'block';">Close
- </button>
- </div>
- <div id="errorStackDialog" title="Error Details" style="display: none;">
- <button type="button"
- style="margin-bottom: 10px;"
- onClick="document.getElementById('errorStackDialog').style.display = 'none';">Close
- </button>
- <pre class="errorTrace">
- ${exception}
+ <div id="errorStack" title="Error Details" >
+ <button type="button"
+ style="margin-bottom: 10px;"
+ onClick="document.getElementById('errorStack').style.display = 'none';">Close
+ </button>
+ <pre class="errorTrace">
+ ${exception}
- Stack Trace:
- <c:forEach var="i" items="exception.stackTrace">
- ${i}
- </c:forEach>
- </pre>
+ Stack Trace:
+ <c:forEach var="i" items="${exception.stackTrace}">
+ ${i}
+ </c:forEach>
+ </pre>
+ </div>
</div>
</rave:rave_generic_page>
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml?rev=1180249&r1=1180248&r2=1180249&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml Fri Oct 7 21:28:56 2011
@@ -36,13 +36,16 @@
/WEB-INF/applicationContext-security.xml
</param-value>
</context-param>
+
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+
<filter>
<filter-name>springSecurityFilterChain</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
+
<filter-mapping>
<filter-name>springSecurityFilterChain</filter-name>
<url-pattern>/*</url-pattern>
@@ -59,6 +62,7 @@
<servlet-name>dispatcher</servlet-name>
<url-pattern>/app/*</url-pattern>
</servlet-mapping>
+
<servlet-mapping>
<servlet-name>dispatcher</servlet-name>
<url-pattern>/index.html</url-pattern>
@@ -68,5 +72,8 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
-
+ <error-page>
+ <exception-type>java.lang.Exception</exception-type>
+ <location>/WEB-INF/views/error.jsp</location>
+ </error-page>
</web-app>
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1180249&r1=1180248&r2=1180249&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Fri Oct 7 21:28:56 2011
@@ -548,6 +548,15 @@ span.error, label.error {
cursor: pointer;
margin-right: 10px;
}
-.errorTrace {
+#errorStack {
display: none;
+
+}
+
+.errorMessage {
+ text-align: center;
+ font-size: 150%;
+}
+.errorLogo {
+ text-align: center;
}
\ No newline at end of file