From f275059ab5768fc03141f81dab83b4ada8d2d6f9 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 23 Jul 2015 09:16:50 +0200
Subject: 
 https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml
 into swamid-interfederations-2.0

---
 ...simpelsaml.natmus.dk-saml2-idp-metadata.php.xml | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

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

diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml
index 5d37eb39..39305f93 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/simpelsaml.natmus.dk/saml2/idp/metadata.php">
+<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/simpelsaml.natmus.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-05-06T12:00:10Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-05-06T12:00:10Z" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natmus.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Nationalmuseet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">National Museum</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>natmus.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
 aW1wZWxzYW1sLm5hdG11cy5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1
@@ -40,7 +42,7 @@ b/t1XfdTsZpmhwsOLUL05aydKS8fdVhedHDrVq6Ccz5y1UzM
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
 aW1wZWxzYW1sLm5hdG11cy5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1
@@ -73,9 +75,4 @@ b/t1XfdTsZpmhwsOLUL05aydKS8fdVhedHDrVq6Ccz5y1UzM
     <md:OrganizationURL xml:lang="da">http://www.nationalmuseet.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.nationalmuseet.dk/sw20374.asp</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <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