Pull name of class used for HTTP resources out into common-beans.xml …

…to simplify later migration to MDA 0.9.
internet2 · Mar 13, 2014 · 93e4e80 · 93e4e80
1 parent d8abbd9
commit 93e4e80
Show file tree

Hide file tree

Showing 35 changed files with 69 additions and 60 deletions.
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -30,7 +30,7 @@
     <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="at_aconet_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_registrarAggregate_url"/>
             </bean>
@@ -43,7 +43,7 @@
     <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="at_aconet_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_edugainAggregate_url"/>
             </bean>

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

diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
@@ -28,7 +28,7 @@
     <bean id="be_belnet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="be_belnet_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="be_belnet_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="be_belnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="be_belnet_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="be_belnet_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
@@ -28,7 +28,7 @@
     <bean id="br_cafe_productionAggregate" parent="DOMResourceSourceStage"
         p:id="br_cafe_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="br_cafe_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="br_cafe_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="br_cafe_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="br_cafe_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
@@ -28,7 +28,7 @@
     <bean id="ca_caf_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ca_caf_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="ca_caf_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="ca_caf_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="ca_caf_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ca_caf_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
@@ -28,7 +28,7 @@
     <bean id="ch_switchaai_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ch_switchaai_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ch_switchaai_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="ch_switchaai_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="ch_switchaai_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ch_switchaai_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
@@ -26,7 +26,7 @@
     <bean id="cl_cofre_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="cl_cofre_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cl_cofre_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -26,6 +26,15 @@
     <bean id="String" abstract="true" class="java.lang.String"/>
     <bean id="QName" abstract="true" class="javax.xml.namespace.QName"/>
 
+    <!--
+        Shibboleth-defined Resource class parent bean.
+        
+        Note: this is named for the Spring-derived but Shibboleth-defined Resource
+        class that will be included in Shibboleth MDA 0.9, to simplify migration.
+    -->
+    <bean id="HTTPResource" abstract="true"
+        class="net.shibboleth.utilities.java.support.httpclient.HttpResource"/>
+
     <!--
         component_parent
         

diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
@@ -38,7 +38,7 @@
     <bean id="cz_eduid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="cz_eduid_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cz_eduid_productionAggregate_url"/>
             </bean>
@@ -51,7 +51,7 @@
     <bean id="cz_eduid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="cz_eduid_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cz_eduid_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
@@ -28,7 +28,7 @@
     <bean id="de_dfnaai_productionAggregate" parent="DOMResourceSourceStage"
         p:id="de_dfnaai_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="de_dfnaai_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="de_dfnaai_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="de_dfnaai_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="de_dfnaai_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
@@ -37,7 +37,7 @@
     <bean id="dk_wayf_idpMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_idpMetadata">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_productionIdpMetadata_url"/>
             </bean>
@@ -50,7 +50,7 @@
     <bean id="dk_wayf_spMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_spMetadata">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_productionSpMetadata_url"/>
             </bean>
@@ -65,7 +65,7 @@
     <bean id="dk_wayf_birkMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_birkMetadata">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://metadata.wayf.dk//birk-idp.xml"/>
             </bean>
@@ -99,7 +99,7 @@
     <bean id="dk_wayf_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="dk_wayf_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
@@ -28,7 +28,7 @@
     <bean id="es_sir_productionAggregate" parent="DOMResourceSourceStage"
         p:id="es_sir_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="es_sir_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="es_sir_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="es_sir_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="es_sir_edugainAggregate_url"/>
             </bean>

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

diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
@@ -28,7 +28,7 @@
     <bean id="fi_haka_productionAggregate" parent="DOMResourceSourceStage"
         p:id="fi_haka_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="fi_haka_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="fi_haka_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="fi_haka_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="fi_haka_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
@@ -31,7 +31,7 @@
     <bean id="fr_renater_productionAggregate" parent="DOMResourceSourceStage"
         p:id="fr_renater_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="fr_renater_productionAggregate_url"/>
             </bean>
@@ -44,7 +44,7 @@
     <bean id="fr_renater_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="fr_renater_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="fr_renater_edugainAggregate_url"/>
             </bean>
@@ -57,7 +57,7 @@
     <bean id="fr_renater_testAggregate" parent="DOMResourceSourceStage"
         p:id="fr_renater_testAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="fr_renater_testAggregate_url"/>
             </bean>

diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
@@ -28,7 +28,7 @@
     <bean id="gr_grnet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="gr_grnet_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="gr_grnet_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="gr_grnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="gr_grnet_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="gr_grnet_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
@@ -25,7 +25,7 @@
     <bean id="hr_eduhr_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="hr_eduhr_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="hr_eduhr_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
@@ -28,7 +28,7 @@
     <bean id="hu_eduid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="hu_eduid_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="hu_eduid_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="hu_eduid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="hu_eduid_edugainAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="hu_eduid_edugainAggregate_url"/>
             </bean>

diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
@@ -18,7 +18,7 @@
     <bean id="ie_edugate_exportAggregate" parent="DOMResourceSourceStage"
         p:id="ie_edugate_exportAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://edugate.heanet.ie/edugate-ukfed-signed.xml"/>        
             </bean>
@@ -31,7 +31,7 @@
     <bean id="ie_edugate_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ie_edugate_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
             </bean>

diff --git a/mdx/in_infed/beans.xml b/mdx/in_infed/beans.xml
@@ -25,7 +25,7 @@
     <bean id="in_infed_productionAggregate" parent="DOMResourceSourceStage"
         p:id="in_infed_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="in_infed_productionAggregate_url"/>
             </bean>

diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
@@ -25,7 +25,7 @@
     <bean id="int_cobweb_productionAggregate" parent="DOMResourceSourceStage"
         p:id="int_cobweb_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="int_cobweb_productionAggregate_url"/>
             </bean>

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
@@ -36,7 +36,7 @@
     <bean id="int_edugain_productionAggregate" parent="DOMResourceSourceStage"
         p:id="int_edugain_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="int_edugain_productionAggregate_url"/>
             </bean>
@@ -49,7 +49,7 @@
     <bean id="int_edugain_testAggregate" parent="DOMResourceSourceStage"
         p:id="int_edugain_testAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="int_edugain_testAggregate_url"/>
             </bean>

diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
@@ -25,7 +25,7 @@
     <bean id="int_testshib_productionAggregate" parent="DOMResourceSourceStage"
         p:id="int_testshib_productionAggregate">
         <property name="DOMResource">
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+            <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="int_testshib_productionAggregate_url"/>
             </bean>