New roadmap phase definitions.

Phase 1 now contains all SPs, phase 2 all entities.
Phase 3 no longer appears in the roadmap.

build.xml

@@ -1511,16 +1511,4 @@
         <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>

mdx/incommon/edugain-phase2.xml

@@ -42,29 +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 2: import all SPs, plus IdPs that support global R&S.
-                -->
-                <bean p:id="selectEntities" parent="XPathFilteringStage"
-                    p:XPathExpression="not(/md:EntityDescriptor
-                        [md:IDPSSODescriptor]
-                        [md:Extensions
-                            /mdattr:EntityAttributes
-                            /saml:Attribute
-                                [@NameFormat = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri']
-                                [@Name = 'http://macedir.org/entity-category-support']
-                            /saml:AttributeValue
-                                [. = 'http://refeds.org/category/research-and-scholarship']
-                        ]
-                    or
-                        /md:EntityDescriptor
-                            [md:SPSSODescriptor]
-                    )"
-                />
-
                 <!-- Filter the entity attributes imported from eduGAIN. -->
                 <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
                     <property name="rules">

mdx/incommon/edugain-policy.xml

@@ -46,20 +46,10 @@
                     Remove all but those eduGAIN entities we intend to import in this
                     phase of the roadmap.
 
-                    Phase 1: import only IdPs that support global R&S.
+                    Phase 1: import only SP entities.
                 -->
                 <bean p:id="selectEntities" parent="XPathFilteringStage"
-                    p:XPathExpression="not(/md:EntityDescriptor
-                        [md:IDPSSODescriptor]
-                        [md:Extensions
-                            /mdattr:EntityAttributes
-                            /saml:Attribute
-                                [@NameFormat = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri']
-                                [@Name = 'http://macedir.org/entity-category-support']
-                            /saml:AttributeValue
-                                [. = 'http://refeds.org/category/research-and-scholarship']
-                        ]
-                    )"
+                    p:XPathExpression="not(/md:EntityDescriptor[md:SPSSODescriptor])"
                 />
 
                 <!-- Filter the entity attributes imported from eduGAIN. -->