From feeb7f88e4b8f2f746805834e2e7ead98f42e9fe Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 16 Feb 2022 11:54:28 +0000
Subject: [PATCH] Entity-level scope refactoring, phase 1

See ukf/ukf-meta#341.
---
 mdx/uk/beans.xml    |  7 +++++++
 mdx/uk/generate.xml | 15 ---------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 054d6ee..51aec44 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -400,6 +400,13 @@
 
                 <ref bean="uk_add_cbc_encryption"/>
 
+                <!--
+                    Remove entity-level Scope elements, leaving only the ones associated
+                    with role descriptors.
+                -->
+                <bean id="stripEntityScopes" parent="mda.XSLTransformationStage"
+                    p:XSLResource="classpath:uk/entity_scopes.xsl"/>
+
                 <ref bean="populateItemIds"/>
                 <ref bean="uk_populateIds"/>
                 <bean id="uk_populateFlowConstraints"
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index e542182..f8a72b6 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -51,15 +51,6 @@
         *****************************
     -->
 
-    <!--
-        stripEntityScopes
-
-        Remove entity-level Scope elements, leaving only the ones associated
-        with role descriptors.
-    -->
-    <bean id="stripEntityScopes" parent="mda.XSLTransformationStage"
-        p:XSLResource="classpath:uk/entity_scopes.xsl"/>
-
     <!--
         finalise_parent
 
@@ -274,7 +265,6 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
-                <ref bean="stripEntityScopes"/>
 
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
@@ -336,7 +326,6 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
-                <ref bean="stripEntityScopes"/>
 
                 <!--
                     Remove embedded images used in mdui:Logo elements.
@@ -584,7 +573,6 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
-                <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseFallback"/>
                 <ref bean="uk_normaliseFallback"/>
@@ -641,7 +629,6 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
-                <ref bean="stripEntityScopes"/>
 
                 <ref bean="uk_finaliseTest"/>
                 <ref bean="uk_normaliseTest"/>
@@ -754,7 +741,6 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
-                <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
 
                 <ref bean="uk_finaliseExport"/>
@@ -855,7 +841,6 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
-                <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
 
                 <ref bean="uk_finaliseExport"/>