From d33502e5e70684292994a3c26b93f3a83cfac360 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 1 May 2017 14:19:25 +0100
Subject: [PATCH] Make consistent use of the String abstract bean

---
 mdx/at_aconet/beans.xml   | 4 ++--
 mdx/int_cobweb/beans.xml  | 2 +-
 mdx/int_edugain/beans.xml | 4 ++--
 mdx/uk/beans.xml          | 4 ++--
 mdx/us_incommon/beans.xml | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index a71afa17..5bebaeda 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -16,11 +16,11 @@
         Location of various resources.
     -->
     <!-- ACOnet-registered entities without interfederation -->
-    <bean id="at_aconet_registrarAggregate_url" class="java.lang.String">
+    <bean id="at_aconet_registrarAggregate_url" parent="String">
         <constructor-arg value="http://eduid.at/md/aconet-registered.xml"/>
     </bean>
     <!-- eduGAIN export aggregate -->
-    <bean id="at_aconet_edugainAggregate_url" class="java.lang.String">
+    <bean id="at_aconet_edugainAggregate_url" parent="String">
         <constructor-arg value="http://eduid.at/md/upstream-edugain.xml"/>
     </bean>
     
diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
index b3fa6adf..21fb37f9 100644
--- a/mdx/int_cobweb/beans.xml
+++ b/mdx/int_cobweb/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Location of various resources.
     -->
-    <bean id="int_cobweb_productionAggregate_url" class="java.lang.String">
+    <bean id="int_cobweb_productionAggregate_url" parent="String">
         <constructor-arg value="https://cobweb.edina.ac.uk/metadata/cobweb-metadata.xml"/>
     </bean>
     
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 32cc5d63..23154d3b 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -22,11 +22,11 @@
         Location of various resources.
     -->
     <!-- production aggregate -->
-    <bean id="int_edugain_productionAggregate_url" class="java.lang.String">
+    <bean id="int_edugain_productionAggregate_url" parent="String">
         <constructor-arg value="http://mds.edugain.org/"/>
     </bean>
     <!-- test aggregate -->
-    <bean id="int_edugain_testAggregate_url" class="java.lang.String">
+    <bean id="int_edugain_testAggregate_url" parent="String">
         <constructor-arg value="http://mds-test.edugain.org"/>
     </bean>
 
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 17b033e7..fa6c3d0c 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -15,10 +15,10 @@
     <!--
         Location of various resources.
     -->
-    <bean id="uk_productionAggregate_url" class="java.lang.String">
+    <bean id="uk_productionAggregate_url" parent="String">
         <constructor-arg value="http://metadata.ukfederation.org.uk/ukfederation-metadata.xml"/>
     </bean>
-    <bean id="uk_exportAggregate_url" class="java.lang.String">
+    <bean id="uk_exportAggregate_url" parent="String">
         <constructor-arg value="http://metadata.ukfederation.org.uk/ukfederation-export.xml"/>
     </bean>
     
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index d7418cac..581e97ac 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -15,16 +15,16 @@
     <!--
         Location of various resources.
     -->
-    <bean id="us_incommon_productionAggregate_url" class="java.lang.String">
+    <bean id="us_incommon_productionAggregate_url" parent="String">
         <constructor-arg value="http://md.incommon.org/InCommon/InCommon-metadata.xml"/>
     </bean>
-    <bean id="us_incommon_fallbackAggregate_url" class="java.lang.String">
+    <bean id="us_incommon_fallbackAggregate_url" parent="String">
         <constructor-arg value="http://md.incommon.org/InCommon/InCommon-metadata-fallback.xml"/>
     </bean>
-    <bean id="us_incommon_previewAggregate_url" class="java.lang.String">
+    <bean id="us_incommon_previewAggregate_url" parent="String">
         <constructor-arg value="http://md.incommon.org/InCommon/InCommon-metadata-preview.xml"/>
     </bean>
-    <bean id="us_incommon_legacyAggregate_url" class="java.lang.String">
+    <bean id="us_incommon_legacyAggregate_url" parent="String">
         <constructor-arg value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
     </bean>