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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jun  7 14:02:51 2014
New Revision: 6057

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6057&view=rev
Log:
Render final error view based on a mapping function.

Added:
    trunk/idp-conf/src/main/resources/views/error.vm
      - copied, changed from r6056, trunk/idp-conf/src/main/resources/views/general-error.vm
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringEventToViewLookupFunction.java   (with props)
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error.jsp
      - copied, changed from r6056, trunk/idp-war/src/main/webapp/WEB-INF/jsp/general-error.jsp
Modified:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/general-error.vm
    trunk/idp-conf/src/main/resources/views/relying-party-error.vm
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/general-error.jsp

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=6057&r1=6056&r2=6057&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/error-mappings.xml Sat Jun  7 14:02:51 2014
@@ -11,13 +11,19 @@
 
 	<context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
 
-    <!-- List of event/error codes during SSO to trap and handle without returning to SPs. -->
+    <!-- List of events to trap and handle with local views, without returning to SPs. -->
 
     <util:list id="shibboleth.LocalEvents">
         <!--
         <value>NoPotentialFlow</value>
         -->
     </util:list>
+    
+    <bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="error" />
+
+    <util:map id="shibboleth.EventViewMap">
+        <entry key="InvalidProfileConfiguration" value="relying-party-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=6057&r1=6056&r2=6057&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 Sat Jun  7 14:02:51 2014
@@ -40,7 +40,7 @@
           </props>
        </property>
        <!--
-       <property name="defaultErrorView" value="general-error"/>
+       <property name="defaultErrorView" value="error"/>
        -->
     </bean>
     

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=6057&r1=6056&r2=6057&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Sat Jun  7 14:02:51 2014
@@ -237,4 +237,9 @@
         </property>
     </bean>
     
+    <bean id="MapEventToView"
+        class="net.shibboleth.idp.profile.context.navigate.SpringEventToViewLookupFunction"
+        p:defaultView-ref="shibboleth.DefaultErrorView"
+        p:eventMap-ref="shibboleth.EventViewMap" />
+    
 </beans>

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=6057&r1=6056&r2=6057&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Sat Jun  7 14:02:51 2014
@@ -128,14 +128,10 @@
         
         <evaluate expression="currentEvent" />
         
-        <transition on="InvalidRelyingPartyConfiguration" to="RelyingPartyError" />
-        <transition on="InvalidProfileConfiguration" to="RelyingPartyError" />
-        
-        <transition to="GeneralError" />
+        <transition to="error" />
     </action-state>
 
-    <end-state id="RelyingPartyError" view="relying-party-error" />
-    <end-state id="GeneralError" view="general-error" />
+    <end-state id="error" view="#{MapEventToView.apply(currentEvent)}" />
 
     <!-- Successful terminal state. -->
 


[... 25 lines stripped ...]