Normalize use of namespace prefix and remove comments

1 files changed, 38 insertions, 38 deletions

diff --git a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
index 6e612575..87141a0d 100644
--- a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
@@ -5,16 +5,16 @@
       <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" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute 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>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.sp.se/adfs/services/trust">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.sp.se/adfs/services/trust">
     <md:Extensions>
       <shibmd:Scope regexp="false">ri.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -33,38 +33,38 @@
         <mdui:DomainHint>ri.se</mdui:DomainHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQQgPVzpJVa6NDIUYTr9T06DANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLnNwLnNlMB4XDTE5MDYyNDA2NDk0MVoXDTI0MDYyMjA2NDk0MVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPkxkGBEpvrPc+V/HKaOg8lb4QtFqIMW2bjvp2YrbOiaEYgwsnJNm6d7JKsGO+AfEomf7GhE+pKTqPvrmVzL+Qq9X2Cqj6pHILgEy+NDHeq9F9RRqp+YIgG4sHjbrBoi2zg2XRdLBbgvVd47OHYCflsAo2pP7VrLY8nvhsEikLcK+Xs8TW/Owf2i9JzNBuEHQbPlPtyFHZ+DVXLFuLRop1E1J/bnUgSlxtU1XDjKUHnIqy9xvzIMCQEtmT+DHZYy24aGiRclQeSxS5tgje8/gmbnb21xu/rZ0i6Nho9nmIHFK+fJ0tikdNPfrVBaTUpyV6ITFSmA+SpeerVlFYzhEBkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAy8FjBavJDPsDpza6C8/6PI1M+DSvLA23j3Ix/V5heO/jwYRjTrDZcymWQ5GhQIdz7pa1mliDX0ZFbHPiDCMuMf6R7oZY4oRPTeMMixD9wX1OULGHtOCjBnJkh8ezbvefa0qSqH7cNnlgNbhpF4Jr7tMBXWV63QLGqswstt04RMywzp1lR3QNHZn6oqzRArmGOLaz5RpNq1/WkI7kVukcAjJ9KnHkvDPrbl/Bbqz6q4LhRG4BFXfFqTeP8TaqeNiBkKo0x5qtnaCwQOnH3NauBZTwfY/dtXJNGLnS0Y3VcUmkUorPaRRzmhG1YfL9JVQh0Fx7IxntT2DPjG4Z0v6phQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0DCCAbigAwIBAgIQIIjCY0H4B4lOIMMuEej49jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLnNwLnNlMB4XDTE4MTAwMTEwNTIwOVoXDTIzMDkzMDEwNTIwOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAgtBgigsDWI39n+hab5cb2l5+DPnchuCi6JiFauM4OPDYEWTK2a1M1DHELS5DsHPyRxZizVp5oRoJYUEwVefmN7Rd8uaFa7Ygu6yRjTtLCdOHjAka8u4J+iqcRwPP6P6UYL/9neV7jacZ4ar4XpXVspZylxVhwMAdwM2vRhAXrNuwj1m7m1pzWtDscxiEimvS8H97XQcv2XCPeW35x1yQODl4WhfX60lWv0j2W3CIE+bpZZV7DnZoOeIaPmakypW1OD78nLXAT6JL+PHR342mHFZ8M9/H+9pd15yILXiJDFoAezNRvSZjFJfsUNpnFSy+cVROMZ1rsgubTvljvrbkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQo++ox3eMut0uzZ6HGp2h5ey2Qhq6JzdG8fBhf4bcKS55NsdlrKvBz73DY7evuuh/4ouZQtazOG+3O8rOrfxol3vhGu8eRx3vxNfETHTNr0bBEFClmZqDMxhr987BJoSmhTOKEuWtsqH0qBZSzpzYkqngACL9DUwSLTPODQgVZKu7b8tqXWxhNb89hk5B1nsm+YuHoRiMNRKV8bW5BVAKySurnhZRfOs8+Xhaj1OGvjItUxcjB1pVJHuLas80YjIGpFd0osAcxkAUhJW8dUnRnFsSg0xg0WmJjtGeiSUSCqYdxWnxXeiqymiMjDok8jRu/AA4XUERkJpY9V/LUXkQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.sp.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">RISE Research Institutes of Sweden</OrganizationName>
-    <OrganizationName xml:lang="en">RISE Research Institutes of Sweden</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">RISE Research Institutes of Sweden</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">RISE Research Institutes of Sweden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.ri.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.ri.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <EmailAddress>mailto:support.it@ri.se</EmailAddress>
-  </ContactPerson>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQQgPVzpJVa6NDIUYTr9T06DANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLnNwLnNlMB4XDTE5MDYyNDA2NDk0MVoXDTI0MDYyMjA2NDk0MVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPkxkGBEpvrPc+V/HKaOg8lb4QtFqIMW2bjvp2YrbOiaEYgwsnJNm6d7JKsGO+AfEomf7GhE+pKTqPvrmVzL+Qq9X2Cqj6pHILgEy+NDHeq9F9RRqp+YIgG4sHjbrBoi2zg2XRdLBbgvVd47OHYCflsAo2pP7VrLY8nvhsEikLcK+Xs8TW/Owf2i9JzNBuEHQbPlPtyFHZ+DVXLFuLRop1E1J/bnUgSlxtU1XDjKUHnIqy9xvzIMCQEtmT+DHZYy24aGiRclQeSxS5tgje8/gmbnb21xu/rZ0i6Nho9nmIHFK+fJ0tikdNPfrVBaTUpyV6ITFSmA+SpeerVlFYzhEBkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAy8FjBavJDPsDpza6C8/6PI1M+DSvLA23j3Ix/V5heO/jwYRjTrDZcymWQ5GhQIdz7pa1mliDX0ZFbHPiDCMuMf6R7oZY4oRPTeMMixD9wX1OULGHtOCjBnJkh8ezbvefa0qSqH7cNnlgNbhpF4Jr7tMBXWV63QLGqswstt04RMywzp1lR3QNHZn6oqzRArmGOLaz5RpNq1/WkI7kVukcAjJ9KnHkvDPrbl/Bbqz6q4LhRG4BFXfFqTeP8TaqeNiBkKo0x5qtnaCwQOnH3NauBZTwfY/dtXJNGLnS0Y3VcUmkUorPaRRzmhG1YfL9JVQh0Fx7IxntT2DPjG4Z0v6phQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQIIjCY0H4B4lOIMMuEej49jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLnNwLnNlMB4XDTE4MTAwMTEwNTIwOVoXDTIzMDkzMDEwNTIwOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAgtBgigsDWI39n+hab5cb2l5+DPnchuCi6JiFauM4OPDYEWTK2a1M1DHELS5DsHPyRxZizVp5oRoJYUEwVefmN7Rd8uaFa7Ygu6yRjTtLCdOHjAka8u4J+iqcRwPP6P6UYL/9neV7jacZ4ar4XpXVspZylxVhwMAdwM2vRhAXrNuwj1m7m1pzWtDscxiEimvS8H97XQcv2XCPeW35x1yQODl4WhfX60lWv0j2W3CIE+bpZZV7DnZoOeIaPmakypW1OD78nLXAT6JL+PHR342mHFZ8M9/H+9pd15yILXiJDFoAezNRvSZjFJfsUNpnFSy+cVROMZ1rsgubTvljvrbkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQo++ox3eMut0uzZ6HGp2h5ey2Qhq6JzdG8fBhf4bcKS55NsdlrKvBz73DY7evuuh/4ouZQtazOG+3O8rOrfxol3vhGu8eRx3vxNfETHTNr0bBEFClmZqDMxhr987BJoSmhTOKEuWtsqH0qBZSzpzYkqngACL9DUwSLTPODQgVZKu7b8tqXWxhNb89hk5B1nsm+YuHoRiMNRKV8bW5BVAKySurnhZRfOs8+Xhaj1OGvjItUxcjB1pVJHuLas80YjIGpFd0osAcxkAUhJW8dUnRnFsSg0xg0WmJjtGeiSUSCqYdxWnxXeiqymiMjDok8jRu/AA4XUERkJpY9V/LUXkQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.sp.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">RISE Research Institutes of Sweden</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">RISE Research Institutes of Sweden</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">RISE Research Institutes of Sweden</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">RISE Research Institutes of Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.ri.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.ri.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:support.it@ri.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>