[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abst...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Oct 23 22:52:43 2014
New Revision: 6781

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6781&view=rev
Log:
Rename a consent action.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/PopulateConsentContext.java
      - copied, changed from r6779, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/PopulateCurrentConsents.java
Modified:
    trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/post-authn/terms-of-use-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/post-authn/terms-of-use-abstract-flow.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/PopulateCurrentConsents.java

Modified: trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-beans.xml?rev=6781&r1=6780&r2=6781&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-beans.xml Thu Oct 23 22:52:43 2014
@@ -25,7 +25,7 @@
     <bean id="PopulateAttributeConsentContext" class="net.shibboleth.idp.consent.flow.ar.PopulateAttributeReleaseContext" scope="prototype"
         p:attributePredicate-ref="shibboleth.consent.AttributeConsent.AttributePredicate" />
 
-    <bean id="PopulateCurrentConsents" class="net.shibboleth.idp.consent.flow.PopulateCurrentConsents" scope="prototype"
+    <bean id="PopulateConsentContext" class="net.shibboleth.idp.consent.flow.PopulateConsentContext" scope="prototype"
         c:currentConsentsFunction-ref="AttributeReleaseConsentFunction"  />
         
     <bean id="SetRPUIInformation" class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml?rev=6781&r1=6780&r2=6781&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml Thu Oct 23 22:52:43 2014
@@ -26,7 +26,7 @@
     <!-- If consent revocation was requested, skip reading from storage. -->
 
     <decision-state id="TestForRevokeConsent">
-        <if test="requestParameters._idp_revokeConsent" then="PopulateCurrentConsents" else="ReadConsentFromStorage" />
+        <if test="requestParameters._idp_revokeConsent" then="PopulateConsentContext" else="ReadConsentFromStorage" />
     </decision-state>
 
 
@@ -39,7 +39,7 @@
     </action-state>
 
     <decision-state id="TestForReadGlobalAttributeConsentFromStorage">
-        <if test="attributeReleaseFlowDescriptor.globalConsentAllowed" then="ReadGlobalAttributeConsentFromStorage" else="PopulateCurrentConsents" />
+        <if test="attributeReleaseFlowDescriptor.globalConsentAllowed" then="ReadGlobalAttributeConsentFromStorage" else="PopulateConsentContext" />
     </decision-state>
 
     <action-state id="ReadGlobalAttributeConsentFromStorage">
@@ -52,14 +52,14 @@
     <!-- If global consent has been given by user, skip the rest of the flow. -->
     
     <decision-state id="TestForGlobalAttributeConsent">
-        <if test="GlobalAttributeConsentPredicate.apply(opensamlProfileRequestContext)" then="proceed" else="PopulateCurrentConsents" />
+        <if test="GlobalAttributeConsentPredicate.apply(opensamlProfileRequestContext)" then="proceed" else="PopulateConsentContext" />
     </decision-state>
 
 
    <!-- Create consent objects and store in consent context. -->
 
-    <action-state id="PopulateCurrentConsents">
-        <evaluate expression="PopulateCurrentConsents" />
+    <action-state id="PopulateConsentContext">
+        <evaluate expression="PopulateConsentContext" />
         <evaluate expression="'proceed'" />
         <transition on="proceed" to="IsConsentRequired" />
     </action-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/post-authn/terms-of-use-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/post-authn/terms-of-use-abstract-beans.xml?rev=6781&r1=6780&r2=6781&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/post-authn/terms-of-use-abstract-beans.xml (original)

[... 54 lines stripped ...]