http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-interfederations-2.0

1 files changed, 42 insertions, 39 deletions

diff --git a/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml b/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml
index ac92b7bd..b06393ed 100644
--- a/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://academic.mintel.com/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://academic.mintel.com/shibboleth">
+  <!--
+		This is a Mintel Oxygen Academic SP for Mintel International Group Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Mintel Reports Academic</mdui:DisplayName>
         <mdui:Description xml:lang="en">World class Market Intelligence reports from Mintel.  Data and
 					analysis on consumers, markets, companies and brands.</mdui:Description>
         <mdui:Logo height="109" width="211">https://academic.mintel.com/static/mintel_header/images/mintelLogo.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -41,35 +44,35 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://academic.mintel.com/resolve_ukfed" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testacademic.mintel.com/resolve_ukfed" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://academic.mintel.com/resolve_ukfed" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testacademic.mintel.com/resolve_ukfed" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="11"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mintel International Group Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mintel Oxygen Academic</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://academic.mintel.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Abdul</md:GivenName>
-    <md:SurName>Malik</md:SurName>
-    <md:EmailAddress>mailto:amalik@mintel.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ameet</md:GivenName>
-    <md:SurName>Shah</md:SurName>
-    <md:EmailAddress>mailto:ashah@mintel.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://academic.mintel.com/resolve_ukfed" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testacademic.mintel.com/resolve_ukfed" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://academic.mintel.com/resolve_ukfed" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testacademic.mintel.com/resolve_ukfed" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="11"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Mintel International Group Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Mintel Oxygen Academic</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://academic.mintel.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Abdul</GivenName>
+    <SurName>Malik</SurName>
+    <EmailAddress>mailto:amalik@mintel.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ameet</GivenName>
+    <SurName>Shah</SurName>
+    <EmailAddress>mailto:ashah@mintel.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>