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

diff --git a/swamid-2.0/sp.it.gu.se-shibboleth.xml b/swamid-2.0/sp.it.gu.se-shibboleth.xml
new file mode 100644
index 00000000..09637b34
--- /dev/null
+++ b/swamid-2.0/sp.it.gu.se-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.it.gu.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://sp.it.gu.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp.it.gu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.it.gu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAPYrC72akwsZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3NwLml0Lmd1LnNlMB4XDTEwMTIwMjE1MzkwOFoXDTE1MTIwMTE1MzkwOFow
+FjEUMBIGA1UEAxMLc3AuaXQuZ3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDZx2MH0AOUIZouNQyGwtj/+M8BFtvusld5mn7PoLiCaEmTU2p4LVmr
+hRwsWuGLkJtqqONNfLh8aAJI47Wj+pLHKsTCrQjnPQdttE8blSpfjjuaOEHsPIio
+LnsxL0fuoGrDx4kb3UyICGvLntNXUuq6mvFqPwgw/650ZVIsnS8aS3hiUrxJG8tt
+tBFDXf53aDJx+VQuuKvAZ79ZXUoOUEX4XkL2xq7Bz5ljjfJd7IUAEjuSWCHyz1yZ
+2KqjJ9uCyi2DeiSCoibLM6GcuQP0AY2vE3h1aidK9sr64jPa5hnhMnimtmsa29K+
+P0etzBGrjrzStwaVKjqIinSZU+PLf7sPAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Nw
+Lml0Lmd1LnNlhgtzcC5pdC5ndS5zZTAdBgNVHQ4EFgQU6/iWGhM8RnEGVjRFECtZ
+MsTWx/swDQYJKoZIhvcNAQEFBQADggEBAFvQ2wiEugd9cy2LG9sI88uINEMnLT+H
+bRroFbK0mOppXbDxVHmc+EWWVqQ9xc/JHdnd19cXSFuc6SmY7Lx5su0rIFv7/h8m
+HduwiIXFs3axucyl26ZKMltDOLpym9KK5u2NQXJYN7BpXq4sjtZlPLH2p9ShmoQ7
+s4wKEXrYSsBU/pTRFg60FNwo2OvJAuVRmPmESVn5YJ8AguUjeNWfiPAmUKhEofhK
+pMGOQDUYW5u9fPy/O+qRzF3xhMLSOejkdwCC2kKEDVKxo27wy6CLeedBAWTj3ERu
+Q9GZYzxeMEXXQg7nerDoFisoBc8c6+jlak7yEX8v5GIZSKV1XHui/yc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp.it.gu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.it.gu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAPYrC72akwsZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3NwLml0Lmd1LnNlMB4XDTEwMTIwMjE1MzkwOFoXDTE1MTIwMTE1MzkwOFow
+FjEUMBIGA1UEAxMLc3AuaXQuZ3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDZx2MH0AOUIZouNQyGwtj/+M8BFtvusld5mn7PoLiCaEmTU2p4LVmr
+hRwsWuGLkJtqqONNfLh8aAJI47Wj+pLHKsTCrQjnPQdttE8blSpfjjuaOEHsPIio
+LnsxL0fuoGrDx4kb3UyICGvLntNXUuq6mvFqPwgw/650ZVIsnS8aS3hiUrxJG8tt
+tBFDXf53aDJx+VQuuKvAZ79ZXUoOUEX4XkL2xq7Bz5ljjfJd7IUAEjuSWCHyz1yZ
+2KqjJ9uCyi2DeiSCoibLM6GcuQP0AY2vE3h1aidK9sr64jPa5hnhMnimtmsa29K+
+P0etzBGrjrzStwaVKjqIinSZU+PLf7sPAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Nw
+Lml0Lmd1LnNlhgtzcC5pdC5ndS5zZTAdBgNVHQ4EFgQU6/iWGhM8RnEGVjRFECtZ
+MsTWx/swDQYJKoZIhvcNAQEFBQADggEBAFvQ2wiEugd9cy2LG9sI88uINEMnLT+H
+bRroFbK0mOppXbDxVHmc+EWWVqQ9xc/JHdnd19cXSFuc6SmY7Lx5su0rIFv7/h8m
+HduwiIXFs3axucyl26ZKMltDOLpym9KK5u2NQXJYN7BpXq4sjtZlPLH2p9ShmoQ7
+s4wKEXrYSsBU/pTRFg60FNwo2OvJAuVRmPmESVn5YJ8AguUjeNWfiPAmUKhEofhK
+pMGOQDUYW5u9fPy/O+qRzF3xhMLSOejkdwCC2kKEDVKxo27wy6CLeedBAWTj3ERu
+Q9GZYzxeMEXXQg7nerDoFisoBc8c6+jlak7yEX8v5GIZSKV1XHui/yc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.it.gu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.it.gu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.it.gu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.it.gu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.it.gu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.it.gu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.it.gu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.it.gu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.it.gu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.it.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.it.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.it.gu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.it.gu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.it.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.it.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>