From aa25aeab5216287b6ed3cc49abbba0773b81cbdd Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 22 Jun 2015 22:34:57 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../www.ccinform.co.uk-shibboleth.xml              | 63 +++++++++++-----------
 1 file changed, 30 insertions(+), 33 deletions(-)

(limited to 'swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
index 40a46fb0..00d7933b 100644
--- a/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ccinform.co.uk/shibboleth">
-  <!--
-		This is a "CC Inform" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ccinform.co.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-22T14:54:28Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -35,28 +32,28 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CC Inform</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kim</GivenName>
-    <SurName>Poupart</SurName>
-    <EmailAddress>mailto:Kim.poupart@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Gale</SurName>
-    <EmailAddress>mailto:mark.gale@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Angie</GivenName>
-    <SurName>Wong</SurName>
-    <EmailAddress>mailto:Angie.Wong@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CC Inform</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kim</md:GivenName>
+    <md:SurName>Poupart</md:SurName>
+    <md:EmailAddress>mailto:Kim.poupart@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Gale</md:SurName>
+    <md:EmailAddress>mailto:mark.gale@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Angie</md:GivenName>
+    <md:SurName>Wong</md:SurName>
+    <md:EmailAddress>mailto:Angie.Wong@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3