Entity-level scope refactoring, phase 1

See ukf/ukf-meta#341.
InCommon · Oct 27, 2023 · feeb7f8 · feeb7f8
1 parent a401e70
commit feeb7f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git 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
@@ -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"/>