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

diff --git a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
new file mode 100644
index 00000000..fbbe4fd5
--- /dev/null
+++ b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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://shib-idp-test.oru.se/idp/shibboleth">
+  <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">oru.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
+NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALts6ImCj550QsZC
+XZKfS0Id5pK3v9rRTSNs6em5F5kR1YLSpNjNmDh7Ly0VM2tHdvF07aQ+0db/lL/C
+1I4w8CjapJl7FtrZR7m5p0MSzoFZD6YO9bdVPx5fXTibUV1pmHOQwzTwvzpKwK7b
+teVTxm5AbZv4MIdHkCruL+j3ULs5Av70AEZqYLZrDsZB4jRj5lrEU3TKWGR9hogt
+FR7mwF29CAyBozOREGtlnyh6dpiPNbEyYogXYHEiO01fuA9YCbjKkLbT6JihZ1Sr
+pulCuNRpSRobmTXx3dqNSEKAtwCPhkACpSjxLRhWhiz/yCTq2Gtnfj/AJ8LbN82d
+ub0uVqcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYi1pZHAtdGVzdC5vcnUuc2WG
+K2h0dHBzOi8vc2hpYi1pZHAtdGVzdC5vcnUuc2UvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFNCO/POVajXZInMq3ou0SdInZHIVMA0GCSqGSIb3DQEBBQUAA4IBAQCw
+vt65eqgtN1+QFyq5dmVXZ6LtggHupoVsYMtwS1hxDqsogsMBG8Q8HKZTSOIHxOJZ
+PwCTZuP93xWqa5r0D4w8W/4FxhpR3gnBzF9KSLSJ+zb99+f/6oxpTMMIcQjear+8
+Dp+2X1kVXtrJ8jhI0/ZDyAEYDv9OB5fLWjg7PworfuOm+bcYUXxdyTstkuMqaKuY
+LkDtPwQOSlQTw2opovGRVI7hHT89tkL3LY53RHSOz3T08J8PrWuggUO3zcpIfIGa
+tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
+vs6Y0aXUmx4uTVjZQtbc
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/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://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/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">oru.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
+NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALts6ImCj550QsZC
+XZKfS0Id5pK3v9rRTSNs6em5F5kR1YLSpNjNmDh7Ly0VM2tHdvF07aQ+0db/lL/C
+1I4w8CjapJl7FtrZR7m5p0MSzoFZD6YO9bdVPx5fXTibUV1pmHOQwzTwvzpKwK7b
+teVTxm5AbZv4MIdHkCruL+j3ULs5Av70AEZqYLZrDsZB4jRj5lrEU3TKWGR9hogt
+FR7mwF29CAyBozOREGtlnyh6dpiPNbEyYogXYHEiO01fuA9YCbjKkLbT6JihZ1Sr
+pulCuNRpSRobmTXx3dqNSEKAtwCPhkACpSjxLRhWhiz/yCTq2Gtnfj/AJ8LbN82d
+ub0uVqcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYi1pZHAtdGVzdC5vcnUuc2WG
+K2h0dHBzOi8vc2hpYi1pZHAtdGVzdC5vcnUuc2UvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFNCO/POVajXZInMq3ou0SdInZHIVMA0GCSqGSIb3DQEBBQUAA4IBAQCw
+vt65eqgtN1+QFyq5dmVXZ6LtggHupoVsYMtwS1hxDqsogsMBG8Q8HKZTSOIHxOJZ
+PwCTZuP93xWqa5r0D4w8W/4FxhpR3gnBzF9KSLSJ+zb99+f/6oxpTMMIcQjear+8
+Dp+2X1kVXtrJ8jhI0/ZDyAEYDv9OB5fLWjg7PworfuOm+bcYUXxdyTstkuMqaKuY
+LkDtPwQOSlQTw2opovGRVI7hHT89tkL3LY53RHSOz3T08J8PrWuggUO3zcpIfIGa
+tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
+vs6Y0aXUmx4uTVjZQtbc
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/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>
+  <Organization>
+    <OrganizationName xml:lang="en">ORUTEST</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Örebro Universitet (TEST)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Jonny</GivenName>
+    <SurName>Ehrnberg</SurName>
+    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Mikael</GivenName>
+    <SurName>Borjesson</SurName>
+    <EmailAddress>mikael.borjesson@oru.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>