Switch to aggregator version 0.6.1, including consequent changes in m…

…any beans files. Use the status handling classes from 0.6.1 instead of the custom class from ukf-mda. New certificate for hu_eduid.
InCommon · Oct 31, 2011 · 34d0761 · 34d0761
1 parent 50df051
commit 34d0761
Show file tree

Hide file tree

Showing 31 changed files with 369 additions and 88 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
 
     <!--