From 969cfe577b7ad486bf77c7432f8d84bc2cb31595 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sun, 17 Mar 2013 17:38:23 +0000
Subject: [PATCH] Switch from SWAMID 1.0 aggregate to SWAMID 2.0 aggregate. 
 This has a validUntil that we can check, and also includes entities imported
 from eduGAIN.

---
 mdx/se_swamid/beans.xml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index f46dbc1a..9785cf8e 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -11,11 +11,17 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
     
+    <!--
+        Import eduGAIN participant beans for namespace stripping stages.
+    -->
+    <import resource="../cz_eduid/beans.xml"/>
+    <import resource="../hu_eduid/beans.xml"/>
+    
     <!--
         Location of various resources.
     -->
     <bean id="se_swamid_productionAggregate_url" class="java.lang.String">
-        <constructor-arg value="http://md.swamid.se/md/swamid-1.0.xml"/>
+        <constructor-arg value="http://md.swamid.se/md/swamid-2.0.xml"/>
     </bean>
     <bean id="se_swamid_edugainAggregate_url" class="java.lang.String">
         <constructor-arg value="http://md2.swamid.se/md/swamid-edugain-1.0.xml"/>
@@ -123,17 +129,25 @@
                 <!--
                 	No validUntil attribute at present.
                 -->
-                <!--
                 <ref bean="check_validUntil"/>
-                -->
                 <ref bean="se_swamid_checkSignature"/>
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="disassemble"/>
-                
+
+                <!--
+                    The production aggregate contains imported entities from
+                    other federations.  So, can have any registrationAuthority,
+                    but default it if not present.
+                -->
                 <ref bean="se_swamid_default_regauth"/>
-                <ref bean="se_swamid_check_regauth"/>
 
+                <!--
+                    Strip eduGAIN participant-specific namespaces.
+                -->
+                <ref bean="cz_eduid_stripMetadataNamespace"/>
+                <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
+                
                 <ref bean="standardImportActions"/>
                 
                 <!-- Strip all entity attributes from this source. -->