Remove non-InCommon entities from InCommon aggregate.

This allows an existing InCommon production aggregate (including
entities from eduGAIN) to be used as a source for the eduGAIN import
flow. Without this, the entities already in the aggregate override the
newly imported ones from eduGAIN.

This should not have any effect in production, where the InCommon
source should just be InCommon entities anyway. It is most valuable
while testing the eduGAIN import flow.

mdx/incommon/import.xml

@@ -104,6 +104,22 @@
                 <!-- Break down into individual entities. -->
                 <ref bean="disassemble"/>
 
+                <!--
+                    In case we are testing with InCommon production metadata
+                    that already includes imported entities, remove those
+                    before proceeding to avoid them overwriting the
+                    new imported version.
+                -->
+                <bean id="keepInCommonEntities" parent="EntityRegistrationAuthorityFilterStage">
+                    <property name="designatedRegistrationAuthorities">
+                        <list>
+                            <ref bean="us_incommon_registrar"/>
+                        </list>
+                    </property>
+                    <property name="requiringRegistrationInformation" value="true"/>
+                    <property name="whitelistingRegistrationAuthorities" value="true"/>
+                </bean>
+
                 <!-- Include a default registrationAuthority for each entity. -->
                 <ref bean="us_incommon_default_regauth"/>