registrationAuthority added to all xml files in swamid-2.0/

xml files normalized, the same way later done during generation om
metadata streams (namespaces, cleaning etc)

1 files changed, 13 insertions, 10 deletions

diff --git a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
index f7916ac0..b80e9806 100644
--- a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.nrm.se/adfs/services/trust">
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.nrm.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Naturhistoriska riksmuseet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Swedish Museum of Natural History</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitstjänst för anställda vid Naturhistoriska riksmuseet</mdui:Description>
@@ -43,7 +46,7 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.nrm.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.nrm.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationName>
     <OrganizationName xml:lang="en">Swedish Museum of Natural History</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationDisplayName>
@@ -51,19 +54,19 @@
     <OrganizationURL xml:lang="sv">http://www.nrm.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.nrm.se/en/16.html</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="support">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Naturhistoriska riksmuseet</Company>
     <SurName>Användarsupport</SurName>
     <EmailAddress>mailto:support@nrm.se</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Naturhistoriska riksmuseet</Company>
     <SurName>System administration</SurName>
     <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="administrative">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Naturhistoriska riksmuseet</Company>
     <SurName>System administration</SurName>
     <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
+</md:EntityDescriptor>