[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 10:39:52 2014
New Revision: 7077

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7077&view=rev
Log:
For now, apply attribute-release flows only to attribute-push cases to avoid confusion.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml?rev=7077&r1=7076&r2=7077&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml Fri Dec 12 10:39:52 2014
@@ -34,15 +34,18 @@
 
     <!-- Parent bean for attribute release consent flows. -->
     <bean id="shibboleth.consent.AttributeReleaseFlow" abstract="true"
-        class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor"
-        p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
-        p:doNotRememberConsentAllowed="false"
-        p:globalConsentAllowed="false"
-        p:perAttributeConsentEnabled="false"
-        p:compareValues="true"
-        p:lifetime="P1Y"
-        p:nonBrowserSupported="false"
-        scope="prototype" />
+            class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor"
+            p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
+            p:doNotRememberConsentAllowed="false"
+            p:globalConsentAllowed="false"
+            p:perAttributeConsentEnabled="false"
+            p:compareValues="true"
+            p:lifetime="P1Y"
+            p:nonBrowserSupported="false">
+        <property name="activationCondition">
+            <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
+        </property>
+    </bean>
 
     <!-- Parent bean for terms of use consent flows. -->
     <bean id="shibboleth.consent.TermsOfUseFlow" abstract="true"
@@ -50,8 +53,7 @@
         p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
         p:compareValues="true"
         p:lifetime="P1Y"
-        p:nonBrowserSupported="false"
-        scope="prototype" />
+        p:nonBrowserSupported="false" />
 
     <!-- Function to lookup consent-specific audit context as a child of the consent context. -->
     <bean id="shibboleth.consent.ChildLookup.ConsentAuditContext"