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

diff --git a/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..1d6fcb1e
--- /dev/null
+++ b/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/shibboleth-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1NFoXDTIwMTIwNTEwMjQ1NFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1mFR94qRsjGB+ukhqu+R/2fvZb9aQ39OrsNhQM8q22dtv8vK9X/ZX+Ym1Mv7/AVMCDwZhEVM2ioPFijk+hQAQQIDAQABo4GEMIGBMB0GA1UdDgQWBBTsJeuxItIS63xBOl92WQmpIgNm5jBSBgNVHSMESzBJgBTsJeuxItIS63xBOl92WQmpIgNm5qEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDjDsLXLLwXUTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EABXkSZKvoDu+elTr2M3Gcj0Igx0D2zaE2l7SW59JJLprHL0TGL4WQfVCXZbJD3ffwzOLQ7A3yoF6ddFohFgt0Ig==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hubbletest.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1NFoXDTIwMTIwNTEwMjQ1NFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1mFR94qRsjGB+ukhqu+R/2fvZb9aQ39OrsNhQM8q22dtv8vK9X/ZX+Ym1Mv7/AVMCDwZhEVM2ioPFijk+hQAQQIDAQABo4GEMIGBMB0GA1UdDgQWBBTsJeuxItIS63xBOl92WQmpIgNm5jBSBgNVHSMESzBJgBTsJeuxItIS63xBOl92WQmpIgNm5qEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDjDsLXLLwXUTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EABXkSZKvoDu+elTr2M3Gcj0Igx0D2zaE2l7SW59JJLprHL0TGL4WQfVCXZbJD3ffwzOLQ7A3yoF6ddFohFgt0Ig==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>