From e949cf897c91c4aede73448f3a2c968ed384a6fb Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 21 Nov 2014 14:51:19 +0000
Subject: [PATCH] Disable InCommon pilot import pipeline now that all entities
 involved are available through eduGAIN.

---
 mdx/uk/generate.xml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index d346dc5b..666fa9a4 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -26,7 +26,6 @@
     <!--
         Import beans from other channels.
     -->
-    <import resource="classpath:us_incommon/beans.xml"/>
     <import resource="classpath:int_edugain/beans.xml"/>
 
 
@@ -298,23 +297,6 @@
         </property>
     </bean>
     
-    <bean id="uk_us_incommon_importPipeline" parent="SimplePipeline"
-        p:id="uk_us_incommon_importPipeline">
-        <property name="stages">
-            <list>
-                <ref bean="us_incommon_exportedEntities"/>
-
-                <!--
-                    Entity Attribute policy for entities from the InCommon pilot.
-                -->
-                <ref bean="stripMdattrNamespace"/>
-
-                <ref bean="importCommonTail"/>
-                <ref bean="uk_hide_idps"/>
-            </list>
-        </property>
-    </bean>
-    
     
     <!--
         ***************************************************
@@ -1216,7 +1198,7 @@
                     <property name="mergedPipelines">
                         <list>
                             <!-- entries earlier in the list have higher precedence -->
-                            <ref bean="uk_us_incommon_importPipeline"/>
+                            <!-- List is currently empty. -->
                         </list>
                     </property>
                 </bean>