Upgrade to Shibboleth MDA 0.8.0 and ukf-mda 0.8.0.

InCommon · Nov 7, 2013 · dd8f36b · dd8f36b
1 parent ff75be9
commit dd8f36b
Show file tree

Hide file tree

Showing 40 changed files with 192 additions and 192 deletions.
diff --git a/build.xml b/build.xml
@@ -83,7 +83,7 @@
 	-->
 	<property name="tools.dir" value="tools"/>
 	<property name="tools.ant" value="${tools.dir}/ant"/>
-	<property name="tools.mda" value="${tools.dir}/mda"/>
+	<property name="tools.mda" value="${tools.dir}/aggregator-cli-0.8.0"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
 	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
 	<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -27,9 +27,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="at_aconet_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_registrarAggregate_url"/>
@@ -40,9 +40,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="at_aconet_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="at_aconet_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_edugainAggregate_url"/>

diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="au_aaf_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="au_aaf_productionAggregate" parent="DOMResourceSourceStage"
         p:id="au_aaf_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml"/>

diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="be_belnet_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="be_belnet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="be_belnet_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="be_belnet_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="be_belnet_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="be_belnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="be_belnet_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="be_belnet_edugainAggregate_url"/>

diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="br_cafe_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="br_cafe_productionAggregate" parent="DOMResourceSourceStage"
         p:id="br_cafe_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="br_cafe_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="br_cafe_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="br_cafe_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="br_cafe_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="br_cafe_edugainAggregate_url"/>

diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ca_caf_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="ca_caf_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ca_caf_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="ca_caf_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ca_caf_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="ca_caf_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="ca_caf_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ca_caf_edugainAggregate_url"/>

diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ch_switchaai_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="ch_switchaai_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ch_switchaai_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ch_switchaai_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ch_switchaai_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="ch_switchaai_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="ch_switchaai_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ch_switchaai_edugainAggregate_url"/>

diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
@@ -23,9 +23,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="cl_cofre_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="cl_cofre_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="cl_cofre_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cl_cofre_edugainAggregate_url"/>

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -118,18 +118,18 @@
         
         Parent for DOM filesystem source stages.
     -->
-    <bean id="DomFilesystemSourceStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
+    <bean id="DOMFilesystemSourceStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
     <!--
-        DomResourceSourceStage
+        DOMResourceSourceStage
         
         Parent for DOM resource source stages.
     -->
-    <bean id="DomResourceSourceStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomResourceSourceStage">
+    <bean id="DOMResourceSourceStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
@@ -313,7 +313,7 @@
     -->
     <bean id="normaliseNamespaces" parent="XSLTransformationStage"
         p:id="normaliseNamespaces">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="ns_norm.xsl"/>
             </bean>
@@ -584,7 +584,7 @@
         Populate RegistrationAuthority values from entities.
     -->
     <bean id="populateRegistrationAuthorities" parent="stage_parent"
-        class="uk.org.ukfederation.mda.validate.mdrpi.RegistrationAuthorityPopulationStage"
+        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"
         p:id="populateRegistrationAuthorities"/>
 
     <!--
@@ -596,7 +596,7 @@
         channel must match the known registration authority value.
     -->
     <bean id="default_regauth_parent" abstract="true" parent="XSLTransformationStage">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="default_regauth.xsl"/>
             </bean>
@@ -783,7 +783,7 @@
 
     <bean id="stripComments" parent="XSLTransformationStage"
         p:id="stripComments">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="strip-comments.xsl"/>
             </bean>
@@ -801,7 +801,7 @@
     <!--
         Standard serializer.
     -->
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DOMElementSerializer"/>
 
     <!--
         Merge strategy that removes duplicates.
@@ -827,7 +827,7 @@
     -->
     <bean id="cleanImport" parent="XSLTransformationStage"
         p:id="cleanImport">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="clean-import.xsl"/>
             </bean>

diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
@@ -35,9 +35,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="cz_eduid_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="cz_eduid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="cz_eduid_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cz_eduid_productionAggregate_url"/>
@@ -48,9 +48,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="cz_eduid_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="cz_eduid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="cz_eduid_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cz_eduid_edugainAggregate_url"/>

diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="de_dfnaai_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="de_dfnaai_productionAggregate" parent="DOMResourceSourceStage"
         p:id="de_dfnaai_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="de_dfnaai_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="de_dfnaai_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="de_dfnaai_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="de_dfnaai_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="de_dfnaai_edugainAggregate_url"/>

diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
@@ -34,9 +34,9 @@
     <!--
         Fetch the IdP metadata.
     -->
-    <bean id="dk_wayf_idpMetadata" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_idpMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_idpMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_productionIdpMetadata_url"/>
@@ -47,9 +47,9 @@
     <!--
         Fetch the SP metadata.
     -->
-    <bean id="dk_wayf_spMetadata" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_spMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_spMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_productionSpMetadata_url"/>
@@ -62,9 +62,9 @@
         
         See http://wayf.dk/en/services/connection-technology-for-services/412
     -->
-    <bean id="dk_wayf_birkMetadata" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_birkMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_birkMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://metadata.wayf.dk//birk-idp.xml"/>
@@ -96,9 +96,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="dk_wayf_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="dk_wayf_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_edugainAggregate_url"/>

diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="es_sir_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="es_sir_productionAggregate" parent="DOMResourceSourceStage"
         p:id="es_sir_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="es_sir_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="es_sir_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="es_sir_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="es_sir_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="es_sir_edugainAggregate_url"/>

diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="eu_clarin_exportAggregate" parent="DomResourceSourceStage"
+    <bean id="eu_clarin_exportAggregate" parent="DOMResourceSourceStage"
         p:id="eu_clarin_exportAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://www.clarin.eu/aai/clarin-sp-metadata.xml"/>

diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fi_haka_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="fi_haka_productionAggregate" parent="DOMResourceSourceStage"
         p:id="fi_haka_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="fi_haka_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="fi_haka_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="fi_haka_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="fi_haka_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="fi_haka_edugainAggregate_url"/>