From 3d7d215b9b13138ac41211b49e00f2927eb5384e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 3 May 2013 17:20:18 +0000
Subject: [PATCH] The production eduGAIN aggregate now has a validUntil
 attribute. All entities in eduGAIN aggregates should now have
 RegistrationInfo elements.

---
 mdx/int_edugain/beans.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index ffeb18ab..040e9445 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -78,12 +78,7 @@
                         missing or expired validUntil attribute
                         invalid signature
                 -->
-                <!--
-                    no validUntil element is present at the moment
-                -->
-                <!--
                 <ref bean="check_validUntil"/>
-                -->
                 <ref bean="int_edugain_checkSignature"/>
                 <ref bean="errorTerminatingFilter"/>
                 
@@ -95,6 +90,12 @@
                 <ref bean="cz_eduid_stripMetadataNamespace"/>
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
                 
+                <!--
+                    All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
+                    we can't check the actual values.
+                -->
+                <ref bean="check_hasreginfo"/>
+                
                 <ref bean="standardImportActions"/>
                 
                 <!-- Strip all entity attributes from this source. -->
@@ -125,10 +126,17 @@
                 <ref bean="disassemble"/>
 
                 <!--
-                    Strip Hungarian entity attributes namespace.
+                    Strip participant-specific namespaces.
                 -->
+                <ref bean="cz_eduid_stripMetadataNamespace"/>
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
 
+                <!--
+                    All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
+                    we can't check the actual values.
+                -->
+                <ref bean="check_hasreginfo"/>
+                
                 <ref bean="standardImportActions"/>
                 
                 <!-- Strip all entity attributes from this source. -->