urkund new entityID

1 files changed, 97 insertions, 100 deletions

diff --git a/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
index fa916188..77e7121c 100644
--- a/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
@@ -1,29 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukf-cds-dev.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Edinburgh.
-	-->
-  <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="2015-01-16T11:14:41Z">
-      <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">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</mdui:DisplayName>
-      </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://ukf-cds-dev.edina.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="2015-01-16T11:14:41Z">
+        <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">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</mdui:DisplayName>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
 						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
@@ -43,13 +40,13 @@
 						XcsYNzIwAw+Lhphm6Cl/dM4X6QyvJGHqf+D/ZhHB2ltd4faO+sDurmcmHLpZ+b7g
 						CIW6zaDitlDneg+4iWmQJ9ciDA+53VkCHt91
 					</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>
 						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -69,13 +66,13 @@
 						clLy0UggCGh3aK6o9Xh8a0uYEDwRoaqQYICkGyyr9ZpFhEQGLyoHdOjnytMWK0g6
 						fmmaemg0jVARvKleJCUu9vzFHDpUJAmXlB8X0w==
 					</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>
 						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -95,30 +92,30 @@
 						uZOnrbQ20spV0hJV0PgfrgGFHRK9eYTz1XlILKpG8fX+WhP4QOro5ywT8nMCUZ7f
 						Epl1SF0WLq/28i3NlTE1SQKjWVgTnSbQNe6Qpg==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.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://ukf-cds-dev.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukf-cds-dev.edina.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://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.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://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.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://ukf-cds-dev.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukf-cds-dev.edina.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>
 						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
 						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
@@ -138,13 +135,13 @@
 						XcsYNzIwAw+Lhphm6Cl/dM4X6QyvJGHqf+D/ZhHB2ltd4faO+sDurmcmHLpZ+b7g
 						CIW6zaDitlDneg+4iWmQJ9ciDA+53VkCHt91
 					</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>
 						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -164,13 +161,13 @@
 						clLy0UggCGh3aK6o9Xh8a0uYEDwRoaqQYICkGyyr9ZpFhEQGLyoHdOjnytMWK0g6
 						fmmaemg0jVARvKleJCUu9vzFHDpUJAmXlB8X0w==
 					</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>
 						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -190,25 +187,25 @@
 						uZOnrbQ20spV0hJV0PgfrgGFHRK9eYTz1XlILKpG8fX+WhP4QOro5ywT8nMCUZ7f
 						Epl1SF0WLq/28i3NlTE1SQKjWVgTnSbQNe6Qpg==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.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://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Sara</md:GivenName>
+      <md:SurName>Hopkins</md:SurName>
+      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Sara</md:GivenName>
+      <md:SurName>Hopkins</md:SurName>
+      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>