[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/error-mappings.xml system/conf/mvc-beans....

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  9 14:17:02 2014
New Revision: 6062

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6062&view=rev
Log:
Add error template for stake requests, map to back-button exception, and enhance MVC error handling.

Added:
    trunk/idp-conf/src/main/resources/views/stale-error.vm   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/error-mappings.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/error-mappings.xml?rev=6062&r1=6061&r2=6062&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/error-mappings.xml Mon Jun  9 14:17:02 2014
@@ -23,6 +23,8 @@
 
     <util:map id="shibboleth.EventViewMap">
         <entry key="InvalidProfileConfiguration" value="relying-party-error" />
+        <entry key="MessageReplay" value="stale-error" />
+        <entry key="MessageExpired" value="stale-error" />
     </util:map>
 
     <!-- Mappings of error events during requests to SAML status codes and SOAP fault codes. -->

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=6062&r1=6061&r2=6062&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml Mon Jun  9 14:17:02 2014
@@ -34,15 +34,15 @@
     
     <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
     
-    <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
-       <property name="exceptionMappings">
-          <props>
-             <prop key="FlowExecutionRestorationFailureException">backbutton-error</prop>
-          </props>
-       </property>
-       <!--
-       <property name="defaultErrorView" value="error"/>
-       -->
+    <bean class="net.shibboleth.ext.spring.error.ExtendedMappingExceptionResolver">
+        <property name="exceptionMappings">
+            <props>
+                <prop key="FlowExecutionRestorationFailureException">stale-error</prop>
+            </props>
+        </property>
+        <!--
+        <property name="defaultErrorView" value="error"/>
+        -->
     </bean>
     
     <!-- ViewResolvers -->