From 56fa350284a12094681ee46c84210468c476f88f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 8 Jun 2015 18:26:36 +0100
Subject: [PATCH] Add eduGAIN filtering reports.

---
 build.xml                      | 35 +++++++++++++++++++
 mdx/incommon/report-phase2.xml | 63 ++++++++++++++++++++++++++++++++++
 mdx/incommon/report-phase3.xml | 63 ++++++++++++++++++++++++++++++++++
 mdx/incommon/report.xml        | 63 ++++++++++++++++++++++++++++++++++
 4 files changed, 224 insertions(+)
 create mode 100644 mdx/incommon/report-phase2.xml
 create mode 100644 mdx/incommon/report-phase3.xml
 create mode 100644 mdx/incommon/report.xml

diff --git a/build.xml b/build.xml
index 275baf53..ad904d68 100644
--- a/build.xml
+++ b/build.xml
@@ -1488,4 +1488,39 @@
         <echo>Generation complete.</echo>
     </target>
 
+    <!--
+        inc.edugain.report
+
+        Report on the eduGAIN entities filtered out because of errors detected.
+    -->
+    <target name="inc.edugain.report">
+        <echo>Looking for errors in eduGAIN entities...</echo>
+        <CHANNEL.do channel="incommon" verb="report"/>
+        <echo>Report complete.</echo>
+    </target>
+
+    <!--
+        inc.edugain.report.phase2
+
+        Report on the eduGAIN entities filtered out because of errors detected
+        under the phase 2 policy.
+    -->
+    <target name="inc.edugain.report.phase2">
+        <echo>Looking for errors in eduGAIN entities under phase 2 policy...</echo>
+        <CHANNEL.do channel="incommon" verb="report-phase2"/>
+        <echo>Report complete.</echo>
+    </target>
+
+    <!--
+        inc.edugain.report.phase3
+
+        Report on the eduGAIN entities filtered out because of errors detected
+        under the phase 3 policy.
+    -->
+    <target name="inc.edugain.report.phase3">
+        <echo>Looking for errors in eduGAIN entities under phase 3 policy...</echo>
+        <CHANNEL.do channel="incommon" verb="report-phase3"/>
+        <echo>Report complete.</echo>
+    </target>
+
 </project>
\ No newline at end of file
diff --git a/mdx/incommon/report-phase2.xml b/mdx/incommon/report-phase2.xml
new file mode 100644
index 00000000..d4802a42
--- /dev/null
+++ b/mdx/incommon/report-phase2.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Report on errors detected in eduGAIN metadata.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="classpath:common-beans.xml"/>
+
+    <!--
+        Import channel-specific beans.
+    -->
+    <import resource="classpath:incommon/beans.xml"/>
+    <import resource="classpath:incommon/edugain-phase2.xml"/>
+
+    <!--
+        Import eduGAIN channel beans.
+    -->
+    <import resource="classpath:int_edugain/beans.xml"/>
+
+    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline"
+        p:id="incommon_edugain_importPipeline">
+        <property name="stages">
+            <list>
+            </list>
+        </property>
+    </bean>
+
+    <!--
+        Report on errors detected in eduGAIN metadata.
+    -->
+    <bean id="report-phase2" parent="SimplePipeline"
+        p:id="report-phase2">
+        <property name="stages">
+            <list>
+                <ref bean="int_edugain_productionEntities"/>
+
+                <!-- Populate identifiers for future actions. -->
+                <ref bean="populateItemIds"/>
+                <ref bean="populateRegistrationAuthorities"/>
+
+                <!-- Apply policy. -->
+                <ref bean="edugainPolicy"/>
+
+                <!--
+                    Announce any entities marked as having errors or warnings.
+                -->
+                <ref bean="errorAnnouncer"/>
+            </list>
+        </property>
+    </bean>
+
+</beans>
diff --git a/mdx/incommon/report-phase3.xml b/mdx/incommon/report-phase3.xml
new file mode 100644
index 00000000..6517c4b1
--- /dev/null
+++ b/mdx/incommon/report-phase3.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Report on errors detected in eduGAIN metadata.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="classpath:common-beans.xml"/>
+
+    <!--
+        Import channel-specific beans.
+    -->
+    <import resource="classpath:incommon/beans.xml"/>
+    <import resource="classpath:incommon/edugain-phase3.xml"/>
+
+    <!--
+        Import eduGAIN channel beans.
+    -->
+    <import resource="classpath:int_edugain/beans.xml"/>
+
+    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline"
+        p:id="incommon_edugain_importPipeline">
+        <property name="stages">
+            <list>
+            </list>
+        </property>
+    </bean>
+
+    <!--
+        Report on errors detected in eduGAIN metadata.
+    -->
+    <bean id="report-phase3" parent="SimplePipeline"
+        p:id="report-phase3">
+        <property name="stages">
+            <list>
+                <ref bean="int_edugain_productionEntities"/>
+
+                <!-- Populate identifiers for future actions. -->
+                <ref bean="populateItemIds"/>
+                <ref bean="populateRegistrationAuthorities"/>
+
+                <!-- Apply policy. -->
+                <ref bean="edugainPolicy"/>
+
+                <!--
+                    Announce any entities marked as having errors or warnings.
+                -->
+                <ref bean="errorAnnouncer"/>
+            </list>
+        </property>
+    </bean>
+
+</beans>
diff --git a/mdx/incommon/report.xml b/mdx/incommon/report.xml
new file mode 100644
index 00000000..965ad559
--- /dev/null
+++ b/mdx/incommon/report.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Report on errors detected in eduGAIN metadata.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="classpath:common-beans.xml"/>
+
+    <!--
+        Import channel-specific beans.
+    -->
+    <import resource="classpath:incommon/beans.xml"/>
+    <import resource="classpath:incommon/edugain-policy.xml"/>
+
+    <!--
+        Import eduGAIN channel beans.
+    -->
+    <import resource="classpath:int_edugain/beans.xml"/>
+
+    <bean id="incommon_edugain_importPipeline" parent="SimplePipeline"
+        p:id="incommon_edugain_importPipeline">
+        <property name="stages">
+            <list>
+            </list>
+        </property>
+    </bean>
+
+    <!--
+        Report on errors detected in eduGAIN metadata.
+    -->
+    <bean id="report" parent="SimplePipeline"
+        p:id="report">
+        <property name="stages">
+            <list>
+                <ref bean="int_edugain_productionEntities"/>
+
+                <!-- Populate identifiers for future actions. -->
+                <ref bean="populateItemIds"/>
+                <ref bean="populateRegistrationAuthorities"/>
+
+                <!-- Apply policy. -->
+                <ref bean="edugainPolicy"/>
+
+                <!--
+                    Announce any entities marked as having errors or warnings.
+                -->
+                <ref bean="errorAnnouncer"/>
+            </list>
+        </property>
+    </bean>
+
+</beans>