http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 43 insertions, 46 deletions

diff --git a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
index 6d01bfed..8527e64d 100644
--- a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.ccinform.co.uk/shibboleth">
-  <!--
-		This is a "CC Inform Test" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.ccinform.co.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-25T12:05:45Z">
       <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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">CCInform (Test)</mdui:DisplayName>
         <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
         <mdui:Logo height="72" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/2014/01/CHildren-logo300.jpg</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -45,39 +42,39 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CCInform (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CCInform Helpdesk</GivenName>
-    <EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Surya</GivenName>
-    <SurName>Radjendirane</SurName>
-    <EmailAddress>mailto:surya.radjendirane@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tracey</GivenName>
-    <SurName>Stobbs</SurName>
-    <EmailAddress>mailto:Tracey.Stobbs@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Katie</GivenName>
-    <SurName>Hodgkiss</SurName>
-    <EmailAddress>mailto:katie.hodgkiss@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sonya</GivenName>
-    <SurName>Chauhan</SurName>
-    <EmailAddress>mailto:Sonya.Chauhan@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CCInform (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CCInform Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Surya</md:GivenName>
+    <md:SurName>Radjendirane</md:SurName>
+    <md:EmailAddress>mailto:surya.radjendirane@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tracey</md:GivenName>
+    <md:SurName>Stobbs</md:SurName>
+    <md:EmailAddress>mailto:Tracey.Stobbs@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Katie</md:GivenName>
+    <md:SurName>Hodgkiss</md:SurName>
+    <md:EmailAddress>mailto:katie.hodgkiss@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sonya</md:GivenName>
+    <md:SurName>Chauhan</md:SurName>
+    <md:EmailAddress>mailto:Sonya.Chauhan@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>