From a401e7045ab9f3ec7a3da432252d107c8189902e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 8 Feb 2023 10:40:13 +0000
Subject: [PATCH] Move conversionService to common-beans

---
 mdx/common-beans.xml     | 23 +++++++++++++++++++++++
 mdx/uk/discofeeds.xml    | 21 ---------------------
 mdx/uk/generate.xml      | 13 -------------
 mdx/uk/mdq-multisign.xml | 13 -------------
 4 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 2a90958..7095571 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -142,6 +142,29 @@
     <!-- *** Default Shibboleth component bean id property from Spring bean id *** -->
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" lazy-init="false"/>
 
+
+    <!--
+        *****************************
+        ***                       ***
+        ***   U T I L I T I E S   ***
+        ***                       ***
+        *****************************
+    -->
+
+    <!-- This bean MUST be called "conversionService" to work properly. -->
+    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
+        <property name="converters">
+            <set>
+                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
+                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
+                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
+                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
+                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
+            </set>
+        </property>
+    </bean>
+
+
     <!--
         *******************************************************
         ***                                                 ***
diff --git a/mdx/uk/discofeeds.xml b/mdx/uk/discofeeds.xml
index 05a7c98..6ca0da3 100644
--- a/mdx/uk/discofeeds.xml
+++ b/mdx/uk/discofeeds.xml
@@ -29,27 +29,6 @@
     -->
     <import resource="classpath:uk/beans.xml"/>
 
-    <!--
-        *****************************
-        ***                       ***
-        ***   U T I L I T I E S   ***
-        ***                       ***
-        *****************************
-    -->
-
-    <!-- This bean MUST be called "conversionService" to work properly. -->
-    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
-            </set>
-        </property>
-    </bean>
-
 
     <!--
         ***************************************************
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 456ab86..e542182 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -51,19 +51,6 @@
         *****************************
     -->
 
-    <!-- This bean MUST be called "conversionService" to work properly. -->
-    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
-            </set>
-        </property>
-    </bean>
-
     <!--
         stripEntityScopes
 
diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
index c7aa033..76bcf9b 100644
--- a/mdx/uk/mdq-multisign.xml
+++ b/mdx/uk/mdq-multisign.xml
@@ -22,19 +22,6 @@
     -->
     <import resource="classpath:uk/beans.xml"/>
 
-    <!-- This bean MUST be called "conversionService" to work properly. -->
-    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
-            </set>
-        </property>
-    </bean>
-
     <!--
         Generate per-entity metadata.
     -->