[java-identity-provider COMMIT] /branches/3.1/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 29 12:36:14 2015
New Revision: 7608

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

https://issues.shibboleth.net/jira/browse/IDP-624

Merge R7449 into the 3.1 stream




Modified:
    branches/3.1/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml

Modified: branches/3.1/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml?rev=7608&r1=7607&r2=7608&view=diff
==============================================================================
--- branches/3.1/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml	(original)
+++ branches/3.1/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml	Mon Jun 29 12:36:14 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.
     -->