From 32aa2cdcc1e35144b931c2c6928fea412a7b385f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 18 Apr 2017 16:36:43 +0100
Subject: [PATCH] Control the entity order of the output aggregate

See incommon/inc-meta#55.
---
 mdx/incommon/import.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index 90d49f0e..4c9bd009 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -17,6 +17,11 @@
     -->
     <import resource="classpath:common-beans.xml"/>
 
+    <!--
+        Import inc-mda beans.
+    -->
+    <import resource="classpath:uk/org/iay/incommon/mda/beans.xml"/>
+
     <!--
         Import channel-specific beans.
     -->
@@ -40,7 +45,13 @@
         <property name="composedStages">
             <list>
                 <!-- Construct a new aggregate from the collection of entities. -->
-                <ref bean="assemble"/>
+                <bean id="inc.assemble" parent="stage_parent"
+                    class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
+                    <property name="itemOrderingStrategy">
+                        <bean parent="inc.InCommonEntityOrderingStrategy"
+                            c:_-ref="us_incommon_registrar"/>
+                    </property>
+                </bean>
 
                 <!-- Apply final tweaks to the aggregate. -->
                 <bean id="finalise" parent="incommon_finalise_parent">