Rebase on the first snapshot of aggregator 0.6, and the corresponding…

…ly reworked ukf-mda.
InCommon · May 16, 2011 · c0f4b73 · c0f4b73
1 parent c3e4510
commit c0f4b73
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 31 deletions.
diff --git a/mdx/aaf/aaf-beans.xml b/mdx/aaf/aaf-beans.xml
@@ -32,9 +32,6 @@
     <bean id="checkAafSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkAafSignature"/>
         <property name="verificationCertificate" ref="aafSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchAafExportAggregate"/>
                 <ref bean="checkAafSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/arnes/arnes-beans.xml b/mdx/arnes/arnes-beans.xml
@@ -32,9 +32,6 @@
     <bean id="checkArnesSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkArnesSignature"/>
         <property name="verificationCertificate" ref="arnesSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchArnesExportAggregate"/>
                 <ref bean="checkArnesSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/caf/caf-beans.xml b/mdx/caf/caf-beans.xml
@@ -32,9 +32,6 @@
     <bean id="checkCafSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkCafSignature"/>
         <property name="verificationCertificate" ref="cafSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchCafExportAggregate"/>
                 <ref bean="checkCafSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -99,15 +99,21 @@
     <!--
         checkSchemas
         
-        A pipeline stage that checks against all the common schemas, as above, and then announces
-        and filters any errors encountered.
+        A pipeline stage that checks against all the common schemas, as above.
     -->
     <bean id="checkSchemas" class="net.shibboleth.metadata.dom.stage.XMLSchemaValidationStage">
         <property name="id" value="checkSchemas"/>
         <property name="schemaResources" ref="schemaResources"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
+    </bean>
+
+    <!--
+        errorAnnouncingFilter
+        
+        A pipeline stage that checks for any errors, and then announces
+        and filters any encountered.
+    -->
+    <bean id="errorAnnouncingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage">
+        <property name="id" value="errorAnnouncingFilter"/>
     </bean>
 
     <!--

diff --git a/mdx/edugain/edugain-beans.xml b/mdx/edugain/edugain-beans.xml
@@ -29,9 +29,6 @@
     <bean id="checkEdugainSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkEdugainSignature"/>
         <property name="verificationCertificate" ref="edugainSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
@@ -25,9 +25,11 @@
             <list>
                 <ref bean="fetchEduGainExportAggregate"/>
                 <ref bean="checkEdugainSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/edugate/edugate-beans.xml b/mdx/edugate/edugate-beans.xml
@@ -29,9 +29,6 @@
     <bean id="checkEdugateSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkEdugateSignature"/>
         <property name="verificationCertificate" ref="edugateSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchEdugateExportAggregate"/>
                 <ref bean="checkEdugateSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/incommon/incommon-beans.xml b/mdx/incommon/incommon-beans.xml
@@ -32,9 +32,6 @@
     <bean id="checkInCommonSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkInCommonSignature"/>
         <property name="verificationCertificate" ref="inCommonSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchInCommonExportAggregate"/>
                 <ref bean="checkInCommonSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/swamid/swamid-beans.xml b/mdx/swamid/swamid-beans.xml
@@ -32,9 +32,6 @@
     <bean id="checkSwamidSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkSwamidSignature"/>
         <property name="verificationCertificate" ref="swamidSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchSwamidExportAggregate"/>
                 <ref bean="checkSwamidSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/switch/switch-beans.xml b/mdx/switch/switch-beans.xml
@@ -29,9 +29,6 @@
     <bean id="checkSwitchSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkSwitchSignature"/>
         <property name="verificationCertificate" ref="switchSigningCertificate"/>
-        <property name="postProcessFilter">
-            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
-        </property>
     </bean>
 
 </beans>
diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml
@@ -21,9 +21,11 @@
             <list>
                 <ref bean="fetchSwitchExportAggregate"/>
                 <ref bean="checkSwitchSignature"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
@@ -19,7 +19,8 @@
     -->
     <import resource="uk-beans.xml"/>
 
-    <bean id="filterDeletedEntities" class="uk.org.ukfederation.mda.XPathFilteringStrategy">
+    <bean id="filterDeletedEntities" class="uk.org.ukfederation.mda.XPathFilteringStage">
+        <property name="id" value="filterDeletedEntities"/>
         <constructor-arg name="expression" value="//ukfedlabel:DeletedEntity"/>
         <constructor-arg name="prefixMappings" ref="commonNamespaces"/>
     </bean>
@@ -37,15 +38,16 @@
                 <constructor-arg value="uk\d{6}.xml"/>
             </bean>
         </property>
-        <property name="postProcessFilter" ref="filterDeletedEntities"/>
     </bean>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>
         <property name="stages">
             <list>
                 <ref bean="fetchUkFragmentFiles"/>
+                <ref bean="filterDeletedEntities"/>
                 <ref bean="checkSchemas"/>
+                <ref bean="errorAnnouncingFilter"/>
                 <ref bean="assemble"/>
             </list>
         </property>

diff --git a/tools/ukf-mda/ukf-mda-0.0.1-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.0.1-SNAPSHOT.jar
diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar