From 4b45d25af2ddd80e209eaf2f130469135aff8d8e Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 16 Feb 2016 14:07:49 +0100
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 ...-module.php-saml-sp-metadata.php-default-sp.xml | 65 +++++++++++-----------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml')

diff --git a/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 1138b8b5..6d268d5e 100644
--- a/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <!--
+		This is a "Survey of English Place-Names" simpleSAMLphp SP for the University of Nottingham.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-04T10:33:01Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Survey of English Place-Names</mdui:DisplayName>
         <mdui:Description xml:lang="en">A county-by-county guide to the linguistic origins of England’s place-names</mdui:Description>
         <mdui:Logo height="121" width="115">https://epns.nottingham.ac.uk/img/logos/epns_logo_hd2.png</mdui:Logo>
       </mdui:UIInfo>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -44,8 +47,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -75,24 +78,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Survey of English Place-Names</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/ins/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Helpline</md:GivenName>
-    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Team</md:GivenName>
-    <md:EmailAddress>mailto:digitalepns@nottingham.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Survey of English Place-Names</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/ins/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IT Helpline</GivenName>
+    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Team</GivenName>
+    <EmailAddress>mailto:digitalepns@nottingham.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
-- 
cgit v1.2.3