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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 10:59:26 2014
New Revision: 7078

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7078&view=rev
Log:
Move the attribute push condition over into user space.

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

Modified: trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml?rev=7078&r1=7077&r2=7078&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml Fri Dec 12 10:59:26 2014
@@ -29,9 +29,14 @@
                 <bean id="intercept/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow" />
         
                 <bean id="intercept/attribute-release" parent="shibboleth.consent.AttributeReleaseFlow"
-                     p:doNotRememberConsentAllowed="true" 
-                     p:globalConsentAllowed="true"
-                     p:perAttributeConsentEnabled="true" />
+                         p:doNotRememberConsentAllowed="true" 
+                         p:globalConsentAllowed="true"
+                         p:perAttributeConsentEnabled="true">
+                    <!-- If perAttributeConsentEnabled is on, you should enable the condition. -->
+                    <property name="activationCondition">
+                        <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
+                    </property>
+                </bean>
             </list>
         </property>
     </bean>

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=7078&r1=7077&r2=7078&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:59:26 2014
@@ -34,18 +34,14 @@
 
     <!-- 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">
-        <property name="activationCondition">
-            <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
-        </property>
-    </bean>
+        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" />
 
     <!-- Parent bean for terms of use consent flows. -->
     <bean id="shibboleth.consent.TermsOfUseFlow" abstract="true"