[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/logout: logout-flow.xml propagatio...

[noreply at shibboleth.net]

Author: serac
Date: Fri Apr  1 10:23:58 2016
New Revision: 8190

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8190&view=rev
Log:
IDP-956 Use on-render for view state setup.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml?rev=8190&r1=8189&r2=8190&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	Fri Apr  1 10:23:58 2016
@@ -73,7 +73,7 @@
     </action-state>
 
     <view-state id="LogoutView" view="logout">
-        <on-entry>
+        <on-render>
             <evaluate expression="WriteAuditLog" />
             <evaluate expression="environment" result="viewScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
@@ -83,7 +83,7 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="viewScope.custom" />
-        </on-entry>
+        </on-render>
         <transition on="proceed" to="LogoutCompleteView" />
         <transition on="end" to="LogoutCompleteView" />
         <transition on="propagate" to="LogoutPropagateView" />

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml?rev=8190&r1=8189&r2=8190&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml	Fri Apr  1 10:23:58 2016
@@ -3,12 +3,12 @@
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
     <view-state id="ShowServiceLogoutView" view="cas/logoutService">
-        <on-entry>
+        <on-render>
             <set name="viewScope.logoutPropCtx"
                  value="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.session.context.LogoutPropagationContext))" />
             <set name="viewScope.messageID" value="T(java.util.UUID).randomUUID()" />
             <set name="viewScope.issueInstant" value="DateFormatter.print(T(org.joda.time.DateTime).now())" />
-        </on-entry>
+        </on-render>
         <transition on="proceed" to="proceed" />
     </view-state>