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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun  5 20:25:20 2014
New Revision: 6051

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6051&view=rev
Log:
Checkpoint some work on error handling refinements.

Added:
    trunk/idp-conf/src/main/resources/views/general-error.vm
      - copied, changed from r6050, trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/relying-party-error.vm   (with props)
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/general-error.jsp
      - copied, changed from r6050, trunk/idp-war/src/main/webapp/WEB-INF/jsp/error.jsp
Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error.jsp

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=6051&r1=6050&r2=6051&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 Thu Jun  5 20:25:20 2014
@@ -36,11 +36,11 @@
     <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
        <property name="exceptionMappings">
           <props>
-             <prop key="FlowExecutionRestorationFailureException">backbutton</prop>
+             <prop key="FlowExecutionRestorationFailureException">backbutton-error</prop>
           </props>
        </property>
        <!--
-       <property name="defaultErrorView" value="error"/>
+       <property name="defaultErrorView" value="general-error"/>
        -->
     </bean>
     

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml?rev=6051&r1=6050&r2=6051&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml Thu Jun  5 20:25:20 2014
@@ -23,6 +23,7 @@
             <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext))" result="viewScope.authenticationContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
+            <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml?rev=6051&r1=6050&r2=6051&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml Thu Jun  5 20:25:20 2014
@@ -25,6 +25,7 @@
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationWarningContext))" result="viewScope.authenticationWarningContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.LDAPResponseContext))" result="viewScope.ldapResponseContext" />
+            <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=6051&r1=6050&r2=6051&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)

[... 108 lines stripped ...]