Rebase on metadata aggregator 0.7.0.

build.xml

@@ -414,8 +414,9 @@
                     </fileset>
                 </classpath>
                 <jvmarg value="-Djava.endorsed.dirs=${tools.mda}/lib/endorsed"/>
-            	<jvmarg value="-Dlogback.configurationFile=${tools.dir}/ukf-mda/logback.xml"/>
             	<jvmarg value="-Dbasedir=${basedir}"/>
+            	<jvmarg value="-enableassertions"/>
+            	<arg value="--quiet"/>
             	<arg value="@{config}"/>
             	<arg value="@{pipeline}"/>
             </java>

build/check_aggregate.xsl

@@ -24,16 +24,8 @@
 
 	<!--
 		Checks across the whole of the document are defined here.
-		
-		The match expression here works with version 0.6 of the metadata aggregator.
-		Once MDA-45 is fixed, it should be replaced with "/":
-		
-		https://issues.shibboleth.net/jira/browse/MDA-45
-		
-		This will make the transform more robust in the presence of nested
-		EntitiesDescriptor elements.
 	-->
-	<xsl:template match="md:EntitiesDescriptor">
+	<xsl:template match="/">
 
 		<!-- check for duplicate entityID values -->
 		<xsl:variable name="distinct.entityIDs" select="set:distinct($entities/@entityID)"/>

mdx/at_aconet/beans.xml

@@ -2,18 +2,22 @@
 <!--
     Common beans for this channel.
 -->
-<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"> 
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:p="http://www.springframework.org/schema/p"
+    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">
+
     <!--
         Fetch the production aggregate.
     -->
-    <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"/>
+    <bean id="at_aconet_productionAggregate" parent="domResourceStage_parent"
+        p:id="at_aconet_productionAggregate">
         <property name="domResource">
-            <bean class="org.opensaml.util.net.HttpResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://wayf.aco.net/aconet-aai-metadata.xml"/>
             </bean>
@@ -23,8 +27,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="at_aconet_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-        lazy-init="true">
+    <bean id="at_aconet_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/at_aconet/aconet-aai-metadata-signing.crt"/>
@@ -35,18 +38,17 @@
     <!--
         Check signing signature.
     -->
-    <bean id="at_aconet_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="at_aconet_checkSignature"/>
+    <bean id="at_aconet_checkSignature" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        p:id="at_aconet_checkSignature">
         <property name="verificationCertificate" ref="at_aconet_signingCertificate"/>
     </bean>
 
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="at_aconet_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="at_aconet_exportedEntities"/>
+    <bean id="at_aconet_exportedEntities" parent="composite_parent"
+        p:id="at_aconet_exportedEntities">
         <property name="composedStages">
             <list>
                 <!-- no export aggregate; use the production one instead -->

mdx/at_aconet/verbs.xml

@@ -2,9 +2,15 @@
 <!--
     Verb definitions for this channel.
 -->
-<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"> 
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:p="http://www.springframework.org/schema/p"
+    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.
     -->
@@ -15,20 +21,17 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="serializeImported"/>
-        <property name="serializer" ref="serializer"/>
+    <bean id="serializeImported" parent="serialize_parent"
+        p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/at_aconet/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="import"/>
+    <bean id="import" parent="pipeline_parent"
+        p:id="import">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_exportedEntities"/>
@@ -38,9 +41,8 @@
         </property>
     </bean>
 
-    <bean id="importRaw" class="net.shibboleth.metadata.pipeline.SimplePipeline"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="importRaw"/>
+    <bean id="importRaw" parent="pipeline_parent"
+        p:id="importRaw">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>

mdx/au_aaf/beans.xml

@@ -2,29 +2,32 @@
 <!--
     Common beans for this channel.
 -->
-<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"> 
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:p="http://www.springframework.org/schema/p"
+    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">
+
     <!--
-        Fetch the AAF production aggregate.
+        Fetch the production aggregate.
     -->
-    <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"/>
+    <bean id="au_aaf_productionAggregate" parent="domResourceStage_parent"
+        p:id="au_aaf_productionAggregate">
         <property name="domResource">
-            <bean class="org.opensaml.util.net.HttpResource">
+            <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"/>
             </bean>
         </property>
     </bean>
 
     <!--
-        AAF signing certificate.
+        Signing certificate.
     -->
-    <bean id="au_aaf_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-        lazy-init="true">
+    <bean id="au_aaf_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/aaf-metadata-cert.pem"/>
@@ -33,20 +36,19 @@
     </bean>
 
     <!--
-        Check AAF signing signature.
+        Check signing signature.
     -->
-    <bean id="au_aaf_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="au_aaf_checkSignature"/>
+    <bean id="au_aaf_checkSignature" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        p:id="au_aaf_checkSignature">
         <property name="verificationCertificate" ref="au_aaf_signingCertificate"/>
     </bean>
 
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="au_aaf_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="au_aaf_exportedEntities"/>
+    <bean id="au_aaf_exportedEntities" parent="composite_parent"
+        p:id="au_aaf_exportedEntities">
         <property name="composedStages">
             <list>
                 <!-- no export aggregate; use the production one instead -->

mdx/au_aaf/verbs.xml

@@ -2,9 +2,15 @@
 <!--
     Verb definitions for this channel.
 -->
-<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"> 
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:p="http://www.springframework.org/schema/p"
+    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.
     -->
@@ -15,20 +21,17 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="serializeImported"/>
-        <property name="serializer" ref="serializer"/>
+    <bean id="serializeImported" parent="serialize_parent"
+        p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="import"/>
+    <bean id="import" parent="pipeline_parent"
+        p:id="import">
         <property name="stages">
             <list>
                 <ref bean="au_aaf_exportedEntities"/>
@@ -38,9 +41,8 @@
         </property>
     </bean>
 
-    <bean id="importRaw" class="net.shibboleth.metadata.pipeline.SimplePipeline"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="importRaw"/>
+    <bean id="importRaw" parent="pipeline_parent"
+        p:id="importRaw">
         <property name="stages">
             <list>
                 <ref bean="au_aaf_productionAggregate"/>

mdx/br_cafe/beans.xml

@@ -2,18 +2,22 @@
 <!--
     Common beans for this channel.
 -->
-<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"> 
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:p="http://www.springframework.org/schema/p"
+    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">
+
     <!--
         Fetch the production aggregate.
     -->
-    <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"/>
+    <bean id="br_cafe_productionAggregate" parent="domResourceStage_parent"
+        p:id="br_cafe_productionAggregate">
         <property name="domResource">
-            <bean class="org.opensaml.util.net.HttpResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://ds.cafe.rnp.br/metadata/cafe-metadata.xml"/>
             </bean>
@@ -23,9 +27,8 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="br_cafe_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="br_cafe_exportedEntities"/>
+    <bean id="br_cafe_exportedEntities" parent="composite_parent"
+        p:id="br_cafe_exportedEntities">
         <property name="composedStages">
             <list>
                 <!-- no export aggregate; use the production one instead -->

mdx/br_cafe/verbs.xml

@@ -2,9 +2,15 @@
 <!--
     Verb definitions for this channel.
 -->
-<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"> 
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:p="http://www.springframework.org/schema/p"
+    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.
     -->
@@ -15,20 +21,17 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="serializeImported"/>
-        <property name="serializer" ref="serializer"/>
+    <bean id="serializeImported" parent="serialize_parent"
+        p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/br_cafe/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="import"/>
+    <bean id="import" parent="pipeline_parent"
+        p:id="import">
         <property name="stages">
             <list>
                 <ref bean="br_cafe_exportedEntities"/>
@@ -38,9 +41,8 @@
         </property>
     </bean>
 
-    <bean id="importRaw" class="net.shibboleth.metadata.pipeline.SimplePipeline"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="importRaw"/>
+    <bean id="importRaw" parent="pipeline_parent"
+        p:id="importRaw">
         <property name="stages">
             <list>
                 <ref bean="br_cafe_productionAggregate"/>