SWAMID-161, Ta bort ur swamid

3 files changed, 0 insertions, 91 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index e3af7b1b..c706344b 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -13,7 +13,6 @@ beta.lobber.se-shibboleth.xml
 betafoo.nordu.net-shibboleth.xml
 bhb-00.its.umu.se-gui-sp.xml
 bhb-00.its.umu.se-user-idp.xml
-bibliometrics.ki.se-shibboleth.xml
 brainstorm.swami.se-shibboleth.xml
 cambro-test-26.umdc.umu.se-shibboleth.xml
 cambro-tst1.umdc.umu.se-shibboleth.xml
diff --git a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
deleted file mode 100644
index 6f10cd42..00000000
--- a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://bibliometrics.ki.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <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>
-        <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>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0ed2f30f..822df09a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -74,7 +74,6 @@
   <xi:include href="swamid-2.0/connect-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/converis.info-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tcs-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/bibliometrics.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/uu.test.diva-portal.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www4.genuinetext.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/su.avedas.com-shibboleth.xml"/>