From 4e444a4e4838bdfcf78d1a479be35a189294937c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 12 Jul 2011 16:09:50 +0000
Subject: [PATCH] Implement a structured aggregate builder.  Don't actually use
 it.

---
 mdx/uk/generate.xml                    |  50 +++++++++++++++++++++++++
 tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar | Bin 12875 -> 13570 bytes
 2 files changed, 50 insertions(+)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index a7d371dc..120ea61d 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -45,6 +45,56 @@
     </bean>
     
 
+    <!--
+        *******************************************************************
+        ***                                                             ***
+        ***   S T R U C T U R E D   A G G R E G A T E   B U I L D E R   ***
+        ***                                                             ***
+        *******************************************************************
+    -->
+    
+    
+    <!--
+        Assemble a nested EntitiesDescriptor structure with the
+        UK federation entities inside an inner element.
+    -->
+    <bean id="uk_assembleStructuredAggregate" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="uk_assembleStructuredAggregate"/>
+        <property name="composedStages">
+            <list>
+                <!--
+                    Step 1: put all UK entities inside a UK-named EntitiesDescriptor
+                -->
+                <bean id="uk_buildNestedEntitiesDescriptor" class="net.shibboleth.metadata.pipeline.SplitMergeStage"
+                    init-method="initialize" lazy-init="true">
+                    <property name="id" value="uk_buildNestedEntitiesDescriptor"/>
+                    <property name="selectionStrategy">
+                        <bean class="uk.org.ukfederation.mda.UKEntitySelectionStrategy"/>
+                    </property>
+                    <property name="selectedItemPipeline">
+                        <bean name="uk_assemblePipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+                            init-method="initialize" lazy-init="true">
+                            <property name="id" value="uk_assemblePipeline"/>
+                            <property name="stages">
+                                <list>
+                                    <ref bean="uk_assemble"/>
+                                </list>
+                            </property>
+                        </bean>
+                    </property>
+                </bean>
+                
+                <!--
+                    Step 2: put that EntitiesDescriptor plus all remaining entities inside an
+                    anonymous outer EntitiesDescriptor.
+                -->
+                <ref bean="assemble"/>
+            </list>
+        </property>
+    </bean>
+
+
     <!--
         ***************************************************
         ***                                             ***
diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar
index d31778af31ff83619ebd6ad77b1023e2c75e04a6..e5d2c3c42b3dad7292b92cdd4765f1119ea2fd6e 100644
GIT binary patch
delta 1138
zcmX?|(v-y;;LXg!#Q*}!o8L_2RbgHRq)a9=SK7ascuEdTy;cHIlLZ*{nZGo>ne4=9
z4B~IDU~FUtGybsTu!B`(^K1hPsPLvSff>F0Y+#wq)5Me@BD*DmS-?_)vb-#UuFY@k
zIK8_b|7B!g2xehmFrOU2C|w`w?V4ATSyCCCnv<Gbl9`_uTvC)+lA2zrmz<MWTs$|}
zJO8qSz&|z5<VUm2mMmqB;#z7mNhIQ<g~HOV7O#nmtO`6{F5K?BN9Fdd?3DErf6d=f
zz$wIjWTt#;gteH*$|jEXxi=;2Kc7uLZeLgTm+gV3lo(fw`bkOd#fskN?s3=qyTqIh
z*m&Uao4XGiF9ps2-lEU8a{KbL;f6Nb1C&Dif4ZNmS=aU^_x}|Johh9CQ!ePpovgF}
z(ki#nA>&=)*+}>92TXzs_oz?3lIyhbo`u?!Z_fTVG?FehwtBauhHHIP<NT#$^{6&p
zAS=(}!9T<Pl&t6HCdr+g@!`ze-P6SqJ?oDNZ~t&fi*wDpb6JPEnZIfA@YM)%EDf$$
zU6_>28m_xWXx4wZ=Lx*8mmOSq;!Iwj%AOVGY0Lb#e7U*r{No=QZ&pMUn+n`La(&Zj
z`z<;#>N)4;IUL`-v2nJT8Rz-`>dno%ca(JaoR;nk`MA(Pe@9gL{~RZ=47H><m$bz-
z7Uxws>u+yX|6hHrWjEid9Znmn6NPw>WY1i8;My7Wx;fX}SA2OAP&n6xO=j2S+qZvZ
zKjNNK{rSt)yu{m6VolNy{;61Lb~-oZXvCQeqpF2JS-+(hYaTG%G{^FK;Z2WprUOFL
zdY5haX|p5u0_)<pcMY?)W+&hIVRCfCM8h?{0hZ2HyXQ^|(XGwg@$N}X@0`__?)>eW
zYFM^xrN&~dl;?43?;krZd%d3lmSi~?K*>;1@i;RxFzrr$t)c~{B~<M|^yWy_R5q}{
zL2VOIs-FBq+a8=ut#tIjbheHWm|mb`4^G&RbezF_4c#0tJzX~qL{HKS1#=_xBEa-!
zy(lm(pdSmS3-t5B^dtR5ED1WqK-&{<at`ojWD;QpWkIli?Djn8J=?|1!0?QXfk6qJ
zF(Jf~#x&*0fs9g<YYoI=f&Q~Yl4Ib9a|9Uv|2I%)VDNPfan$wnbJNdFEKAMPN7w?+
z=qQ?%Q8dS@Pu{4is)J91Hj0LM>XRJ}!<n9g^qEXPXQ;(wtqWutPS!RO;uB>MWq1Mf
J35y;`4*)tpz?A?1

delta 395
zcmZq5I-SBB;LXg!#Q*~7O|K{NsxYSkDU->}hl3tYJS7LFUMqp9$pVb}f<W31tQbm2
zOm0+`o}A6d#oW;FdUFM1BQr?p=07Ys>|j0FJlntmD!ge-U`8)L8(3!ZG%+QJ$Zm;X
z7O<3{EH8vntbClA8R(kHw(447I!oOSL~mZLp2`Lm5Y{sRxpT6Yo;}!_9z8uUy;si&
zOn-uko9H`(95%U1KL;%SQa=q$2N{Hd=~V_1V4Br13QQ*%#)9cXhWTLH#3&I=|22}H
zyxB-@@;qgZ$#%v(U^n<0OEcY5nVe-T3+8qKx!kIg15H#XpMk2l4HWVL3F%H&HPK?4
c3S!1Fz0{h#(Zrcggh7O%nT>&AlQt+Q0cCiS#sB~S