[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 21:53:16 2014
New Revision: 6780

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6780&view=rev
Log:
More consent abstraction. Remove remaining terms of use actions and replace with "generic" consent actions and terms of use specific functions. Remove any consent related event IDs in lieu of predicates and decision-states.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeReleaseConsentFunction.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/IsConsentRequiredPredicate.java
      - copied, changed from r6736, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/MessageSourceConsentFunction.java
      - copied, changed from r6736, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.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/ConsentEventIds.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateAttributeReleaseChoices.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/IsAttributeReleaseConsentRequired.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/ReleaseAttributes.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/

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=6780&r1=6779&r2=6780&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 21:53:16 2014
@@ -11,6 +11,8 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+   <bean id="AttributeReleaseConsentFunction" class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseConsentFunction" scope="prototype" />
+
     <bean id="AttributeConsentFlowDescriptorLookupStrategy" class="net.shibboleth.idp.consent.logic.FlowDescriptorLookup" scope="prototype"
         c:type="#{ T(net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor) }" />
 
@@ -22,6 +24,9 @@
 
     <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"
+        c:currentConsentsFunction-ref="AttributeReleaseConsentFunction"  />
         
     <bean id="SetRPUIInformation" class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
@@ -40,9 +45,7 @@
     <bean id="ReadGlobalAttributeConsentFromStorage" class="net.shibboleth.idp.consent.flow.storage.ReadConsentFromStorage" scope="prototype"
         p:storageKeyLookupStrategy-ref="shibboleth.consent.UserStorageKey" />
 
-    <bean id="IsAttributeConsentRequired" class="net.shibboleth.idp.consent.flow.ar.IsAttributeReleaseConsentRequired" scope="prototype" />
-
-    <bean id="CreateAttributeConsentChoices" class="net.shibboleth.idp.consent.flow.ar.CreateAttributeReleaseChoices" scope="prototype" />
+    <bean id="IsConsentRequiredPredicate" class="net.shibboleth.idp.consent.logic.IsConsentRequiredPredicate" scope="prototype" />
 
     <bean id="ExtractConsent" class="net.shibboleth.idp.consent.flow.ExtractConsent" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />

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=6780&r1=6779&r2=6780&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 21:53:16 2014

[... 480 lines stripped ...]