From 7b01144b199756ebd777398f6aa9beda689fcc11 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 30 Aug 2019 15:43:16 +0100
Subject: [PATCH] Inline importCommonTail (only used once)

Step in ukf/ukf-meta#141
---
 mdx/uk/generate.xml | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 459f39d2..96e8181d 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -211,29 +211,6 @@
         p:whitelistingEntities="false"
         p:designatedEntities-ref="importEntityBlacklist"/>
 
-    <!--
-        importCommonTail
-
-        Common actions to be performed on each import pipeline.
-    -->
-    <bean id="importCommonTail" parent="mda.CompositeStage">
-        <property name="composedStages">
-            <list>
-                <ref bean="removeUKEntities"/>
-                <ref bean="removeBlacklistedEntities"/>
-                <ref bean="standardImportActions"/>
-
-                <!--
-                    Silently remove entities which are marked as
-                    having errors.
-                -->
-                <ref bean="errorRemover"/>
-
-                <ref bean="uk_fix_mailto"/>
-            </list>
-        </property>
-    </bean>
-
     <bean id="entityAttributes.blacklist" parent="mda.EntityAttributeFilteringStage">
         <property name="whitelisting" value="false"/>
         <property name="rules">
@@ -259,7 +236,17 @@
                 -->
                 <ref bean="entityAttributes.blacklist"/>
 
-                <ref bean="importCommonTail"/>
+                <ref bean="removeUKEntities"/>
+                <ref bean="removeBlacklistedEntities"/>
+                <ref bean="standardImportActions"/>
+
+                <!--
+                    Silently remove entities which are marked as
+                    having errors.
+                -->
+                <ref bean="errorRemover"/>
+
+                <ref bean="uk_fix_mailto"/>
             </list>
         </property>
     </bean>