swamid-1.0* removed

nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data

1 files changed, 64 insertions, 0 deletions

diff --git a/swamid-2.0/account.mdh.se-shibboleth.xml b/swamid-2.0/account.mdh.se-shibboleth.xml
new file mode 100644
index 00000000..9658adc2
--- /dev/null
+++ b/swamid-2.0/account.mdh.se-shibboleth.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account.mdh.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://www.swamid.se/category/sfs-1993-1153</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://account.mdh.se/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kontoaktivering Mälardalens högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Account activation Mälardalen University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Mälardalens högskola</mdui:Description>
+        <mdui:Description xml:lang="en">Account activation service for Mälardalen University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIJAPaKAClrLbTPMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmFjY291bnQubWRoLnNlMB4XDTEyMTIwNDE0MjgxNloXDTIyMTIwMjE0Mjgx
+NlowGTEXMBUGA1UEAxMOYWNjb3VudC5tZGguc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDnDT2AU69L2h1ZQ6iEVWhGtQYC78dkJBcJ8XjDHImC8BEC
+wxJVg2SNwzT4pb8tBT0PpAXHRbTdsg7Isxa6Ah13OBWN4pEuj1+gweijXwie6BGn
+AL2WMeVIDYkA31tNcy5h2qqfhyHFTeFBhoVfwjL38kXb5eZ8z3so6HKX7CRyg3w8
+i8Wvisey073edn6ojH+k/6hjOCU2Yw7Gi9nfgZF5fAIh50djp52Ygvfer5QuNvow
+S0V2vZlvU4Le9SkJhMZZyJa7xcbXCte3d7ZzkqW20H/8b9OxZq72HrJILodJkmzp
+NSsn2xesDp5eVb5U0uSDf5Ecw3I/xH57Q6AI0qRfAgMBAAGjXzBdMDwGA1UdEQQ1
+MDOCDmFjY291bnQubWRoLnNlhiFodHRwczovL2FjY291bnQubWRoLnNlL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFAX+Mwdh0P9/9UldxwhrauU/EvDpMA0GCSqGSIb3DQEB
+BQUAA4IBAQDON1n9lbL4S1b+aPR6pegQxpF1Kcw0NnmKp9tECubXVCSJw8V+1lLt
+xSRdF8i5PNALSwxahOYndivb1bY23dPZ1oKIbR9yGrcAY9aSRzt4l2Yh7k73LBgI
+0OHsbLLKxiReYWvMR5+QseIN3FpgBeAUJmOPQL79FcYxQl+nX4DgBatb/aYYOU0S
+nLhAo0q9al1Is1QdxLo5FyHaYR/Xu+p31ltowAg4NQ29zRHfW7BQG2JmBEXrxIB2
+zpHIUu/5SWS3wMnuRZgdr25OF2r+/mwgyOrAJ69Zi1ajEIA7YhGwVZ5V5FF4UgPe
+Ty6ceQwd7bOvvrpf5YqChJKmoxF3bTiK
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <!--
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.mdh.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.mdh.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.mdh.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.mdh.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/NIM/Artifact"/>
+    -->
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account.mdh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.mdh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.mdh.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.mdh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>