From 2611f64cd91d0f00811612e37357d2fcc3b16c8c Mon Sep 17 00:00:00 2001 From: Ian Young Date: Thu, 17 Jul 2014 14:47:56 +0000 Subject: [PATCH 1/9] Add a couple of useful parent beans. --- mdx/common-beans.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index 9c2cb544..b552abbc 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -86,6 +86,9 @@ + + + + + + + entity cannot be both opted in to and opted out from export + + + + diff --git a/xml/uk-fed-label.xsd b/xml/uk-fed-label.xsd index e35fd06d..83213fb8 100644 --- a/xml/uk-fed-label.xsd +++ b/xml/uk-fed-label.xsd @@ -2,7 +2,7 @@ @@ -124,4 +124,13 @@ + + + + Indicates that the entity has been opted-out from inclusion in + the UK federation export aggregate. + + + + \ No newline at end of file From e8663e04a4b1f9109c24a3ee8aba0ada1c552379 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Fri, 25 Jul 2014 14:28:23 +0000 Subject: [PATCH 3/9] Upgrade to ukf-mda 0.8.4 for entity attribute filtering. --- .../{ukf-mda-0.8.3.jar => ukf-mda-0.8.4.jar} | Bin 50404 -> 63064 bytes 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/ukf-mda/{ukf-mda-0.8.3.jar => ukf-mda-0.8.4.jar} (68%) diff --git a/tools/ukf-mda/ukf-mda-0.8.3.jar b/tools/ukf-mda/ukf-mda-0.8.4.jar similarity index 68% rename from tools/ukf-mda/ukf-mda-0.8.3.jar rename to tools/ukf-mda/ukf-mda-0.8.4.jar index 7363a1f70dcf9bb5b70b7734a22c088a67c6b64b..c92160a5e1eaf7317d405472515dc55333640c97 100644 GIT binary patch delta 15733 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 E0fD=%8vp Date: Fri, 25 Jul 2014 14:29:17 +0000 Subject: [PATCH 4/9] Common definitions for new ukf-mda entity attribute filtering stage. --- mdx/common-beans.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index b552abbc..f45984a1 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -269,6 +269,21 @@ + + + + + + + + + + @@ -1034,9 +1049,6 @@ - - - From 8013686bb81cde372f45a2e46ac975d7b29a5f7a Mon Sep 17 00:00:00 2001 From: Ian Young Date: Fri, 25 Jul 2014 14:29:59 +0000 Subject: [PATCH 5/9] Add entity attribute acceptance policy for eduGAIN. --- mdx/uk/generate.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml index 1f94848e..0ca659de 100644 --- a/mdx/uk/generate.xml +++ b/mdx/uk/generate.xml @@ -255,6 +255,29 @@ + + + + + + + + + + + + + + + + + + + + + @@ -265,6 +288,12 @@ + + + + From ded8d07b81f2da995833602f8498d6e4e2a7a387 Mon Sep 17 00:00:00 2001 From: Alex Stuart Date: Wed, 30 Jul 2014 14:31:27 +0000 Subject: [PATCH 6/9] Relax rule that exported entities MUST have a RegistrationPolicy element --- mdx/uk/check_uk_mdrps.xsl | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/mdx/uk/check_uk_mdrps.xsl b/mdx/uk/check_uk_mdrps.xsl index a97b9769..d7b83d45 100644 --- a/mdx/uk/check_uk_mdrps.xsl +++ b/mdx/uk/check_uk_mdrps.xsl @@ -37,22 +37,6 @@ - - - - - exported entity lacks a RegistrationPolicy - - - - - + + @@ -1019,6 +1022,7 @@ + @@ -1031,7 +1035,7 @@ individual entities. The result is a collection of entities, some of which may be labelled with - errors. No announcement of removal of those entities is performed here; + errors. No announcement or removal of those entities is performed here; that is left to the caller. --> Date: Wed, 13 Aug 2014 13:29:55 +0000 Subject: [PATCH 8/9] Extend valid URL checking to all appropruate MDUI elements. --- mdx/_rules/check_mdui.xsl | 45 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/mdx/_rules/check_mdui.xsl b/mdx/_rules/check_mdui.xsl index c24d01e3..5615990b 100644 --- a/mdx/_rules/check_mdui.xsl +++ b/mdx/_rules/check_mdui.xsl @@ -191,16 +191,57 @@ + + + + + + mdui: + + ' + + ' is not a valid URL: + + + + + + - + + + + mdui: + + ' + + ' is not a valid URL: + + + + + + + + mdui: - is not a valid URL: + ' + + ' is not a valid URL: From 267157eb106b6f67b0b2d3b02552f8b8fb42a591 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Wed, 13 Aug 2014 15:17:37 +0000 Subject: [PATCH 9/9] Upgrade to sdss-xalan-md version 1.1.5. Permits '+' in local-part of e-mail addresses. --- tools/xalan/lib/sdss-xalan-md-1.1.4.jar | Bin 6061 -> 0 bytes tools/xalan/lib/sdss-xalan-md-1.1.5.jar | Bin 0 -> 5995 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tools/xalan/lib/sdss-xalan-md-1.1.4.jar create mode 100644 tools/xalan/lib/sdss-xalan-md-1.1.5.jar diff --git a/tools/xalan/lib/sdss-xalan-md-1.1.4.jar b/tools/xalan/lib/sdss-xalan-md-1.1.4.jar deleted file mode 100644 index fff62a435398d2d7a8dd3c0b46a5ead0dbaf17b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6061 zcmb7I2{=^k`ySh58OpwXW#5f8B}>^RW(>wowy_UGl6@<(lkC~aR+f~=7P4>I$C5&J zDQgj*(0}BUKGk>qfA4jjIp@00bKmDVXP)JKZgm(QJ~7~6fm|NSeZTnUhX{LyD{9FK zD62vQ)&DUg1dw3OC__1?EU>pdu?N-9W^h?mWr(7t78nls4DWiS0uuoDlfnded%Ai{ zHG~F5C+D2_p*`*VFabHjQ?ofbaWs7O?Cw>m;Tn`M4Nd1X-p5o-Bowit8r0sDuQWbm z??6RwLhGlKLgUXkgca*T#oN)M(s$e`HI2c>V8D@A0D!nt-oKp3!+Pan_rvX94SPne2X(lD(eEQi1QM2uYAZG<+F;Bi>~Rymxwh< z4m7fNK_*$EmTqmxt5^@_C;48vT(CGsf@DePTAFyVkiH<%>ru74{r9HiZ4NZ_y%}BM zDxa-#KI(b0Q)aTQB9C2X(1-Wui5!9&q&Kq*qC9jvsJAv^nkGkkEGbvt(G1hKViIZ# zm-LehE<*HaD{<}1ABUYacjOQy2y#rpL|We0emIvxl@aMcSzkde$R1O5A?f0j6dwoX z5nT^2c_7<0(25HTQ~SOxGXN*3ey+sQQ2um-QVuOhUZlEzrpaY2N~lo?gHY$q_X9>cH*@F5VXA6|qw`J)mq@?!Y^pvTXZi&AUNVwc!E#9BHrR zYM$S&m=f>;#FhqIlBfDCwTs&{o#B0#Jao^Fm-QNxk6J5h!lO3rQscMkm)G$d^S@;6 z16waz=(plYv4@zSXBR0l^eDT;{=UH+DrETVLmo|mp6a85H|M3BNvNaO;*g)125eOB zfN!V|6hM!NRcVH`Y3lV z!oXg&#j#S}x5i4)Bi0zfyBuh1M>Jkjqg?^>9GLW$5f&#&jd`Q66|ygANVo=5cmX(P zRpQz5A+O?e?JO5YH$rEh@siv-;azJw8OS7PrY&(-ZXT@C|H4Flg0)&7x4SAEu6r##;x>l{3;Qur#{+32`~J zE4gJiygw13&W~>p^tl=sVtk<7fgA)qB5Egh8 znmfMUl`bJ^ZFOsZe;==&GmL>1MA9T5{&u*Y9#mvLF_%7cvxvd%1%nx=^wchC1^1is z^yg#&e+kjarOPbHGJD@cmJ~2I)h`>=*@T<(N%0D^yDk-ftZKjuvKbz;4AI_+RGP$< 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 R$N}VlW^4dsuuK5J{{foALOuWh diff --git a/tools/xalan/lib/sdss-xalan-md-1.1.5.jar b/tools/xalan/lib/sdss-xalan-md-1.1.5.jar new file mode 100644 index 0000000000000000000000000000000000000000..eba7cfdd35f50004e42f7b50bf58c9159e443f51 GIT binary patch literal 5995 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