Cope with future name change to Dom(DOM)DocumentFactoryBean.

internet2 · Jun 5, 2014 · 6487773 · 6487773
1 parent 333436d
commit 6487773
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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">