From 024212e0aad12856ed26749d163ec98eb4019aaa Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 7 Nov 2014 15:34:14 +0000
Subject: [PATCH] Accept hide-from-discovery entity category from eduGAIN
 participants. Also, tidy the list and use Spring c:-notation for categories.

---
 mdx/uk/generate.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 98b6f57d..e4e7531e 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -262,18 +262,21 @@
                 <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
                     <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">
-                                <constructor-arg value="http://refeds.org/category/research-and-scholarship"/>
-                            </bean>
+                            <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">
-                                <constructor-arg value="http://refeds.org/category/research-and-scholarship"/>
-                            </bean>
-                            <!-- Permit GÉANT CoC category from any eduGAIN participant. -->
-                            <bean parent="EntityCategoryMatcher">
-                                <constructor-arg value="http://www.geant.net/uri/dataprotection-code-of-conduct/v1"/>
-                            </bean>
+                            <bean parent="EntityCategorySupportMatcher"
+                                c:category="http://refeds.org/category/research-and-scholarship"/>
                         </list>
                     </property>
                 </bean>