From b992c771b21c03e2fe11890979155047a82e1c78 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 9 Jul 2015 00:06:41 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 ...f.aams.dk-simplesaml-saml2-idp-metadata.php.xml | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml')

diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
index 634bf92b..ccea7957 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.aams.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.aams.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-10T11:47:30Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:47:30Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <saml:Attribute Name="tags">
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-    </saml:Attribute>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aams.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="da">Aarhus Maskinmesterskole</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Aarhus Maskinmesterskole</mdui:DisplayName>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>aams.dk</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIC9jCCAd4CAQcwDQYJKoZIhvcNAQELBQAwQTE/MD0GA1UEAww2aHR0cHM6Ly93
 YXlmLmFhbXMuZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4X
@@ -42,7 +40,7 @@ y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIC9jCCAd4CAQcwDQYJKoZIhvcNAQELBQAwQTE/MD0GA1UEAww2aHR0cHM6Ly93
 YXlmLmFhbXMuZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4X
@@ -76,7 +74,8 @@ y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
     <md:OrganizationURL xml:lang="en">http://www.aams.dk/en-GB/Home.aspx</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mine@headnet.dk</md:EmailAddress>
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3