[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: Sat Dec 19 01:59:09 2015
New Revision: 8054

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8054&view=rev
Log:
IDP-873 - Add list to customize attribute display order.

Don't re-use the whitelist to control attribute display order, instead use a new list.

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=8054&r1=8053&r2=8054&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	Sat Dec 19 01:59:09 2015
@@ -66,6 +66,17 @@
     -->
 
     <!--
+    Customize the order in which attributes are displayed.
+    Attribute IDs not present in this list will be sorted according to their
+    natural order and displayed subsequent to any attribute IDs specified here.
+    -->
+    <!--
+    <util:list id="shibboleth.consent.attribute-release.AttributeDisplayOrder">
+        <value>mail</value>
+    </util:list>
+    -->
+
+    <!--
     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=8054&r1=8053&r2=8054&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	Sat Dec 19 01:59:09 2015
@@ -84,7 +84,7 @@
     <!-- Default comparator which orders attributes according to the whitelist. -->
     <bean id="DefaultAttributeIDComparator"
         class="net.shibboleth.idp.consent.logic.impl.PreferExplicitOrderComparator"
-        c:order-ref="shibboleth.consent.attribute-release.WhitelistedAttributeIDs" />
+        c:order="#{getObject('shibboleth.consent.attribute-release.AttributeDisplayOrder')}" />
 
     <!-- Action beans -->