Normalize use of namespace prefix and remove comments

1 files changed, 28 insertions, 29 deletions

diff --git a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
index 600f4099..79e5a40d 100644
--- a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
+++ b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">O'Reilly Learning Platform</mdui:DisplayName>
@@ -18,7 +18,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <!-- Serial No. 1690942378109942522077, expires on Fri Jan 11 20:48:32 2030 GMT -->
           <ds:X509Certificate>
 MIIC7DCCAdSgAwIBAgIJW6qKHeTxYmDdMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNhZmFyaWp2LmF1dGgwLmNvbTAeFw0xNjA1MDQxOTQ4MzJaFw0zMDAxMTEy
@@ -42,31 +41,31 @@ xuvjUFEYjJuhY/HwYbmCghKebqIusOEkfaLO0HZmwpI=
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safarijv.auth0.com/logout"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/login/callback?connection=uppsala-university" index="0" isDefault="true"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">O'Reilly Learning Platform</ServiceName>
-      <ServiceDescription xml:lang="en">Use of this SP requires an Enterprise or Academic subscription to the O'Reilly Learning Platform. Please visit https://www.oreilly.com/ for details.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" 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"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">O'Reilly Media</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Safari Books Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.oreilly.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Jesse Banning</GivenName>
-    <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jesse Banning</GivenName>
-    <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Matt Kirk</GivenName>
-    <EmailAddress>mailto:security-feedback@oreilly.com</EmailAddress>
-  </ContactPerson>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/login/callback?connection=uppsala-university" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">O'Reilly Learning Platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Use of this SP requires an Enterprise or Academic subscription to the O'Reilly Learning Platform. Please visit https://www.oreilly.com/ for details.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" 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"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">O'Reilly Media</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Safari Books Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.oreilly.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jesse Banning</md:GivenName>
+    <md:EmailAddress>mailto:safari-prof-serv@oreilly.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jesse Banning</md:GivenName>
+    <md:EmailAddress>mailto:safari-prof-serv@oreilly.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Matt Kirk</md:GivenName>
+    <md:EmailAddress>mailto:security-feedback@oreilly.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>