From 0ca291b75be8dd9ce81ea4a480283ba88a211365 Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders.lordal@hig.se>
Date: Wed, 17 Jun 2015 10:44:21 +0200
Subject: Resolves SWAMIDOPS-7718

---
 swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml | 68 +++++++++++++++++++++++
 swamid-testing-sp-1.0.mxml                        |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml

diff --git a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..cd3b2f3c
--- /dev/null
+++ b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://akka-adm.demo.its.uu.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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Uppsala University AKKA DEMO</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA DEMO</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Authentication Control - Directory Administration DEMO</mdui:Description>
+        <mdui:Description xml:lang="sv">Autentisering Kontroll - Katalogadministration DEMO</mdui:Description>
+        <mdui:Logo height="50" width="50"> https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50"> https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en"> http://akka-adm.demo.its.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv"> http://akka-adm.demo.its.uu.se</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC9DCCAdygAwIBAgIJAJV0MHQLU696MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3ZpcmdvLml0cy51dS5zZTAeFw0xNTA2MTYxNjEyMzJaFw0yNTA2MTMxNjEy
+MzJaMBoxGDAWBgNVBAMTD3ZpcmdvLml0cy51dS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKURYrKnlepBelj8KQW/T+Ha1qtziQQ4gQJkLTYPIUVF
+TlBCiJgGlAgZtQ71WXKRGvfqt2PelpcMONPll0E0OY/J1p6FQlBt9iUYF2fq/9to
+DOQJVm2xLxItO2dLQ/89FJUxcpXnxirK5YxH162jW7Hz+WldOZ5kyQAHeu3HmEAK
+fNIYTCloMSmdwj1q1jNuu5vOoR8zmVoXmtUAPF/HwkdvSyVs9doS5BgnbMeyoBk9
+4xiFmDiO1Gy0ox7Ag9klLh6WxJVKulqfXA83uWLbADqG18XOrCzSOEiJY/QHLVLX
+9JJm5HTypGmUY1X22EQaTYagk6b52NtVkexXVR3zJTECAwEAAaM9MDswGgYDVR0R
+BBMwEYIPdmlyZ28uaXRzLnV1LnNlMB0GA1UdDgQWBBRPmpge3PE7E2Rg+DE28bh/
+NLGFYzANBgkqhkiG9w0BAQUFAAOCAQEAB2TzC1/cKVSxM72XCcegq9oMEf51KvKU
+nY8fkr8d+0LIE4aSNwgHf6nOSQGh+jLBpDaeIaEylzQ50hNG/XVcq3xpAiEGHDj5
+5Kmkqm2S8AscPaUBQEB46bQz9npTpem1PORzsOStUxHuj2JKulGdLFF61wR3Kjcb
+p4+WwrYtlk+elmgzGrj0W7aF9JN9NWupGlpc7Q0YQHxhlw6fWXp4Ny0hmXByCIY/
+Focty5H3QmBpK8aLH3wbajaLaDZs4IXp+wrIOjYGo79ZYeH9ky6DHGZV6G13bUY7
+xxDg6j9aNkDMliUUAe6tc0OcQkp0gbwwFzJMT/qq8K7AfKlX8vES9Q==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>IT Servicedesk</md:SurName>
+    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index becc332d..795f2345 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -58,4 +58,5 @@
   <xi:include href="swamid-2.0/akkatest-anv.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/t0253.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/emmautv.ldc.lu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3