urkund new entityID

1 files changed, 97 insertions, 100 deletions

diff --git a/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml
index 33055cce..bee49781 100644
--- a/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml
@@ -1,30 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.merthyr.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Merthyr Tydfil College Limited.
-	-->
-  <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="2016-03-03T12:55:28Z">
-      <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">merthyr.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The College Merthyr Tydfil</mdui:DisplayName>
-        <mdui:Logo height="80" width="60">https://identity.merthyr.ac.uk/idp/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </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://identity.merthyr.ac.uk/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="2016-03-03T12:55:28Z">
+        <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">merthyr.ac.uk</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">The College Merthyr Tydfil</mdui:DisplayName>
+          <mdui:Logo height="80" width="60">https://identity.merthyr.ac.uk/idp/images/logo.png</mdui:Logo>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAPD1e21Xbsbc/ewgYYj9T3jdllMqMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE3WhcNMzYwMjE4MDkxNTE3WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -44,13 +41,13 @@
 						h6tZW61OSImXh4vVx25jBaSeil94bu4eTHX8NPGRSPWsJHjkSSMyj//E/Hb0nvUT
 						o4sOxqCOINYHaIz5vc4Hg+Cabyout4Zg
 					</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>
 						MIIDQzCCAiugAwIBAgIUT3wLwUQdjtdrHC5Eh49xQf4S89AwDQYJKoZIhvcNAQEL
 						BQAwITEfMB0GA1UEAwwWaWRlbnRpdHkubWVydGh5ci5hYy51azAeFw0xNjAyMTgw
 						OTE1MTZaFw0zNjAyMTgwOTE1MTZaMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRo
@@ -70,13 +67,13 @@
 						rSjxVr67J+DjF3pC14TahR8ZsrDMw6w/Iz3Za0YQz7P/ZzdHsLmEEhHH3Bk1KXvY
 						kPLAK20Qa90x4UjhW2sgzMV/s/7W1f8=
 					</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>
 						MIIDRDCCAiygAwIBAgIVALriBK2Djfe+kurUI1ykFZQSYOVKMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE2WhcNMzYwMjE4MDkxNTE2WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -96,26 +93,26 @@
 						wT1q733K59v8dHfRH77nQXgY92yKaFUyqdtoqALMqgtUiKmjMA5Q8zLDg5beDStM
 						+GnV89LwIOI1mWeY2qsFeA8oFXy+49hn
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.merthyr.ac.uk: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://identity.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.merthyr.ac.uk/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">merthyr.ac.uk</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://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.merthyr.ac.uk: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://identity.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.merthyr.ac.uk/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">merthyr.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAPD1e21Xbsbc/ewgYYj9T3jdllMqMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE3WhcNMzYwMjE4MDkxNTE3WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -135,13 +132,13 @@
 						h6tZW61OSImXh4vVx25jBaSeil94bu4eTHX8NPGRSPWsJHjkSSMyj//E/Hb0nvUT
 						o4sOxqCOINYHaIz5vc4Hg+Cabyout4Zg
 					</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>
 						MIIDQzCCAiugAwIBAgIUT3wLwUQdjtdrHC5Eh49xQf4S89AwDQYJKoZIhvcNAQEL
 						BQAwITEfMB0GA1UEAwwWaWRlbnRpdHkubWVydGh5ci5hYy51azAeFw0xNjAyMTgw
 						OTE1MTZaFw0zNjAyMTgwOTE1MTZaMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRo
@@ -161,13 +158,13 @@
 						rSjxVr67J+DjF3pC14TahR8ZsrDMw6w/Iz3Za0YQz7P/ZzdHsLmEEhHH3Bk1KXvY
 						kPLAK20Qa90x4UjhW2sgzMV/s/7W1f8=
 					</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>
 						MIIDRDCCAiygAwIBAgIVALriBK2Djfe+kurUI1ykFZQSYOVKMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE2WhcNMzYwMjE4MDkxNTE2WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -187,28 +184,28 @@
 						wT1q733K59v8dHfRH77nQXgY92yKaFUyqdtoqALMqgtUiKmjMA5Q8zLDg5beDStM
 						+GnV89LwIOI1mWeY2qsFeA8oFXy+49hn
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Merthyr Tydfil College Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The College Merthyr Tydfil</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:IT.Servicedesk@merthyr.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Jackson</SurName>
-    <EmailAddress>mailto:J.Jackson1@merthyr.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Watkins</SurName>
-    <EmailAddress>mailto:A.Watkins@merthyr.ac.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://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Merthyr Tydfil College Limited</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">The College Merthyr Tydfil</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>IT Service Desk</md:GivenName>
+      <md:EmailAddress>mailto:IT.Servicedesk@merthyr.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>John</md:GivenName>
+      <md:SurName>Jackson</md:SurName>
+      <md:EmailAddress>mailto:J.Jackson1@merthyr.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Adam</md:GivenName>
+      <md:SurName>Watkins</md:SurName>
+      <md:EmailAddress>mailto:A.Watkins@merthyr.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>