Add cacheDuration to production aggregates

See ukf/ukf-meta#112.

mdx/uk/README.md

@@ -28,10 +28,9 @@ before being included in the `export` version consumed by interfederation partne
 
 ### Export Preview Aggregate vs. Export Aggregate
 
-Status (2020-04-22):
+Status (2020-07-01):
 
-* The `export-preview` aggregate includes a `cacheDuration` attribute with a
-  value of six hours.
+* These aggregates are currently identical.
 
 ## Production Maturity Pipeline
 
@@ -60,16 +59,13 @@ when it appeared in the fallback aggregate, which would be too late to take corr
 
 ### Test Aggregate vs. Production Aggregate
 
-Status (2020-04-22):
+Status (2020-07-01):
 
 * The `test` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
 
 * The `test` aggregate does not include the entity-level copy of the scopes for an
   identity provider (`ukf-meta#49`).
 
-* The `test` aggregate includes a `cacheDuration` attribute with a
-  value of six hours.
-
 
 ### `cds-all` Aggregate vs. Production Aggregate
 
@@ -81,6 +77,7 @@ Status (2017-12-05):
 
 ### Fallback Aggregate vs. Production Aggregate
 
-Status (2018-01-08):
+Status (2020-07-01):
 
-* These aggregates are currently identical.
+* The `back` aggregate does not currently include the `cacheDuration` attribute
+  which is present with a value of six hours in all others.

mdx/uk/generate.xml

@@ -309,6 +309,8 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="assembleAggregate"/>
+                <bean parent="mda.SetCacheDurationStage"
+                    p:cacheDuration="${cacheDuration.aggregate.duration}"/>
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
 
@@ -373,6 +375,8 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="assembleAggregate"/>
+                <bean parent="mda.SetCacheDurationStage"
+                    p:cacheDuration="${cacheDuration.aggregate.duration}"/>
 
                 <!--
                     Remove embedded images used in mdui:Logo elements.
@@ -496,6 +500,8 @@
 
                 <!-- make an aggregate first so that we're only traversing one item -->
                 <ref bean="assembleAggregate"/>
+                <bean parent="mda.SetCacheDurationStage"
+                    p:cacheDuration="${cacheDuration.aggregate.duration}"/>
 
                 <!-- remove many things that the CDS doesn't look at -->
                 <ref bean="CDSStripUnwanted"/>
@@ -749,6 +755,8 @@
 
                 <ref bean="stripUkfedlabelNamespace"/>
                 <ref bean="assembleAggregate"/>
+                <bean parent="mda.SetCacheDurationStage"
+                    p:cacheDuration="${cacheDuration.aggregate.duration}"/>
                 <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
@@ -853,10 +861,10 @@
 
                 <ref bean="stripUkfedlabelNamespace"/>
                 <ref bean="assembleAggregate"/>
-                <ref bean="stripEntityScopes"/>
-                <ref bean="stripEmptyExtensions"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
+                <ref bean="stripEntityScopes"/>
+                <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
 
                 <bean id="uk_normaliseExportPreview" parent="mda.XSLTransformationStage"