Don't pull the SWAMID eduGAIN aggregate any more; just rely on the ed…

…uGAIN feed itself.

Apart from minor formatting differences, this just means that eduGAIN may in the future override the SWAMID upstream with entities from other participants.

mdx/uk/generate.xml

@@ -26,7 +26,6 @@
     <!--
         Import beans from other channels.
     -->
-    <import resource="classpath:se_swamid/beans.xml"/>
     <import resource="classpath:us_incommon/beans.xml"/>
     <import resource="classpath:int_edugain/beans.xml"/>
 
@@ -262,16 +261,6 @@
         </property>
     </bean>
 
-    <bean id="uk_se_swamid_importPipeline" parent="SimplePipeline"
-        p:id="uk_se_swamid_importPipeline">
-        <property name="stages">
-            <list>
-                <ref bean="se_swamid_edugainEntities"/>
-                <ref bean="importCommonTail"/>
-            </list>
-        </property>
-    </bean>
-
     <bean id="uk_us_incommon_importPipeline" parent="SimplePipeline"
         p:id="uk_us_incommon_importPipeline">
         <property name="stages">
@@ -1031,7 +1020,6 @@
                         <list>
                             <!-- entries earlier in the list have higher precedence -->
                             <ref bean="uk_us_incommon_importPipeline"/>
-                            <ref bean="uk_se_swamid_importPipeline"/>
                             <ref bean="uk_int_edugain_importPipeline"/>
                         </list>
                     </property>