summaryrefslogtreecommitdiff
path: root/src/main/webapp/wayferror.jsp
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-01 11:35:10 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-01 11:35:10 +0200
commite54fabf198f50546b093753900d3a41fa7535181 (patch)
treebcd4952415c938101ae168efc2dcb2b550369e23 /src/main/webapp/wayferror.jsp
parent6c67f4c3050fa01d1b8e04f334cb8dd2293b39d0 (diff)
parentbd0c52acfb796b5a8cd85c2f535e7e874f558f3a (diff)
Merge branch 'trunk' into idp.nordu.net
Conflicts: src/main/webapp/wayf.jsp
Diffstat (limited to 'src/main/webapp/wayferror.jsp')
-rwxr-xr-x[-rw-r--r--]src/main/webapp/wayferror.jsp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/webapp/wayferror.jsp b/src/main/webapp/wayferror.jsp
index 1fd564a..5e72816 100644..100755
--- a/src/main/webapp/wayferror.jsp
+++ b/src/main/webapp/wayferror.jsp
@@ -5,7 +5,7 @@
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
- <jsp:useBean id="requestURL" scope="request" class="java.lang.String"/>
+ <jsp:useBean id="requestURL" scope="application" class="java.lang.String"/>
<jsp:useBean id="errorText" scope="request" class="java.lang.String"/>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -24,14 +24,9 @@
<p>Please email <a href="mailto:user@domain"> administrator's name</a> and include the following error message:</p>
-<logic:notEmpty name="requestURL">
-<p class="error">Discovery Service failure at (<bean:write name="requestURL" />)</p>
+<p class="error">WAYF failure at (<bean:write name="requestURL" />)</p>
<p><bean:write name="errorText" /></p>
-</logic:notEmpty>
-<logic:empty name="requestURL">
-<p class="error">The Discovery Service should not be called directly</p>
-</logic:empty>
</body>