[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/DONOTTOUCH system/views/cas/footer.vm s...
noreply at shibboleth.net
noreply at shibboleth.net
Sat Jan 17 14:47:09 EST 2015
Author: scantor
Date: Sat Jan 17 14:47:08 2015
New Revision: 7252
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7252&view=rev
Log:
Add missing svn:eol props.
Modified:
trunk/idp-conf/src/main/resources/system/DONOTTOUCH (props changed)
trunk/idp-conf/src/main/resources/system/views/cas/footer.vm (props changed)
trunk/idp-conf/src/main/resources/system/views/cas/header.vm (props changed)
trunk/idp-conf/src/main/resources/system/views/cas/proxyFailure.vm (props changed)
trunk/idp-conf/src/main/resources/system/views/cas/proxySuccess.vm (props changed)
trunk/idp-conf/src/main/resources/system/views/cas/validateFailure.vm (props changed)
trunk/idp-conf/src/main/resources/system/views/cas/validateSuccess.vm (props changed)
trunk/idp-conf/src/main/resources/views/error.vm (contents, props changed)
trunk/idp-conf/src/main/resources/views/login.vm (props changed)
Modified: trunk/idp-conf/src/main/resources/views/error.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/error.vm?rev=7252&r1=7251&r2=7252&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/error.vm (original)
+++ trunk/idp-conf/src/main/resources/views/error.vm Sat Jan 17 14:47:08 2015
@@ -1,68 +1,68 @@
-##
-## Velocity Template for error end-state
-##
-## Velocity context will contain the following properties
-## flowRequestContext - the Spring Web Flow RequestContext
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-##
-#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
-#set ($defaultTitleSuffix = $springMacroRequestContext.getMessage("idp.title.suffix", "Error"))
-##
-#if ($flowRequestContext)
- ## This handles flow events, the most common case.
- #set ($eventId = $flowRequestContext.getCurrentEvent().getId())
- #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "error"))
- #set ($titleSuffix = $springMacroRequestContext.getMessage("${eventKey}.title", "$defaultTitleSuffix"))
- #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "$defaultTitleSuffix: $eventId"))
- #if ($eventId == "AccessDenied" or $eventId == "ContextCheckDenied")
- $response.setStatus(403)
- #elseif ($eventId == "UnableToDecode" || $eventId == "InvalidMessage")
- $response.setStatus(400)
- #else
- $response.setStatus(500)
- #end
-#elseif ($exception)
- ## This handles exceptions that reach the Spring-MVC exception handler.
- #set ($eventId = $exception.getClass().getSimpleName())
- #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "error"))
- #set ($titleSuffix = $springMacroRequestContext.getMessage("${eventKey}.title", "$defaultTitleSuffix"))
- #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "$defaultTitleSuffix: $eventId"))
-#else
- ## This is a catch-all that theoretically shouldn't happen?
- #set ($titleSuffix = $defaultTitleSuffix)
- #set ($message = $springMacroRequestContext.getMessage("idp.message", "An unidentified error occurred."))
-#end
-##
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8">
- <title>$title - $titleSuffix</title>
- <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
- </head>
-
- <body>
- <div class="wrapper">
- <div class="container">
- <header>
- <img src="$request.getContextPath()/images/dummylogo.png" alt="#springMessageText("idp.logo.alt-text", "logo")">
- <h3>$title - $titleSuffix</h3>
- </header>
-
- <div class="content">
- #evaluate($message)
- </div>
- </div>
-
- <footer>
- <div class="container container-footer">
- <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
- </div>
- </footer>
-
- </div>
- </body>
+##
+## Velocity Template for error end-state
+##
+## Velocity context will contain the following properties
+## flowRequestContext - the Spring Web Flow RequestContext
+## encoder - HTMLEncoder class
+## request - HttpServletRequest
+## response - HttpServletResponse
+## environment - Spring Environment object for property resolution
+##
+#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
+#set ($defaultTitleSuffix = $springMacroRequestContext.getMessage("idp.title.suffix", "Error"))
+##
+#if ($flowRequestContext)
+ ## This handles flow events, the most common case.
+ #set ($eventId = $flowRequestContext.getCurrentEvent().getId())
+ #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "error"))
+ #set ($titleSuffix = $springMacroRequestContext.getMessage("${eventKey}.title", "$defaultTitleSuffix"))
[... 51 lines stripped ...]
More information about the commits
mailing list