From ee665271c57883a780be8311bc02f031f5a9b50c Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 2 Mar 2016 09:45:09 +0100
Subject: Resolves SWAMIDOPS-8048

---
 swamid-2.0/scalear-staging2.herokuapp.com.xml | 60 +++++++++++++++++++++++++++
 swamid-2.0/test.scalable-learning.com.xml     | 60 +++++++++++++++++++++++++++
 swamid-2.0/www.scalable-learning.com.xml      | 59 ++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                            |  3 ++
 4 files changed, 182 insertions(+)
 create mode 100644 swamid-2.0/scalear-staging2.herokuapp.com.xml
 create mode 100644 swamid-2.0/test.scalable-learning.com.xml
 create mode 100644 swamid-2.0/www.scalable-learning.com.xml

diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
new file mode 100644
index 00000000..a473a028
--- /dev/null
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -0,0 +1,60 @@
+<?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:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://scalear-staging2.herokuapp.com" xml:base="swamid-2.0/.xml">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
+        <saml:AttributeValue> http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://scalear-staging2.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDljCCAn4CCQCqbKeZgkK/pTANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMC
+U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
+VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEnMCUGA1UE
+Awwec2NhbGVhci1zdGFnaW5nMi5oZXJva3VhcHAuY29tMB4XDTE2MDIyNTExMzI0
+NVoXDTE3MDIyNDExMzI0NVowgYwxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTVE9D
+S0hPTE0xEjAQBgNVBAcMCVNUT0NLSE9MTTEaMBgGA1UECgwRU0NBTEFCTEUgTEVB
+Uk5JTkcxEDAOBgNVBAsMB3NjYWxlYXIxJzAlBgNVBAMMHnNjYWxlYXItc3RhZ2lu
+ZzIuaGVyb2t1YXBwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJt5KVMamR4VM+orgoHIXhdY4YCjojE+NLpUTlQhVY+FHnBxEf5NbZoX617qoys1
+XY+X4wWgGEKqzaGryWh2d7vKjkhyRkYyTTMnnMEVeRx2B9d1dtWXwn+VLob6LbGJ
+Att/yJnj9N4YdYsE4wQ96KBTcEOzDjXaMlhkR1DD2v2iGqmlE+rfwAfOJjWe1sD8
+VvIYyTKfoA3QbF3M75TR77RrEDr//rsAWLd0WGv77NxiSrGVes5pPEZlH/s5DUh3
+nanhrStyLZUPpVZDgzWfnntZnnV2Y18EwmFtbfiP3uoQOQBCrPCRplcqSfXxmGDT
+VveQGP10ZpJAEZPVDM9lhrkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJD01OmDH
+fYT/KcRxAAWi7+RwOZsQmv+t3wkmzEQ3BDOETQ4XMVAtommwGtSaL24Z7Mo6lxSJ
+v0yCCkBCxkeKST8Rsx0iaTKdFpKc8DesPplEmNjbud+BoA7VNyXBAiGsifOzHXW3
+MQytZReHD/l0AO6DSjukXZADKQQtfQIJplMyCfBJMBtNlG6PH6oPiGxI6NhDytHO
+ZXxK1uQ+5ZunqauacDK2idAh/Oe4aaAfxYMp1Oh7/oXU80nM3RDz2hVSeQVy85y8
+pq7jZ9OX3q5P9y5agNP6P1SaXNjgSUdAFMSbaltu5/I5LPo8RYXZUScKW1N9LEx7
+qONqqzvm+WBOIQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>
+urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
new file mode 100644
index 00000000..486d7b9b
--- /dev/null
+++ b/swamid-2.0/test.scalable-learning.com.xml
@@ -0,0 +1,60 @@
+<?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:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://test.scalable-learning.com" xml:base="swamid-2.0/.xml">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://test.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDjjCCAnYCCQCloAAdJBMwmDANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMC
+U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
+VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UE
+AwwadGVzdC5zY2FsYWJsZS1sZWFybmluZy5jb20wHhcNMTYwMjI1MTEyNzUxWhcN
+MTcwMjI0MTEyNzUxWjCBiDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVNUT0NLSE9M
+TTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
+RzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UEAwwadGVzdC5zY2FsYWJsZS1sZWFy
+bmluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPYtv2obOV
+NRyVFwnXcl0pdqz8LHo/vkJGPHc8UHla8w+ceQQ7NZlmSeVOvXskStYwqh4HzAyk
+FmTb7hkCTP9yRnLrLTZUd6z2q0I0Skdo8A8r02mFfDPFin049/pqau9dlwbvLQyL
+IDcp2iqGeudpkikl7Gn7/zBkERCtwmiROAIs9B9m5VoAddLp/oVGnmErSPj0iVBu
+FB9kTiPoix5UFbTVGYhRFZiy6vFYfanBf9TucRpP8MicE3pLsYQ3IcIT9gcAtpyb
+Y/GhHejXuxzEJ9QOkO1vRsL93ddxlAtWzewtBE8kKZYMbIkq5TyceQ1aTTVgKHqZ
+/pu/6E8ChiIJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAB1TYuTkeR5OGmfugdw4
+9fB9hilkPpvTXDDLQUCR/QVNnfBORE+HUzCDp11TqT0TaRr4HV66rxH4FaJcn4qW
+YMYmDJ0oa7eLPvGIV5pRiDa4Cp5s+V61gNYIfGNHDS8BC3HouyiFW/owtQdOiNWE
+V/QqkTImxrx30CjnyNF5jttPEkAS4GGgo1O34IvEUXjE7Xe0CdlaQ9uRjNg8YxqI
+pfmqBJSriM/SplXf72vjn9kg+fgsv8qp7yoj3pVt1o4Re8x3AvrF+sHd1m4J1BwA
+uU1mjJmnSIatkJ0UHoAPKlQrteJiiFL1yphWuTQnoRqUYsnxqIxA+vFOtrt9pQaM
+ROE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>
+urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://test.scalable-learning.com/saml/consume"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
new file mode 100644
index 00000000..6daa0398
--- /dev/null
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -0,0 +1,59 @@
+<?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:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.scalable-learning.com" xml:base="swamid-2.0/.xml">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://www.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDjDCCAnQCCQDSdbONyCFCGzANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
+U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
+VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEiMCAGA1UE
+AwwZd3d3LnNjYWxhYmxlLWxlYXJuaW5nLmNvbTAeFw0xNjAyMjUxMTEyNTdaFw0x
+NzAyMjQxMTEyNTdaMIGHMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU1RPQ0tIT0xN
+MRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
+MRAwDgYDVQQLDAdzY2FsZWFyMSIwIAYDVQQDDBl3d3cuc2NhbGFibGUtbGVhcm5p
+bmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut3wWgrigP2C
+L8zUlER/YfTtQCvExXxCBRLtP9pxHb4q3a+PkJvy+xUD4TZhtLu5rdMqXvSfrCCC
+K6FO+MoLmVu7BzANl2RW37FUtkc2oyDD79hVwyZkcb3VSbYe3v4E5wwyEr40EZuY
+VK8VvGXZWCj1jw3wWfqU8Y683luDvRq7B7dlRDkzV5NfuOhk0Ghq3WoqPX//1+TE
+hWrFXJw/t/KVIatePcOFUj2q8+fvAfVgJ/RS7NKCqbmcm7dYR38QptWXpK22FDEh
+9QNFFXLahLK/g52rMdonlL646TgXfHcYdK3h9uHkh0d2cTaNFUisho/RQ706GwOV
+rrmfMjKXrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA7/7Yl+dZf7anFmHFq7xl7
+WoiyNJcdzMxvGjAtaaxUUGKNCV44AMdnLJGXeDmbmWXOE+2o3WD54+1mUKLeKsXe
+TbQ6mXOEetXBHzuWxOY0a65s4mCGyqPgHTQ5bLSz/h+GLjRvMqLoXtOXhj3Woa1f
+LHep+dsEIbVdze3uxztVBzOKqkfKsT1eqSrW+z5ir72bkVf0F7rMjPh3VnGgoL65
+wYSrKz3rhwVbkf0eGJeoICGCV6Gbtc/b4D/GXx9VhWA+ni5WBJn4wE0Gy7dvr1If
+fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>
+urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8ec88f38..6bcb8280 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -497,4 +497,7 @@
   <xi:include href="swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test.play.umu.se-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/www.test.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/scalear-staging2.herokuapp.com.xml"/>
+  <xi:include href="swamid-2.0/test.scalable-learning.com.xml"/>
+  <xi:include href="swamid-2.0/www.scalable-learning.com.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3