[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/intercept/consent-intercept-config.xml sy...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Mar 26 21:15:54 2015
New Revision: 7449

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7449&view=rev
Log:
IDP-624 Wire comparator used to control attribute display order during attribute release consent.

Modified:
    trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml?rev=7449&r1=7448&r2=7449&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml Thu Mar 26 21:15:54 2015
@@ -66,6 +66,18 @@
     -->
 
     <!--
+    The following beans define the comparator used to order attributes displayed to the user
+    during attribute release consent. The default comparator prefers ordering attributes in
+    the order in which they appear in the whitelist.
+    -->
+    <alias alias="shibboleth.consent.attribute-release.AttributeIDComparator"
+            name="shibboleth.consent.attribute-release.DefaultAttributeIDComparator" />
+            
+    <bean id="shibboleth.consent.attribute-release.DefaultAttributeIDComparator"
+        class="net.shibboleth.idp.consent.logic.PreferExplicitOrderComparator"
+        c:order-ref="shibboleth.consent.attribute-release.WhitelistedAttributeIDs" />
+
+    <!--
     These beans define mappings between audit log categories and formatting strings.
     -->
 

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml?rev=7449&r1=7448&r2=7449&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml Thu Mar 26 21:15:54 2015
@@ -91,7 +91,8 @@
 
     <bean id="PopulateAttributeConsentContext"
         class="net.shibboleth.idp.consent.flow.ar.PopulateAttributeReleaseContext" scope="prototype"
-        p:attributePredicate-ref="AttributePredicate" />
+        p:attributePredicate-ref="AttributePredicate"
+        p:attributeIdComparator-ref="shibboleth.consent.attribute-release.AttributeIDComparator" />
 
     <bean id="PopulatePreConsentAuditContext"
         class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"