From e96be8dbdeb6446932839fc1415996a9e4f34bdd Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 18 Apr 2011 14:27:42 +0000
Subject: [PATCH] Add a first look at the SWAMID federation. Refactor all the
 mdx import flows, dividing multi-use beans from the import flow itself.
 Rename a lot of files and Ant targets for consistency.  /feds/ has become
 /mdx/, in particular.

---
 build.xml                                     | 229 ++++--------------
 feds/clean_import.xsl => mdx/clean-import.xsl |  31 ++-
 feds/common_beans.xml => mdx/common-beans.xml |  22 +-
 .../edugain/edugain-beans.xml                 |  33 +--
 mdx/edugain/edugain-import.xml                |  38 +++
 {feds => mdx}/edugain/edugain-signer.crt      |   0
 .../edugate/edugate-beans.xml                 |  33 +--
 mdx/edugate/edugate-import.xml                |  34 +++
 {feds => mdx}/edugate/metadata-signer.crt     |   0
 {feds => mdx}/incommon/incommon.pem           |   0
 mdx/swamid/md-signer.crt                      |  21 ++
 mdx/swamid/swamid-beans.xml                   |  40 +++
 mdx/swamid/swamid-import.xml                  |  34 +++
 mdx/uk/uk-beans.xml                           |  22 ++
 feds/uk/collect.xml => mdx/uk/uk-collect.xml  |  11 +-
 15 files changed, 288 insertions(+), 260 deletions(-)
 rename feds/clean_import.xsl => mdx/clean-import.xsl (65%)
 rename feds/common_beans.xml => mdx/common-beans.xml (92%)
 rename feds/edugain/import.xml => mdx/edugain/edugain-beans.xml (58%)
 create mode 100644 mdx/edugain/edugain-import.xml
 rename {feds => mdx}/edugain/edugain-signer.crt (100%)
 rename feds/edugate/import.xml => mdx/edugate/edugate-beans.xml (58%)
 create mode 100644 mdx/edugate/edugate-import.xml
 rename {feds => mdx}/edugate/metadata-signer.crt (100%)
 rename {feds => mdx}/incommon/incommon.pem (100%)
 create mode 100644 mdx/swamid/md-signer.crt
 create mode 100644 mdx/swamid/swamid-beans.xml
 create mode 100644 mdx/swamid/swamid-import.xml
 create mode 100644 mdx/uk/uk-beans.xml
 rename feds/uk/collect.xml => mdx/uk/uk-collect.xml (90%)

diff --git a/build.xml b/build.xml
index e06d1603..08f9f8a6 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
 	-->
 	<property name="build.dir" value="${basedir}/build"/>
 	<property name="entities.dir" value="entities"/>
-	<property name="feds.dir" value="${basedir}/feds"/>
+    <property name="mdx.dir" value="${basedir}/mdx"/>
 	<property name="xml.dir" value="${basedir}/xml"/>
 
 	<!--
@@ -515,9 +515,6 @@
                 	<fileset dir="${tools.dir}/ukf-mda">
                 		<include name="*.jar"/>
                 	</fileset>
-                    <fileset dir="${tools.dir}/ukf-members">
-                        <include name="*.jar"/>
-                    </fileset>
                 </classpath>
                 <jvmarg value="-Djava.endorsed.dirs=${tools.mda}/lib/endorsed"/>
             	<jvmarg value="-Dlogback.configurationFile=${tools.dir}/ukf-mda/logback.xml"/>
@@ -959,36 +956,14 @@
 	</macrodef>
 	
     <!--
-        ***********************************************
-        ***                                         ***
-        ***   E D U G A T E   F E D E R A T I O N   ***
-        ***                                         ***
-        ***********************************************
+        *********************************************
+        ***                                       ***
+        ***   M E T A D A T A   E X C H A N G E   ***
+        ***                                       ***
+        *********************************************
     -->
-    
-    <property name="edugate.dir" value="${feds.dir}/edugate"/>
-    <property name="edugate.metadata.location"
-        value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>
-    <property name="edugate.metadata.cert"
-       value="${edugate.dir}/metadata-signer.crt"/>
-    
-    <macrodef name="XMLSECTOOL.VFY.edugate">
-        <attribute name="i"/><!-- input file, assumed to be in the XML directory -->
-        <sequential>
-            <XMLSECTOOL i="@{i}">
-                <args>
-                    <arg value="--verifySignature"/>
-                    <arg value="--certificate"/>
-                    <arg value="${edugate.metadata.cert}"/>
-                    <!--
-                    <arg value="- -quiet"/>
-                    -->
-                </args>
-            </XMLSECTOOL>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="CHECK.edugate">
+	
+    <macrodef name="CHECK.imported">
         <attribute name="i"/>
         <sequential>
             <CHECK.std i="@{i}">
@@ -999,43 +974,21 @@
         </sequential>
     </macrodef>
     
-    <target name="verify.edugate">
-        <echo>Verifying metadata held at ${edugate.metadata.location}</echo>
-        <delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-        <get src="${edugate.metadata.location}" dest="${xml.dir}/temp.xml"/>
-        
-        <!--
-            Verify signature and schema using xmlsectool.
-        -->
-        <XMLSECTOOL.VFY.edugate i="temp.xml"/>
-        
-        <!--
-            Run checking rulesets.
-        -->
-        <CHECK.edugate i="${xml.dir}/temp.xml"/>
-    	
-        <!--
-            Delete the temporary file.
-        -->
-        <delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-        
-        <echo>Verification completed.</echo>
-    </target>
+	<!--
+        ***********************************************
+        ***                                         ***
+        ***   E D U G A T E   F E D E R A T I O N   ***
+        ***                                         ***
+        ***********************************************
+    -->
+    
+    <property name="edugate.dir" value="${mdx.dir}/edugate"/>
 
-    <target name="fed.edugate.import">
-        <echo>Importing Edugate metadata from ${edugate.metadata.location}</echo>
-        
-        <!--
-            Run the aggregator CLI to import the metadata.
-        -->
-        <MDA config="${edugate.dir}/import.xml" out="${edugate.dir}/imported.xml"/>
-        
-        <!--
-            Run checking rulesets.
-        -->
-        <CHECK.edugate i="${edugate.dir}/imported.xml"/>
-        
-        <echo>Import completed.</echo>
+	<target name="flow.edugate.import">
+        <echo>Running Edugate import flow.</echo>
+        <MDA config="${edugate.dir}/edugate-import.xml" out="${edugate.dir}/imported.xml"/>
+        <CHECK.imported i="${edugate.dir}/imported.xml"/>
+        <echo>Completed Edugate import flow.</echo>
     </target>
     
 	<!--
@@ -1046,52 +999,8 @@
 	    *************************************************
 	-->
 	
-	<property name="incommon.dir" value="${feds.dir}/incommon"/>
-	<property name="incommon.metadata.location"
-		value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
-	<property name="incommon.metadata.cert"
-	   value="${incommon.dir}/incommon.pem"/>
-	
-    <macrodef name="XMLSECTOOL.VFY.incommon">
-        <attribute name="i"/><!-- input file, assumed to be in the XML directory -->
-        <sequential>
-            <XMLSECTOOL i="@{i}">
-                <args>
-                    <arg value="--verifySignature"/>
-                    <arg value="--certificate"/>
-                    <arg value="${incommon.metadata.cert}"/>
-                    <!--
-                    <arg value="- -quiet"/>
-                    -->
-                </args>
-            </XMLSECTOOL>
-        </sequential>
-    </macrodef>
+	<property name="incommon.dir" value="${mdx.dir}/incommon"/>
 
-	<target name="verify.incommon">
-        <echo>Verifying metadata held at ${incommon.metadata.location}</echo>
-        <delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-        <get src="${incommon.metadata.location}" dest="${xml.dir}/temp.xml"/>
-        
-        <!--
-            Verify using xmlsectool.
-        -->
-        <XMLSECTOOL.VFY.incommon i="temp.xml"/>
-		
-		<!--
-		    Run UK checking rulesets.
-		-->
-        <CHECK i="${xml.dir}/temp.xml" s="check_imported.xsl"/>
-        
-        <!--
-            Delete the temporary file.
-        -->
-        <delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-		
-        <echo>Verification completed.</echo>
-    </target>
-
-	
 	<!--
 	    *************************
 	    ***                   ***
@@ -1100,72 +1009,32 @@
 	    *************************
 	-->
 	
-	<property name="edugain.dir" value="${feds.dir}/edugain"/>
-	<property name="edugain.metadata.location"
-        value="http://mds.edugain.org/"/>
-    <property name="edugain.metadata.cert"
-       value="${edugain.dir}/edugain-signer.crt"/>
-
-    <macrodef name="XMLSECTOOL.VFY.edugain">
-        <attribute name="i"/><!-- input file, assumed to be in the XML directory -->
-        <sequential>
-            <XMLSECTOOL i="@{i}">
-                <args>
-                    <arg value="--verifySignature"/>
-                    <arg value="--certificate"/>
-                    <arg value="${edugain.metadata.cert}"/>
-                    <!--
-                    <arg value="- -quiet"/>
-                    -->
-                </args>
-            </XMLSECTOOL>
-        </sequential>
-    </macrodef>
+	<property name="edugain.dir" value="${mdx.dir}/edugain"/>
 
-	<target name="verify.edugain">
-        <echo>Verifying metadata held at ${edugain.metadata.location}</echo>
-        <delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-        <get src="${edugain.metadata.location}" dest="${xml.dir}/temp.xml"/>
-        
-        <!--
-            Verify using xmlsectool.
-            
-            Don't do this for now.  Although the signature verifies, the
-            file as a whole is often not schema-valid.
-        -->
-        <!--
-        <XMLSECTOOL.VFY.edugain i="temp.xml"/>
-        -->
-        
-        <!--
-            Run UK checking rulesets.
-        -->
-        <CHECK i="${xml.dir}/temp.xml" s="check_imported.xsl"/>
-        
-        <!--
-            Delete the temporary file.
-        -->
-        <delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-        
-        <echo>Verification completed.</echo>
-	</target>
-	
-    <target name="fed.edugain.import">
-        <echo>Importing eduGAIN metadata from ${edugain.metadata.location}</echo>
-        
-        <!--
-            Run the aggregator CLI to import the metadata.
-        -->
-        <MDA config="${edugain.dir}/import.xml" out="${edugain.dir}/imported.xml"/>
-        
-        <!--
-            Run checking rulesets.
-        -->
-        <CHECK.edugate i="${edugain.dir}/imported.xml"/>
-        
-        <echo>Import completed.</echo>
+    <target name="flow.edugain.import">
+        <echo>Running eduGAIN import flow.</echo>
+        <MDA config="${edugain.dir}/edugain-import.xml" out="${edugain.dir}/imported.xml"/>
+        <CHECK.imported i="${edugain.dir}/imported.xml"/>
+        <echo>Completed eduGAIN import flow.</echo>
     </target>
     
+    <!--
+        *********************************************
+        ***                                       ***
+        ***   S W A M I D   F E D E R A T I O N   ***
+        ***                                       ***
+        *********************************************
+    -->
+	
+	<property name="swamid.dir" value="${mdx.dir}/swamid"/>
+	
+	<target name="flow.swamid.import">
+		<echo>Running SWAMID import flow.</echo>
+		<MDA config="${swamid.dir}/swamid-import.xml" out="${swamid.dir}/imported.xml"/>
+		<CHECK.imported i="${swamid.dir}/imported.xml"/>
+		<echo>Completed SWAMID import flow.</echo>
+	</target>
+    
 	<!--
 	    *************************************************
 	    ***                                           ***
@@ -1174,18 +1043,18 @@
 	    *************************************************
 	-->
 	
-    <target name="fed.uk.collect">
+    <target name="flow.uk.collect">
         <echo>Collecting UK fragment files.</echo>
         
         <!--
             Run the aggregator CLI to collect the metadata.
         -->
-        <MDA config="${feds.dir}/uk/collect.xml" out="${feds.dir}/uk/collected.xml"/>
+        <MDA config="${mdx.dir}/uk/uk-collect.xml" out="${mdx.dir}/uk/collected.xml"/>
         
         <!--
             Run checking rulesets.
         -->
-        <CHECK.edugate i="${feds.dir}/uk/collected.xml"/>
+        <CHECK.imported i="${mdx.dir}/uk/collected.xml"/>
         
         <echo>Collection completed.</echo>
     </target>
diff --git a/feds/clean_import.xsl b/mdx/clean-import.xsl
similarity index 65%
rename from feds/clean_import.xsl
rename to mdx/clean-import.xsl
index bdb7edf1..30300433 100644
--- a/feds/clean_import.xsl
+++ b/mdx/clean-import.xsl
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 	
-	clean_import.xsl
+	clean-import.xsl
 	
 	Clean up imported metadata from a metadata exchange channel.
 	
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
+	xmlns:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+	extension-element-prefixes="mdxTextUtils"
 	exclude-result-prefixes="elab ukfedlabel wayf">
 
 	<!--Force UTF-8 encoding for the output.-->
@@ -33,6 +34,28 @@
 	<!-- strip xml:base entirely -->
 	<xsl:template match="@xml:base"/>
 	
+	<!-- remove KeyDescriptor elements which lack embedded key material -->
+	<xsl:template match="md:KeyDescriptor[not(descendant::ds:X509Certificate)]"/>
+	
+	<!-- Remove KeyName elements; they refer to an inaccessable trust fabric -->
+	<xsl:template match="ds:KeyName"/>
+	
+	<!-- Remove <ds:X509SubjectName> elements; long ones cause problems. -->
+	<xsl:template match="ds:X509SubjectName"/>
+	
+	<!--
+		Normalise whitespace in X509Certificate elements.
+	-->
+	<!--
+	<xsl:template match="ds:X509Certificate">
+		<xsl:element name="ds:X509Certificate">
+			<xsl:text>&#10;</xsl:text>
+			<xsl:value-of select="mdxTextUtils:wrapBase64(.)"/>
+			<xsl:text>&#10;</xsl:text>
+		</xsl:element>
+	</xsl:template>
+	-->
+	
 	<!--By default, copy text blocks, comments and attributes unchanged.-->
 	<xsl:template match="text()|comment()|@*">
 		<xsl:copy/>
diff --git a/feds/common_beans.xml b/mdx/common-beans.xml
similarity index 92%
rename from feds/common_beans.xml
rename to mdx/common-beans.xml
index 5f981e21..59f0fb46 100644
--- a/feds/common_beans.xml
+++ b/mdx/common-beans.xml
@@ -120,19 +120,23 @@
         <property name="id" value="cleanImport"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/feds/clean_import.xsl"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/clean-import.xsl"/>
             </bean>
         </property>
     </bean>
     
     <!--
-        <bean id="members" class="uk.org.ukfederation.members.Members">
-            <constructor-arg>
-                <bean class="java.io.File">
-                    <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
-                </bean>
-            </constructor-arg>
-        </bean>
+        Basic EntitiesDescriptor disassembler pipeline stage.
     -->
-        
+    <bean id="disassemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage">
+        <property name="id" value="disassemble"/>
+    </bean>
+    
+    <!--
+        Basic EntitiesDescriptor assembler pipeline stage.
+    -->
+    <bean id="assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
+        <property name="id" value="assemble"/>
+    </bean>
+    
 </beans>
diff --git a/feds/edugain/import.xml b/mdx/edugain/edugain-beans.xml
similarity index 58%
rename from feds/edugain/import.xml
rename to mdx/edugain/edugain-beans.xml
index a62e6217..8f542cfb 100644
--- a/feds/edugain/import.xml
+++ b/mdx/edugain/edugain-beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from eduGAIN.
+    Common beans for eduGAIN operations.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util"
@@ -9,11 +9,6 @@
         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 commonly used beans.
-    -->
-    <import resource="../common_beans.xml"/>
-    
     <bean id="fetchEduGainExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
         <property name="id" value="fetchEduGainExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
@@ -26,7 +21,7 @@
     <bean id="edugainSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/feds/edugain/edugain-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/edugain-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -39,28 +34,4 @@
         </property>
     </bean>
     
-    <bean id="disassemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage">
-        <property name="id" value="disassemble"/>
-    </bean>
-    
-    <bean id="assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
-        <property name="id" value="assemble"/>
-    </bean>
-
-    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
-        <property name="id" value="pipeline"/>
-        <property name="stages">
-            <list>
-                <ref bean="fetchEduGainExportAggregate"/>
-                <ref bean="checkEdugainSignature"/>
-                <ref bean="cleanImport"/>
-                <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="assemble"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
-
 </beans>
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
new file mode 100644
index 00000000..466ea41a
--- /dev/null
+++ b/mdx/edugain/edugain-import.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Import pipeline for metadata from eduGAIN.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        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 commonly used beans.
+    -->
+    <import resource="../common-beans.xml"/>
+    
+    <!--
+        Import eduGAIN-specific beans.
+    -->
+    <import resource="edugain-beans.xml"/>
+    
+    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
+        <property name="id" value="pipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="fetchEduGainExportAggregate"/>
+                <ref bean="checkEdugainSignature"/>
+                <ref bean="cleanImport"/>
+                <ref bean="disassemble"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="assemble"/>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+
+</beans>
diff --git a/feds/edugain/edugain-signer.crt b/mdx/edugain/edugain-signer.crt
similarity index 100%
rename from feds/edugain/edugain-signer.crt
rename to mdx/edugain/edugain-signer.crt
diff --git a/feds/edugate/import.xml b/mdx/edugate/edugate-beans.xml
similarity index 58%
rename from feds/edugate/import.xml
rename to mdx/edugate/edugate-beans.xml
index 49c653cd..9625056a 100644
--- a/feds/edugate/import.xml
+++ b/mdx/edugate/edugate-beans.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from Edugate.
+    Common beans for Edugate operations.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
 
-    <!--
-        Import commonly used beans.
-    -->
-    <import resource="../common_beans.xml"/>
-        
     <!--
         Fetch the Edugate metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
@@ -26,7 +21,7 @@
     <bean id="edugateSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/feds/edugate/metadata-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugate/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -39,28 +34,4 @@
         </property>
     </bean>
     
-    <bean id="disassemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage">
-        <property name="id" value="disassemble"/>
-    </bean>
-    
-    <bean id="assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
-        <property name="id" value="assemble"/>
-    </bean>
-
-    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
-        <property name="id" value="pipeline"/>
-        <property name="stages">
-            <list>
-                <ref bean="fetchEdugateExportAggregate"/>
-                <ref bean="checkEdugateSignature"/>
-                <ref bean="cleanImport"/>
-                <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="assemble"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
-
 </beans>
diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml
new file mode 100644
index 00000000..6af6e19f
--- /dev/null
+++ b/mdx/edugate/edugate-import.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Import pipeline for metadata from Edugate.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
+
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="../common-beans.xml"/>
+        
+    <!--
+        Import Edugate-specific beans.
+    -->
+    <import resource="edugate-beans.xml"/>
+    
+    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
+        <property name="id" value="pipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="fetchEdugateExportAggregate"/>
+                <ref bean="checkEdugateSignature"/>
+                <ref bean="cleanImport"/>
+                <ref bean="disassemble"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="assemble"/>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+
+</beans>
diff --git a/feds/edugate/metadata-signer.crt b/mdx/edugate/metadata-signer.crt
similarity index 100%
rename from feds/edugate/metadata-signer.crt
rename to mdx/edugate/metadata-signer.crt
diff --git a/feds/incommon/incommon.pem b/mdx/incommon/incommon.pem
similarity index 100%
rename from feds/incommon/incommon.pem
rename to mdx/incommon/incommon.pem
diff --git a/mdx/swamid/md-signer.crt b/mdx/swamid/md-signer.crt
new file mode 100644
index 00000000..16ac8288
--- /dev/null
+++ b/mdx/swamid/md-signer.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl0CBEY7EskwDQYJKoZIhvcNAQEEBQAwfzELMAkGA1UEBhMCU0UxEjAQ
+BgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMREwDwYDVQQKEwhT
+V0FNSS5zZTEPMA0GA1UECxMGU1dBTUlEMSQwIgYDVQQDExtTV0FNSUQgbWV0YWRh
+dGEgc2lnbmVyIHYxLjEwHhcNMDcwNTA0MTEwMjMzWhcNMTcwNTAxMTEwMjMzWjB/
+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9j
+a2hvbG0xETAPBgNVBAoTCFNXQU1JLnNlMQ8wDQYDVQQLEwZTV0FNSUQxJDAiBgNV
+BAMTG1NXQU1JRCBtZXRhZGF0YSBzaWduZXIgdjEuMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAM6wXN3pVCo98SACS6JCHjSlWj83oNL/Ct+a9hmAx1NZ
+SKg7lnEJYwWBvzJt5o/47jRQbGm94a45Yy5LVoXq4XyCKINhMxSwbRROvr8Hw6tg
+P1Z9dk5Jjejvus3gyaH3+EuEyP4aIjTlgmHDwW6HOv/m/4bOXSHB4Pisn7aocqU7
+kjpOn1f0cGodWOgGO4tP7KXs6ndcLhIkW+e/B80WEr0kocuc/pvx+aLuKSkttk/A
+fP1DFs5sqX31RXQKGrB/uEEYVv1Qvneig+RXGSbqk2Tab3BcLE/Cjnfi9Q9cH/jR
+eL/YSSafGtl+EBgXKszxjMtELhiEWsL9RrMu1HUkBusCAwEAATANBgkqhkiG9w0B
+AQQFAAOCAQEAkXaa61gp/lkEDNRFc0bzH3ZyoUFgol64F1zdAwBS3xnsCkTnAXt3
+p452daEyz+0UR5J/BruMOyvR57w1m7ckVnx/sAgRgaD6gQlUWehjKPEsx8o5iDfO
+5R1V5Rn2o7+0VuIJDDObEAtMwqn2Nk6TTzsUVfz5y9nUQAxBz3EqXnnSgRwqSwRF
+yiVkpVfwtUHIolAf6O2N9Fg1jqoqt4mQCOyRZpD0/5SRYESTY6TJjTmvoh+zOPlI
+yEiw+Zrl/FWjXtBnRnz8AVT5NRzYiMHdbTHs0Fh6elsb5b9gTBo7j6+t36m7oo2K
+DaWWpMWvuWHugEqvIAXDCI/HzTbbiWm9NQ==
+-----END CERTIFICATE-----
diff --git a/mdx/swamid/swamid-beans.xml b/mdx/swamid/swamid-beans.xml
new file mode 100644
index 00000000..4d2e6add
--- /dev/null
+++ b/mdx/swamid/swamid-beans.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Common beans for SWAMID operations.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
+
+    <!--
+        Fetch the SWAMID export metadata aggregate.  For the moment, use the production aggregate in lieu
+        of a designated export aggregate.
+    -->
+    <bean id="fetchSwamidExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+        <property name="id" value="fetchSwamidExportAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="http://md.swamid.se/md/swamid-1.0.xml"/>        
+    </bean>
+    
+    <!--
+        SWAMID federation signing certificate.
+    -->
+    <bean id="swamidSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+        <property name="certificateFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/swamid/md-signer.crt"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Check SWAMID signing signature.
+    -->
+    <bean id="checkSwamidSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+        <property name="id" value="checkSwamidSignature"/>
+        <property name="verificationCertificate" ref="swamidSigningCertificate"/>
+        <property name="postProcessFilter">
+            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml
new file mode 100644
index 00000000..9abf95bd
--- /dev/null
+++ b/mdx/swamid/swamid-import.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Import pipeline for metadata from SWAMID.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
+
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="../common-beans.xml"/>
+        
+    <!--
+        Import SWAMID-specific beans.
+    -->
+    <import resource="swamid-beans.xml"/>
+    
+    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
+        <property name="id" value="pipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="fetchSwamidExportAggregate"/>
+                <ref bean="checkSwamidSignature"/>
+                <ref bean="cleanImport"/>
+                <ref bean="disassemble"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="assemble"/>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+
+</beans>
diff --git a/mdx/uk/uk-beans.xml b/mdx/uk/uk-beans.xml
new file mode 100644
index 00000000..1b0edcfc
--- /dev/null
+++ b/mdx/uk/uk-beans.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Common beans for UK federation operations.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        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">
+
+    <!--
+        <bean id="members" class="uk.org.ukfederation.members.Members">
+        <constructor-arg>
+        <bean class="java.io.File">
+        <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
+        </bean>
+        </constructor-arg>
+        </bean>
+    -->
+    
+</beans>
diff --git a/feds/uk/collect.xml b/mdx/uk/uk-collect.xml
similarity index 90%
rename from feds/uk/collect.xml
rename to mdx/uk/uk-collect.xml
index 1632e0ec..97a63f84 100644
--- a/feds/uk/collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -12,8 +12,13 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common_beans.xml"/>
+    <import resource="../common-beans.xml"/>
     
+    <!--
+        Import UK-specific beans.
+    -->
+    <import resource="uk-beans.xml"/>
+        
     <bean id="filterDeletedEntities" class="uk.org.ukfederation.mda.XPathFilteringStrategy">
         <constructor-arg name="expression" value="//ukfedlabel:DeletedEntity"/>
         <constructor-arg name="prefixMappings" ref="commonNamespaces"/>
@@ -35,10 +40,6 @@
         <property name="postProcessFilter" ref="filterDeletedEntities"/>
     </bean>
     
-    <bean id="assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
-        <property name="id" value="assemble"/>
-    </bean>
-
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>
         <property name="stages">