Remove phase 1 / phase 2 distinction.

InCommon · Dec 22, 2015 · 0bc680f · 0bc680f
1 parent 46d0f9c
commit 0bc680f
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 232 deletions.
diff --git a/build.xml b/build.xml
@@ -1353,16 +1353,4 @@
         <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>
-
 </project>
diff --git a/mdx/incommon/edugain-phase2.xml b/mdx/incommon/edugain-phase2.xml
diff --git a/mdx/incommon/edugain-policy.xml b/mdx/incommon/edugain-policy.xml
@@ -42,16 +42,6 @@
                     <property name="whitelistingRegistrationAuthorities" value="false"/>
                 </bean>
 
-                <!--
-                    Remove all but those eduGAIN entities we intend to import in this
-                    phase of the roadmap.
-
-                    Phase 1: import only SP entities.
-                -->
-                <bean p:id="selectEntities" parent="XPathFilteringStage"
-                    p:XPathExpression="not(/md:EntityDescriptor[md:SPSSODescriptor])"
-                />
-
                 <!-- Filter the entity attributes imported from eduGAIN. -->
                 <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
                     <property name="rules">

diff --git a/mdx/incommon/report-phase2.xml b/mdx/incommon/report-phase2.xml