urkund new entityID

1 files changed, 93 insertions, 96 deletions

diff --git a/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
index c532c61e..f9d6e24e 100644
--- a/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-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://shibb.hull-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Hull College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-17T15:23:20Z">
-      <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">hull-college.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hull College Group</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (Test)</mdui:Description>
-      </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://shibb.hull-college.ac.uk/idp/shibboleth">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-17T15:23:20Z">
+        <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">hull-college.ac.uk</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">Hull College Group</mdui:DisplayName>
+          <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (Test)</mdui:Description>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -39,13 +36,13 @@
 						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
 						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
 					</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>
 						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -65,13 +62,13 @@
 						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
 						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
 					</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>
 						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
 						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
@@ -91,30 +88,30 @@
 						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
 						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.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://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+      <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://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.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>
 						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -134,13 +131,13 @@
 						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
 						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
 					</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>
 						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -160,13 +157,13 @@
 						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
 						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
 					</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>
 						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
 						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
@@ -186,25 +183,25 @@
 						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
 						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hull College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hull College Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Skerrow</SurName>
-    <EmailAddress>mailto:Chris.Skerrow@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:Dave.Perry@hull-college.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://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Hull College</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Hull College Group</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Chris</md:GivenName>
+      <md:SurName>Skerrow</md:SurName>
+      <md:EmailAddress>mailto:Chris.Skerrow@hull-college.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>David</md:GivenName>
+      <md:SurName>Perry</md:SurName>
+      <md:EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>