[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/session-manager-system.xml idp-con...

[noreply at shibboleth.net]

Author: serac
Date: Tue Oct  6 07:10:57 2015
New Revision: 7798

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7798&view=rev
Log:
IDP-224 Refactor logout propagation flow selection.

Provide a common facility to allow both logout propagation UI and master
propagation flow to select a LogoutPropagationFlowDescriptor.

Added:
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/logic/
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/logic/LogoutPropagationFlowDescriptorSelector.java
Modified:
    trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
    trunk/idp-conf/src/main/resources/views/logout-propagate.vm
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SelectLogoutPropagationFlow.java

Modified: trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml?rev=7798&r1=7797&r2=7798&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml	Tue Oct  6 07:10:57 2015
@@ -76,12 +76,14 @@
 
     <!-- Built-in logout propagation flows. -->
     
-    <bean id="logoutprop/saml2" class="net.shibboleth.idp.session.LogoutPropagationFlowDescriptor">
-        <property name="activationCondition">
-            <bean class="net.shibboleth.idp.session.LogoutPropagationFlowDescriptor.ActivationCondition"
-                p:sessionType="#{ T(net.shibboleth.idp.saml.session.SAML2SPSession) }" />
-        </property>
-    </bean>
+    <bean id="logoutprop/saml2" class="net.shibboleth.idp.session.LogoutPropagationFlowDescriptor"
+          c:sessionType="#{ T(net.shibboleth.idp.saml.session.SAML2SPSession) }" />
+
+    <!-- Selector function used in logout-propagation UI and logout-propagation master flow -->
+
+    <bean id="shibboleth.LogoutPropagationFlowSelector"
+          class="net.shibboleth.idp.session.logic.LogoutPropagationFlowDescriptorSelector"
+          c:flows-ref="shibboleth.LogoutPropagationFlows" />
 
     <!-- The import is at the bottom to avoid a depends-on in a user-editable file. -->
     <import resource="../../conf/session-manager.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=7798&r1=7797&r2=7798&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	Tue Oct  6 07:10:57 2015
@@ -102,6 +102,7 @@
             <evaluate expression="T(org.cryptacular.util.CodecUtil)" result="requestScope.codecUtil" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
+            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.LogoutPropagationFlowSelector')" result="requestScope.flowSelector" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext')" result="requestScope.custom" />
         </on-entry>
     </end-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml?rev=7798&r1=7797&r2=7798&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml	Tue Oct  6 07:10:57 2015
@@ -35,8 +35,8 @@
         
     <bean id="SelectPropagationFlow"
         class="net.shibboleth.idp.session.impl.SelectLogoutPropagationFlow" scope="prototype"
-        p:availableFlows-ref="shibboleth.LogoutPropagationFlows" />
-        
+        c:selector-ref="shibboleth.LogoutPropagationFlowSelector" />
+
     <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:formattingMap-ref="shibboleth.AuditFormattingMap" />
 

Modified: trunk/idp-conf/src/main/resources/views/logout-propagate.vm

[... 321 lines stripped ...]