Normalize use of namespace prefix and remove comments

1 files changed, 53 insertions, 53 deletions

diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
index 4d0e09c4..6197c79f 100644
--- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
@@ -4,29 +4,29 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-17T16:03:07Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <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:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al3</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <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:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</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>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:IDPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://dev.eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
-    <ns0:Extensions>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">eduid.se</ns1:Scope>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.eduid.se</ns1:Scope>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://dev.eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">eduid.se</shibmd:Scope>
+      <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
 RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
 MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
 ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
@@ -45,14 +45,14 @@ EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
 g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
 xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
 hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
 RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
 MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
 ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
@@ -71,31 +71,31 @@ EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
 g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
 xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
 hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dev.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">eduID DEV TEST</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID DEV TEST</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>eduID</ns0:GivenName>
-    <ns0:SurName>developers</ns0:SurName>
-    <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback+swamidtesting@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dev.eduid.se/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/slo/redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/sso/redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/sso/post"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduID DEV TEST</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduID DEV TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduID</md:GivenName>
+    <md:SurName>developers</md:SurName>
+    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>