From 117625704beabb386287f7f764da0aa713d21d94 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 19 Dec 2015 16:29:32 +0000
Subject: [PATCH] Remove workrounds for MDA-140 now that we're using MDA 0.9.0.

---
 mdx/uk/beans.xml    | 19 -------------------
 mdx/uk/generate.xml | 28 +---------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index b3ddbdc8..1dd7e60a 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -364,9 +364,6 @@
                         </bean>
                     </property>
                     
-                    <!--
-                        Pipeline for selected items.
-                    -->
                     <property name="selectedItemPipeline">
                         <bean id="selectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
@@ -376,22 +373,6 @@
                             </property>
                         </bean>
                     </property>
-                    
-                    <!--
-                        Pipeline for unselected items.
-                        
-                        This is only required because of MDA-140, and can be removed when
-                        we move to MDA 0.9.0.
-                    -->
-                    <property name="nonselectedItemPipeline">
-                        <bean id="nonselectedItemPipeline" parent="SimplePipeline">
-                            <property name="stages">
-                                <list>
-                                    <!-- nothing required -->
-                                </list>
-                            </property>
-                        </bean>
-                    </property>
 
                 </bean>
                 
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 763a889c..8e826937 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -644,20 +644,7 @@
                             <constructor-arg ref="commonNamespaces"/>
                         </bean>
                     </property>
-                    
-                    <!--
-                        Pipeline for selected (explicitly opted in) items.
-                    -->
-                    <property name="selectedItemPipeline">
-                        <bean id="selectedItemPipeline" parent="SimplePipeline">
-                            <property name="stages">
-                                <list>
-                                    <!-- nothing required -->
-                                </list>
-                            </property>
-                        </bean>
-                    </property>
-                    
+
                     <!--
                         The pipeline for unselected (not explicitly opted in) items removes entities
                         matching specific rules.
@@ -769,19 +756,6 @@
                         </bean>
                     </property>
 
-                    <!--
-                        Pipeline for selected (explicitly opted in) items.
-                    -->
-                    <property name="selectedItemPipeline">
-                        <bean id="selectedItemPipeline" parent="SimplePipeline">
-                            <property name="stages">
-                                <list>
-                                    <!-- nothing required -->
-                                </list>
-                            </property>
-                        </bean>
-                    </property>
-
                     <!--
                         The pipeline for unselected (not explicitly opted in) items removes entities
                         matching specific rules.