From 113ba6151f5ea2cf332558e6798a04728be77c50 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 9 Jul 2015 00:29:39 +0200
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 .../shibidptest.york.ac.uk-shibboleth.xml          | 85 +++++++++++-----------
 1 file changed, 44 insertions(+), 41 deletions(-)

(limited to 'swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
index 06b77e6f..eb257a44 100644
--- a/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidptest.york.ac.uk/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidptest.york.ac.uk/shibboleth">
+  <!--
+		This is a Shibboleth test IdP owned by the University of York.
+	-->
+  <Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
@@ -9,12 +12,12 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-07T16:13:09Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </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">york.ac.uk</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -43,21 +46,21 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.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://shibidptest.york.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidptest.york.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://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.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://shibidptest.york.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidptest.york.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">york.ac.uk</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -86,23 +89,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.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 York</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of York test service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>User Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.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 York</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of York test service</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.york.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>User Support</GivenName>
+    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
-- 
cgit v1.2.3