From 376f39703abf69cb49e8abeb272867d739685f0c Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 8 Jun 2016 14:55:06 +0200
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 .../dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml    | 93 +++++++++++-----------
 1 file changed, 48 insertions(+), 45 deletions(-)

(limited to 'swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml
index bd7c02fc..63fca893 100644
--- a/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-jiscidp.edina.ac.uk/idp/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-jiscidp.edina.ac.uk/idp/shibboleth">
+  <!--
+		This is the  "JISC Executive - new" Shibboleth 2 IdP operated by the University of Edinburgh.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jisc.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collections.jisc.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jiscadvance.ac.uk</shibmd:Scope>
@@ -15,8 +18,8 @@
         <mdui:Logo height="39" width="52">https://dlib-jiscidp.edina.ac.uk/img/jisc.gif</mdui:Logo>
         <mdui:Logo height="16" width="16">https://dlib-jiscidp.edina.ac.uk/img/jiscicon.gif</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -41,24 +44,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jisc.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collections.jisc.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jiscadvance.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -83,27 +86,27 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">JISC Executive New</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>EDINA Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>EDINA Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:edina.infrastructure@ed.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UK federation infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">JISC Executive New</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>EDINA Helpdesk</GivenName>
+    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>EDINA Infrastructure</GivenName>
+    <EmailAddress>mailto:edina.infrastructure@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>UK federation infrastructure</GivenName>
+    <EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
-- 
cgit v1.2.3