From c099e6395897bd2493f7a3d47952ea0ce587b11a Mon Sep 17 00:00:00 2001 From: Ian Young Date: Mon, 19 Jun 2017 14:37:28 +0100 Subject: [PATCH] Remove trailing white space from XML files See ukf/ukf-meta#134. --- attic/extract_entityids.xsl | 6 +- attic/extract_member_dates.xsl | 8 +- attic/extract_saml2sp.xsl | 10 +- attic/identity.xsl | 10 +- attic/members_domains.xsl | 20 +- build.xml | 10 +- build/extract_addresses.xsl | 12 +- build/extract_cert_locs.xsl | 8 +- build/extract_embedded.xsl | 6 +- build/extract_locs.xsl | 12 +- build/extract_nk_cert_locs.xsl | 12 +- build/extract_nk_nocert_locs.xsl | 8 +- build/extract_nocert_locs.xsl | 4 +- charting/saml2.xsl | 14 +- charting/scopes.xsl | 4 +- mdx/_rules/check_adfs.xsl | 14 +- mdx/_rules/check_aggregate.xsl | 10 +- mdx/_rules/check_algsupport.xsl | 20 +- mdx/_rules/check_bindings.xsl | 18 +- mdx/_rules/check_entityid_prefix.xsl | 4 +- mdx/_rules/check_filtered.xsl | 4 +- mdx/_rules/check_framework.xsl | 16 +- mdx/_rules/check_future_0.xsl | 4 +- mdx/_rules/check_future_1.xsl | 4 +- mdx/_rules/check_future_2.xsl | 4 +- mdx/_rules/check_future_3.xsl | 6 +- mdx/_rules/check_future_4.xsl | 4 +- mdx/_rules/check_future_5.xsl | 4 +- mdx/_rules/check_future_6.xsl | 4 +- mdx/_rules/check_future_7.xsl | 4 +- mdx/_rules/check_future_8.xsl | 4 +- mdx/_rules/check_future_9.xsl | 4 +- mdx/_rules/check_hasreginfo.xsl | 6 +- mdx/_rules/check_hoksso.xsl | 28 +- mdx/_rules/check_idp_tls.xsl | 6 +- mdx/_rules/check_idpdisc.xsl | 18 +- mdx/_rules/check_imported.xsl | 10 +- mdx/_rules/check_incmd.xsl | 24 +- mdx/_rules/check_init.xsl | 12 +- mdx/_rules/check_mdattr.xsl | 18 +- mdx/_rules/check_mdiop.xsl | 6 +- mdx/_rules/check_mdrpi.xsl | 52 ++-- mdx/_rules/check_mdui.xsl | 78 ++--- mdx/_rules/check_misc.xsl | 30 +- mdx/_rules/check_namespaces.xsl | 46 +-- mdx/_rules/check_rands_member.xsl | 16 +- mdx/_rules/check_rands_support.xsl | 8 +- mdx/_rules/check_regauth.xsl | 10 +- mdx/_rules/check_reqattr.xsl | 86 +++--- mdx/_rules/check_saml1.xsl | 12 +- mdx/_rules/check_saml2.xsl | 22 +- mdx/_rules/check_saml2int.xsl | 32 +- mdx/_rules/check_saml2meta.xsl | 22 +- mdx/_rules/check_shib_noregscope.xsl | 2 +- mdx/_rules/check_shib_regscope.xsl | 6 +- mdx/_rules/check_shibboleth.xsl | 62 ++-- mdx/_rules/check_sirtfi.xsl | 4 +- mdx/_rules/check_sp_tls.xsl | 6 +- mdx/_rules/check_uk_algorithms.xsl | 24 +- mdx/_rules/check_uk_trust.xsl | 46 +-- mdx/_rules/check_vhosts.xsl | 14 +- mdx/_rules/mdui_dn_en_match.xsl | 8 +- mdx/_rules/mdui_dn_en_present.xsl | 6 +- mdx/at_aconet/beans.xml | 34 +-- mdx/at_aconet/verbs.xml | 18 +- mdx/clean-import.xsl | 28 +- mdx/common-beans.xml | 256 ++++++++-------- mdx/default_regauth.xsl | 16 +- mdx/int_cobweb/beans.xml | 14 +- mdx/int_cobweb/verbs.xml | 14 +- mdx/int_edugain/beans.xml | 22 +- mdx/int_edugain/check_recovered.xsl | 4 +- mdx/int_edugain/verbs.xml | 36 +-- mdx/ns_norm.xsl | 68 ++--- mdx/schema/MetadataExchange.xsd | 8 +- mdx/schema/incommon-metadata.xsd | 8 +- ...oasis-200401-wss-wssecurity-secext-1.0.xsd | 2 +- ...asis-200401-wss-wssecurity-utility-1.0.xsd | 8 +- mdx/schema/refeds-metadata.xsd | 6 +- mdx/schema/saml-metadata-rpi-v1.0.xsd | 26 +- mdx/schema/saml-schema-metadata-2.0.xsd | 18 +- .../sstc-saml-metadata-algsupport-v1.0.xsd | 2 +- mdx/schema/sstc-saml-metadata-ui-v1.0.xsd | 6 +- mdx/schema/uk-fed-label.xsd | 26 +- mdx/schema/ws-addr.xsd | 30 +- mdx/schema/ws-authorization.xsd | 38 +-- mdx/schema/ws-federation.xsd | 78 ++--- mdx/schema/ws-securitypolicy-1.2.xsd | 42 +-- mdx/schema/xenc-schema-11.xsd | 10 +- mdx/schema/xenc-schema.xsd | 14 +- mdx/schema/xml.xsd | 2 +- mdx/schema/xmldsig-core-schema.xsd | 140 ++++----- mdx/schema/xmldsig11-schema.xsd | 18 +- mdx/strip-aa-mdui.xsl | 12 +- mdx/strip-comments.xsl | 10 +- mdx/strip-mdui-logo-data.xsl | 12 +- mdx/test/beans.xml | 6 +- mdx/test/verbs.xml | 10 +- mdx/uk/beans.xml | 164 +++++----- mdx/uk/blacklist.xml | 4 +- mdx/uk/check_fixup_encmethod.xsl | 8 +- mdx/uk/check_uk_keydesc_key.xsl | 6 +- mdx/uk/check_uk_mdattr.xsl | 14 +- mdx/uk/check_uk_mdrps.xsl | 12 +- mdx/uk/check_uk_urlenc.xsl | 8 +- mdx/uk/check_ukreg.xsl | 12 +- mdx/uk/collect.xml | 2 +- mdx/uk/entity_scopes.xsl | 8 +- mdx/uk/final_tweak.xsl | 42 +-- mdx/uk/fix_mailto.xsl | 8 +- mdx/uk/fragment.xsl | 18 +- mdx/uk/generate.xml | 216 ++++++------- mdx/uk/ns_norm_back.xsl | 50 +-- mdx/uk/ns_norm_cds.xsl | 24 +- mdx/uk/ns_norm_export.xsl | 48 +-- mdx/uk/ns_norm_export_preview.xsl | 48 +-- mdx/uk/ns_norm_fragment.xsl | 28 +- mdx/uk/ns_norm_test.xsl | 50 +-- mdx/uk/ns_norm_uk.xsl | 50 +-- mdx/uk/scopes_copy.xsl | 16 +- mdx/uk/sp_mdui_test.xsl | 28 +- mdx/uk/statistics-charting.xsl | 96 +++--- mdx/uk/statistics.xsl | 286 +++++++++--------- mdx/uk/strip_extensions.xsl | 12 +- mdx/uk/strip_sirtfi_contacts.xsl | 8 +- mdx/uk/verbs.xml | 82 ++--- mdx/us_incommon/beans.xml | 38 +-- mdx/us_incommon/verbs.xml | 14 +- mdx/validation-beans.xml | 138 ++++----- 129 files changed, 1786 insertions(+), 1786 deletions(-) diff --git a/attic/extract_entityids.xsl b/attic/extract_entityids.xsl index 95de7af2..c8d79b18 100644 --- a/attic/extract_entityids.xsl +++ b/attic/extract_entityids.xsl @@ -2,10 +2,10 @@ @@ -23,7 +23,7 @@ - + diff --git a/attic/extract_member_dates.xsl b/attic/extract_member_dates.xsl index b1e69ec8..ac25f80e 100644 --- a/attic/extract_member_dates.xsl +++ b/attic/extract_member_dates.xsl @@ -2,10 +2,10 @@ @@ -16,7 +16,7 @@ - + ," @@ -30,5 +30,5 @@ - + diff --git a/attic/extract_saml2sp.xsl b/attic/extract_saml2sp.xsl index e3378aaf..6950a87e 100644 --- a/attic/extract_saml2sp.xsl +++ b/attic/extract_saml2sp.xsl @@ -2,10 +2,10 @@ @@ -18,7 +18,7 @@ - + @@ -29,9 +29,9 @@ - + - + diff --git a/attic/identity.xsl b/attic/identity.xsl index caac8f28..dc2ad8b1 100644 --- a/attic/identity.xsl +++ b/attic/identity.xsl @@ -2,9 +2,9 @@ @@ -14,17 +14,17 @@ Force UTF-8 encoding for the output. --> - + - + - + diff --git a/attic/members_domains.xsl b/attic/members_domains.xsl index f1104725..eedd6d9f 100644 --- a/attic/members_domains.xsl +++ b/attic/members_domains.xsl @@ -2,17 +2,17 @@ @@ -20,11 +20,11 @@ - + - + - + - + diff --git a/build.xml b/build.xml index c277c79b..6ca3971a 100644 --- a/build.xml +++ b/build.xml @@ -522,7 +522,7 @@ fs.tar.mdqcache"> Stage 4 Success: MDQ cache created; all files comitted to data repository. - + - + @@ -1706,7 +1706,7 @@ - + @@ -2322,7 +2322,7 @@ - + @@ -25,15 +25,15 @@ - + - + - + @@ -41,5 +41,5 @@ - + diff --git a/build/extract_cert_locs.xsl b/build/extract_cert_locs.xsl index 983f7194..b2b0eabf 100644 --- a/build/extract_cert_locs.xsl +++ b/build/extract_cert_locs.xsl @@ -2,11 +2,11 @@ @@ -23,7 +23,7 @@ - + diff --git a/build/extract_embedded.xsl b/build/extract_embedded.xsl index 9dc0d3bb..75927cec 100644 --- a/build/extract_embedded.xsl +++ b/build/extract_embedded.xsl @@ -2,14 +2,14 @@ diff --git a/build/extract_locs.xsl b/build/extract_locs.xsl index b5411589..1de4ddb0 100644 --- a/build/extract_locs.xsl +++ b/build/extract_locs.xsl @@ -2,10 +2,10 @@ @@ -23,22 +23,22 @@ - + - + - + - + diff --git a/build/extract_nk_cert_locs.xsl b/build/extract_nk_cert_locs.xsl index b18d937d..8bd8cd03 100644 --- a/build/extract_nk_cert_locs.xsl +++ b/build/extract_nk_cert_locs.xsl @@ -2,11 +2,11 @@ @@ -22,20 +22,20 @@ - + - + diff --git a/build/extract_nk_nocert_locs.xsl b/build/extract_nk_nocert_locs.xsl index bd038a08..8c502036 100644 --- a/build/extract_nk_nocert_locs.xsl +++ b/build/extract_nk_nocert_locs.xsl @@ -2,11 +2,11 @@ @@ -22,13 +22,13 @@ - + diff --git a/build/extract_nocert_locs.xsl b/build/extract_nocert_locs.xsl index a67c1f1c..0ca45f9a 100644 --- a/build/extract_nocert_locs.xsl +++ b/build/extract_nocert_locs.xsl @@ -2,11 +2,11 @@ diff --git a/charting/saml2.xsl b/charting/saml2.xsl index 17780729..7e916c3f 100644 --- a/charting/saml2.xsl +++ b/charting/saml2.xsl @@ -1,14 +1,14 @@ - + - + @@ -45,7 +45,7 @@ ])"/> - + diff --git a/charting/scopes.xsl b/charting/scopes.xsl index 6b05fd54..b53d2ccc 100644 --- a/charting/scopes.xsl +++ b/charting/scopes.xsl @@ -2,11 +2,11 @@ diff --git a/mdx/_rules/check_adfs.xsl b/mdx/_rules/check_adfs.xsl index c5336cc8..e4edee1f 100644 --- a/mdx/_rules/check_adfs.xsl +++ b/mdx/_rules/check_adfs.xsl @@ -2,12 +2,12 @@ @@ -33,7 +33,7 @@ ADFS IdP role lacks SSO service with appropriate Binding - + @@ -26,7 +26,7 @@ Checks across the whole of the document are defined here. --> - + - + - + diff --git a/mdx/_rules/check_algsupport.xsl b/mdx/_rules/check_algsupport.xsl index 2902221f..0c2481aa 100644 --- a/mdx/_rules/check_algsupport.xsl +++ b/mdx/_rules/check_algsupport.xsl @@ -2,9 +2,9 @@ @@ -29,16 +29,16 @@ EncryptionMethod should not be present on 'signing' KeyDescriptor - + - + - + - + @@ -51,14 +51,14 @@ - + - + - + - + diff --git a/mdx/_rules/check_bindings.xsl b/mdx/_rules/check_bindings.xsl index 7b2d0163..282c8658 100644 --- a/mdx/_rules/check_bindings.xsl +++ b/mdx/_rules/check_bindings.xsl @@ -2,9 +2,9 @@ @@ -32,7 +32,7 @@ - + - + @@ -128,7 +128,7 @@ - + - + ds:X509SerialNumber should have been filtered out diff --git a/mdx/_rules/check_framework.xsl b/mdx/_rules/check_framework.xsl index 613c1b6a..d6557058 100644 --- a/mdx/_rules/check_framework.xsl +++ b/mdx/_rules/check_framework.xsl @@ -2,9 +2,9 @@ @@ -19,7 +19,7 @@ xsl:message element. --> - + @@ -112,13 +112,13 @@ - - + + - + diff --git a/mdx/_rules/check_future_0.xsl b/mdx/_rules/check_future_0.xsl index 7604ebd8..36dcb13e 100644 --- a/mdx/_rules/check_future_0.xsl +++ b/mdx/_rules/check_future_0.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_1.xsl b/mdx/_rules/check_future_1.xsl index 5ef23c5d..020829f6 100644 --- a/mdx/_rules/check_future_1.xsl +++ b/mdx/_rules/check_future_1.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_2.xsl b/mdx/_rules/check_future_2.xsl index 0226d724..9e8119f0 100644 --- a/mdx/_rules/check_future_2.xsl +++ b/mdx/_rules/check_future_2.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_3.xsl b/mdx/_rules/check_future_3.xsl index 4b83d777..cb307b84 100644 --- a/mdx/_rules/check_future_3.xsl +++ b/mdx/_rules/check_future_3.xsl @@ -2,10 +2,10 @@ @@ -27,5 +27,5 @@ --> - + diff --git a/mdx/_rules/check_future_4.xsl b/mdx/_rules/check_future_4.xsl index 11cfa927..4d3e9c74 100644 --- a/mdx/_rules/check_future_4.xsl +++ b/mdx/_rules/check_future_4.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_5.xsl b/mdx/_rules/check_future_5.xsl index 326c22c2..42bff55a 100644 --- a/mdx/_rules/check_future_5.xsl +++ b/mdx/_rules/check_future_5.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_6.xsl b/mdx/_rules/check_future_6.xsl index b312f48e..376914dc 100644 --- a/mdx/_rules/check_future_6.xsl +++ b/mdx/_rules/check_future_6.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_7.xsl b/mdx/_rules/check_future_7.xsl index 65f06792..ea671d33 100644 --- a/mdx/_rules/check_future_7.xsl +++ b/mdx/_rules/check_future_7.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_8.xsl b/mdx/_rules/check_future_8.xsl index 52030060..f80a9a9b 100644 --- a/mdx/_rules/check_future_8.xsl +++ b/mdx/_rules/check_future_8.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_future_9.xsl b/mdx/_rules/check_future_9.xsl index edfbec8e..8d41c815 100644 --- a/mdx/_rules/check_future_9.xsl +++ b/mdx/_rules/check_future_9.xsl @@ -2,10 +2,10 @@ diff --git a/mdx/_rules/check_hasreginfo.xsl b/mdx/_rules/check_hasreginfo.xsl index f3319047..e312f5be 100644 --- a/mdx/_rules/check_hasreginfo.xsl +++ b/mdx/_rules/check_hasreginfo.xsl @@ -4,7 +4,7 @@ check_hasreginfo.xsl Check that an entity has a RegistrationInfo element. - + --> - + entity does not have an mdrpi:RegistrationInfo element - + diff --git a/mdx/_rules/check_hoksso.xsl b/mdx/_rules/check_hoksso.xsl index ed17d412..28505a92 100644 --- a/mdx/_rules/check_hoksso.xsl +++ b/mdx/_rules/check_hoksso.xsl @@ -2,12 +2,12 @@ @@ -26,12 +26,12 @@ - + @@ -40,7 +40,7 @@ - + @@ -49,7 +49,7 @@ - + - + @@ -96,7 +96,7 @@ - + - + @@ -146,7 +146,7 @@ - + @@ -156,5 +156,5 @@ - + diff --git a/mdx/_rules/check_idp_tls.xsl b/mdx/_rules/check_idp_tls.xsl index 688956a4..ef39c042 100644 --- a/mdx/_rules/check_idp_tls.xsl +++ b/mdx/_rules/check_idp_tls.xsl @@ -2,9 +2,9 @@ @@ -42,5 +42,5 @@ ResponseLocation does not start with https:// - + diff --git a/mdx/_rules/check_idpdisc.xsl b/mdx/_rules/check_idpdisc.xsl index 14077c40..f7b18305 100644 --- a/mdx/_rules/check_idpdisc.xsl +++ b/mdx/_rules/check_idpdisc.xsl @@ -2,9 +2,9 @@ @@ -25,7 +25,7 @@ "index" attributes on DiscoveryResponse elements should all be different for any given entity. --> - + @@ -37,29 +37,29 @@ - + - + missing index attribute on DiscoveryResponse - + missing Binding attribute on DiscoveryResponse - + incorrect Binding value on DiscoveryResponse - - + + diff --git a/mdx/_rules/check_imported.xsl b/mdx/_rules/check_imported.xsl index e632f40d..de5f97dc 100644 --- a/mdx/_rules/check_imported.xsl +++ b/mdx/_rules/check_imported.xsl @@ -2,9 +2,9 @@ @@ -36,7 +36,7 @@ this IdP does not have any Scope elements - + - + diff --git a/mdx/_rules/check_incmd.xsl b/mdx/_rules/check_incmd.xsl index 214860a3..727dd71f 100644 --- a/mdx/_rules/check_incmd.xsl +++ b/mdx/_rules/check_incmd.xsl @@ -2,12 +2,12 @@ @@ -27,13 +27,13 @@ - + incmd:contactType should only appear on md:ContactPerson - + @@ -43,13 +43,13 @@ - + incmd:contactType must be an absolute URI - + @@ -63,19 +63,19 @@ - + - + - + @@ -84,7 +84,7 @@ - + @@ -93,5 +93,5 @@ - + diff --git a/mdx/_rules/check_init.xsl b/mdx/_rules/check_init.xsl index f33fd624..6000a50e 100644 --- a/mdx/_rules/check_init.xsl +++ b/mdx/_rules/check_init.xsl @@ -2,10 +2,10 @@ @@ -24,19 +24,19 @@ - + missing Binding attribute on RequestInitiator - + incorrect Binding value on RequestInitiator - - + + diff --git a/mdx/_rules/check_mdattr.xsl b/mdx/_rules/check_mdattr.xsl index f5782d52..4a845f6a 100644 --- a/mdx/_rules/check_mdattr.xsl +++ b/mdx/_rules/check_mdattr.xsl @@ -2,14 +2,14 @@ @@ -26,12 +26,12 @@ Common support functions. --> - + @@ -44,10 +44,10 @@ EntityAttributes must only appear within Extensions of EntityDescriptor or EntitiesDescriptor - + @@ -58,7 +58,7 @@ @@ -66,5 +66,5 @@ more than one EntityAttributes element in an Extensions element - + diff --git a/mdx/_rules/check_mdiop.xsl b/mdx/_rules/check_mdiop.xsl index ac3104fd..503e76d6 100644 --- a/mdx/_rules/check_mdiop.xsl +++ b/mdx/_rules/check_mdiop.xsl @@ -2,7 +2,7 @@ @@ -42,5 +42,5 @@ KeyDescriptor contains more than one X509Certificate - + diff --git a/mdx/_rules/check_mdrpi.xsl b/mdx/_rules/check_mdrpi.xsl index db9911b9..19253239 100644 --- a/mdx/_rules/check_mdrpi.xsl +++ b/mdx/_rules/check_mdrpi.xsl @@ -2,14 +2,14 @@ @@ -26,10 +26,10 @@ Common support functions. --> - + @@ -44,10 +44,10 @@ RegistrationInfo must only appear within Extensions of EntityDescriptor or EntitiesDescriptor - + @@ -55,10 +55,10 @@ more than one RegistrationInfo element in one Extensions element - + @@ -66,12 +66,12 @@ [md:EntityDescriptor//mdrpi:RegistrationInfo | md:EntitiesDescriptor//mdrpi:RegistrationInfo]"> RegistrationInfo may not appear on both EntitiesDescriptor and child elements - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -113,10 +113,10 @@ - + @@ -131,12 +131,12 @@ PublicationInfo must only appear within Extensions of EntityDescriptor or EntitiesDescriptor - + @@ -144,10 +144,10 @@ PublicationInfo must be within document element's Extensions - + @@ -155,10 +155,10 @@ more than one PublicationInfo element in one Extensions element - + @@ -171,5 +171,5 @@ - + diff --git a/mdx/_rules/check_mdui.xsl b/mdx/_rules/check_mdui.xsl index a2a53f44..05fca711 100644 --- a/mdx/_rules/check_mdui.xsl +++ b/mdx/_rules/check_mdui.xsl @@ -2,14 +2,14 @@ @@ -27,21 +27,21 @@ Common support functions. --> - + more than one UIInfo element in one Extensions element - + - + @@ -57,18 +57,18 @@ UIInfo appearing outside Extensions element - + @@ -78,12 +78,12 @@ ) - + @@ -92,27 +92,27 @@ - + - + - + - + - + @@ -130,8 +130,8 @@ - - + + @@ -151,15 +151,15 @@ mdui:Logo contains non-breaking space - + @@ -169,10 +169,10 @@ - + @@ -194,7 +194,7 @@ @@ -209,10 +209,10 @@ - + @@ -227,17 +227,17 @@ - + DiscoHints appearing outside Extensions element - + @@ -246,23 +246,23 @@ ) - + - + more than one DiscoHints element in one Extensions element - + - + @@ -270,5 +270,5 @@ GeolocationHint must be RFC5870 URI starting with 'geo:' - + diff --git a/mdx/_rules/check_misc.xsl b/mdx/_rules/check_misc.xsl index ec334f47..d95af024 100644 --- a/mdx/_rules/check_misc.xsl +++ b/mdx/_rules/check_misc.xsl @@ -2,10 +2,10 @@ @@ -21,7 +21,7 @@ --> - + @@ -40,11 +40,11 @@ OrganizationDisplayName contains line break - - + + @@ -53,11 +53,11 @@ Location contains space character - - + + @@ -70,7 +70,7 @@ @@ -79,11 +79,11 @@ Binding contains space character - - + + @@ -92,8 +92,8 @@ empty xml:lang attribute - - + + diff --git a/mdx/_rules/check_namespaces.xsl b/mdx/_rules/check_namespaces.xsl index 2bb9f7fa..c4c83a1e 100644 --- a/mdx/_rules/check_namespaces.xsl +++ b/mdx/_rules/check_namespaces.xsl @@ -1,13 +1,13 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -103,5 +103,5 @@ - + diff --git a/mdx/_rules/check_rands_member.xsl b/mdx/_rules/check_rands_member.xsl index bee2e9d0..5ae4531f 100644 --- a/mdx/_rules/check_rands_member.xsl +++ b/mdx/_rules/check_rands_member.xsl @@ -2,12 +2,12 @@ REFEDS R+S requires mdui:DisplayName - + REFEDS R+S requires mdui:InformationURL - + @@ -41,7 +41,7 @@ REFEDS R+S support only applies to identity provider entities - + diff --git a/mdx/_rules/check_regauth.xsl b/mdx/_rules/check_regauth.xsl index e98400ae..bf4328a0 100644 --- a/mdx/_rules/check_regauth.xsl +++ b/mdx/_rules/check_regauth.xsl @@ -4,7 +4,7 @@ check_regauth.xsl Check that the registration authority on an entity is the expected one. - + --> - + (value not set) - + @@ -38,5 +38,5 @@ - + diff --git a/mdx/_rules/check_reqattr.xsl b/mdx/_rules/check_reqattr.xsl index 6840a020..1952aa34 100644 --- a/mdx/_rules/check_reqattr.xsl +++ b/mdx/_rules/check_reqattr.xsl @@ -2,33 +2,33 @@ - + - + - + @@ -245,10 +245,10 @@ - + - + - + @@ -327,7 +327,7 @@ - + @@ -337,7 +337,7 @@ "> - + @@ -358,19 +358,19 @@ - + - + @@ -388,10 +388,10 @@ - + - + @@ -436,7 +436,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -472,17 +472,17 @@ - + - - + + @@ -500,8 +500,8 @@ - + - + diff --git a/mdx/_rules/check_saml1.xsl b/mdx/_rules/check_saml1.xsl index 92de66c5..e5bc1caa 100644 --- a/mdx/_rules/check_saml1.xsl +++ b/mdx/_rules/check_saml1.xsl @@ -4,7 +4,7 @@ check_saml1.xsl Checking ruleset containing rules associated with the SAML 1.x specification. - + Author: Ian A. Young --> @@ -28,7 +28,7 @@ no POST support on SAML 1.1 SP - + @@ -40,7 +40,7 @@ SAML 1.1 AttributeAuthority missing appropriately bound AttributeService - + @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -79,5 +79,5 @@ - + diff --git a/mdx/_rules/check_saml2.xsl b/mdx/_rules/check_saml2.xsl index e35ed8a6..3c5a5e26 100644 --- a/mdx/_rules/check_saml2.xsl +++ b/mdx/_rules/check_saml2.xsl @@ -4,7 +4,7 @@ check_saml2.xsl Checking ruleset containing rules associated with the SAML 2.0 specification. - + Author: Ian A. Young --> @@ -20,7 +20,7 @@ --> - + + --> SAML 2.0 SP has no encryption key - + @@ -80,7 +80,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -106,5 +106,5 @@ - + diff --git a/mdx/_rules/check_saml2int.xsl b/mdx/_rules/check_saml2int.xsl index 812fe87e..f8c930e0 100644 --- a/mdx/_rules/check_saml2int.xsl +++ b/mdx/_rules/check_saml2int.xsl @@ -2,11 +2,11 @@ @@ -23,10 +23,10 @@ --> - + SP excludes both SAML 2 name identifier formats - + SAML 2.0 AttributeAuthorityDescriptor excludes SAML 2 transient name identifier format - + @@ -102,10 +102,10 @@ - + no HTTP-POST support on SAML 2.0 SP - + @@ -138,5 +138,5 @@ SAML 2.0 AttributeAuthority has no embedded signing key - + diff --git a/mdx/_rules/check_saml2meta.xsl b/mdx/_rules/check_saml2meta.xsl index cd5f1139..45cbcaa0 100644 --- a/mdx/_rules/check_saml2meta.xsl +++ b/mdx/_rules/check_saml2meta.xsl @@ -2,10 +2,10 @@ @@ -22,11 +22,11 @@ --> - + - + @@ -44,13 +44,13 @@ AssertionConsumerService index values not all different - + - + @@ -59,14 +59,14 @@ ArtifactResolutionService index values not all different - + - - + + @@ -108,6 +108,6 @@ - - + + diff --git a/mdx/_rules/check_shib_noregscope.xsl b/mdx/_rules/check_shib_noregscope.xsl index 0f1e0b79..32470d4d 100644 --- a/mdx/_rules/check_shib_noregscope.xsl +++ b/mdx/_rules/check_shib_noregscope.xsl @@ -25,5 +25,5 @@ Scope lacks @regexp - + diff --git a/mdx/_rules/check_shib_regscope.xsl b/mdx/_rules/check_shib_regscope.xsl index b20fa7d3..bffd7332 100644 --- a/mdx/_rules/check_shib_regscope.xsl +++ b/mdx/_rules/check_shib_regscope.xsl @@ -4,7 +4,7 @@ check_shib_regscope.xsl Check for the presence of Shibboleth Scope elements containing regular expressions. - + --> - + @@ -27,5 +27,5 @@ - + diff --git a/mdx/_rules/check_shibboleth.xsl b/mdx/_rules/check_shibboleth.xsl index 79aa6799..591e32b3 100644 --- a/mdx/_rules/check_shibboleth.xsl +++ b/mdx/_rules/check_shibboleth.xsl @@ -4,11 +4,11 @@ check_shibboleth.xsl Checking ruleset containing rules associated with: - + * the Shibboleth profile specifications - + * known problems with Shibboleth implementations - + Author: Ian A. Young --> @@ -26,13 +26,13 @@ --> - + @@ -42,16 +42,16 @@ OrganizationURL '' does not start with acceptable prefix - - + + Shibboleth 1.x auth request needs urn:oasis:names:tc:SAML:1.1:protocol in IDPSSODescriptor/@protocolSupportEnumeration - + Shibboleth 1.x auth request needs urn:mace:shibboleth:1.0 in IDPSSODescriptor/@protocolSupportEnumeration - - + + @@ -132,15 +132,15 @@ ds:KeyInfo child element not in ds namespace - - + + @@ -151,7 +151,7 @@ @@ -159,11 +159,11 @@ Scope value contains space character - + @@ -172,8 +172,8 @@ Scope value contains line break - - + + diff --git a/mdx/_rules/check_sp_tls.xsl b/mdx/_rules/check_sp_tls.xsl index 401740ad..fe78eccb 100644 --- a/mdx/_rules/check_sp_tls.xsl +++ b/mdx/_rules/check_sp_tls.xsl @@ -2,9 +2,9 @@ @@ -32,5 +32,5 @@ ResponseLocation does not start with https:// - + diff --git a/mdx/_rules/check_uk_algorithms.xsl b/mdx/_rules/check_uk_algorithms.xsl index 10db2ce2..197da8c8 100644 --- a/mdx/_rules/check_uk_algorithms.xsl +++ b/mdx/_rules/check_uk_algorithms.xsl @@ -2,7 +2,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -69,7 +69,7 @@ ]"> - + @@ -82,7 +82,7 @@ - + @@ -119,7 +119,7 @@ ]"> - + @@ -143,7 +143,7 @@ @@ -158,10 +158,10 @@ - + @@ -178,7 +178,7 @@ ]"> - + diff --git a/mdx/_rules/check_uk_trust.xsl b/mdx/_rules/check_uk_trust.xsl index 6db92755..041da61b 100644 --- a/mdx/_rules/check_uk_trust.xsl +++ b/mdx/_rules/check_uk_trust.xsl @@ -1,57 +1,57 @@ - + - - + + - + IdP SSO Descriptor lacking KeyDescriptor - + - + SP SSO Descriptor lacking KeyDescriptor - + - + IdP AA Descriptor lacking KeyDescriptor - + - - + + @@ -114,5 +114,5 @@ entity has legacy KeyName element - + diff --git a/mdx/_rules/check_vhosts.xsl b/mdx/_rules/check_vhosts.xsl index 7b7a1999..a938a1dc 100644 --- a/mdx/_rules/check_vhosts.xsl +++ b/mdx/_rules/check_vhosts.xsl @@ -2,10 +2,10 @@ @@ -30,22 +30,22 @@ Look for IdPs which have either attribute authority or artifact resolution locations on the same host:port combination as any of the SSO locations. --> - + substring-before(substring-after(concat(., '/'), 'https://'), '/') - + - + - + @@ -54,5 +54,5 @@ - + diff --git a/mdx/_rules/mdui_dn_en_match.xsl b/mdx/_rules/mdui_dn_en_match.xsl index 8281fe9d..f4b993dc 100644 --- a/mdx/_rules/mdui_dn_en_match.xsl +++ b/mdx/_rules/mdui_dn_en_match.xsl @@ -2,12 +2,12 @@ @@ -37,5 +37,5 @@ - + diff --git a/mdx/_rules/mdui_dn_en_present.xsl b/mdx/_rules/mdui_dn_en_present.xsl index 16e2ab15..42c32d2a 100644 --- a/mdx/_rules/mdui_dn_en_present.xsl +++ b/mdx/_rules/mdui_dn_en_present.xsl @@ -2,10 +2,10 @@ @@ -27,5 +27,5 @@ - + diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml index 5bebaeda..5ab7a9fc 100644 --- a/mdx/at_aconet/beans.xml +++ b/mdx/at_aconet/beans.xml @@ -11,7 +11,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + @@ -23,7 +23,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -49,13 +49,13 @@ - + - + @@ -65,10 +65,10 @@ - + @@ -79,10 +79,10 @@ - + @@ -93,7 +93,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml index 6919e231..54399699 100644 --- a/mdx/at_aconet/verbs.xml +++ b/mdx/at_aconet/verbs.xml @@ -11,17 +11,17 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + - + @@ -30,7 +30,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -86,7 +86,7 @@ - + - + - + - + - + - + - + - + @@ -55,7 +55,7 @@ - + - + - + - + diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index e782e283..bf13de14 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -36,14 +36,14 @@ *** *** *********************************** --> - + - + @@ -51,7 +51,7 @@ class="org.springframework.core.io.ClassPathResource"/> - + @@ -60,21 +60,21 @@ - + @@ -125,13 +125,13 @@ - + - + - + @@ -140,7 +140,7 @@ - + - + @@ -176,10 +176,10 @@ - + @@ -210,18 +210,18 @@ - + - + - + - + - + - + - + - + - + @@ -332,11 +332,11 @@ - - + + @@ -349,9 +349,9 @@ @@ -396,22 +396,22 @@ - + - + - + @@ -426,7 +426,7 @@ @@ -439,10 +439,10 @@ - + @@ -453,10 +453,10 @@ - + @@ -467,10 +467,10 @@ - + @@ -482,12 +482,12 @@ - + @@ -498,9 +498,9 @@ - - - + + + - + @@ -530,12 +530,12 @@ Basic EntitiesDescriptor disassembler pipeline stage. --> - + - + @@ -547,53 +547,53 @@ - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + @@ -871,10 +871,10 @@ - + @@ -883,31 +883,31 @@ - + - + - + - + - + - + - + - + - + - + (value not set) - + @@ -61,17 +61,17 @@ - + - + - + diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml index 21fb37f9..a937917c 100644 --- a/mdx/int_cobweb/beans.xml +++ b/mdx/int_cobweb/beans.xml @@ -11,14 +11,14 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + @@ -31,13 +31,13 @@ - + - + @@ -52,7 +52,7 @@ - + - + - + diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml index 49cd2a9a..0a626f57 100644 --- a/mdx/int_cobweb/verbs.xml +++ b/mdx/int_cobweb/verbs.xml @@ -11,17 +11,17 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + - + @@ -30,7 +30,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml index 23154d3b..95222469 100644 --- a/mdx/int_edugain/beans.xml +++ b/mdx/int_edugain/beans.xml @@ -11,13 +11,13 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + @@ -42,7 +42,7 @@ - + @@ -55,13 +55,13 @@ - + - + @@ -92,9 +92,9 @@ - + - + @@ -122,11 +122,11 @@ - + - + @@ -22,5 +22,5 @@ entity has recovered from a previous error condition - + diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml index 21f8be8a..e4fa53e4 100644 --- a/mdx/int_edugain/verbs.xml +++ b/mdx/int_edugain/verbs.xml @@ -11,17 +11,17 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + - + @@ -30,7 +30,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -121,7 +121,7 @@ @@ -130,16 +130,16 @@ - + - + - + @@ -148,13 +148,13 @@ - + @@ -163,14 +163,14 @@ - + - + diff --git a/mdx/ns_norm.xsl b/mdx/ns_norm.xsl index 78ab442c..bef1f20b 100644 --- a/mdx/ns_norm.xsl +++ b/mdx/ns_norm.xsl @@ -2,20 +2,20 @@ @@ -46,7 +46,7 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - + exclude-result-prefixes="md" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -65,16 +65,16 @@ *** *** ******************************************* --> - - + + - - + + @@ -83,7 +83,7 @@ - + @@ -92,8 +92,8 @@ - - + + - - + + - - + + - + @@ -130,43 +130,43 @@ - + - + - + - + - + - + - + @@ -184,8 +184,8 @@ - - + + - - + + - - + + - @@ -45,7 +45,7 @@ Convenience attribute group used to simplify this schema. -This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. +This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. diff --git a/mdx/schema/refeds-metadata.xsd b/mdx/schema/refeds-metadata.xsd index 1dadc094..3cab63b2 100644 --- a/mdx/schema/refeds-metadata.xsd +++ b/mdx/schema/refeds-metadata.xsd @@ -7,14 +7,14 @@ attributeFormDefault="unqualified" blockDefault="substitution" version="2.0"> - + Unofficial schema for REFEDS metadata; specifically the contactType extension required for SIRTFI. - + - + diff --git a/mdx/schema/saml-metadata-rpi-v1.0.xsd b/mdx/schema/saml-metadata-rpi-v1.0.xsd index ebe5e9d1..d5025fe2 100644 --- a/mdx/schema/saml-metadata-rpi-v1.0.xsd +++ b/mdx/schema/saml-metadata-rpi-v1.0.xsd @@ -12,10 +12,10 @@ xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" - elementFormDefault="unqualified" - attributeFormDefault="unqualified" - blockDefault="substitution" - version="1.0"> + elementFormDefault="unqualified" + attributeFormDefault="unqualified" + blockDefault="substitution" + version="1.0"> @@ -24,17 +24,17 @@ Location: http://docs.oasis-open.org/security/saml/Post2.0/ Revision history: 21 March 2011 - Correct minOccurs on elements that were meant to be optional + Correct minOccurs on elements that were meant to be optional 17 December 2010 Change of document title and namespace 24 November 2010 Initial Submission - + - + @@ -45,9 +45,9 @@ - + - + @@ -59,21 +59,21 @@ - + - + - + - + diff --git a/mdx/schema/saml-schema-metadata-2.0.xsd b/mdx/schema/saml-schema-metadata-2.0.xsd index b656d4f4..f052721c 100644 --- a/mdx/schema/saml-schema-metadata-2.0.xsd +++ b/mdx/schema/saml-schema-metadata-2.0.xsd @@ -47,14 +47,14 @@ - + - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -318,7 +318,7 @@ - + diff --git a/mdx/schema/sstc-saml-metadata-algsupport-v1.0.xsd b/mdx/schema/sstc-saml-metadata-algsupport-v1.0.xsd index c4e0f58b..8e30f4af 100644 --- a/mdx/schema/sstc-saml-metadata-algsupport-v1.0.xsd +++ b/mdx/schema/sstc-saml-metadata-algsupport-v1.0.xsd @@ -10,7 +10,7 @@ --> - - - + @@ -89,7 +89,7 @@ - + diff --git a/mdx/schema/uk-fed-label.xsd b/mdx/schema/uk-fed-label.xsd index 854255e1..fdf261d3 100644 --- a/mdx/schema/uk-fed-label.xsd +++ b/mdx/schema/uk-fed-label.xsd @@ -4,17 +4,17 @@ targetNamespace="http://ukfederation.org.uk/2006/11/label" version="2016-09-15" elementFormDefault="qualified"> - + This schema describes the UK federation label namespace. - + For additional information, see the Federation Technical Specification. - + This version of the schema follows FTS edition 1.1 of 1-June-2007. - + @@ -28,7 +28,7 @@ neither text nor nested elements. --> - + @@ -84,7 +84,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ version of software used. This information is added to an entity only if it has been received from the deployer of the entity on the indicated date. - + This information is used in entity fragment files only, and is not included in the metadata published by the UK federation. Its principal use is in classifying @@ -124,7 +124,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -165,5 +165,5 @@ - + diff --git a/mdx/schema/ws-addr.xsd b/mdx/schema/ws-addr.xsd index 47362edb..2926d27d 100644 --- a/mdx/schema/ws-addr.xsd +++ b/mdx/schema/ws-addr.xsd @@ -16,7 +16,7 @@ $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $ --> - + @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -56,17 +56,17 @@ - + - + - + @@ -80,15 +80,15 @@ - + - + - + @@ -104,7 +104,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -122,9 +122,9 @@ - + - + @@ -133,5 +133,5 @@ - + diff --git a/mdx/schema/ws-authorization.xsd b/mdx/schema/ws-authorization.xsd index 0fcdade9..f9648dd9 100644 --- a/mdx/schema/ws-authorization.xsd +++ b/mdx/schema/ws-authorization.xsd @@ -1,34 +1,34 @@ - - + @@ -46,7 +46,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -66,7 +66,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -127,7 +127,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + diff --git a/mdx/schema/ws-federation.xsd b/mdx/schema/ws-federation.xsd index f87059db..e6a2a322 100644 --- a/mdx/schema/ws-federation.xsd +++ b/mdx/schema/ws-federation.xsd @@ -1,23 +1,23 @@ - - - + + @@ -188,7 +188,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -226,7 +226,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -236,7 +236,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -254,18 +254,18 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + - + - + @@ -288,7 +288,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -302,7 +302,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -328,19 +328,19 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + - + - + @@ -363,11 +363,11 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + - + @@ -378,15 +378,15 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + - + - + @@ -397,7 +397,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -417,9 +417,9 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + - + @@ -436,7 +436,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -459,7 +459,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + diff --git a/mdx/schema/ws-securitypolicy-1.2.xsd b/mdx/schema/ws-securitypolicy-1.2.xsd index 948e78a9..9346a4b3 100644 --- a/mdx/schema/ws-securitypolicy-1.2.xsd +++ b/mdx/schema/ws-securitypolicy-1.2.xsd @@ -1,23 +1,23 @@ - - - + @@ -574,7 +574,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -600,7 +600,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -1040,7 +1040,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -1066,7 +1066,7 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + @@ -1201,5 +1201,5 @@ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - + diff --git a/mdx/schema/xenc-schema-11.xsd b/mdx/schema/xenc-schema-11.xsd index 1abb6437..1a8ceb2a 100644 --- a/mdx/schema/xenc-schema-11.xsd +++ b/mdx/schema/xenc-schema-11.xsd @@ -2,14 +2,14 @@ diff --git a/mdx/schema/xenc-schema.xsd b/mdx/schema/xenc-schema.xsd index cdfc8333..82f7be4b 100644 --- a/mdx/schema/xenc-schema.xsd +++ b/mdx/schema/xenc-schema.xsd @@ -2,14 +2,14 @@ @@ -35,7 +35,7 @@ - + @@ -166,6 +166,6 @@ - + diff --git a/mdx/schema/xml.xsd b/mdx/schema/xml.xsd index 38bba34d..f10e6abb 100644 --- a/mdx/schema/xml.xsd +++ b/mdx/schema/xml.xsd @@ -27,7 +27,7 @@ <type . . .> . . . <attributeGroup ref="xml:specialAttrs"/> - + will define a type which will schema-validate an instance element with any of those attributes diff --git a/mdx/schema/xmldsig-core-schema.xsd b/mdx/schema/xmldsig-core-schema.xsd index 07aad278..ebcd6a42 100644 --- a/mdx/schema/xmldsig-core-schema.xsd +++ b/mdx/schema/xmldsig-core-schema.xsd @@ -19,7 +19,7 @@ + version="0.1" elementFormDefault="qualified"> @@ -32,16 +32,16 @@ - - - - - - + + + + + + - + @@ -54,21 +54,21 @@ - - - - - - + + + + + + - + - + @@ -78,48 +78,48 @@ - + - - - - + + + + - - - + + + - + - + - + - + - + - - + + @@ -131,26 +131,26 @@ - + - - - - - - + + + + + + - + - + @@ -159,18 +159,18 @@ - + - - + + - + @@ -184,10 +184,10 @@ - - - - + + + + @@ -195,17 +195,17 @@ - - + + - - + + - + @@ -216,13 +216,13 @@ - + - + @@ -230,40 +230,40 @@ - + - + - + - + - + - + - + - + - + - + - - + + @@ -296,10 +296,10 @@ - - + + - + diff --git a/mdx/schema/xmldsig11-schema.xsd b/mdx/schema/xmldsig11-schema.xsd index f03643a3..4de60789 100644 --- a/mdx/schema/xmldsig11-schema.xsd +++ b/mdx/schema/xmldsig11-schema.xsd @@ -2,14 +2,14 @@ @@ -37,7 +37,7 @@ - + @@ -53,7 +53,7 @@ type="dsig11:ECValidationDataType" minOccurs="0"/> - + @@ -91,7 +91,7 @@ - + @@ -125,7 +125,7 @@ - + diff --git a/mdx/strip-aa-mdui.xsl b/mdx/strip-aa-mdui.xsl index dd323f4b..755cefb7 100644 --- a/mdx/strip-aa-mdui.xsl +++ b/mdx/strip-aa-mdui.xsl @@ -1,10 +1,10 @@ - + - + - + diff --git a/mdx/strip-comments.xsl b/mdx/strip-comments.xsl index d42afa7e..b1545093 100644 --- a/mdx/strip-comments.xsl +++ b/mdx/strip-comments.xsl @@ -1,10 +1,10 @@ - + - + diff --git a/mdx/strip-mdui-logo-data.xsl b/mdx/strip-mdui-logo-data.xsl index da379da0..7036cbe1 100644 --- a/mdx/strip-mdui-logo-data.xsl +++ b/mdx/strip-mdui-logo-data.xsl @@ -1,10 +1,10 @@ - + - + - + diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml index 3d6d2700..e3a8f5a0 100644 --- a/mdx/test/beans.xml +++ b/mdx/test/beans.xml @@ -11,14 +11,14 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + @@ -30,5 +30,5 @@ - + diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml index 8a6d93e7..3214ed55 100644 --- a/mdx/test/verbs.xml +++ b/mdx/test/verbs.xml @@ -11,17 +11,17 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + - + @@ -30,7 +30,7 @@ - + @@ -50,5 +50,5 @@ - + diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml index c70c921e..22b88e63 100644 --- a/mdx/uk/beans.xml +++ b/mdx/uk/beans.xml @@ -21,18 +21,18 @@ - - + + @@ -47,12 +47,12 @@ - + - - + + @@ -61,30 +61,30 @@ - + - - + + - - + + - - + + - - + + @@ -122,11 +122,11 @@ - - + + @@ -135,11 +135,11 @@ - - + + @@ -148,43 +148,43 @@ - + - - + + - - + + - + - + @@ -197,34 +197,34 @@ --> - - + + - - + + - + - - + + @@ -235,17 +235,17 @@ - - + + - + @@ -254,7 +254,7 @@ - + - + - + @@ -332,16 +332,16 @@ - - + + - + - + - + - + @@ -389,10 +389,10 @@ - + @@ -403,7 +403,7 @@ - + - + @@ -426,10 +426,10 @@ - + - + - + @@ -474,7 +474,7 @@ - + - + - + diff --git a/mdx/uk/check_fixup_encmethod.xsl b/mdx/uk/check_fixup_encmethod.xsl index 0e5825cf..59841507 100644 --- a/mdx/uk/check_fixup_encmethod.xsl +++ b/mdx/uk/check_fixup_encmethod.xsl @@ -19,11 +19,11 @@ --> - + @@ -31,6 +31,6 @@ KeyDescriptor contains EncryptionMethod: OpenSAML-C 2.0 problem - - + + diff --git a/mdx/uk/check_uk_keydesc_key.xsl b/mdx/uk/check_uk_keydesc_key.xsl index 1214b41c..bd9c2db3 100644 --- a/mdx/uk/check_uk_keydesc_key.xsl +++ b/mdx/uk/check_uk_keydesc_key.xsl @@ -2,9 +2,9 @@ @@ -29,5 +29,5 @@ - + diff --git a/mdx/uk/check_uk_mdattr.xsl b/mdx/uk/check_uk_mdattr.xsl index b5709e1a..e5016f1b 100644 --- a/mdx/uk/check_uk_mdattr.xsl +++ b/mdx/uk/check_uk_mdattr.xsl @@ -2,9 +2,9 @@ @@ -12,11 +12,11 @@ xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> - + @@ -31,7 +31,7 @@ Assertion not permitted within EntityAttributes - + @@ -72,7 +72,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/mdx/uk/check_uk_mdrps.xsl b/mdx/uk/check_uk_mdrps.xsl index d7b83d45..50b72cca 100644 --- a/mdx/uk/check_uk_mdrps.xsl +++ b/mdx/uk/check_uk_mdrps.xsl @@ -2,9 +2,9 @@ @@ -35,8 +35,8 @@ - - + + @@ -27,6 +27,6 @@ URL-encoded Location attribute; should be entity-encoded - - + + diff --git a/mdx/uk/check_ukreg.xsl b/mdx/uk/check_ukreg.xsl index 28434419..e1897d02 100644 --- a/mdx/uk/check_ukreg.xsl +++ b/mdx/uk/check_ukreg.xsl @@ -2,10 +2,10 @@ @@ -24,7 +24,7 @@ --> - + @@ -33,8 +33,8 @@ badly formatted e-mail address: '' - - + + @@ -49,5 +49,5 @@ - + diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml index 9b1d2c45..fd7392f5 100644 --- a/mdx/uk/collect.xml +++ b/mdx/uk/collect.xml @@ -16,7 +16,7 @@ Import commonly used beans. --> - + diff --git a/mdx/uk/entity_scopes.xsl b/mdx/uk/entity_scopes.xsl index 66c3548f..71c2a941 100644 --- a/mdx/uk/entity_scopes.xsl +++ b/mdx/uk/entity_scopes.xsl @@ -10,7 +10,7 @@ - + - + - + diff --git a/mdx/uk/final_tweak.xsl b/mdx/uk/final_tweak.xsl index f27f7e9a..cb8a50b2 100644 --- a/mdx/uk/final_tweak.xsl +++ b/mdx/uk/final_tweak.xsl @@ -4,7 +4,7 @@ final_tweak.xsl Final tweaks required for UK federation aggregates. - + --> - + - + - + - + @@ -84,7 +84,7 @@ - + @@ -148,10 +148,10 @@ - + @@ -167,17 +167,17 @@ - + - + - + diff --git a/mdx/uk/fix_mailto.xsl b/mdx/uk/fix_mailto.xsl index b25f1793..dab37629 100644 --- a/mdx/uk/fix_mailto.xsl +++ b/mdx/uk/fix_mailto.xsl @@ -4,7 +4,7 @@ fix_mailto.xsl Add "mailto:" scheme to e-mail addresses if not already present. - + --> - + - + - + diff --git a/mdx/uk/fragment.xsl b/mdx/uk/fragment.xsl index f0a7ef0b..39d59e3e 100644 --- a/mdx/uk/fragment.xsl +++ b/mdx/uk/fragment.xsl @@ -2,16 +2,16 @@ - + - + - + @@ -56,18 +56,18 @@ *** *** ********************************************* --> - + - + - + diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml index b899bb5b..9622c0aa 100644 --- a/mdx/uk/generate.xml +++ b/mdx/uk/generate.xml @@ -16,13 +16,13 @@ Import commonly used beans. --> - + - + @@ -36,19 +36,19 @@ *** *** ***************************** --> - + - + @@ -60,10 +60,10 @@ - + @@ -202,13 +202,13 @@ - + - + @@ -233,7 +233,7 @@ - + @@ -243,8 +243,8 @@ - - + + - + @@ -278,20 +278,20 @@ --> - + - + - + - + - + @@ -315,7 +315,7 @@ ])]"/> - + @@ -324,7 +324,7 @@ - + @@ -338,7 +338,7 @@ --> - + - + - + @@ -413,7 +413,7 @@ - + @@ -424,7 +424,7 @@ *** *** ******************************************* --> - + - + - + - + @@ -468,16 +468,16 @@ - + - + - + - + @@ -494,10 +494,10 @@ - + - + @@ -506,7 +506,7 @@ - + @@ -515,21 +515,21 @@ --> - + - + - + - + - + @@ -546,10 +546,10 @@ - + - + @@ -558,7 +558,7 @@ - + @@ -567,18 +567,18 @@ --> - + - + - + @@ -591,7 +591,7 @@ *** *** ******************************************* --> - + @@ -600,12 +600,12 @@ - + - + @@ -614,13 +614,13 @@ - + - + @@ -645,22 +645,22 @@ - + - + @@ -675,7 +675,7 @@ - + - + @@ -704,7 +704,7 @@ @@ -712,12 +712,12 @@ - + - + - + - + @@ -807,7 +807,7 @@ --> - + @@ -820,7 +820,7 @@ @@ -828,7 +828,7 @@ - + @@ -837,7 +837,7 @@ - + @@ -850,7 +850,7 @@ *** *** ************************************* --> - + @@ -858,20 +858,20 @@ Acquire metadata for all UK-registered entities. --> - + - + @@ -886,31 +886,31 @@ - + - + - + - + - + @@ -961,14 +961,14 @@ - + @@ -1017,20 +1017,20 @@ - + - + @@ -1045,7 +1045,7 @@ - + diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl index e59ac8ce..cf1bee2b 100644 --- a/mdx/uk/ns_norm_back.xsl +++ b/mdx/uk/ns_norm_back.xsl @@ -2,25 +2,25 @@ @@ -38,7 +38,7 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" exclude-result-prefixes="alg md xenc" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -49,13 +49,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -82,7 +82,7 @@ - + @@ -91,8 +91,8 @@ - - + + - - + + @@ -112,7 +112,7 @@ - + - - - + + + diff --git a/mdx/uk/ns_norm_cds.xsl b/mdx/uk/ns_norm_cds.xsl index 3eac4726..15113ea3 100644 --- a/mdx/uk/ns_norm_cds.xsl +++ b/mdx/uk/ns_norm_cds.xsl @@ -2,9 +2,9 @@ @@ -20,7 +20,7 @@ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" - + exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel xsi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -31,13 +31,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -64,7 +64,7 @@ - + @@ -73,5 +73,5 @@ - + diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl index 4ee1d693..a64aef3b 100644 --- a/mdx/uk/ns_norm_export.xsl +++ b/mdx/uk/ns_norm_export.xsl @@ -2,19 +2,19 @@ @@ -32,7 +32,7 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - + exclude-result-prefixes="alg md ukfedlabel xenc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -43,13 +43,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -76,7 +76,7 @@ - + @@ -85,8 +85,8 @@ - - + + - - + + @@ -106,7 +106,7 @@ - + - - - + + + diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl index 6bbe0cb8..5bd6277d 100644 --- a/mdx/uk/ns_norm_export_preview.xsl +++ b/mdx/uk/ns_norm_export_preview.xsl @@ -2,19 +2,19 @@ @@ -32,7 +32,7 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - + exclude-result-prefixes="alg md ukfedlabel xenc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -43,13 +43,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -76,7 +76,7 @@ - + @@ -85,8 +85,8 @@ - - + + - - + + @@ -106,7 +106,7 @@ - + - - - + + + diff --git a/mdx/uk/ns_norm_fragment.xsl b/mdx/uk/ns_norm_fragment.xsl index e7cab1d4..8739efa1 100644 --- a/mdx/uk/ns_norm_fragment.xsl +++ b/mdx/uk/ns_norm_fragment.xsl @@ -2,14 +2,14 @@ @@ -26,7 +26,7 @@ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" - + exclude-result-prefixes="md" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -37,13 +37,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -70,7 +70,7 @@ - + @@ -79,6 +79,6 @@ - - + + diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl index 71fdaee4..2a8865c8 100644 --- a/mdx/uk/ns_norm_test.xsl +++ b/mdx/uk/ns_norm_test.xsl @@ -2,25 +2,25 @@ @@ -38,7 +38,7 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - + exclude-result-prefixes="alg md xenc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -49,13 +49,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -82,7 +82,7 @@ - + @@ -91,8 +91,8 @@ - - + + - - + + @@ -112,7 +112,7 @@ - + - - - + + + diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl index 8e5bf095..8b8bd5ce 100644 --- a/mdx/uk/ns_norm_uk.xsl +++ b/mdx/uk/ns_norm_uk.xsl @@ -2,25 +2,25 @@ @@ -38,7 +38,7 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - + exclude-result-prefixes="alg md xenc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -49,13 +49,13 @@ Import templates for basic normalisation. --> - + - + - - + + - - + + @@ -82,7 +82,7 @@ - + @@ -91,8 +91,8 @@ - - + + - - + + @@ -112,7 +112,7 @@ - + - - - + + + diff --git a/mdx/uk/scopes_copy.xsl b/mdx/uk/scopes_copy.xsl index 658a1a18..c9a0de6c 100644 --- a/mdx/uk/scopes_copy.xsl +++ b/mdx/uk/scopes_copy.xsl @@ -2,10 +2,10 @@ - + - - + + - + - + diff --git a/mdx/uk/sp_mdui_test.xsl b/mdx/uk/sp_mdui_test.xsl index 0ae7c2ca..4c67f43f 100644 --- a/mdx/uk/sp_mdui_test.xsl +++ b/mdx/uk/sp_mdui_test.xsl @@ -1,11 +1,11 @@ @@ -25,19 +25,19 @@ version="1.0"> - + - + - + UK Federation SP discovery UI test

UK Federation SP discovery UI test

- +
    : - +
      - +
    • @@ -86,7 +86,7 @@ - +
    • @@ -30,16 +30,16 @@ version="1.0"> - + - + - + @@ -47,33 +47,33 @@ - + - + - + - + - + - + - + - + - + 
       
             
-        
+
         
@@ -277,7 +277,7 @@
             select="$entities.simplesamlphp.in[md:Extensions/ukfedlabel:Software/@name='simpleSAMLphp']"/>
         
-        
+
         
@@ -286,7 +286,7 @@
             select="$entities.atyponsamlsp.in[md:Extensions/ukfedlabel:Software/@name='Atypon SAML SP 1.1/2.0']"/>
         
-        
+
         
@@ -295,7 +295,7 @@
             select="$entities.openathens.in[md:Extensions/ukfedlabel:Software/@name='OpenAthens']"/>
         
-        
+
         
@@ -306,7 +306,7 @@
             ]"/>
         
-        
+
         
@@ -328,7 +328,7 @@
             select="$entities.gateways.in[md:Extensions/ukfedlabel:Software/@name='Eduserv Gateway']"/>
         
-        
+
         
@@ -342,7 +342,7 @@
                 ]"/>
         
-        
+
         
@@ -351,7 +351,7 @@
             select="$entities.guanxi.in[md:Extensions/ukfedlabel:Software/@name='Guanxi']"/>
         
-        
+
         
@@ -360,14 +360,14 @@
             select="$entities.athensim.in[md:Extensions/ukfedlabel:Software/@name='AthensIM']"/>
         
-        
+
         
         
         
-        
+
         
-        
+
         
             
             Shibboleth 3.x
             
         
-        
+
         
             
             Shibboleth 2.x
@@ -401,13 +401,13 @@
             Other than Shibboleth
             
         
-        
+
         
             
             EZproxy
             
         
-        
+
         
             
             simpleSAMLphp
@@ -425,31 +425,31 @@
             AthensIM
             
         
-        
+
         
             
             Guanxi
             
         
-        
+
         
             
             Athens/Shibboleth gateway
             
         
-        
+
         
             
             OpenAthens Virtual IdP
             
         
-        
+
         
             
             OpenAthens
             
         
-        
+
         
             
             Unknown or other
@@ -496,5 +496,5 @@
             
         
     
-    
+
 
diff --git a/mdx/uk/statistics.xsl b/mdx/uk/statistics.xsl
index d98a266b..e2698021 100644
--- a/mdx/uk/statistics.xsl
+++ b/mdx/uk/statistics.xsl
@@ -1,11 +1,11 @@
 
 
@@ -30,16 +30,16 @@
     version="1.0">
 
     
-    
+
     
     
-    
+
     
-        
+
         
 
         
-                
+
                 
                 
                 
-                
+
                 
                 
                 
-                
+
                 
                 
                 
-                
+
                 
      Outsourcing worksheet:
      
                 
        
                     
      • 
@@ -316,22 +316,22 @@
                     ***                                       ***
                     *********************************************
                 -->
-                
+
 
                 
        Entity Statistics
        
                 
        
-                    This section provides a useful bottom-up summary of the federation, 
-                    by categorisation of entities, both total numbers and percentages. 
-                    There are three subsections, presenting statistics applying to all entities, 
-                    to Identity Providers and to Service Providers. 
-                    In each subsection there is a 'breakdown by software used'. 
-                    This lists the entities using each type of software recorded if 
-                    there are fewer than 10 such entities in the category; 
-                    otherwise only the overall numbers and percentages are given. 
+                    This section provides a useful bottom-up summary of the federation,
+                    by categorisation of entities, both total numbers and percentages.
+                    There are three subsections, presenting statistics applying to all entities,
+                    to Identity Providers and to Service Providers.
+                    In each subsection there is a 'breakdown by software used'.
+                    This lists the entities using each type of software recorded if
+                    there are fewer than 10 such entities in the category;
+                    otherwise only the overall numbers and percentages are given.
                     (The software used is requested by the UK federation as part of the entity registration procedure,
                     and this information is recorded in the Software element of our records but not included
                     in published metadata.  Heuristics are used to guess the software in use
-                    if there is no Software element in the metadata.) 
+                    if there is no Software element in the metadata.)
                 
        
                 
        Total entities: .  This breaks down into:
        
                 
          
@@ -345,7 +345,7 @@
                         
          (including dual nature: )
          
                     
                 
        
-                
+
                 
        Of the  entities:
        
                 
          
                     
        • 
@@ -386,7 +386,7 @@
                             
          
                         
          • 
                     
-                    
+
                     
                     
                     
@@ -406,7 +406,7 @@
                             
          
                         
                               
-                    
+
                     
                     
                     
@@ -426,11 +426,11 @@
                             
          
                         
                               
-                    
+
                     
                         
                     
-                    
+
                 
        
 
                 
@@ -450,8 +450,8 @@
                     ***                                         ***
                     ***********************************************
                 -->
-                
-                
+
+
                 
        Identity Providers
        
                 
        There are  identity providers,
                 including 
@@ -484,12 +484,12 @@
                         
        
                             Support SAML 1.1 artifact resolution: 
                             (
-                            of all IdPs, 
+                            of all IdPs,
                             
                             of SAML 1.1 IdPs).
                         
        
                     
        • 
-                    
+
                     
                     
                     
@@ -506,7 +506,7 @@
                     
 
                 
      
-                
+
                 
      SSO protocol support:
      • - + @@ -556,7 +556,7 @@ ()

      - +

    • Not supporting SAML 1.1 SSO: @@ -565,7 +565,7 @@ ()

      • - + @@ -575,7 +575,7 @@ SAML 2.0 SSO: ()

      - +
        @@ -585,7 +585,7 @@ ( of SAML 2.0 IdPs, of all IdPs) - + @@ -597,7 +597,7 @@
      - +

    • Not supporting SAML 2.0 SSO: @@ -606,7 +606,7 @@ ()

      • - +
    @@ -616,8 +616,8 @@ - - + + - - + +

    Service Providers

    There are service providers, including @@ -642,7 +642,7 @@ ().

    - +
  • @@ -651,7 +651,7 @@ ().

    • - + @@ -662,7 +662,7 @@ ().

    - +
  • @@ -671,7 +671,7 @@ ().

    • - + @@ -686,9 +686,9 @@ - +
- +

SSO protocol support:

    )

    - + @@ -722,7 +722,7 @@
- + @@ -742,7 +742,7 @@ ()

- + @@ -755,7 +755,7 @@ - +

  • Not supporting SAML 1.1 SSO: @@ -764,7 +764,7 @@ ()

    • - + @@ -784,7 +784,7 @@ ()

    - + @@ -813,11 +813,11 @@ PAOS: ()

    - - + + - +

  • Not supporting SAML 2.0 SSO: @@ -828,7 +828,7 @@

    • - + @@ -836,9 +836,9 @@ - - - + + +

    Entities by Owner

    - This section is intended to be largely self-explanatory. - Any items in [...] brackets give additional information about the entity: - its type, the software used, etc. + This section is intended to be largely self-explanatory. + Any items in [...] brackets give additional information about the entity: + its type, the software used, etc.

      @@ -858,8 +858,8 @@
    - - + +

    Identity Provider Accountability

    - +

    The following entities are visible in the main federation discovery service but do not assert user accountability: @@ -918,8 +918,8 @@ - - + + - +

    Export Aggregate: Entities Opted Out

    @@ -949,7 +949,7 @@ [RqA] - [!RqA] + [!RqA] @@ -969,13 +969,13 @@
  • No SAML 2.0 support
    • - + - + - +

    Export Aggregate: Entities Explicitly Opted In

    @@ -1003,7 +1003,7 @@ [RqA] - [!RqA] + [!RqA] @@ -1023,7 +1023,7 @@
  • No SAML 2.0 support
    • - + @@ -1094,11 +1094,11 @@ - +     - + - + @@ -1168,16 +1168,16 @@ - + - +   - +   @@ -1196,7 +1196,7 @@ - + @@ -1253,7 +1253,7 @@ *** " O F T H E S E " E X T R A S *** *** *** ********************************************* - + Extra list entries for the "of these" breakdowns in the entity sections. --> @@ -1272,7 +1272,7 @@

    - + @@ -1283,7 +1283,7 @@ () provide algorithm support metadata:

    - +
      @@ -1302,7 +1302,7 @@ () - + @@ -1311,7 +1311,7 @@ () - + @@ -1320,7 +1320,7 @@ () - + @@ -1329,7 +1329,7 @@ () - + @@ -1350,9 +1350,9 @@ () - +
    - +
  • @@ -1370,7 +1370,7 @@ ()
    • - + @@ -1379,7 +1379,7 @@ () - + @@ -1406,7 +1406,7 @@ () - + () - + @@ -1436,9 +1436,9 @@ [, ] - + - +
  • @@ -1459,9 +1459,9 @@ ()
    • - + - + @@ -1484,7 +1484,7 @@ *** C L A S S I F Y E N T I T I E S B Y S O F T W A R E *** *** *** ********************************************************************* - + The classification algorithms used here are chained together so that each classification step works only on those entities not already classified. This means that entities won't be counted twice, but @@ -1492,10 +1492,10 @@ shouldn't be changed without careful thought. In general, more specific algorithms should appear before more general ones. --> - + @@ -1535,7 +1535,7 @@ select="$entities.simplesamlphp.in[md:Extensions/ukfedlabel:Software/@name='simpleSAMLphp']"/> - + @@ -1544,7 +1544,7 @@ select="$entities.atyponsamlsp.in[md:Extensions/ukfedlabel:Software/@name='Atypon SAML SP 1.1/2.0']"/> - + @@ -1553,7 +1553,7 @@ select="$entities.openathens.in[md:Extensions/ukfedlabel:Software/@name='OpenAthens']"/> - + @@ -1564,7 +1564,7 @@ ]"/> - + @@ -1586,7 +1586,7 @@ select="$entities.gateways.in[md:Extensions/ukfedlabel:Software/@name='Eduserv Gateway']"/> - + @@ -1600,7 +1600,7 @@ ]"/> - + @@ -1609,7 +1609,7 @@ select="$entities.guanxi.in[md:Extensions/ukfedlabel:Software/@name='Guanxi']"/> - + @@ -1618,14 +1618,14 @@ select="$entities.athensim.in[md:Extensions/ukfedlabel:Software/@name='AthensIM']"/> - + - + - + Shibboleth 3.x - + Shibboleth 2.x @@ -1659,13 +1659,13 @@ Other than Shibboleth - + EZproxy - + simpleSAMLphp @@ -1683,31 +1683,31 @@ AthensIM - + Guanxi - + Athens/Shibboleth gateway - + OpenAthens Virtual IdP - + OpenAthens - + Unknown or other @@ -1754,7 +1754,7 @@     - + - + @@ -44,12 +44,12 @@ - + - + diff --git a/mdx/uk/strip_sirtfi_contacts.xsl b/mdx/uk/strip_sirtfi_contacts.xsl index 9975d051..daa51068 100644 --- a/mdx/uk/strip_sirtfi_contacts.xsl +++ b/mdx/uk/strip_sirtfi_contacts.xsl @@ -1,14 +1,14 @@ - + - + diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml index 18d5b51c..cfed773c 100644 --- a/mdx/uk/verbs.xml +++ b/mdx/uk/verbs.xml @@ -16,12 +16,12 @@ Import commonly used beans. --> - + - + - + @@ -48,7 +48,7 @@ @@ -78,7 +78,7 @@ @@ -108,7 +108,7 @@ *** *** *********************** --> - + @@ -118,7 +118,7 @@ any of them fail. --> - + - + - + - + @@ -189,7 +189,7 @@ - + - + @@ -230,10 +230,10 @@ - + @@ -247,9 +247,9 @@ @@ -258,28 +258,28 @@ - + - + - + - + - + - + @@ -305,7 +305,7 @@ - + @@ -319,29 +319,29 @@ - + - + - + @@ -355,7 +355,7 @@ ### ### ################################################# --> - + @@ -364,7 +364,7 @@ - + @@ -375,7 +375,7 @@ - + @@ -384,7 +384,7 @@ - + - + diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml index 581e97ac..2c132199 100644 --- a/mdx/us_incommon/beans.xml +++ b/mdx/us_incommon/beans.xml @@ -11,7 +11,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + @@ -27,7 +27,7 @@ - + @@ -40,13 +40,13 @@ - + - + @@ -56,7 +56,7 @@ @@ -67,10 +67,10 @@ - + @@ -81,7 +81,7 @@     - + @@ -98,12 +98,12 @@ - +     - + @@ -111,7 +111,7 @@ - + - + @@ -143,7 +143,7 @@     - + @@ -153,9 +153,9 @@ - +     - + - +     - + diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml index bd9340a8..aff47f46 100644 --- a/mdx/us_incommon/verbs.xml +++ b/mdx/us_incommon/verbs.xml @@ -11,17 +11,17 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - + - + @@ -33,7 +33,7 @@     - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml index cd4f5786..f7ed527f 100644 --- a/mdx/validation-beans.xml +++ b/mdx/validation-beans.xml @@ -20,12 +20,12 @@ *********************************** --> - - + - + - + - + - + - + - + - + - + - + - + @@ -115,7 +115,7 @@ - + - + - + @@ -175,27 +175,27 @@ - + - + - + - + - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -319,7 +319,7 @@ - + - + @@ -377,7 +377,7 @@ *** *** ******************************************************* --> - + - + @@ -412,7 +412,7 @@ *** *** *********************************************** --> - + @@ -459,43 +459,43 @@ --> - + - + - + - + - + - + - + @@ -504,7 +504,7 @@ @@ -533,19 +533,19 @@ --> - + - + - + @@ -557,19 +557,19 @@ --> - + - + - + @@ -599,7 +599,7 @@ @@ -614,7 +614,7 @@ --> - + @@ -629,7 +629,7 @@ *** *** ********************************************* --> - + @@ -667,5 +667,5 @@ - +