No need for p:id notation any more, post MDA 0.9.0.

internet2 · Dec 19, 2015 · 6d367c7 · 6d367c7
1 parent 71c3e75
commit 6d367c7
Show file tree

Hide file tree

Showing 14 changed files with 164 additions and 310 deletions.
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -27,8 +27,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="at_aconet_productionAggregate">
+    <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -40,8 +39,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage"
-        p:id="at_aconet_edugainAggregate">
+    <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -59,12 +57,10 @@
     <!--
         Check signing signature.
     -->
-    <bean id="at_aconet_checkProductionSignature" parent="XMLSignatureValidationStage"
-        p:id="at_aconet_checkProductionSignature">
+    <bean id="at_aconet_checkProductionSignature" parent="XMLSignatureValidationStage">
         <property name="verificationCertificate" ref="at_aconet_signingCertificate"/>
     </bean>
-    <bean id="at_aconet_checkEdugainSignature" parent="XMLSignatureValidationStageSHA256"
-        p:id="at_aconet_checkEdugainSignature">
+    <bean id="at_aconet_checkEdugainSignature" parent="XMLSignatureValidationStageSHA256">
         <property name="verificationCertificate" ref="at_aconet_signingCertificate"/>
     </bean>
 
@@ -74,8 +70,7 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="at_aconet_check_regauth" parent="check_regauth_parent"
-        p:id="at_aconet_check_regauth">
+    <bean id="at_aconet_check_regauth" parent="check_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="expectedAuthority" value-ref="at_aconet_registrar"/>
@@ -89,8 +84,7 @@
         Provide a default registrationAuthority appropriate to
         this channel.
     -->
-    <bean id="at_aconet_default_regauth" parent="default_regauth_parent"
-        p:id="at_aconet_default_regauth">
+    <bean id="at_aconet_default_regauth" parent="default_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="defaultAuthority" value-ref="at_aconet_registrar"/>
@@ -101,8 +95,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="at_aconet_productionEntities" parent="CompositeStage"
-        p:id="at_aconet_productionEntities">
+    <bean id="at_aconet_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -124,8 +117,7 @@
     <!--
         Fetch the eduGAIN export entities as a collection.
     -->
-    <bean id="at_aconet_edugainEntities" parent="CompositeStage"
-        p:id="at_aconet_edugainEntities">
+    <bean id="at_aconet_edugainEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
@@ -22,17 +22,15 @@
     -->
     <import resource="classpath:at_aconet/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="${basedir}/mdx/at_aconet/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionEntities"/>
@@ -43,8 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -53,8 +50,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugain" parent="SimplePipeline"
-        p:id="importEdugain">
+    <bean id="importEdugain" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
@@ -65,8 +61,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="SimplePipeline"
-        p:id="importEdugainRaw">
+    <bean id="importEdugainRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
@@ -75,15 +70,13 @@
         </property>
     </bean>
 
-    <bean id="verifyEdugain" parent="SimplePipeline"
-        p:id="verifyEdugain">
+    <bean id="verifyEdugain" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
                 <ref bean="standardImportActions"/>
 
-                <bean parent="X509ValidationStage"
-                    p:id="checkCertificates">
+                <bean id="checkCertificates" parent="X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
@@ -97,9 +90,8 @@
                     Remove a specific entity we know has a problem that it will take
                     a while to resolve.
                 -->
-                <bean parent="stage_parent"
+                <bean id="filterEntities" parent="stage_parent"
                     class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
-                    p:id="filterEntities"
                     p:whitelistingEntities="false">
                     <property name="designatedEntities">
                         <set>

diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
@@ -22,8 +22,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="int_cobweb_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="int_cobweb_productionAggregate">
+    <bean id="int_cobweb_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -46,16 +45,14 @@
     <!--
         Check signing signature.
     -->
-    <bean id="int_cobweb_checkSignature" parent="XMLSignatureValidationStage"
-        p:id="int_cobweb_checkSignature">
+    <bean id="int_cobweb_checkSignature" parent="XMLSignatureValidationStage">
         <property name="verificationCertificate" ref="int_cobweb_signingCertificate"/>
     </bean>
 
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="int_cobweb_productionEntities" parent="CompositeStage"
-        p:id="int_cobweb_productionEntities">
+    <bean id="int_cobweb_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_cobweb_productionAggregate"/>

diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml
@@ -22,17 +22,15 @@
     -->
     <import resource="classpath:int_cobweb/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="${basedir}/mdx/int_cobweb/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
@@ -43,8 +41,7 @@
         </property>
     </bean>
 
-    <bean id="verifyProduction" parent="SimplePipeline"
-        p:id="verifyProduction">
+    <bean id="verifyProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
@@ -54,8 +51,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionAggregate"/>

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
@@ -32,8 +32,7 @@
     <!--
         Fetches the eduGAIN production aggregate.
     -->
-    <bean id="int_edugain_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="int_edugain_productionAggregate">
+    <bean id="int_edugain_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -45,8 +44,7 @@
     <!--
         Fetch the eduGAIN test aggregate.
     -->
-    <bean id="int_edugain_testAggregate" parent="DOMResourceSourceStage"
-        p:id="int_edugain_testAggregate">
+    <bean id="int_edugain_testAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -64,24 +62,21 @@
     <!--
         Check a signature against the eduGAIN signing certificate.
     -->
-    <bean id="int_edugain_checkSignature" parent="XMLSignatureValidationStageSHA256"
-        p:id="int_edugain_checkSignature">
+    <bean id="int_edugain_checkSignature" parent="XMLSignatureValidationStageSHA256">
         <property name="verificationCertificate" ref="int_edugain_signingCertificate"/>
     </bean>
 
     <!--
         Remove blacklisted entities.
     -->
     <bean id="int_edugain_removeBlacklistedEntities" parent="EntityFilterStage"
-        p:id="int_edugain_removeBlacklistedEntities"
         p:whitelistingEntities="false"
         p:designatedEntities-ref="int_edugain_entity_blacklist"/>
 
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="int_edugain_productionEntities" parent="CompositeStage"
-        p:id="int_edugain_productionEntities">
+    <bean id="int_edugain_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -111,8 +106,7 @@
     <!--
         Fetch the test entities as a collection.
     -->
-    <bean id="int_edugain_testEntities" parent="CompositeStage"
-        p:id="int_edugain_testEntities">
+    <bean id="int_edugain_testEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_testAggregate"/>

diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
@@ -23,17 +23,15 @@
     <import resource="classpath:int_edugain/beans.xml"/>
     <import resource="classpath:int_edugain/verify-blacklist.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="${basedir}/mdx/int_edugain/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -44,8 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -54,8 +51,7 @@
         </property>
     </bean>
 
-    <bean id="importTest" parent="SimplePipeline"
-        p:id="importTest">
+    <bean id="importTest" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_testEntities"/>
@@ -74,13 +70,11 @@
         blacklist are ignored, so that we only need to deal with each entity
         entering an error state once.
     -->
-    <bean id="verify" parent="SimplePipeline"
-        p:id="verify">
+    <bean id="verify" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
                 <bean id="removeBlacklistedEntities" parent="EntityFilterStage"
-                    p:id="removeBlacklistedEntities"
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
@@ -96,8 +90,7 @@
         Looks for eduGAIN entities which *were* in an error state, as shown by
         their inclusion in our verification blacklist, but have now recovered.
     -->
-    <bean id="verify.recovered" parent="SimplePipeline"
-        p:id="verify.recovered">
+    <bean id="verify.recovered" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -108,13 +101,11 @@
 
                 <!-- remove all entities *other* than the ones in the blacklist -->
                 <bean id="removeAllButBlacklistedEntities" parent="EntityFilterStage"
-                    p:id="removeAllButBlacklistedEntities"
                     p:whitelistingEntities="true"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
                 <!-- flag up any remaining entities -->
-                <bean id="check_recovered" parent="XSLValidationStage"
-                    p:id="check_recovered">
+                <bean id="check_recovered" parent="XSLValidationStage">
                     <property name="XSLResource">
                         <bean parent="FileSystemResource">
                             <constructor-arg value="${basedir}/mdx/int_edugain/check_recovered.xsl"/>
@@ -132,8 +123,7 @@
         Same as verify, but not making use of the validation
         blacklist. Can be used to check up on blacklisted entities.
     -->
-    <bean id="verify.all" parent="SimplePipeline"
-        p:id="verify.all">
+    <bean id="verify.all" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>

diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
@@ -16,8 +16,7 @@
         Fetch the aggregate aggregate.
     -->
     <bean id="test_aggregate" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
-        p:id="test_aggregate">
+        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
@@ -29,8 +28,7 @@
     <!--
         Fetch and process the entities as a collection.
     -->
-    <bean id="test_entities" parent="CompositeStage"
-        p:id="test_entities">
+    <bean id="test_entities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="test_aggregate"/>