resolve conflicts and merge

1 files changed, 0 insertions, 92 deletions

diff --git a/swamid-interfederations-1.0/moodle.helsinki.fi.xml b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
deleted file mode 100644
index 02ddf702..00000000
--- a/swamid-interfederations-1.0/moodle.helsinki.fi.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.helsinki.fi/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Helsinki Moodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</mdui:Description>
-        <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <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">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFcTCCBFmgAwIBAgIQBs4LDAt4QhHxA6/9vcQV2jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJtb29kbGUuaGVs
-c2lua2kuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRJht4CmQi
-9WWU+ep1UhI11GXJTUXY4PzukaXUtO4RbZAnvd0U4Xb5sPDNsCVSIASBX0fkbSZJ
-yQ8FY/PhRk2QIt+erjReWIWA6V3UY6kJIq9IrUh4Z06aGrLvkEjHFbI0VA/AZ/8T
-2BxJrMg3v9mT12B9ueDvybIc6IERiDctRrB+s5nPskvua/2oTq4hDM9mGYTN4ZLB
-fR2OViwPxsGi3V22+iLa66JCmIK8kCeekNhS7OsclWWzIfPpCW1azjUZ2HrRndoi
-A/zJSpmT1rxY8WTchr0xdPdgVDzDZSv/FhRDacbFIC99drSWmg4wiYLvIidDt/zu
-tRoJdUGYPxqljdsyHwftjqqy2YNSMrxD8LDsaF07RZYjpK9GLDXroJzEOhlAJu/c
-qd4+RO+LjF21TWTe4Kw9u4+VNvjrfFDvkj5QAPxti70nOzkqY9Y+T4h1UNkyr8u+
-EGjNLOIE41B5V5MhTkf9x6lQD9IkejHpZA2bP5dmUtBft72UCPCDm2YMkLeXfOI9
-CaBkxLzi4doXmNLjXVEtsVx3qkvyH595ACnSaS/kUfnbgjaMdz15dh7PUPz2OQAE
-P3VijjcTzls96u81aBfHOHY1khqEueKkehJLq7ZFLefy/hcnFDMXWNMSeQaiGDjO
-qMAYHGzjR94Uar2Jvxvwzg2dF3GznzLZeQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB8kuozI2dNLBE+Oy8Ie
-Rp4+GmUeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJt
-b29kbGUuaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBAEkxmg/WVjzPKULi
-7OO3LiKrIgAhRchg8SGfngcgM6E2I8RoLS69/ZC0eWOubAZBJPfvCvaX5u3GWTWd
-dtHeCZWIKOhCFKMj079qWO27O67ys/E//vYakEnSxkpBkQ5u0tyolS7BFQcTWoPR
-BFc/Z+NaZhBmcm7tyFkQsrHTQZTq/s1Anxc7t3sXuUsFl4/LOEwiXkJYoxYOPE7t
-A0iMOwlhJ5VuCIEYZLJ1yA6AZCgJX8TgZvQEdsAxIA6VFJmXsJokBa/wDYQt5fPo
-kBViCHGTlh5cyshXEA2zL/Ywe8EjJkZCDWdoOC+r6CGtxjRxD7tvb/27+1dbYnI0
-Red7UuI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Helsingin yliopiston Moodle</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Helsinki's Moodle</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">University of Helsinki's Moodle learning management system.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Heiko</md:GivenName>
-    <md:SurName>Schach</md:SurName>
-    <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Peltonen</md:SurName>
-    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>