From 93e4e80bd9cb78addc0a734ac05c125d941bb984 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 13 Mar 2014 11:57:55 +0000
Subject: [PATCH] Pull name of class used for HTTP resources out into
 common-beans.xml to simplify later migration to MDA 0.9.

---
 mdx/at_aconet/beans.xml     | 4 ++--
 mdx/au_aaf/beans.xml        | 2 +-
 mdx/be_belnet/beans.xml     | 4 ++--
 mdx/br_cafe/beans.xml       | 4 ++--
 mdx/ca_caf/beans.xml        | 4 ++--
 mdx/ch_switchaai/beans.xml  | 4 ++--
 mdx/cl_cofre/beans.xml      | 2 +-
 mdx/common-beans.xml        | 9 +++++++++
 mdx/cz_eduid/beans.xml      | 4 ++--
 mdx/de_dfnaai/beans.xml     | 4 ++--
 mdx/dk_wayf/beans.xml       | 8 ++++----
 mdx/es_sir/beans.xml        | 4 ++--
 mdx/eu_clarin/beans.xml     | 2 +-
 mdx/fi_haka/beans.xml       | 4 ++--
 mdx/fr_renater/beans.xml    | 6 +++---
 mdx/gr_grnet/beans.xml      | 4 ++--
 mdx/hr_eduhr/beans.xml      | 2 +-
 mdx/hu_eduid/beans.xml      | 4 ++--
 mdx/ie_edugate/beans.xml    | 4 ++--
 mdx/in_infed/beans.xml      | 2 +-
 mdx/int_cobweb/beans.xml    | 2 +-
 mdx/int_edugain/beans.xml   | 4 ++--
 mdx/int_testshib/beans.xml  | 2 +-
 mdx/it_idem/beans.xml       | 4 ++--
 mdx/jp_gakunin/beans.xml    | 2 +-
 mdx/lv_laife/beans.xml      | 4 ++--
 mdx/nl_surfconext/beans.xml | 4 ++--
 mdx/nl_surfnet/beans.xml    | 6 +++---
 mdx/no_feide/beans.xml      | 4 ++--
 mdx/nz_tuakiri/beans.xml    | 2 +-
 mdx/se_swamid/beans.xml     | 4 ++--
 mdx/si_arnes/beans.xml      | 2 +-
 mdx/uk/beans.xml            | 4 ++--
 mdx/uk_eduserv/beans.xml    | 2 +-
 mdx/us_incommon/beans.xml   | 2 +-
 35 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 06526132..e0bf7b64 100644
--- 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
index dbd6c012..9b8c9027 100644
--- 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
index c7005b65..0770259e 100644
--- 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
index 97267880..0d00e8da 100644
--- 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
index 53df6c7c..e9b6a659 100644
--- 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
index 7fd66298..c1a3099a 100644
--- 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
index 870bbf4c..dbac3d67 100644
--- 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
index 8e33d500..5d743f38 100644
--- 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
index 5264cb1b..14796823 100644
--- 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
index d5e93675..3a2aa126 100644
--- 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
index 4436e03c..f48d060f 100644
--- 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
index 21a6a5e9..7e81b926 100644
--- 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
index 7dd12483..ad2ac4f1 100644
--- 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
index f636602e..897ca7f2 100644
--- 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
index 8a223f2f..e7c4fa06 100644
--- 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
index 0373f872..a207f23f 100644
--- 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
index 855bcca5..e653791c 100644
--- 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
index d35487ba..b94fcb34 100644
--- 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
index 356eed59..c548b94c 100644
--- 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
index 6478d4d9..e0134ee1 100644
--- 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
index c0620cdd..063fb9a7 100644
--- 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
index ad834750..c7d03228 100644
--- 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
index 9a0ef07b..000c42c1 100644
--- 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>
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 4cb658ad..5ba7a3b5 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -28,7 +28,7 @@
     <bean id="it_idem_productionAggregate" parent="DOMResourceSourceStage"
         p:id="it_idem_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="it_idem_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="it_idem_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="it_idem_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="it_idem_edugainAggregate_url"/>
             </bean>
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index 70964e5e..4baf5226 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -18,7 +18,7 @@
     <bean id="jp_gakunin_productionAggregate" parent="DOMResourceSourceStage"
         p:id="jp_gakunin_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://metadata.gakunin.nii.ac.jp/gakunin-metadata.xml"/>
             </bean>
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index 2f053a05..68764bd7 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -28,7 +28,7 @@
     <bean id="lv_laife_productionAggregate" parent="DOMResourceSourceStage"
         p:id="lv_laife_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="lv_laife_productionAggregate_url"/>
             </bean>
@@ -41,7 +41,7 @@
     <bean id="lv_laife_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="lv_laife_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="lv_laife_edugainAggregate_url"/>
             </bean>
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index e56de310..58a823f0 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -45,7 +45,7 @@
     <bean id="nl_surfconext_idpAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfconext_idpAggregate">
         <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://engine.surfconext.nl/authentication/proxy/idps-metadata"/>
             </bean>
@@ -58,7 +58,7 @@
     <bean id="nl_surfconext_spAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfconext_spAggregate">
         <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://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>
             </bean>
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index a4b06c39..624fc764 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -25,7 +25,7 @@
     <bean id="nl_surfnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfnet_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="nl_surfnet_edugainAggregate_url"/>
             </bean>
@@ -57,7 +57,7 @@
     <bean id="nl_surfnet_idpAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfnet_idpAggregate">
         <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://wayf.surfnet.nl/federate/metadata"/>
             </bean>
@@ -70,7 +70,7 @@
     <bean id="nl_surfnet_spAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfnet_spAggregate">
         <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://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>
             </bean>
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index a276f5ee..9e83f6aa 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -27,7 +27,7 @@
     <bean id="no_feide_idpMetadata" parent="DOMResourceSourceStage"
         p:id="no_feide_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" value="https://idp.feide.no/simplesaml/saml2/idp/metadata.php"/>
             </bean>
@@ -55,7 +55,7 @@
     <bean id="no_feide_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="no_feide_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="no_feide_edugainAggregate_url"/>
             </bean>
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index e3c370af..3895e862 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -18,7 +18,7 @@
     <bean id="nz_tuakiri_productionAggregate" parent="DOMResourceSourceStage"
         p:id="nz_tuakiri_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://directory.test.tuakiri.ac.nz/metadata/tuakiri-test-metadata-signed.xml"/>
             </bean>
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index fc2f64a8..d8dc8e1c 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -34,7 +34,7 @@
     <bean id="se_swamid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="se_swamid_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="se_swamid_productionAggregate_url"/>
             </bean>
@@ -47,7 +47,7 @@
     <bean id="se_swamid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="se_swamid_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="se_swamid_edugainAggregate_url"/>
             </bean>
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index 2a523fae..e2e3f454 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -18,7 +18,7 @@
     <bean id="si_arnes_productionAggregate" parent="DOMResourceSourceStage"
         p:id="si_arnes_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://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"/>
             </bean>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 12688727..c2ea638b 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -46,7 +46,7 @@
     <bean id="uk_exportAggregate" parent="DOMResourceSourceStage"
         p:id="uk_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" ref="uk_exportAggregate_url"/>        
             </bean>
@@ -60,7 +60,7 @@
     <bean id="uk_productionAggregate" parent="DOMResourceSourceStage"
         p:id="uk_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="uk_productionAggregate_url"/>        
             </bean>
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index 9eed21c3..6820ba16 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -18,7 +18,7 @@
     <bean id="uk_eduserv_exportAggregate" parent="DOMResourceSourceStage"
         p:id="uk_eduserv_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://auth.athensams.net/saml/metadata?name=ukfederation"/>
             </bean>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 6ddf7bc5..367b50cf 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -34,7 +34,7 @@
     <bean id="us_incommon_productionAggregate" parent="DOMResourceSourceStage"
         p:id="us_incommon_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="us_incommon_productionAggregate_url"/>
             </bean>