From 358ca491597620495250389732f0d913852c3ba4 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 22 Dec 2015 12:15:09 +0000
Subject: [PATCH] Migrate to post-0.9.0 conventions.

---
 mdx/incommon/beans.xml          |  8 ++------
 mdx/incommon/edugain-policy.xml |  7 +++----
 mdx/incommon/export.xml         | 31 +++++++------------------------
 mdx/incommon/import.xml         | 26 +++++++-------------------
 mdx/incommon/report.xml         |  6 ++----
 5 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/mdx/incommon/beans.xml b/mdx/incommon/beans.xml
index bceb3c37..82a1b7ea 100644
--- a/mdx/incommon/beans.xml
+++ b/mdx/incommon/beans.xml
@@ -23,12 +23,8 @@
         Template for a stage used in each output pipeline which performs
         final tweaks on the document.
     -->
-    <bean id="incommon_finalise_parent" abstract="true" parent="XSLTransformationStage">
-        <property name="XSLResource">
-            <bean parent="ClassPathResource">
-                <constructor-arg value="incommon/final_tweak.xsl"/>
-            </bean>
-        </property>
+    <bean id="incommon_finalise_parent" abstract="true" parent="XSLTransformationStage"
+        p:XSLResource="classpath:incommon/final_tweak.xsl">
         <property name="transformParameters">
             <map>
                 <entry key="publisher" value-ref="us_incommon_registrar"/>
diff --git a/mdx/incommon/edugain-policy.xml b/mdx/incommon/edugain-policy.xml
index d0f292d8..a21e0030 100644
--- a/mdx/incommon/edugain-policy.xml
+++ b/mdx/incommon/edugain-policy.xml
@@ -19,8 +19,7 @@
         Entities with errors are NOT removed here, so that this policy can be
         used in contexts where reporting is more appropriate than just removal.
     -->
-    <bean id="edugainPolicy" parent="CompositeStage"
-        p:id="edugainPolicy">
+    <bean id="edugainPolicy" parent="CompositeStage">
         <property name="composedStages">
             <list>
 
@@ -32,7 +31,7 @@
                     from another registrar or metadata exchange as they may be
                     old versions of entities we have deregistered, or spoofed.
                 -->
-                <bean p:id="removeInCommonEntities" parent="EntityRegistrationAuthorityFilterStage">
+                <bean id="removeInCommonEntities" parent="EntityRegistrationAuthorityFilterStage">
                     <property name="designatedRegistrationAuthorities">
                         <list>
                             <ref bean="us_incommon_registrar"/>
@@ -43,7 +42,7 @@
                 </bean>
 
                 <!-- Filter the entity attributes imported from eduGAIN. -->
-                <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
+                <bean id="entityAttributes" parent="EntityAttributeFilteringStage">
                     <property name="rules">
                         <list>
                             <!-- Permit REFEDS R&S category membership -->
diff --git a/mdx/incommon/export.xml b/mdx/incommon/export.xml
index 64d0d5bc..6500992a 100644
--- a/mdx/incommon/export.xml
+++ b/mdx/incommon/export.xml
@@ -23,8 +23,7 @@
     <import resource="classpath:incommon/beans.xml"/>
     <import resource="classpath:incommon/export-whitelist.xml"/>
 
-    <bean id="serializeExported" parent="SerializationStage"
-        p:id="serializeExported">
+    <bean id="serializeExported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${inc.exported.xml}"/>
@@ -35,8 +34,7 @@
     <!--
         Construct InCommon eduGAIN export aggregate.
     -->
-    <bean id="export" parent="SimplePipeline"
-        p:id="export">
+    <bean id="export" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -45,8 +43,7 @@
                     In a production environment, this will be the *unsigned* aggregate,
                     so we perform minimal checking on its contents.
                 -->
-                <bean id="production_aggregate" parent="DOMResourceSourceStage"
-                    p:id="production_aggregate">
+                <bean id="production_aggregate" parent="DOMResourceSourceStage">
                     <property name="DOMResource">
                         <bean parent="FileSystemResource" c:_0="${inc.production.xml}"/>
                     </property>
@@ -57,7 +54,6 @@
 
                 <!-- Remove all but the entities we want to export. -->
                 <bean id="applyEntityWhitelist" parent="EntityFilterStage"
-                    p:id="applyEntityWhitelist"
                     p:whitelistingEntities="true"
                     p:designatedEntities-ref="incommon_edugain_export_whitelist"/>
 
@@ -71,16 +67,10 @@
                     InCommon production metadata
                 -->
                 <bean id="rands_to_refeds" parent="XSLTransformationStage"
-                    p:id="rands_to_refeds">
-                    <property name="XSLResource">
-                        <bean parent="ClassPathResource">
-                            <constructor-arg value="incommon/rands_to_refeds.xsl"/>
-                        </bean>
-                    </property>
-                </bean>
+                    p:XSLResource="classpath:incommon/rands_to_refeds.xsl"/>
 
                 <!-- Filter the entity attributes released to eduGAIN. -->
-                <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
+                <bean id="entityAttributes" parent="EntityAttributeFilteringStage">
                    <property name="rules">
                        <list>
                            <!-- Permit REFEDS R&S category membership -->
@@ -99,8 +89,7 @@
                 <ref bean="assemble"/>
 
                 <!-- Apply final tweaks to the aggregate. -->
-                <bean id="finalise" parent="incommon_finalise_parent"
-                    p:id="finalise">
+                <bean id="finalise" parent="incommon_finalise_parent">
                     <property name="transformParameters">
                         <map>
                             <entry key="extraText" value="eduGAIN export metadata"/>
@@ -111,13 +100,7 @@
 
                 <!-- Normalise the use of namespace prefixes in the resulting XML document. -->
                 <bean id="normalise" parent="XSLTransformationStage"
-                    p:id="normalise">
-                    <property name="XSLResource">
-                        <bean parent="FileSystemResource">
-                            <constructor-arg value="${incdir}/ns_norm_export.xsl"/>
-                        </bean>
-                    </property>
-                </bean>
+                    p:XSLResource="classpath:incommon/ns_norm_export.xsl"/>
 
                 <!-- Write the resulting aggregate out to a file. -->
                 <ref bean="serializeExported"/>
diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index 232957db..5579320d 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -28,8 +28,7 @@
     -->
     <import resource="classpath:int_edugain/beans.xml"/>
 
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${inc.imported.xml}"/>
@@ -37,8 +36,7 @@
         </property>
     </bean>
 
-    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline"
-        p:id="incommon_edugain_importPipeline">
+    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -62,8 +60,7 @@
     <!--
         Construct InCommon eduGAIN import aggregate.
     -->
-    <bean id="import" parent="SimplePipeline"
-        p:id="import">
+    <bean id="import" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -72,8 +69,7 @@
                     In a production environment, this will be the *unsigned* aggregate,
                     so we perform minimal checking on its contents.
                 -->
-                <bean id="production_aggregate" parent="DOMResourceSourceStage"
-                    p:id="production_aggregate">
+                <bean id="production_aggregate" parent="DOMResourceSourceStage">
                     <property name="DOMResource">
                         <bean parent="FileSystemResource" c:_0="${inc.production.xml}"/>
                     </property>
@@ -90,8 +86,7 @@
                 <ref bean="populateRegistrationAuthorities"/>
 
                 <!-- Merge in selected entities from eduGAIN. -->
-                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage.deduplicate"
-                    p:id="mergeProductionMDXortedEntities">
+                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage.deduplicate">
                     <property name="mergedPipelines">
                         <list>
                             <ref bean="incommon_edugain_importPipeline"/>
@@ -103,8 +98,7 @@
                 <ref bean="assemble"/>
 
                 <!-- Apply final tweaks to the aggregate. -->
-                <bean id="finalise" parent="incommon_finalise_parent"
-                    p:id="finalise">
+                <bean id="finalise" parent="incommon_finalise_parent">
                     <property name="transformParameters">
                         <map>
                             <entry key="extraText" value="Contains InCommon and eduGAIN metadata"/>
@@ -115,13 +109,7 @@
 
                 <!-- Normalise the use of namespace prefixes in the resulting XML document. -->
                 <bean id="normalise" parent="XSLTransformationStage"
-                    p:id="normalise">
-                    <property name="XSLResource">
-                        <bean parent="FileSystemResource">
-                            <constructor-arg value="${incdir}/ns_norm_import.xsl"/>
-                        </bean>
-                    </property>
-                </bean>
+                    p:XSLResource="classpath:incommon/ns_norm_import.xsl"/>
 
                 <!-- Write the resulting aggregate out to a file. -->
                 <ref bean="serializeImported"/>
diff --git a/mdx/incommon/report.xml b/mdx/incommon/report.xml
index 965ad559..fafdc182 100644
--- a/mdx/incommon/report.xml
+++ b/mdx/incommon/report.xml
@@ -28,8 +28,7 @@
     -->
     <import resource="classpath:int_edugain/beans.xml"/>
 
-    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline"
-        p:id="incommon_edugain_importPipeline">
+    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
             </list>
@@ -39,8 +38,7 @@
     <!--
         Report on errors detected in eduGAIN metadata.
     -->
-    <bean id="report" parent="SimplePipeline"
-        p:id="report">
+    <bean id="report" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>