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, 67 insertions, 0 deletions

diff --git a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
new file mode 100644
index 00000000..c233af24
--- /dev/null
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs01.fhs.se/adfs/services/trust">
+  <Extensions>
+    <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
+    <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
+    <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC3DCCAcSgAwIBAgIQYNkK/dJqwqZPH4XxymtDHjANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDIwMTE3MTQ1MFoXDTE0MDIwMTE3MTQ1MFowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPDtM/dMEsLl/yQJ6RlX19ngHPmBDqwnW67qeDaitEi9Fw5+dIcU22zKJ6psSAVqBwj/HHVS7qCfPCAsHaY6XlLLqn6VReSo1qgDxsMOu0J41So04dV55FIQj1ExjzuYCE50XLC12m2jva+ijOabf8Up1snFgOze1CYmYiArJg283Rivl3CfGrMV1S7UuCBbjhnctI9t2OyvZknsvIgz/G5DZVEPIZS2phHKIyqFAA4zD3DaPTW1m9Rknq7MDw6wL1jnicTRSf5RaXPu7r5JBBgPfdgZw2SG/b+JJWL9FmDgE6otD6JQg6M4LPOI0uEg5Lk6RAfwBG3/hYwi/jEmGYcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA0MPoTO+0FDbpX0bXfx6nqL++gLgFEoMZk7QU5WRAIbB7ueoAql7vpadfamvx+Sy70+C4xmY3Ud52M6G2649TOgS5nXOMPB7lCpSS3yGJklRnuhdlRJCl+tfPn0+Q3fmGFNMAhgcy63PNat3Cg/ucDD+XhM4jLw2Yp7aGZy6ZFocQdD4oRPcph3wlmHmb5E4u3ONrG1Gr/SZjPugEi+fqWZdezcYM+PqFwvhqrmu1Y92l4T2u95UZEL0i/oJC0m/9xDMMTL3pWILwY0KDe3rlDjOhBuTKTUM5FYFjaQwBHtnB6n1zbFIdAFbASSJ9CFUXySboEVqEnSwLJn7ztgV+bg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC1jCCAb6gAwIBAgIQKhAv7tvnLoFM2et83uQ/XzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDIwMTE3MTQ1MFoXDTE0MDIwMTE3MTQ1MFowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKEoDVI2vLh+TIPAvDrrjoai+qVbI6lHzcH9Hkx7UzJrlKu3JKYl/YaXL3j+UrXviCKFnML2J7ufFTmw4YoTx25eoSWHK88YXNqPh42EoQd0Y9OeSh/TJzNI/EBakIR0T9RZtRsmzLluuWdWUONEaUNHVhOg9334gXRbN6teZiHGXaq+TelM38a3uKNsLQ63NWKRwc4vWLiT1LqflFVkGEb5gY553SSAygbQOqBfd1R2DCmdG6VoQsvqPSXYO5BpGll4TgllcAr2cOwojU3tvGjU+gZqxKKQ47Tm0J6Dyz+6VSvMqaIJP9weCY6WpPaRyMXKDT8CUNP+pl0vLWH6MLMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAeTQ53HiJVFr6xFGXFoTNwOeT3Jv0uGQyGIgrebRC3/bf/mOnNcALyMI+WJz2MQC9HEtymf2hJ1qUGs+wpJbMwrCywjTzkQYKgKRTuayQaXc8YpDQF8f6WBlIeA6W1NgYem1Tmli5UVwqpcelYOMWFpsE6s4MrTHy5EvptWUoDtQtobu0zwmPibv1ObBfkLaIvdCbMuEHL7p+deVlTdRlnTe+77CqhMAT8jv4aNDD1IJONU0XpXdVrtmWOOiwijrmLuvR2JlRAyym505sQokdo/5Um8hrhu+dSRWy5RHvBQ+xDRRuZQvhtHtuYiZMtmfUpGjXpO/xC9mxxnFHZzZBog==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs01.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Försvarshögskolan</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Alex</GivenName>
+    <SurName>Sjöblom</SurName>
+    <EmailAddress>helpdesk@fhs.se</EmailAddress>
+    <TelephoneNumber>+46(0)855342545</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>