From 723c01ff822fd4eed2a52df3bc95539c74d24516 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 10 Apr 2017 12:03:25 +0100
Subject: [PATCH] Switch to entity attribute blacklist for fallback aggregate

Final phase of ukf/ukf-meta#10.
---
 mdx/uk/generate.xml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 9a5bcb41..1d5af74d 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -219,33 +219,6 @@
         </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>
@@ -531,7 +504,6 @@
                 <ref bean="check_dup_display"/>
                 <ref bean="errorTerminatingFilter"/>
                 
-                <ref bean="entityAttributes.whitelist"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="stripWayfNamespace"/>
                 <ref bean="stripEmptyExtensions"/>