From 8ba340f72b53056b1dc494f8605170f21225441b Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders@lordal.se>
Date: Tue, 7 Jun 2016 07:59:30 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 ...saml-module.php-saml-sp-metadata.php-default-sp.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml')

diff --git a/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index a57ece3c..60c8d32d 100644
--- a/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-    <mdattr:EntityAttributes>
-      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2016-03-15T09:59:25Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2016-03-11T16:15:49Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.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">norway</saml:AttributeValue>
-    </saml:Attribute>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</mdui:DisplayName>
         <mdui:Description xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/</mdui:InformationURL>
@@ -25,14 +21,14 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
         </ds:X509Data>
       </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>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
         </ds:X509Data>
-- 
cgit v1.2.3