[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/error.jsp

Sat May 17 07:13:55 EDT 2014

Author: rdw
Date: Sat May 17 07:13:55 2014
New Revision: 5942

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5942&view=rev
Log:
IDP- 251Add the error .jsp file.

Modified:
    trunk/idp-war/src/main/webapp/error.jsp

Modified: trunk/idp-war/src/main/webapp/error.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/error.jsp?rev=5942&r1=5941&r2=5942&view=diff
==============================================================================

--- trunk/idp-war/src/main/webapp/error.jsp (original)
+++ trunk/idp-war/src/main/webapp/error.jsp Sat May 17 07:13:55 2014
@@ -1,33 +1,17 @@
-<%@page import="edu.internet2.middleware.shibboleth.common.profile.AbstractErrorHandler"%>
-<%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
+<%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
-<html>
-<body>
-	<img src="<%= request.getContextPath()%>/images/dummylogo.png" alt="Replace or remove this logo"/>
-	<h3>ERROR</h3>
-	<p>
-	    An error occurred while processing your request.  Please contact your helpdesk or
-	    user ID office for assistance.
-	</p>
-	<p>
-	   This service requires cookies.  Please ensure that they are enabled and try your 
-	   going back to your desired resource and trying to login again.
-	</p>
-	<p>
-	   Use of your browser's back button may cause specific errors that can be resolved by
-	   going back to your desired resource and trying to login again.
-	</p>
-        <p>
-           If you think you were sent here in error,
-           please contact <idpui:serviceContact>technical support</idpui:serviceContact>
-        </p>       
-	<% 
-       Throwable error = (Throwable) request.getAttribute(AbstractErrorHandler.ERROR_KEY);
-	   if(error != null){
-	       org.owasp.esapi.Encoder esapiEncoder = org.owasp.esapi.ESAPI.encoder();
-	%>
-	<strong>Error Message: <%= esapiEncoder.encodeForHTML(error.getMessage()) %></strong>
-	<% } %>
+<%@ page import="net.shibboleth.utilities.java.support.codec.HTMLEncoder" %>
+<%@ page import="org.springframework.webflow.execution.RequestContext" %>
 
-</body>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <body>
+    
+        <h2>ERROR</h2>
+        
+<% RequestContext rc = (RequestContext) request.getAttribute("flowRequestContext");
+   if ( rc != null && rc.getCurrentEvent() != null) { %>
+        <p>ERROR: <%= HTMLEncoder.encodeForHTML(rc.getCurrentEvent().getId()) %></p>
+<% } %>
+        
+    </body>
 </html>

