From 34d076173b5fc99214134236cc2211510325ff0e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 31 Oct 2011 08:41:15 +0000
Subject: [PATCH] Switch to aggregator version 0.6.1, including consequent
 changes in many beans files. Use the status handling classes from 0.6.1
 instead of the custom class from ukf-mda. New certificate for hu_eduid.

---
 mdx/at_aconet/beans.xml                       |   9 +-
 mdx/au_aaf/beans.xml                          |   9 +-
 mdx/br_cafe/beans.xml                         |   9 +-
 mdx/ca_caf/beans.xml                          |   9 +-
 mdx/ch_switchaai/beans.xml                    |   9 +-
 mdx/common-beans.xml                          | 141 ++++++++++++++----
 mdx/cz_eduid/beans.xml                        |   9 +-
 mdx/de_dfnaai/beans.xml                       |   9 +-
 mdx/dk_wayf/beans.xml                         |   9 +-
 mdx/es_sir/beans.xml                          |   9 +-
 mdx/eu_clarin/beans.xml                       |   9 +-
 mdx/fi_haka/beans.xml                         |   9 +-
 mdx/fr_renater/beans.xml                      |  18 ++-
 mdx/gr_grnet/beans.xml                        |   9 +-
 mdx/hu_eduid/beans.xml                        |  11 +-
 mdx/hu_eduid/href-metadata-signer-2011.crt    |  27 ++++
 mdx/ie_edugate/beans.xml                      |  18 ++-
 mdx/int_edugain/beans.xml                     |  18 ++-
 mdx/int_testshib/beans.xml                    |   9 +-
 mdx/it_idem/beans.xml                         |   9 +-
 mdx/jp_gakunin/beans.xml                      |   9 +-
 mdx/lv_laife/beans.xml                        |   9 +-
 mdx/nl_surfnet/beans.xml                      |  18 ++-
 mdx/no_feide/beans.xml                        |   9 +-
 mdx/nz_tuakiri/beans.xml                      |   9 +-
 mdx/se_swamid/beans.xml                       |   9 +-
 mdx/si_arnes/beans.xml                        |   9 +-
 mdx/uk_eduserv/beans.xml                      |   9 +-
 mdx/us_incommon/beans.xml                     |   9 +-
 mdx/validation-beans.xml                      |   8 +
 .../{ukf-mda-0.6.4.jar => ukf-mda-0.6.5.jar}  | Bin 26697 -> 27392 bytes
 31 files changed, 369 insertions(+), 88 deletions(-)
 create mode 100644 mdx/hu_eduid/href-metadata-signer-2011.crt
 rename tools/ukf-mda/{ukf-mda-0.6.4.jar => ukf-mda-0.6.5.jar} (73%)

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index afd19fcc..187c0ed0 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="at_aconet_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="at_aconet_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://wayf.aco.net/aconet-aai-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://wayf.aco.net/aconet-aai-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index 4cd206ed..e7ac661c 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the AAF production aggregate.
     -->
-    <bean id="au_aaf_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="au_aaf_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="au_aaf_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index d73e7565..3e607298 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="br_cafe_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="br_cafe_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="br_cafe_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://ds.cafe.rnp.br/metadata/cafe-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://ds.cafe.rnp.br/metadata/cafe-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index 67b1b7c6..59a184c2 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the CAF production aggregate.
     -->
-    <bean id="ca_caf_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="ca_caf_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="ca_caf_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://caf-shibops.ca/CoreServices/cafshib_metadata_signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://caf-shibops.ca/CoreServices/cafshib_metadata_signed.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index be4f459d..562ee118 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the SWITCH production aggregate.
     -->
-    <bean id="ch_switchaai_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="ch_switchaai_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="ch_switchaai_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://switch.ch/aai/federation/SWITCHaai/metadata.switchaai_signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://switch.ch/aai/federation/SWITCHaai/metadata.switchaai_signed.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 7e2e2722..e753bff8 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -10,10 +10,124 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
     <!--
-        Import beans related to metadata validation.
+        ***************************************************
+        ***                                             ***
+        ***   V A L I D A T I O N   F R A M E W O R K   ***
+        ***                                             ***
+        ***************************************************
+    -->
+    
+    <!--
+        Import beans that perform individual validation checks.
     -->
     <import resource="validation-beans.xml"/>
     
+    <!--
+        identifierStrategy
+        
+        Standard item identifier strategy.
+    -->
+    <bean id="identifierStrategy" class="uk.org.ukfederation.mda.UKItemIdentificationStrategy"/>
+    
+    <!--
+        errorAnnouncer
+        
+        A pipeline stage that logs any errors and warnings present,
+        but takes no action on them.
+    -->
+    <bean id="errorAnnouncer" class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="errorAnnouncer"/>
+        <property name="identifierStrategy" ref="identifierStrategy"/>
+        <property name="selectionRequirements">
+            <list>
+                <value>#{T(net.shibboleth.metadata.ErrorStatus)}</value>
+                <value>#{T(net.shibboleth.metadata.WarningStatus)}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        errorRemover
+        
+        This pipeline stage removes any items marked with an error status.
+    -->
+    <bean id="errorRemover" class="net.shibboleth.metadata.pipeline.ItemMetadataFilterStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="errorRemover"/>
+        <property name="identifierStrategy" ref="identifierStrategy"/>
+        <property name="selectionRequirements">
+            <list>
+                <value>#{T(net.shibboleth.metadata.ErrorStatus)}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        errorTerminator
+        
+        This pipeline stage causes CLI termination if any item is marked with an error status.
+    -->
+    <bean id="errorTerminator" class="net.shibboleth.metadata.pipeline.ItemMetadataTerminationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="errorTerminator"/>
+        <property name="identifierStrategy" ref="identifierStrategy"/>
+        <property name="selectionRequirements">
+            <list>
+                <value>#{T(net.shibboleth.metadata.ErrorStatus)}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        errorAnnouncingFilter
+        
+        Announce any errors or warnings encountered, then remove
+        any items that had errors.  Items with warnings are retained.
+    -->
+    <bean id="errorAnnouncingFilter" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="errorAnnouncingFilter"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="errorAnnouncer"/>
+                <ref bean="errorRemover"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        errorTerminatingFilter
+        
+        A pipeline stage that checks for any errors, and then announces
+        and filters any encountered.
+    -->
+    <bean id="errorTerminatingFilter" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="errorTerminatingFilter"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="errorAnnouncer"/>
+                <ref bean="errorTerminator"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        *********************
+        ***               ***
+        ***   ( E N D )   ***
+        ***               ***
+        *********************
+    -->
+    
+    <!--
+        httpClient
+        
+        Common, basic, HTTP client for use with HTTP resources.
+    -->
+    <bean name="httpClient" class="org.apache.http.impl.client.DefaultHttpClient"/>
+    
     <!--
         parserPool
         
@@ -116,30 +230,7 @@
         <property name="id" value="checkSchemas"/>
         <property name="schemaResources" ref="schemaResources"/>
     </bean>
-    
-    <!--
-        errorAnnouncingFilter
-        
-        A pipeline stage that checks for any errors, and then announces
-        and filters any encountered.
-    -->
-    <bean id="errorAnnouncingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="errorAnnouncingFilter"/>
-    </bean>
-    
-    <!--
-        errorTerminatingFilter
-        
-        A pipeline stage that checks for any errors, and then announces
-        and filters any encountered.
-    -->
-    <bean id="errorTerminatingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="errorTerminatingFilter"/>
-        <property name="terminating" value="true"/>
-    </bean>
-    
+
     <!--
         cleanImport
         
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index 9def3abd..675db4bf 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -18,11 +18,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="cz_eduid_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="cz_eduid_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="cz_eduid_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://metadata.eduid.cz/entities/eduid"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://metadata.eduid.cz/entities/eduid"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index 92ecea80..73a5141c 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="de_dfnaai_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="de_dfnaai_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="de_dfnaai_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 3ab64bf4..3f8466aa 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -9,11 +9,16 @@
     <!--
         Fetch the IdP metadata.
     -->
-    <bean id="dk_wayf_idpMetadata" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="dk_wayf_idpMetadata" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="dk_wayf_idpMetadata"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://wayf.wayf.dk/saml2/idp/metadata.php"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://wayf.wayf.dk/saml2/idp/metadata.php"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index 956e26ba..a627c347 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="es_sir_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="es_sir_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="es_sir_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://www.rediris.es/sir/shib1metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://www.rediris.es/sir/shib1metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
index 28a2f10b..4325b8e0 100644
--- a/mdx/eu_clarin/beans.xml
+++ b/mdx/eu_clarin/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="eu_clarin_exportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="eu_clarin_exportAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="eu_clarin_exportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://www.clarin.eu/aai/clarin-sp-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://www.clarin.eu/aai/clarin-sp-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 455421fe..00cf5976 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fi_haka_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="fi_haka_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="fi_haka_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://haka.funet.fi/metadata/haka-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://haka.funet.fi/metadata/haka-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index 507fc6cb..4a55c8d7 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -8,21 +8,31 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fr_renater_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="fr_renater_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="fr_renater_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://services-federation.renater.fr/metadata/renater-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://services-federation.renater.fr/metadata/renater-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
         Fetch the test aggregate.
     -->
-    <bean id="fr_renater_testAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="fr_renater_testAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="fr_renater_testAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://services-federation.renater.fr/metadata/renater-test-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://services-federation.renater.fr/metadata/renater-test-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index 1f32559f..8cf94baf 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="gr_grnet_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="gr_grnet_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="gr_grnet_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://aai.grnet.gr/metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://aai.grnet.gr/metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index df0f3f2d..c4ed6768 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="hu_eduid_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="hu_eduid_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="hu_eduid_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://metadata.eduid.hu/metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://metadata.eduid.hu/metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
@@ -22,7 +27,7 @@
         lazy-init="true">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/hu_eduid/href-metadata-signer-2010.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/hu_eduid/href-metadata-signer-2011.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/hu_eduid/href-metadata-signer-2011.crt b/mdx/hu_eduid/href-metadata-signer-2011.crt
new file mode 100644
index 00000000..1d5f50c1
--- /dev/null
+++ b/mdx/hu_eduid/href-metadata-signer-2011.crt
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMCSFUx
+FzAVBgNVBAoTDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLExllZHVJRCBGZWRlcmF0
+aW9uIE9wZXJhdG9yMRgwFgYDVQQDEw9NZXRhZGF0YSBTaWduZXIxGjAYBgkqhkiG
+9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTExMTAwNTA4MTg0NloXDTMxMDkzMDA4MTg0
+NlowgYAxCzAJBgNVBAYTAkhVMRcwFQYDVQQKEw5OSUlGIEluc3RpdHV0ZTEiMCAG
+A1UECxMZZWR1SUQgRmVkZXJhdGlvbiBPcGVyYXRvcjEYMBYGA1UEAxMPTWV0YWRh
+dGEgU2lnbmVyMRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPRzY77JN44loezTsDnipWRVNRtupoXfdEUT
++TutYG7Z74qTH2JGDEUEtVzctwL4Z53qqDAEoYZCNU0uJ6yYElhbWk6wQ2rXi/KF
+BXwsKW/Gcs83Law70X5mh9qaTRUWdngtkUDse1WKGE1DUKm9s4VrJtnBMXJg8Y3V
+ImXdPd2K1o40VT7TPe0yjjtbVX13Xg9vNMuXxD5YkawiSZ5BqJ1K1j3GEB/0DX0n
+pQItdVd/1Pu3IVSPkpZAknUIiMt3xQ1VzZSlipZrvLqa8cLf+/QePouOv91Axxuc
+VhN6Wc8J+i8qEZ117ygK6ifdoi8aNzQcyKDyakrTN6luttgejEkCAwEAAaOB4DCB
+3TAdBgNVHQ4EFgQUEttcbKAzsQaeczMxL0t7qYcGMYUwga0GA1UdIwSBpTCBooAU
+EttcbKAzsQaeczMxL0t7qYcGMYWhgYakgYMwgYAxCzAJBgNVBAYTAkhVMRcwFQYD
+VQQKEw5OSUlGIEluc3RpdHV0ZTEiMCAGA1UECxMZZWR1SUQgRmVkZXJhdGlvbiBP
+cGVyYXRvcjEYMBYGA1UEAxMPTWV0YWRhdGEgU2lnbmVyMRowGAYJKoZIhvcNAQkB
+FgthYWlAbmlpZi5odYIBATAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
+AQCYot78JOcq84L5uE7vluqb6msXP7ifmhv6GPjhc1RB3bNkMyx/cj02ewyD+kEE
+39TfxKlwLew4Zt+Vc+V9YwlPcvciKd1NjdfGsaSUJ5pkrOylon2ubXLCr4EGt8fv
+TRXmNW4Ye6+QcO3tDyk2Tz5tVo9+6VsLYdGiIWSE9LViiYr63kXEJpnBeyLcyGsd
+WOLRHFa3u4QCvAJGiJXpWTGOaxIwHPAYw5Kfpns0EX+eliooaLEf0ZvJWGyCIOWT
+uyKcFvmWTLlRPwFT6qpXqROOlsDrqSD/rMgSpBbEA330oyNcLRyF8ZaT/48gxdBj
+i0FObSeW3thg/FR4Wle0gSpL
+-----END CERTIFICATE-----
+
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index abde8c2e..5d50aee6 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -8,21 +8,31 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="ie_edugate_exportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="ie_edugate_exportAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="ie_edugate_exportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-ukfed-signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://edugate.heanet.ie/edugate-ukfed-signed.xml"/>        
+            </bean>
+        </property>
     </bean>
     
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ie_edugate_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="ie_edugate_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="ie_edugate_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 6a6f2a76..bdc57470 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -12,21 +12,31 @@
     <!--
         Fetch the eduGAIN test aggregate.
     -->
-    <bean id="int_edugain_testAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="int_edugain_testAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="int_edugain_testAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://mds-test.edugain.org"/>
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://mds-test.edugain.org"/>
+            </bean>
+        </property>
     </bean>
 
     <!--
         Fetches the eduGAIN production aggregate.
     -->
-    <bean id="int_edugain_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="int_edugain_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="int_edugain_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://mds.edugain.org"/>
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://mds.edugain.org"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
index 47ae9893..e0031c31 100644
--- a/mdx/int_testshib/beans.xml
+++ b/mdx/int_testshib/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="int_testshib_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="int_testshib_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="int_testshib_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://www.testshib.org/metadata/testshib-two-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://www.testshib.org/metadata/testshib-two-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 71475886..e57d2d13 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="it_idem_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="it_idem_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="it_idem_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://www.idem.garr.it/docs/conf/signed-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://www.idem.garr.it/docs/conf/signed-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index ea754c95..e055dda2 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="jp_gakunin_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="jp_gakunin_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="jp_gakunin_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://metadata.gakunin.nii.ac.jp/gakunin-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://metadata.gakunin.nii.ac.jp/gakunin-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index 5f8344da..4b4deb1d 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="lv_laife_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="lv_laife_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="lv_laife_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://laife.lanet.lv/metadata/laife-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://laife.lanet.lv/metadata/laife-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index 368a569f..cd2ba98b 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -29,21 +29,31 @@
     <!--
         Fetch the IdP aggregate.
     -->
-    <bean id="nl_surfnet_idpAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="nl_surfnet_idpAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="nl_surfnet_idpAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://wayf.surfnet.nl/federate/metadata"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://wayf.surfnet.nl/federate/metadata"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
         Fetch the SP aggregate.
     -->
-    <bean id="nl_surfnet_spAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="nl_surfnet_spAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="nl_surfnet_spAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index bbcc485a..a61e4516 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -9,11 +9,16 @@
     <!--
         Fetch the IdP metadata.
     -->
-    <bean id="no_feide_idpMetadata" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="no_feide_idpMetadata" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="no_feide_idpMetadata"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://idp.feide.no/simplesaml/saml2/idp/metadata.php"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://idp.feide.no/simplesaml/saml2/idp/metadata.php"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index 6a756f38..a0a6c27b 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="nz_tuakiri_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="nz_tuakiri_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="nz_tuakiri_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://directory.test.tuakiri.ac.nz/metadata/tuakiri-test-metadata-signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://directory.test.tuakiri.ac.nz/metadata/tuakiri-test-metadata-signed.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 4e246359..20b61474 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the SWAMID production.
     -->
-    <bean id="se_swamid_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="se_swamid_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="se_swamid_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://md.swamid.se/md/swamid-1.0.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://md.swamid.se/md/swamid-1.0.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index 4fac4287..34d5d31f 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the ARNES production aggregate.
     -->
-    <bean id="si_arnes_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="si_arnes_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="si_arnes_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index acc57376..9ed6c934 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the export metadata aggregate.
     -->
-    <bean id="uk_eduserv_exportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="uk_eduserv_exportAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="uk_eduserv_exportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://auth.athensams.net/saml/metadata?name=ukfederation"/>
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="https://auth.athensams.net/saml/metadata?name=ukfederation"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 85b3b9f2..75d815cd 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -8,11 +8,16 @@
     <!--
         Fetch the InCommon production metadata aggregate.
     -->
-    <bean id="us_incommon_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="us_incommon_productionAggregate" class="net.shibboleth.metadata.dom.DomResourceSourceStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="us_incommon_productionAggregate"/>
         <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>        
+        <property name="domResource">
+            <bean class="org.opensaml.util.net.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url" value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
+            </bean>
+        </property>
     </bean>
     
     <!--
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 30e829b5..ed6b8133 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -176,6 +176,14 @@
         </property>
     </bean>
     
+    <!--
+        *********************
+        ***               ***
+        ***   ( E N D )   ***
+        ***               ***
+        *********************
+    -->
+    
     <!--
         check_misc
     -->
diff --git a/tools/ukf-mda/ukf-mda-0.6.4.jar b/tools/ukf-mda/ukf-mda-0.6.5.jar
similarity index 73%
rename from tools/ukf-mda/ukf-mda-0.6.4.jar
rename to tools/ukf-mda/ukf-mda-0.6.5.jar
index b392b3885eeefa316e0aa3237886b22a6eb4e7b8..2f36df247d54d56434b244a68e70f2720dd288c7 100644
GIT binary patch
delta 4110
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

delta 3434
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