urkund new entityID

1 files changed, 88 insertions, 91 deletions

diff --git a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
index ba73e43e..4808839d 100644
--- a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpdev.bham.ac.uk-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://idpdev.bham.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Development IdP" Shibboleth IdP for the University of Birmingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-30T12:57:07Z">
-      <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">bham.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Birmingham (Development IdP)</mdui:DisplayName>
-        <mdui:Logo height="34" width="141">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
-        <mdui:Logo height="48" width="39">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</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://idpdev.bham.ac.uk/idp/shibboleth">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-30T12:57:07Z">
+        <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">bham.ac.uk</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">University of Birmingham (Development IdP)</mdui:DisplayName>
+          <mdui:Logo height="34" width="141">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
+          <mdui:Logo height="48" width="39">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</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>
 						MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
 						WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -40,13 +37,13 @@
 						sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
 						tHKz
 					</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>
 						MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
 						N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
@@ -66,13 +63,13 @@
 						OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
 						1eJP3Q==
 					</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>
 						MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
 						WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -92,26 +89,26 @@
 						SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
 						2T4z
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.bham.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://idpdev.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpdev.bham.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">bham.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://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.bham.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://idpdev.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpdev.bham.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">bham.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>
 						MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
 						WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -131,13 +128,13 @@
 						sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
 						tHKz
 					</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>
 						MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
 						N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
@@ -157,13 +154,13 @@
 						OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
 						1eJP3Q==
 					</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>
 						MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
 						WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -183,23 +180,23 @@
 						SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
 						2T4z
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Birmingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Birmingham (Development IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:ServiceDesk@contacts.bham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Bryan</SurName>
-    <EmailAddress>mailto:J.G.Bryan@bham.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://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">University of Birmingham</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">University of Birmingham (Development IdP)</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.bham.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Service Desk</md:GivenName>
+      <md:EmailAddress>mailto:ServiceDesk@contacts.bham.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Graham</md:GivenName>
+      <md:SurName>Bryan</md:SurName>
+      <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>