urkund new entityID

1 files changed, 89 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
index 0c116e5e..4bd2023e 100644
--- a/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
@@ -1,26 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.c2kqa.net/idp/shibboleth">
-  <!--
-		This is a Shibboleth "C2k" IdP for the Western Education and Library Board.
-	-->
-  <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" registrationInstant="2010-06-08T12:31:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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://shibboleth.c2kqa.net/idp/shibboleth">
+    <md: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" registrationInstant="2010-06-08T12:31:00Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMVdsRzaFcLg3tqUb2Yqh6VErKz2MA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwNVoXDTM2MDQxNDA5NTYwNVowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -40,13 +37,13 @@
 						y2qtbQEXy26ZQ+BPuTN3Cw82xlSh1r265xYyVL1cgHxPkPJ53svI3g/O6tXGnVIs
 						kM1g8SzQfI8T1ImqqXxphg==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJLnh2DoKCqjbJY+li5EloIoNgPWMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwM1oXDTM2MDQxNDA5NTYwM1owHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -66,13 +63,13 @@
 						e6qWoUgdreAwxA82WruvyERft5N7p4WlRy7Ot3S351lMFUze7iXR8U1EefCCPEaK
 						+bNUZQjUbiUE1a0xGim4bA==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIURucd3pg44Ox1UB55Oe0lcWESH5UwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTYwNDE0MDk1
 						NjAzWhcNMzYwNDE0MDk1NjAzWjAfMR0wGwYDVQQDDBRzaGliYm9sZXRoLmMya3Fh
@@ -92,26 +89,26 @@
 						5V4y5Reso+8gVvTh7C2AAkEkG56J9l1+iURDYjEKAxiwgJeQcnmmIAAeQubCFru1
 						Dw+3tzN2G2l2VW+6eNf6
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.net: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://shibboleth.c2kqa.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.net: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://shibboleth.c2kqa.net/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMVdsRzaFcLg3tqUb2Yqh6VErKz2MA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwNVoXDTM2MDQxNDA5NTYwNVowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -131,13 +128,13 @@
 						y2qtbQEXy26ZQ+BPuTN3Cw82xlSh1r265xYyVL1cgHxPkPJ53svI3g/O6tXGnVIs
 						kM1g8SzQfI8T1ImqqXxphg==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJLnh2DoKCqjbJY+li5EloIoNgPWMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwM1oXDTM2MDQxNDA5NTYwM1owHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -157,13 +154,13 @@
 						e6qWoUgdreAwxA82WruvyERft5N7p4WlRy7Ot3S351lMFUze7iXR8U1EefCCPEaK
 						+bNUZQjUbiUE1a0xGim4bA==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIURucd3pg44Ox1UB55Oe0lcWESH5UwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTYwNDE0MDk1
 						NjAzWhcNMzYwNDE0MDk1NjAzWjAfMR0wGwYDVQQDDBRzaGliYm9sZXRoLmMya3Fh
@@ -183,24 +180,24 @@
 						5V4y5Reso+8gVvTh7C2AAkEkG56J9l1+iURDYjEKAxiwgJeQcnmmIAAeQubCFru1
 						Dw+3tzN2G2l2VW+6eNf6
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Western Education and Library Board</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">C2k</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stephen</GivenName>
-    <SurName>Marley</SurName>
-    <EmailAddress>mailto:stephen.marley@capita.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joe</GivenName>
-    <SurName>Boyle</SurName>
-    <EmailAddress>mailto:joe.boyle@capita.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Western Education and Library Board</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">C2k</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Stephen</md:GivenName>
+      <md:SurName>Marley</md:SurName>
+      <md:EmailAddress>mailto:stephen.marley@capita.co.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Joe</md:GivenName>
+      <md:SurName>Boyle</md:SurName>
+      <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>