[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: Tue Oct 13 15:43:47 2015
New Revision: 7812

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7812&view=rev
Log:
IDP-624 - Move attribute ID comparator impl to system/ from conf/.


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=7812&r1=7811&r2=7812&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	Tue Oct 13 15:43:47 2015
@@ -66,20 +66,6 @@
     -->
 
     <!--
-    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" />
-    
-    <!-- TODO IDP-624 Fix this user-space dependency on a non-API class. -->
-    <!-- For now, kept this in impl module, maybe we just move it to -api. -->
-    <bean id="shibboleth.consent.attribute-release.DefaultAttributeIDComparator"
-        class="net.shibboleth.idp.consent.logic.impl.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=7812&r1=7811&r2=7812&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	Tue Oct 13 15:43:47 2015
@@ -81,6 +81,11 @@
         class="net.shibboleth.idp.consent.storage.impl.ConsentSerializer"
         p:symbolics-ref="shibboleth.consent.AttributeSymbolics" />
 
+    <!-- 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" />
+
     <!-- Action beans -->
 
     <bean id="InitializeConsentContext"
@@ -92,7 +97,7 @@
     <bean id="PopulateAttributeConsentContext"
         class="net.shibboleth.idp.consent.flow.ar.impl.PopulateAttributeReleaseContext" scope="prototype"
         p:attributePredicate-ref="AttributePredicate"
-        p:attributeIdComparator-ref="shibboleth.consent.attribute-release.AttributeIDComparator" />
+        p:attributeIdComparator="#{getObject('shibboleth.consent.attribute-release.AttributeIDComparator') ?: getObject('DefaultAttributeIDComparator') }" />
 
     <bean id="PopulatePreConsentAuditContext"
         class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"