Normalize use of namespace prefix and remove comments

1 files changed, 51 insertions, 53 deletions

diff --git a/swamid-2.0/idp-shibtest.slu.se-idp.xml b/swamid-2.0/idp-shibtest.slu.se-idp.xml
index 69405b42..ebda2be2 100644
--- a/swamid-2.0/idp-shibtest.slu.se-idp.xml
+++ b/swamid-2.0/idp-shibtest.slu.se-idp.xml
@@ -11,8 +11,8 @@
       </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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" 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=https://idp-shibtest.slu.se/idp">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" 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=https://idp-shibtest.slu.se/idp">
+    <md:Extensions>
       <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SLU Shibboleth Idp Test</mdui:DisplayName>
@@ -26,9 +26,8 @@
         <mdui:Logo xml:lang="sv" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -58,8 +57,8 @@ lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -89,8 +88,8 @@ fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -120,22 +119,21 @@ osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shibtest.slu.se/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shibtest.slu.se/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -165,8 +163,8 @@ lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -196,8 +194,8 @@ fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -227,29 +225,29 @@ osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationName>
-    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.slu.se/en/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">https://www.slu.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>