urkund new entityID

1 files changed, 46 insertions, 49 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 8a5904a0..3e934857 100644
--- a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
@@ -1,25 +1,22 @@
-<?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>
-    <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>
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<?xml version="1.0"?>
+<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>
+    </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>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -43,30 +40,30 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</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>Shane</GivenName>
-    <SurName>Yin</SurName>
-    <EmailAddress>mailto:Shane.Yin@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>CCInform Helpdesk</GivenName>
-    <EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Viper Team</GivenName>
-    <EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </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>Shane</md:GivenName>
+      <md:SurName>Yin</md:SurName>
+      <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <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>Viper Team</md:GivenName>
+      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>