1 files changed, 11 insertions, 14 deletions
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
index e279a192..3d92c88f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
@@ -1,24 +1,26 @@
 <?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="http://birk.wayf.dk/birk.php/ucnsso.ucn.dk/adfs/services/trust">
+<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="http://birk.wayf.dk/birk.php/ucnsso.ucn.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-09T09:51:19Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-09T09:51:19Z" 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">ucn.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">University College Nordjylland</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University College of Northern Denmark</mdui:DisplayName>
         <mdui:Logo width="186" height="67">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALoAAABDCAYAAAArkx8gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFMzY3QkI1RTgzNzExRTA4NUM3RDdBMzk0QzdFMDg4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFMzY3QkI2RTgzNzExRTA4NUM3RDdBMzk0QzdFMDg4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUUzNjdCQjNFODM3MTFFMDg1QzdEN0EzOTRDN0UwODgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MUUzNjdCQjRFODM3MTFFMDg1QzdEN0EzOTRDN0UwODgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7jALpaAAALSElEQVR42uxde5RVVRnf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</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucn.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDUy
 OTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
@@ -48,11 +50,6 @@ xUQ=
     <md:OrganizationDisplayName xml:lang="da">University College Nordjylland</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University College of Northern Denmark</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="da">http://www.ucn.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ucnorth.dk/Default.aspx</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ucn.dk/english</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>WAYF</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>