From 193c193acdcdfbd4a7154ea3f9d6511dee3a2db4 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 27 Jan 2017 14:03:10 +0000
Subject: [PATCH] Switch to entity attribute blacklist for test aggregate

First phase of ukf/ukf-meta#10.
---
 mdx/uk/generate.xml | 70 +++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 19c041c2..d4fcbaaa 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -243,6 +243,48 @@
         </property>
     </bean>
 
+    <bean id="entityAttributes.blacklist" parent="EntityAttributeFilteringStage">
+        <property name="whitelisting" value="false"/>
+        <property name="rules">
+            <list>
+                <!-- Deny "InCommon registration" attribute (duplicates mdrpi:registrationAuthority) -->
+                <bean parent="EntityCategoryMatcher"
+                    c:category="http://id.incommon.org/category/registered-by-incommon"/>
+
+                <!-- Deny InCommon "supports InCommon R+S" attribute (duplicates REFEDS variant) -->
+                <bean parent="EntityCategorySupportMatcher"
+                    c:category="http://id.incommon.org/category/research-and-scholarship"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="entityAttributes.whitelist" parent="EntityAttributeFilteringStage">
+        <property name="whitelisting" value="true"/>
+        <property name="rules">
+            <list>
+                <!-- Permit GÉANT CoC category from any eduGAIN participant. -->
+                <bean parent="EntityCategoryMatcher"
+                    c:category="http://www.geant.net/uri/dataprotection-code-of-conduct/v1"/>
+                
+                <!-- Permit REFEDS Hide From Discovery category from any eduGAIN participant. -->
+                <bean parent="EntityCategoryMatcher"
+                    c:category="http://refeds.org/category/hide-from-discovery"/>
+                
+                <!-- Permit REFEDS R&S category from any eduGAIN participant. -->
+                <bean parent="EntityCategoryMatcher"
+                    c:category="http://refeds.org/category/research-and-scholarship"/>
+                
+                <!-- Permit REFEDS R&S category *support* from any eduGAIN participant. -->
+                <bean parent="EntityCategorySupportMatcher"
+                    c:category="http://refeds.org/category/research-and-scholarship"/>
+                
+                <!-- Permit SIRTFI entity attribute from any eduGAIN participant -->
+                <ref bean="SIRTFI.entity.attribute.matcher"/>
+                
+            </list>
+        </property>
+    </bean>
+    
     <bean id="uk_int_edugain_importPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
@@ -251,31 +293,7 @@
                 <!--
                     Entity Attribute policy for entities from eduGAIN participants.
                 -->
-                <bean id="entityAttributes" parent="EntityAttributeFilteringStage">
-                    <property name="rules">
-                        <list>
-                            <!-- Permit GÉANT CoC category from any eduGAIN participant. -->
-                            <bean parent="EntityCategoryMatcher"
-                                c:category="http://www.geant.net/uri/dataprotection-code-of-conduct/v1"/>
-
-                            <!-- Permit REFEDS Hide From Discovery category from any eduGAIN participant. -->
-                            <bean parent="EntityCategoryMatcher"
-                                c:category="http://refeds.org/category/hide-from-discovery"/>
-
-                            <!-- Permit REFEDS R&S category from any eduGAIN participant. -->
-                            <bean parent="EntityCategoryMatcher"
-                            	c:category="http://refeds.org/category/research-and-scholarship"/>
-
-                            <!-- Permit REFEDS R&S category *support* from any eduGAIN participant. -->
-                            <bean parent="EntityCategorySupportMatcher"
-                                c:category="http://refeds.org/category/research-and-scholarship"/>
-
-                            <!-- Permit SIRTFI entity attribute from any eduGAIN participant -->
-                            <ref bean="SIRTFI.entity.attribute.matcher"/>
-
-                        </list>
-                    </property>
-                </bean>
+                <ref bean="entityAttributes.blacklist"/>
 
                 <ref bean="importCommonTail"/>
             </list>
@@ -316,6 +334,7 @@
                 <ref bean="check_dup_display"/>
                 <ref bean="errorTerminatingFilter"/>
                 
+                <ref bean="entityAttributes.whitelist"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="stripWayfNamespace"/>
                 <ref bean="fixup_keyuse"/>
@@ -556,6 +575,7 @@
                 <ref bean="check_dup_display"/>
                 <ref bean="errorTerminatingFilter"/>
                 
+                <ref bean="entityAttributes.whitelist"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="stripWayfNamespace"/>
                 <ref bean="fixup_keyuse"/>