Normalize use of namespace prefix and remove comments

1 files changed, 54 insertions, 58 deletions

diff --git a/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
index 60ce6e7a..2931cbe1 100644
--- a/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
@@ -5,14 +5,14 @@
       <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:AttributeValue>http://www.swamid.se/policy/assurance/al2</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:AttributeValue>http://www.swamid.se/policy/assurance/al2</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 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://shibboleth-test.uhr.se/idp/shibboleth">
-    <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://shibboleth-test.uhr.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Universitets- och högskolerådet - Test</mdui:DisplayName>
@@ -29,9 +29,8 @@
         <mdui:IPHint>193.11.100.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.33760,18.05835</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </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>
@@ -61,8 +60,8 @@ R1pR1C9aGOgVijhfxA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -92,8 +91,8 @@ m0LsY3AEmqhT8UG9og==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -123,19 +122,18 @@ l7UYcB93c7mgKbGO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-test.uhr.se/idp/profile/Shibboleth/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://shibboleth-test.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <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://shibboleth-test.uhr.se/idp/profile/SAML2/Redirect/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://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-test.uhr.se/idp/profile/Shibboleth/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://shibboleth-test.uhr.se/idp/profile/SAML2/POST/SSO"/>
+    <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://shibboleth-test.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.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 @@ R1pR1C9aGOgVijhfxA==
                         </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 @@ m0LsY3AEmqhT8UG9og==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -227,33 +225,31 @@ l7UYcB93c7mgKbGO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet - Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:hakan.pettersson@uhr.se</EmailAddress>
-    <TelephoneNumber>070-595 96 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:hakan.pettersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 70595 96 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:hakan.pettersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 70595 96 28</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet - Test</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>070-595 96 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70595 96 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70595 96 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>