urkund new entityID

1 files changed, 83 insertions, 86 deletions

diff --git a/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
index 42b60c75..20193670 100644
--- a/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rhc-fed.reaseheath.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Reaseheath College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-07T15:39:22Z">
-      <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">reaseheath.ac.uk</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://rhc-fed.reaseheath.ac.uk/idp/shibboleth">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-07T15:39:22Z">
+        <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">reaseheath.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>
 						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -35,13 +32,13 @@
 						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
 						LesywhYMlSPtH22K+a3CiahDMw==
 					</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>
 						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -61,13 +58,13 @@
 						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
 						gvZT6e+fbGfucnFJvdlyK66CbQ==
 					</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>
 						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
 						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
@@ -87,26 +84,26 @@
 						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
 						5QUuKHTcpSRcXCPL+qGac9d/T6E=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.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://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.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">reaseheath.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://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.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://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.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">reaseheath.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>
 						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -126,13 +123,13 @@
 						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
 						LesywhYMlSPtH22K+a3CiahDMw==
 					</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>
 						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -152,13 +149,13 @@
 						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
 						gvZT6e+fbGfucnFJvdlyK66CbQ==
 					</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>
 						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
 						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
@@ -178,23 +175,23 @@
 						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
 						5QUuKHTcpSRcXCPL+qGac9d/T6E=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reaseheath College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reaseheath College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@reaseheath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Dickins</SurName>
-    <EmailAddress>mailto:Oliverd@reaseheath.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://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Reaseheath College</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Reaseheath College</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>IT Services</md:GivenName>
+      <md:EmailAddress>mailto:itservices@reaseheath.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Oliver</md:GivenName>
+      <md:SurName>Dickins</md:SurName>
+      <md:EmailAddress>mailto:Oliverd@reaseheath.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>