Normalize use of namespace prefix and remove comments

1 files changed, 42 insertions, 42 deletions

diff --git a/swamid-2.0/indico.nordu.net-mellon.xml b/swamid-2.0/indico.nordu.net-mellon.xml
index 5c2af9f0..f300137a 100644
--- a/swamid-2.0/indico.nordu.net-mellon.xml
+++ b/swamid-2.0/indico.nordu.net-mellon.xml
@@ -5,13 +5,13 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Indico NORDUnet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="da">Indico NORDUnet</mdui:DisplayName>
@@ -21,54 +21,54 @@
         <mdui:Description xml:lang="sv">Indico NORDUnet är en mötes- och konferenssamarbetsservice.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://indico.nordu.net/privacy-statement/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEvTCCAqUCFA5ORy4xhWVYr4K0A+z+Wm6l3eoGMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGluZGljby5ub3JkdS5uZXQwHhcNMTkwOTAzMTM0MzU1WhcNMjkwOTAyMTM0MzU1WjAbMRkwFwYDVQQDDBBpbmRpY28ubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5qHznB3r03a/N9JLY28K+Lw7lnoke7dqRFSBWIkBB58NlH0MF/m/eL/gWnlOLNZfE9AfURWzGIbid6mrZUF/ZdrDcJFRq9zrQyCjE4kkxMxbwYAJsO/RUQyuiEmVYBHk8Y06MicHDa10TD5jyDgGIz+JjD5q6ZTrnhfos6o4la38Z5jNUV1y1LOeeGcD1sc8MWj0V7Wv/TjhWuTE7KHifdXEam27jwh/iXrHQeZm07GPj+vytUe9mPa+b+yr9b0brOaXOPYUkrugRRKZlG1tQLPxEq9HosnxPLG7xnUIsHUWUg4rK/ywz+FrGXKG6e5CHfjfSg8L3jNXGEgqCu9Ob1SRTTZeBMPvEhqhAy0kRmFy7aMu/yDueGR/VYJFwmdKV/XTCxy2lbMalFaVfpitckkRij+cik0i66ET2JHbxfsOd5dAVBRrbZ3NcwulbdWFl07OQaXmHJr6YX46eG65BgVaS/6Os0NQCu0+pidSPge4O1W5TN/C7LCLi4jYVeO/fQ7Qr2zEXrgVEHFAblbD26z0eVuHrcIzJbjfgB1x1+vIPmAq1QnkgXSC4oJDVNosMzyCRwF1RG0s9oHrUysMbNafwJgDMMaBJ4HRrXp8b1TbW8aOTOh+MyQTfO2Wb91nkwDaOTz5oUNZSei8YAj8iOo42hFTlW/IRr1lP7nEjUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAxP8ByZzJGuQD8FisLfbH1vctQwHFBB8lQBlONaTDVM48kKrIAcWFdgx4ocn/O4053mqulsk1Bgv05LbuUckuTmgcCi7NDOyPUDEfgkhMsDLxcFe3yf0Kx8SX3SEamfDHR+MVHZOU6MJWGcPZOqmD8gvUPKcRxm1o1xp9HJ91dhKzoHQYv5KMDcZTi5MbCH+cCzYGjPBDYLcB89h3f4Lpx4UqJ4HAfB30R5G+gHXu8vvrQs4nKI7AVI+I34d4XMHyb33+nEmoXRRJuVNOlEexSoGg9keSv2EqkrX/DBijiB3WPctrTXROQOVwNruAkdUF4jZpZdmmWFHyJwPIXAP2NTLeDZnyKygy+fntXxByI+hO92CmC2DOQKzvOPcH7apMV4nmgtQg8ioRjdzrKtcM0ZaEw3B5OLZmYiRaIjT6fYfyaauQGxUgHMeuhgVOYy0vra18nKBXupSXBc9LJhwK8hz69cZ04UkUFuhsDE8Ej2wD9NMKKI5xnrTNM93hHwxvsW5depOrvJY/NqDNJtFqxvlEpoouUevIF4dxuYn3ZQVCVAN2rlkqY7TYY+QG4Nhd+oWJgzKNlR5Ydqk12ODFSujq7L1eOZ7Lypb58jVn6OFlJ8+rup2kAfFZ9IZ9HkVnVoQPdv11zNbDrt03dOMTHgvdEfVmvp0UmfY+c+e24Y8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEvTCCAqUCFA5ORy4xhWVYr4K0A+z+Wm6l3eoGMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGluZGljby5ub3JkdS5uZXQwHhcNMTkwOTAzMTM0MzU1WhcNMjkwOTAyMTM0MzU1WjAbMRkwFwYDVQQDDBBpbmRpY28ubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5qHznB3r03a/N9JLY28K+Lw7lnoke7dqRFSBWIkBB58NlH0MF/m/eL/gWnlOLNZfE9AfURWzGIbid6mrZUF/ZdrDcJFRq9zrQyCjE4kkxMxbwYAJsO/RUQyuiEmVYBHk8Y06MicHDa10TD5jyDgGIz+JjD5q6ZTrnhfos6o4la38Z5jNUV1y1LOeeGcD1sc8MWj0V7Wv/TjhWuTE7KHifdXEam27jwh/iXrHQeZm07GPj+vytUe9mPa+b+yr9b0brOaXOPYUkrugRRKZlG1tQLPxEq9HosnxPLG7xnUIsHUWUg4rK/ywz+FrGXKG6e5CHfjfSg8L3jNXGEgqCu9Ob1SRTTZeBMPvEhqhAy0kRmFy7aMu/yDueGR/VYJFwmdKV/XTCxy2lbMalFaVfpitckkRij+cik0i66ET2JHbxfsOd5dAVBRrbZ3NcwulbdWFl07OQaXmHJr6YX46eG65BgVaS/6Os0NQCu0+pidSPge4O1W5TN/C7LCLi4jYVeO/fQ7Qr2zEXrgVEHFAblbD26z0eVuHrcIzJbjfgB1x1+vIPmAq1QnkgXSC4oJDVNosMzyCRwF1RG0s9oHrUysMbNafwJgDMMaBJ4HRrXp8b1TbW8aOTOh+MyQTfO2Wb91nkwDaOTz5oUNZSei8YAj8iOo42hFTlW/IRr1lP7nEjUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAxP8ByZzJGuQD8FisLfbH1vctQwHFBB8lQBlONaTDVM48kKrIAcWFdgx4ocn/O4053mqulsk1Bgv05LbuUckuTmgcCi7NDOyPUDEfgkhMsDLxcFe3yf0Kx8SX3SEamfDHR+MVHZOU6MJWGcPZOqmD8gvUPKcRxm1o1xp9HJ91dhKzoHQYv5KMDcZTi5MbCH+cCzYGjPBDYLcB89h3f4Lpx4UqJ4HAfB30R5G+gHXu8vvrQs4nKI7AVI+I34d4XMHyb33+nEmoXRRJuVNOlEexSoGg9keSv2EqkrX/DBijiB3WPctrTXROQOVwNruAkdUF4jZpZdmmWFHyJwPIXAP2NTLeDZnyKygy+fntXxByI+hO92CmC2DOQKzvOPcH7apMV4nmgtQg8ioRjdzrKtcM0ZaEw3B5OLZmYiRaIjT6fYfyaauQGxUgHMeuhgVOYy0vra18nKBXupSXBc9LJhwK8hz69cZ04UkUFuhsDE8Ej2wD9NMKKI5xnrTNM93hHwxvsW5depOrvJY/NqDNJtFqxvlEpoouUevIF4dxuYn3ZQVCVAN2rlkqY7TYY+QG4Nhd+oWJgzKNlR5Ydqk12ODFSujq7L1eOZ7Lypb58jVn6OFlJ8+rup2kAfFZ9IZ9HkVnVoQPdv11zNbDrt03dOMTHgvdEfVmvp0UmfY+c+e24Y8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.nordu.net/mellon/logout"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.nordu.net/mellon/logout"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.nordu.net/mellon/postResponse"/>
-    <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.nordu.net/mellon/artifactResponse"/>
-    <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.nordu.net/mellon/paosResponse"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Indico NORDUnet</ServiceName>
-      <ServiceName xml:lang="da">Indico NORDUnet</ServiceName>
-      <ServiceName xml:lang="sv">Indico NORDUnet</ServiceName>
-      <ServiceDescription xml:lang="en">
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.nordu.net/mellon/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.nordu.net/mellon/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.nordu.net/mellon/postResponse"/>
+    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.nordu.net/mellon/artifactResponse"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.nordu.net/mellon/paosResponse"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Indico NORDUnet</md:ServiceName>
+      <md:ServiceName xml:lang="da">Indico NORDUnet</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Indico NORDUnet</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
         Indico NORDUnet is a meeting, workshop and conference collaboration service.
-      </ServiceDescription>
-      <ServiceDescription xml:lang="da">
+      </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">
         Indico NORDUnet er en samarbejds platform til at arrangere møder, workshops og konferencer.
-      </ServiceDescription>
-      <ServiceDescription xml:lang="sv">
+      </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">
         Indico NORDUnet är en mötes- och konferenssamarbetsservice.
-      </ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">NORDUnet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.nordu.net</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Administrator</GivenName>
-    <EmailAddress>mailto:sei@nordu.net</EmailAddress>
-  </ContactPerson>
+      </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>