From c71fdad1da80c73c163d3edfee9342687cc17cca Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sun, 12 Jun 2011 15:11:31 +0000 Subject: [PATCH] Fatal error if any signature checks fail. Fatal error if any other checks fail on the collection flow. Requires a ukf-mda artifact bump to bring in the updated filter definition required. --- mdx/aaf/aaf-import.xml | 5 ++++- mdx/arnes/arnes-import.xml | 5 ++++- mdx/caf/caf-import.xml | 5 ++++- mdx/common-beans.xml | 12 ++++++++++++ mdx/edugain/edugain-import.xml | 5 ++++- mdx/edugain/edugain-test-import.xml | 5 ++++- mdx/edugate/edugate-import.xml | 5 ++++- mdx/incommon/incommon-import.xml | 5 ++++- mdx/swamid/swamid-import.xml | 5 ++++- mdx/switch/switch-import.xml | 5 ++++- mdx/uk/uk-collect.xml | 9 +++++++-- tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar | Bin 7233 -> 8379 bytes 12 files changed, 55 insertions(+), 11 deletions(-) diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml index c2729602..46789966 100644 --- a/mdx/aaf/aaf-import.xml +++ b/mdx/aaf/aaf-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml index cddc2f74..da3f39e6 100644 --- a/mdx/arnes/arnes-import.xml +++ b/mdx/arnes/arnes-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml index 6ab50940..6ea3453b 100644 --- a/mdx/caf/caf-import.xml +++ b/mdx/caf/caf-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index bc7e25a6..fdc938a8 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -124,6 +124,18 @@ + + + + + + + + + + diff --git a/mdx/edugain/edugain-test-import.xml b/mdx/edugain/edugain-test-import.xml index 5700560a..f742a769 100644 --- a/mdx/edugain/edugain-test-import.xml +++ b/mdx/edugain/edugain-test-import.xml @@ -25,7 +25,10 @@ - + + + + diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml index e18d2f57..7d20d474 100644 --- a/mdx/edugate/edugate-import.xml +++ b/mdx/edugate/edugate-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml index 4a4d8855..0b4c2666 100644 --- a/mdx/incommon/incommon-import.xml +++ b/mdx/incommon/incommon-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml index 65b2bfdd..2aacce31 100644 --- a/mdx/swamid/swamid-import.xml +++ b/mdx/swamid/swamid-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml index eab3fd0c..2709b382 100644 --- a/mdx/switch/switch-import.xml +++ b/mdx/switch/switch-import.xml @@ -21,7 +21,10 @@ - + + + + diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml index bb44ebde..54f0e397 100644 --- a/mdx/uk/uk-collect.xml +++ b/mdx/uk/uk-collect.xml @@ -99,7 +99,10 @@ - + + + + - + + + diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar index 39294c3569406fdc30d0694c995e610005451041..066102bda90974d946a04b832bf9297a8386b654 100644 GIT binary patch delta 3688 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 b+P|f-$%Ea3>#?!{*Z`aK06-i3^zZ)xGRT2b delta 2706 zcmaKuc{CK<8^_1k24fjxH+GXPgRzu#5~dI_wxWdW*|XJ8#-zqJ7>y0c*(w0 zb`fFlX6@%tGN>??%J#!~-_Eap-h0lypMSp3z0Y~>z32Hh8@HY2wy|Vp;RGBF!^pM_ zZh2;dLuiqhiz3=G`XrCBEPDhJACnq$@gdJLX+jQZbm4~Amlak3;378wpii=45+`{| z$YH5YF7{9-ff->Sw0+gr6kcbRi6MckYeCvoj>eZ4zBlycbJW#y&3#VDPHyk) z#XjFEu895d#aWdcIW{&}5xdd6$9Rn0+bl=W8%bwy@(8a8CPu^d^v!oOJ9&2!{u{I( zE!c{Pfm87AQL$(ZD&avv?nl3%r)l0|SPLDha!0n8GdsAWUtDS64U86^;Icss9|h;k zx`V{0ZC8{6J=#YbHA_7ki_09&IfOZx#3{9v(-Xgo9khgy+?386S^WIVbT@ze`E*6ZRK)$n5GLv$@RkLK;D z>+78mk^cz~y&0|3G`P7WiX3TySovlQ^$$7rQVEXJU9)2_9MMlB0EEwm^Qoks6R+Y~ zhSv;RzxDA7Xhn1Su2%D~I&Tz~qtUuL8dj7deqeoTZ49qb&3usP_N*&D8ywZc55I{| zP&C!P)+Mp@EU-ZRI{wQOG&Wgby{Q;J3M;M3rIb%%>XC_#3c)*-tXKK#kQ-Duk+3sl zRcoAU*D{MVm}VXRB+{cjB@7d-_vG4a;%5i3H`JeFz*KArX|R)SX*8Uji3NuCa((DSwv{g?o}8!O;q z)_YT5`x@OG4J93AtEXF_h#Fpr({RM&`=9-oE?A7ykuR{)pEnVMU32mieo3S=X&I`JFUAHC#o*^{HxYChDSN}yEK%Et|I>z|U|KN{!RL@sq%ZI-?rhN?u( zZ1ol4n^VYdjQ#PL@T%<951bUm^{*zXMttl3-&Y|<8LJvf41YuYk}}Ysu4uuWCQXt* zb?)@qHG1^3Rqc68@-3CFr;sEDwLV}_qFtt=7yC^AkCq>LVYqKz_W=+6=g8@A&% zv|OdVY`eptWCUS{^3wZ(Q(Qz*e&O8u#{g7^ny(c7QBPT-!t7d9f3YS;_=(DFEIxQm zn0qsk^7G6cKVOr=S9Ng`+BIq3k?4{X;%>7X=KFuZyY~#|_ZPhkV8n&cR@8-@TQI~d z)|b08oT*3T6`GKDqSueaCDR-^Cy3u4ZYo&&7#-NEpHAuxO>aOwIypPx z46<9=3l@qMHqX{wRE#1j={}TYpA2KK*%PJJ%`Fcs=YUS~UT8}5FuWSi;*luLRm?qA zm1G2M8nQ%j{;Y!T(0BBbj0nS1qIwwYH8U1rzAlHR1B>eSApoxM5FNLNwbGrFp#r+= zWT`5gmoA`&RC2Ov;?rlWsYqO{e;sBx--a zrwBnRJm(#aA`Gr_TmrhI#ViR5l}Y#gdDI#MPMlgg{9e{&)4Tg+#DAMEb# zmP9K;()ql4K!U z-nX@aa~9(Cz_qq_CTt!j+uy3F4fbF?pR4L*+0mRY7NSwhD7Kb1D@UYx3A$+6nmcpV za1Of-|CdTqF@P@leud|D{YCd9eYI3=91z-F;3DjmxkZJ<;MGK4?e)bfgA(?urjkZRyDUqs|C78 zdIhQdTd>@3!8Q<5l@y#b4g*Uc*8jH(sQf0(I1)MmCy$^?IwcL2{&h`