-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/mdx/uk/ns_norm_cds.xsl b/mdx/uk/ns_norm_cds.xsl
index 15113ea3..2d3dcfb2 100644
--- a/mdx/uk/ns_norm_cds.xsl
+++ b/mdx/uk/ns_norm_cds.xsl
@@ -1,77 +1,77 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+ xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+ xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+ xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+ xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+ 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"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index a64aef3b..7947548f 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -1,93 +1,93 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl
index 5bd6277d..0ddc1e1f 100644
--- a/mdx/uk/ns_norm_export_preview.xsl
+++ b/mdx/uk/ns_norm_export_preview.xsl
@@ -1,93 +1,93 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/mdx/uk/ns_norm_fragment.xsl b/mdx/uk/ns_norm_fragment.xsl
index 8739efa1..1402c135 100644
--- a/mdx/uk/ns_norm_fragment.xsl
+++ b/mdx/uk/ns_norm_fragment.xsl
@@ -1,84 +1,84 @@
-
-
-
-
+
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
index 2a8865c8..3f930240 100644
--- a/mdx/uk/ns_norm_test.xsl
+++ b/mdx/uk/ns_norm_test.xsl
@@ -1,120 +1,120 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index 8b8bd5ce..dca0f099 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -1,120 +1,120 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/mdx/uk/scopes_copy.xsl b/mdx/uk/scopes_copy.xsl
index c9a0de6c..c97e12e5 100644
--- a/mdx/uk/scopes_copy.xsl
+++ b/mdx/uk/scopes_copy.xsl
@@ -1,22 +1,22 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/mdx/uk/statistics.xsl b/mdx/uk/statistics.xsl
index e2698021..c79539fb 100644
--- a/mdx/uk/statistics.xsl
+++ b/mdx/uk/statistics.xsl
@@ -1173,16 +1173,16 @@
|
-
+
*
diff --git a/mdx/uk/strip_extensions.xsl b/mdx/uk/strip_extensions.xsl
index f8899e5a..176baabb 100644
--- a/mdx/uk/strip_extensions.xsl
+++ b/mdx/uk/strip_extensions.xsl
@@ -1,55 +1,55 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+
+ xmlns:exsl="http://exslt.org/common"
+ extension-element-prefixes="exsl"
+
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ exclude-result-prefixes="md">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mdx/uk/strip_sirtfi_contacts.xsl b/mdx/uk/strip_sirtfi_contacts.xsl
index daa51068..659847dd 100644
--- a/mdx/uk/strip_sirtfi_contacts.xsl
+++ b/mdx/uk/strip_sirtfi_contacts.xsl
@@ -1,34 +1,34 @@
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ exclude-result-prefixes="md">
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 2c132199..8d99949b 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -45,7 +45,7 @@
InCommon signing certificate.
-->
+ p:resource="classpath:us_incommon/inc-md-cert.pem"/>
-
+
+
+
diff --git a/utilities/2016-09-16/gen-ukid-to-name.xsl b/utilities/2016-09-16/gen-ukid-to-name.xsl
index 3df2bd3b..0cd3ba9f 100644
--- a/utilities/2016-09-16/gen-ukid-to-name.xsl
+++ b/utilities/2016-09-16/gen-ukid-to-name.xsl
@@ -1,19 +1,19 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/utilities/2016-10-06/gen-id-to-name.xsl b/utilities/2016-10-06/gen-id-to-name.xsl
index a2c477cc..4f1d0a7b 100644
--- a/utilities/2016-10-06/gen-id-to-name.xsl
+++ b/utilities/2016-10-06/gen-id-to-name.xsl
@@ -1,19 +1,19 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/utilities/2017-02-27/listHideFromWAYFandEA.xsl b/utilities/2017-02-27/listHideFromWAYFandEA.xsl
index fcd27029..44d25f20 100644
--- a/utilities/2017-02-27/listHideFromWAYFandEA.xsl
+++ b/utilities/2017-02-27/listHideFromWAYFandEA.xsl
@@ -9,8 +9,8 @@
+ [md:Extensions/mdattr:EntityAttributes]
+ [md:Extensions/wayf:HideFromWAYF]">
|