From 6487773c74389461c7ebfad0b62952643dd6c13b Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 5 Jun 2014 10:16:23 +0000
Subject: [PATCH] Cope with future name change to Dom(DOM)DocumentFactoryBean.

---
 mdx/common-beans.xml | 4 ++++
 mdx/uk/beans.xml     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index bde6b908..074aa665 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -221,6 +221,10 @@
     
     <!-- *** Parent beans for Shibboleth spring-extensions factory beans. *** -->
 
+    <!-- anticipates name change in spring-extensions bundled with MDA 0.9 -->
+    <bean id="DOMDocumentFactoryBean" abstract="true"
+        class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean"/>
+    
     <bean id="PrivateKeyFactoryBean" abstract="true"
         class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"/>
     
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 09b2308f..e159b7e6 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -179,7 +179,7 @@
         
         This bean contains the contents of the members.xml file as a DOM Document.
     -->
-    <bean id="uk_membersDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean">
+    <bean id="uk_membersDocument" parent="DOMDocumentFactoryBean">
         <property name="documentResource" ref="uk_membersResource"/>
         <property name="parserPool" ref="parserPool"/>
     </bean>
@@ -322,7 +322,7 @@
         
         This bean contains the contents of the trust roots file as a DOM Document.
     -->
-    <bean id="uk_trustRootsDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean">
+    <bean id="uk_trustRootsDocument" parent="DOMDocumentFactoryBean">
         <property name="parserPool" ref="parserPool"/>
         <property name="documentResource">
             <bean parent="FileSystemResource">