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

diff --git a/swamid-2.0/akino.hh.se-shibboleth.xml b/swamid-2.0/akino.hh.se-shibboleth.xml
new file mode 100644
index 00000000..232c0992
--- /dev/null
+++ b/swamid-2.0/akino.hh.se-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://akino.hh.se/shibboleth">
+  <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>akino.hh.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=akino.hh.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJANFCVxC7y6BWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2FraW5vLmhoLnNlMB4XDTA5MTAyNzA4MjU1N1oXDTE5MTAyNTA4MjU1N1ow
+FjEUMBIGA1UEAxMLYWtpbm8uaGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD2Y7TZAeEnPMmlwz3hoXDa/wFIRy6Bodm63LdzbL1cy8PQwgtZM5n7
+8CqSy0tE5dpGeGK3oqEJkalbQa9mY/+HGf4ENC7CzlRnJ/xYpLSBiAHCz0ch9+Tc
+ZqbbB7IDEhWEiwj25dZ3OG6wqveHtZGQueju34RwF9slrjAPHkXrHC0zSHLVB+hr
+upH8FHTCEJhTY80mZy1DVBEVU6s0DFDjhTX7zYeytM51tKh5iSqJ/dI4jp7GAWx5
+0pDslYxX29aGUbBaKUL83L4RpLW4hecbPiWYeG4tw5Z3pEhifCo0YEffwFJjTGsh
+TP3XAeiOVEInvmH1jK+LgUpzz7rnyy7pAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Fr
+aW5vLmhoLnNlMB0GA1UdDgQWBBQavhHSFdU5J1TVygW7QNzSuG4QTDANBgkqhkiG
+9w0BAQUFAAOCAQEAlxMSNZxBeI4qFUaUBdH0S8FSheF5ynIutcj5bXfmst4rBxRa
+CZIB+NLzwGIp2rwNM53uB3P1osDr+BilLeFUvgSiGwMYFdAHkr9Bg2WqJj9/phW3
+scmeVlwizwXyQscs8fYr9UQGGjrt+tYIJ8NbZCp7bLyjZdwjC2MGe2bDQzA/S2ye
+JfTpxJCZp5ocIfNyPCGmpf6pLBYjQbVfqO4bNJOvaArHylA8wYb5nYO1HFoqKOB/
+7ayOBgrV5oO97iUTRmBU9Ka8GIqJqdC4LIUwj6HcmCJ94rQbldH5/nbitL9ND2oY
+s2ozMUSsHZxcwpFZ7NQ4lLsgm9VihBDXZ4mTXQ==
+</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>akino.hh.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=akino.hh.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJANFCVxC7y6BWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2FraW5vLmhoLnNlMB4XDTA5MTAyNzA4MjU1N1oXDTE5MTAyNTA4MjU1N1ow
+FjEUMBIGA1UEAxMLYWtpbm8uaGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD2Y7TZAeEnPMmlwz3hoXDa/wFIRy6Bodm63LdzbL1cy8PQwgtZM5n7
+8CqSy0tE5dpGeGK3oqEJkalbQa9mY/+HGf4ENC7CzlRnJ/xYpLSBiAHCz0ch9+Tc
+ZqbbB7IDEhWEiwj25dZ3OG6wqveHtZGQueju34RwF9slrjAPHkXrHC0zSHLVB+hr
+upH8FHTCEJhTY80mZy1DVBEVU6s0DFDjhTX7zYeytM51tKh5iSqJ/dI4jp7GAWx5
+0pDslYxX29aGUbBaKUL83L4RpLW4hecbPiWYeG4tw5Z3pEhifCo0YEffwFJjTGsh
+TP3XAeiOVEInvmH1jK+LgUpzz7rnyy7pAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Fr
+aW5vLmhoLnNlMB0GA1UdDgQWBBQavhHSFdU5J1TVygW7QNzSuG4QTDANBgkqhkiG
+9w0BAQUFAAOCAQEAlxMSNZxBeI4qFUaUBdH0S8FSheF5ynIutcj5bXfmst4rBxRa
+CZIB+NLzwGIp2rwNM53uB3P1osDr+BilLeFUvgSiGwMYFdAHkr9Bg2WqJj9/phW3
+scmeVlwizwXyQscs8fYr9UQGGjrt+tYIJ8NbZCp7bLyjZdwjC2MGe2bDQzA/S2ye
+JfTpxJCZp5ocIfNyPCGmpf6pLBYjQbVfqO4bNJOvaArHylA8wYb5nYO1HFoqKOB/
+7ayOBgrV5oO97iUTRmBU9Ka8GIqJqdC4LIUwj6HcmCJ94rQbldH5/nbitL9ND2oY
+s2ozMUSsHZxcwpFZ7NQ4lLsgm9VihBDXZ4mTXQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akino.hh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akino.hh.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akino.hh.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akino.hh.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akino.hh.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akino.hh.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akino.hh.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akino.hh.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akino.hh.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akino.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://akino.hh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akino.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akino.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akino.hh.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akino.hh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>