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

1 files changed, 33 insertions, 30 deletions

diff --git a/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml b/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml
index e2fdd900..d8f2c2a4 100644
--- a/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml
+++ b/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.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://simplesamlphp-dev.cf.ac.uk/idp/simplesamlphp">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://simplesamlphp-dev.cf.ac.uk/idp/simplesamlphp">
+  <!--
+		This is a development simpleSAMLphp IdP for Cardiff University.
+	-->
+  <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>
       </saml:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.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>
@@ -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>
@@ -77,24 +80,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cardiff University (Test - Dev SSP)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://iam.cardiff.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rhys</md:GivenName>
-    <md:SurName>Smith</md:SurName>
-    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rhys</md:GivenName>
-    <md:SurName>Smith</md:SurName>
-    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University (Test - Dev SSP)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://iam.cardiff.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>