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

diff --git a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
new file mode 100644
index 00000000..198ac5d4
--- /dev/null
+++ b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bibliometrics.ki.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: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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>dakini</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=dakini</ds:X509SubjectName>
+          <ds:X509IssuerSerial>
+            <ds:X509IssuerName>CN=dakini</ds:X509IssuerName>
+            <ds:X509SerialNumber>13185477282229581982</ds:X509SerialNumber>
+          </ds:X509IssuerSerial>
+          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJALb8ObqBRvieMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+BAMTBmRha2luaTAeFw0wOTA4MjAwODQ1MDhaFw0xOTA4MTgwODQ1MDhaMBExDzAN
+BgNVBAMTBmRha2luaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWH
+C8Fn5KzWao6uaivX319kdey1mI8ig50awhcF3wkTW+ZZxP4vkbC6YBcrmQOO1iKd
+EVj16GLWaJ8Ut+iVY/rvPgdS2jDbZ2w8BEoa0Vbzn8lcuuBM13oudRiTVVGzLY1V
+PgKzmT3n13VTPEnJeAVgS8SzA15ncMIUQaMLnXxjSzJvzk9f5dWD1Gj0cygpwMT5
+f0oKa0UjYK71kj9we96CVQEi7Rab0sO9jwr+a+nIOUbmND9cLDcsH4p33s/toxJw
+DhNNyk0qn9d31FdEdWxvjKadB3e3XQfidSQcWCi+zj7QSbg4l4JdbCT4dHxnbxhF
+wZ4QYQDb4mAwT6Z4cgMCAwEAAaM0MDIwEQYDVR0RBAowCIIGZGFraW5pMB0GA1Ud
+DgQWBBTxVcu+3um0LDAQLjN13N8+gEAKRjANBgkqhkiG9w0BAQUFAAOCAQEAbSsU
+SIRr47OU0aMebcZdoN/rRlJ0WQoMxb/bK89MiUr9AqWdCJ+DRGuQyXhieMIlOaJu
+WCqlajH795ZfZExSDDH/PG3EhcvC2rOMuBWbAxlpYc0hsXBq8NilZhiSSAqrYurG
+NEKkvNz7AU9EB9u1GMIO3p3UTKiXDVVaGL6fSseSKXsaYH6udoRz++25eDeQPUgp
+HgDpL2zWJcwd1mIaNAxIylz+rR4Rakohiwdl2dkMIT3aimODRAvQVf4wvV08Q11M
+DK12w8bmjGJp07CTu/QuoWW+jyY1S0k6Kv3LN6VtXWckviepGDFNzdGgML9V5fRJ
+fP+xp1jCheyR/F9V3w==
+</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>dakini</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=dakini</ds:X509SubjectName>
+          <ds:X509IssuerSerial>
+            <ds:X509IssuerName>CN=dakini</ds:X509IssuerName>
+            <ds:X509SerialNumber>13185477282229581982</ds:X509SerialNumber>
+          </ds:X509IssuerSerial>
+          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJALb8ObqBRvieMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+BAMTBmRha2luaTAeFw0wOTA4MjAwODQ1MDhaFw0xOTA4MTgwODQ1MDhaMBExDzAN
+BgNVBAMTBmRha2luaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWH
+C8Fn5KzWao6uaivX319kdey1mI8ig50awhcF3wkTW+ZZxP4vkbC6YBcrmQOO1iKd
+EVj16GLWaJ8Ut+iVY/rvPgdS2jDbZ2w8BEoa0Vbzn8lcuuBM13oudRiTVVGzLY1V
+PgKzmT3n13VTPEnJeAVgS8SzA15ncMIUQaMLnXxjSzJvzk9f5dWD1Gj0cygpwMT5
+f0oKa0UjYK71kj9we96CVQEi7Rab0sO9jwr+a+nIOUbmND9cLDcsH4p33s/toxJw
+DhNNyk0qn9d31FdEdWxvjKadB3e3XQfidSQcWCi+zj7QSbg4l4JdbCT4dHxnbxhF
+wZ4QYQDb4mAwT6Z4cgMCAwEAAaM0MDIwEQYDVR0RBAowCIIGZGFraW5pMB0GA1Ud
+DgQWBBTxVcu+3um0LDAQLjN13N8+gEAKRjANBgkqhkiG9w0BAQUFAAOCAQEAbSsU
+SIRr47OU0aMebcZdoN/rRlJ0WQoMxb/bK89MiUr9AqWdCJ+DRGuQyXhieMIlOaJu
+WCqlajH795ZfZExSDDH/PG3EhcvC2rOMuBWbAxlpYc0hsXBq8NilZhiSSAqrYurG
+NEKkvNz7AU9EB9u1GMIO3p3UTKiXDVVaGL6fSseSKXsaYH6udoRz++25eDeQPUgp
+HgDpL2zWJcwd1mIaNAxIylz+rR4Rakohiwdl2dkMIT3aimODRAvQVf4wvV08Q11M
+DK12w8bmjGJp07CTu/QuoWW+jyY1S0k6Kv3LN6VtXWckviepGDFNzdGgML9V5fRJ
+fP+xp1jCheyR/F9V3w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bibliometrics.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bibliometrics.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bibliometrics.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bibliometrics.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bibliometrics.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bibliometrics.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bibliometrics.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bibliometrics.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>