Skip to content

Commit

Permalink
Consolidate ODN-to-MDUI processing
Browse files Browse the repository at this point in the history 
Now that this is being done everywhere, we can just do it once, and simplify the way it's done.
See ukf/ukf-meta#150.
  • Loading branch information
@iay
iay committed Jan 15, 2018
1 parent 724330a commit f1fbf44
Showing 1 changed file with 9 additions and 76 deletions.
85 changes: 9 additions & 76 deletions mdx/uk/generate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,46 +112,6 @@
</bean>


<!--
*************************************
*** ***
*** M D U I H A N D L I N G ***
*** ***
*************************************
-->


<!--
odn_to_mdui
Ensure that all UKf-registered identity providers have
mdui:DisplayName and mdui:Description elements.
-->
<bean id="odn_to_mdui" parent="mda.SplitMergeStage">

<!-- Select UKf-registered entities only. -->
<property name="selectionStrategy">
<bean parent="mda.XPathItemSelectionStrategy"
c:_0 = "/md:EntityDescriptor/md:Extensions/mdrpi:RegistrationInfo/@registrationAuthority =
'http://ukfederation.org.uk'"
c:_1-ref="commonNamespaces"
/>
</property>

<!-- Process selected entities. -->
<property name="selectedItemPipeline">
<bean parent="mda.SimplePipeline">
<property name="stages">
<list>
<bean parent="mda.XSLTransformationStage"
p:XSLResource="classpath:uk/odn_to_mdui.xsl"/>
</list>
</property>
</bean>
</property>
</bean>


<!--
*****************************************
*** ***
Expand Down Expand Up @@ -334,12 +294,6 @@
<bean id="uk_productionPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!--
Ensure that all UKf-registered identity providers have
mdui:DisplayName elements.
-->
<ref bean="odn_to_mdui"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
Expand Down Expand Up @@ -400,12 +354,6 @@
-->
<ref bean="strip.SIRTFI"/>

<!--
Ensure that all UKf-registered identity providers have
mdui:DisplayName and mdui:Description elements.
-->
<ref bean="odn_to_mdui"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
Expand Down Expand Up @@ -585,12 +533,6 @@
<bean id="uk_fallbackPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!--
Ensure that all UKf-registered identity providers have
mdui:DisplayName elements.
-->
<ref bean="odn_to_mdui"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
Expand Down Expand Up @@ -768,12 +710,6 @@
</property>
</bean>

<!--
Ensure that all UKf-registered identity providers have
mdui:DisplayName and mdui:Description elements.
-->
<ref bean="odn_to_mdui"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
Expand Down Expand Up @@ -889,12 +825,6 @@
</property>
</bean>

<!--
Ensure that all UKf-registered identity providers have
mdui:DisplayName and mdui:Description elements.
-->
<ref bean="odn_to_mdui"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
Expand Down Expand Up @@ -986,6 +916,15 @@
<ref bean="uk_stripAdminContacts"/>
<ref bean="stripEmptyExtensions"/>

<!--
odn_to_mdui
Ensure that beyond this point, all UKf-registered identity providers
have mdui:DisplayName and mdui:Description elements.
-->
<bean id="odn_to_mdui" parent="mda.XSLTransformationStage"
p:XSLResource="classpath:uk/odn_to_mdui.xsl"/>

<!--
***********************************************
*** ***
Expand Down Expand Up @@ -1123,12 +1062,6 @@
and pre-production-status MDX relationships.
-->

<!--
Ensure that beyond this point, UKf-registered identity providers
have mdui:DisplayName and mdui:Description elements.
-->
<ref bean="odn_to_mdui"/>

<!--
Fork into new pipelines for additional aggregates.
-->
Expand Down

0 comments on commit f1fbf44

Please sign in to comment.