From f9c1f192605bfe80ee0283130655ca5d37476428 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 18 May 2011 10:22:50 +0000
Subject: [PATCH] Move the serializer into the common beans collection.

---
 build.xml                        | 2 +-
 mdx/aaf/aaf-import.xml           | 2 --
 mdx/arnes/arnes-import.xml       | 2 --
 mdx/caf/caf-import.xml           | 2 --
 mdx/common-beans.xml             | 5 +++++
 mdx/edugain/edugain-import.xml   | 2 --
 mdx/edugate/edugate-import.xml   | 2 --
 mdx/incommon/incommon-import.xml | 2 --
 mdx/swamid/swamid-import.xml     | 2 --
 mdx/switch/switch-import.xml     | 2 --
 mdx/uk/uk-collect.xml            | 2 --
 11 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index 60ee5751..31edf09d 100644
--- a/build.xml
+++ b/build.xml
@@ -1195,7 +1195,7 @@
         <!--
             Run checking rulesets.
         -->
-        <CHECK.imported i="${mdx.dir}/uk/collected.xml"/>
+        <CHECK i="${xml.dir}/${uk.master.file}" s="check.xsl"/>
         
         <echo>Collection completed.</echo>
     </target>
diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml
index 5c8d304a..04eddfcb 100644
--- a/mdx/aaf/aaf-import.xml
+++ b/mdx/aaf/aaf-import.xml
@@ -30,7 +30,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml
index 84dd3760..3141aaed 100644
--- a/mdx/arnes/arnes-import.xml
+++ b/mdx/arnes/arnes-import.xml
@@ -30,7 +30,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml
index fca9f1a6..78e9ce85 100644
--- a/mdx/caf/caf-import.xml
+++ b/mdx/caf/caf-import.xml
@@ -31,6 +31,4 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
-
 </beans>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index c5081a1c..cf59bae4 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -146,4 +146,9 @@
         <property name="id" value="assemble"/>
     </bean>
     
+    <!--
+        Standard serializer.
+    -->
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
+    
 </beans>
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
index 232ff313..cdcc2fc5 100644
--- a/mdx/edugain/edugain-import.xml
+++ b/mdx/edugain/edugain-import.xml
@@ -34,7 +34,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml
index b4b164d9..a9fe987a 100644
--- a/mdx/edugate/edugate-import.xml
+++ b/mdx/edugate/edugate-import.xml
@@ -31,6 +31,4 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
-
 </beans>
diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml
index e9021063..903fb3e2 100644
--- a/mdx/incommon/incommon-import.xml
+++ b/mdx/incommon/incommon-import.xml
@@ -30,7 +30,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml
index b5020e1e..83bbf2a6 100644
--- a/mdx/swamid/swamid-import.xml
+++ b/mdx/swamid/swamid-import.xml
@@ -30,7 +30,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml
index 53b1993b..868f54d6 100644
--- a/mdx/switch/switch-import.xml
+++ b/mdx/switch/switch-import.xml
@@ -30,7 +30,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
index a5de6643..7947cde1 100644
--- a/mdx/uk/uk-collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -52,7 +52,5 @@
             </list>
         </property>
     </bean>
-    
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>