Update meta.eduroam.se

3 files changed, 32 insertions, 115 deletions

diff --git a/swamid-2.0/meta.eduroam.se-shibboleth.xml b/swamid-2.0/meta.eduroam.se-shibboleth.xml
deleted file mode 100644
index c1ad7c52..00000000
--- a/swamid-2.0/meta.eduroam.se-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.eduroam.se/shibboleth">
-  <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.eduroam.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>meta.eduroam.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBTCCAe2gAwIBAgIJAPh6o9VnEARbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xMTEwMDcxNDM5MDBaFw0yMTEwMDQxNDM5
-MDBaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANZ98HMQtCgIEsR8nwsnLFK0THbzS/mBg5RZLn6N72Ev
-Lh1m/IjUEb6biqsRIaq3e377tABcvgD4UnCFi5yX6DQvwV6U46G4CJ6M4ilOAM01
-KWNhcX3JNUo2/vczWX4dSj3/u1uBc9DwqBdkCNeOBluzQuYJtIOd7bb3SBGomDbP
-cwwzk4RbUR4D/6i14+zLhivx6sFcFxLzZw3cyb8+bmlHwNdoyZYpXJpwXVLc1iFI
-650ZXw8jUNg7XZHqKEnnzIIjNmo3NwywBosLDUmksjNJlftvHBAVWo2lKgUffS/z
-8gfRUT10NBJGVasy84cm60R+scuvBLtIxxHezUJO2cMCAwEAAaNOMEwwKwYDVR0R
-BCQwIoIPbWV0YS5lZHVyb2FtLnNlhg9tZXRhLmVkdXJvYW0uc2UwHQYDVR0OBBYE
-FJdh5hCOYUWIC7Ftaflm0xXkfwaYMA0GCSqGSIb3DQEBBQUAA4IBAQAopSB0Jj6G
-7nHlsblCirgCvFwvIEoKxyBLCsdjhzG6YdwzPPAKEnHBsrx02CNesHe1i8ksTlRK
-8KUEmf+L2PG0LXZNeYO02W+3mr18MOxt0z6f4QIAp1tpsDJkoERuEVVQOcthRA/J
-JAF6/j66o21JsCuXnrPmjCVRS8xtxRIeJ7AitKIVQOcYVsHafw0QbHgz1t+uWI0U
-7OnL+DyOpCQ7eiqwdYOwcWjOoR/McIMzQ0oTIl03Gqe1aRzuOPkszANfNXhbWtKw
-oc1+nqi2B03IRK/9s4QsOZVrcdczbrq97zE8pZcHVCzwgD9L3pWIYNY1WGE7qwTx
-VHwj8+XpYqMH
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>meta.eduroam.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBTCCAe2gAwIBAgIJAPh6o9VnEARbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xMTEwMDcxNDM5MDBaFw0yMTEwMDQxNDM5
-MDBaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANZ98HMQtCgIEsR8nwsnLFK0THbzS/mBg5RZLn6N72Ev
-Lh1m/IjUEb6biqsRIaq3e377tABcvgD4UnCFi5yX6DQvwV6U46G4CJ6M4ilOAM01
-KWNhcX3JNUo2/vczWX4dSj3/u1uBc9DwqBdkCNeOBluzQuYJtIOd7bb3SBGomDbP
-cwwzk4RbUR4D/6i14+zLhivx6sFcFxLzZw3cyb8+bmlHwNdoyZYpXJpwXVLc1iFI
-650ZXw8jUNg7XZHqKEnnzIIjNmo3NwywBosLDUmksjNJlftvHBAVWo2lKgUffS/z
-8gfRUT10NBJGVasy84cm60R+scuvBLtIxxHezUJO2cMCAwEAAaNOMEwwKwYDVR0R
-BCQwIoIPbWV0YS5lZHVyb2FtLnNlhg9tZXRhLmVkdXJvYW0uc2UwHQYDVR0OBBYE
-FJdh5hCOYUWIC7Ftaflm0xXkfwaYMA0GCSqGSIb3DQEBBQUAA4IBAQAopSB0Jj6G
-7nHlsblCirgCvFwvIEoKxyBLCsdjhzG6YdwzPPAKEnHBsrx02CNesHe1i8ksTlRK
-8KUEmf+L2PG0LXZNeYO02W+3mr18MOxt0z6f4QIAp1tpsDJkoERuEVVQOcthRA/J
-JAF6/j66o21JsCuXnrPmjCVRS8xtxRIeJ7AitKIVQOcYVsHafw0QbHgz1t+uWI0U
-7OnL+DyOpCQ7eiqwdYOwcWjOoR/McIMzQ0oTIl03Gqe1aRzuOPkszANfNXhbWtKw
-oc1+nqi2B03IRK/9s4QsOZVrcdczbrq97zE8pZcHVCzwgD9L3pWIYNY1WGE7qwTx
-VHwj8+XpYqMH
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meta.eduroam.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meta.eduroam.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/djnro.eduroam.se.xml b/swamid-2.0/meta.eduroam.se.xml
index fb2766c1..28f5729c 100644
--- a/swamid-2.0/djnro.eduroam.se.xml
+++ b/swamid-2.0/meta.eduroam.se.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://djnro.eduroam.se">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.eduroam.se">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -26,36 +26,37 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://djnro.eduroam.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://djnro.eduroam.se/Shibboleth.sso/DS/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meta.eduroam.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.eduroam.se/Shibboleth.sso/DS/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">djnro.eduroam.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">djnro.eduroam.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">eduroam meta</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduroam meta</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Detta är Sveriges nya eduroam metadata hanteringsverktyg</mdui:Description>
         <mdui:Description xml:lang="en">This is the new eduroam metadata management system for Sweden</mdui:Description>
+        <mdui:Logo height="115" width="50">https://djnro.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>djnro.eduroam.se</ds:KeyName>
+        <ds:KeyName>meta.eduroam.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=djnro.eduroam.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAJoT0WRuE/rKMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGRqbnJvLmVkdXJvYW0uc2UwHhcNMTcwMTI3MDkwNzUxWhcNMjcwMTI1MDkw
-NzUxWjAbMRkwFwYDVQQDExBkam5yby5lZHVyb2FtLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAz3AyXIQaSaoTWm/gDyTHq1GD7dY6y4m1vAhUWjQd
-Cn0ywA8yQSYJ8t8tjUYeSYpZ6QPfv2OEbCiyeNoSMT+cNLlwjND0ty0OlWAyaSXg
-DBw6y3N69faTeCrmCEM+2pKMP1hw6sAOej8M4fVMkbx9U338Bfmg6OGf7fS2an6+
-96h6TYC09lGZt1NdnX32aZpXV92fK/jv4PC5PPBLM2CYxFCZ3XuDkB7qQ/83tJBy
-mCMVilE206FylVTVamECvHoZg7epXqx8kziCAntaL6LRax2nwOLM8Hi8MQfBAEUj
-vu3p3MgdL5jt/Rnq97wQ8qIX1lq4ywnXM6ICEiTmTUutlQIDAQABoz4wPDAbBgNV
-HREEFDASghBkam5yby5lZHVyb2FtLnNlMB0GA1UdDgQWBBS3DILTb8nvwMZPOJsY
-ef7sB/O/GzANBgkqhkiG9w0BAQUFAAOCAQEARbGB1Pd/F84zZNIeoOupODR7i/yR
-n43mivclmgV0Ub+hLDvhRXWJb3lPp+WB46ZTmFc/tL292DdhPPt/F9bXjMke3sqa
-q0fw5CHhrLW72vWJx/DjeZ0nV8nJJb3gE2c4g4FL7Do/tHk3NrbFKXFULIp1131U
-dNiALdes4wwYvDpzWvtx7NaFGhvUIQLlY6qxjHZqvjf61zG1+mJ6ZkU7CPvg6pYM
-lBtICVFyH8MCB3GZR8kOmfgMZtxtMLEt8z32LFKS7RrHwA18GBu2l6LTlx0YyXDk
-Qgj/u8SdtmZhYQSG+Fzkk6iwqzvz+oU3cVgO8BPrPnL3m9bShejczYFq+Q==
+          <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPxbtJJgj8+DMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xNzAzMjQxMTM2MDlaFw0yNzAzMjIxMTM2
+MDlaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAJiUJnvTlXFvlPhqHlUvGuTwTKl9lmAeap37RKonVMtB
+gGa+UV4lJ5I4vZqmo1GqBq3/YWwQTTAyQkdE4rZR5fpLYnfe0L/a8IPuVuq4U7YX
+cGj4ArShzOOCEtVRFfqUfZoe0g4YzPVCKpD7M+kYUnCIQYcBwc4aMVcKHGCCJWMG
+gssYjoQ3R4cpDten4++bApaOUqNP8YeWTe24PPSPqUA18ocqPeuONPsynnVUzZaO
+jF30687QTEWi7mLixnCskTxX/d3HzUj6B+X2nUI/7HfOEWTGF00smiGN7Y7UZkIm
+XJfgpYvNUkvmiWEUzUi5ZsGECd7GdeS7mZCeZOI3sUUCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPbWV0YS5lZHVyb2FtLnNlMB0GA1UdDgQWBBRI4mYILiY8u0TWHOjSwnSu
+8sBqCjANBgkqhkiG9w0BAQUFAAOCAQEAO/R5fMGks2QvEYGqP8sWZEh8Mcb6+rWr
+m/WqKx4qKLiFHOE5IgDRoozQtzxSC8mroowvQhO1QuX1eb2+kmNxLYdBxWaO/Afu
+4t5PhvbiFbxm5pa3UG+fSEnRIVoANc1aSUFREYqGw76vUxL9AgWHhZj7yk7PwDAr
+qVwd3QyMOJookxU52F2tKfh6Ycvj19U+hZh95R8ItW0PSGNllsxPayIdpt2voZM5
+mReDC+W3lhFUIiep/tdMa2FQmxvBfXpwWP/xxgdNLQHhUAYigMCyWvIeTdMsw5Cd
+n1KiEHawTUUJfngoFN0QtwwvnExeTkUoAOa6ZYr5BscvnB9xKgaDgw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -69,13 +70,13 @@ Qgj/u8SdtmZhYQSG+Fzkk6iwqzvz+oU3cVgO8BPrPnL3m9bShejczYFq+Q==
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://djnro.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://djnro.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://djnro.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://djnro.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://djnro.eduroam.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://djnro.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://djnro.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Paul</md:GivenName>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7781954a..b5490bb1 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -161,7 +161,7 @@
   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sutest.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/meta.eduroam.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.sunet.se.xml"/>
   <xi:include href="swamid-2.0/smd.du.se-shibboleth.xml"/>
@@ -499,7 +499,6 @@
   <xi:include href="swamid-2.0/dbhprod.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.utb1.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.utb1.ladok.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/djnro.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/www.test.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml"/>