Move the serializer into the common beans collection.

InCommon · May 18, 2011 · f9c1f19 · f9c1f19
1 parent 26cca0f
commit f9c1f19
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -52,7 +52,5 @@
             </list>
         </property>
     </bean>
-
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>