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

diff --git a/swamid-1.0/connect.uninett.no-shibboleth.xml b/swamid-1.0/connect.uninett.no-shibboleth.xml
deleted file mode 100644
index db8b1dfe..00000000
--- a/swamid-1.0/connect.uninett.no-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.uninett.no/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/nren-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:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/kalmar2" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>connect.uninett.no</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect.uninett.no</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJANWZWC6gwE0uMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvbm5lY3QudW5pbmV0dC5ubzAeFw0xMDA5MjIxNTEyNDhaFw0yMDA5MTkx
-NTEyNDhaMB0xGzAZBgNVBAMTEmNvbm5lY3QudW5pbmV0dC5ubzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALIM0lNQWtE3FlIgrLpfToA8d1e76MsAngiz
-h0JVNK2mMRlnC1CJ1NccY+9Qx6plb99D/FFopE3DHMcFO3x22QAR78RF6qBnvblY
-K0z+kAgiQ2T7nT5SnKQHPfy1Ji+MEDLAuWJIDbFUaKrhm1MUa2qDB5X1mKDMifup
-bz+PCvzzGkOVUrNRFT9as6PL2hzl0wiNL5Y47aX+Bd/xgwHrIjB6WmYMFNG/GptI
-5sAlY4kh4+q1MS3y4ummGM17gRFI9hsTZ8XL0Vmah+llpXGI56qCom1S2u15/IiI
-4sEfUd137KsjnID24qhRBpx/yVt8VDMcSi2SI0ONTCDvyNUi8lECAwEAAaNAMD4w
-HQYDVR0RBBYwFIISY29ubmVjdC51bmluZXR0Lm5vMB0GA1UdDgQWBBQbibmqTOyh
-cscfToiKe/IbZYKwPDANBgkqhkiG9w0BAQUFAAOCAQEABMRM+2kFSrzMEW1BI7zX
-+4Ef+6Q8Yk/KmVc7w6P7Z2x4UdxrEIiK7O9/toGFO8j3iOGCYQ+KEbGtZ/E+BbDX
-4mQL+i3B1oS3PG84WNrgV26gHG0PTHn9yAD9gkFKNRG7QIyIlg1wgbO8zdht02vK
-QTyM4x8uqziirHV4zzOWDwVR2pZbkIMQ0pJWxbcGViFo/ZtdSiKzt8/hwcWR1DyG
-+Pi6oxtIm0md9BvlzGp9UxK6xDHFfZF4ZRQI4+nhT7bBCrBFW/8NGjlPCM9TIH7j
-ao7+7w52jMiiBR55pJftvE13MdhRq7Gb/AfWu08CuCSJ5Ge2DV13OMm0vtlLjkPC
-Jw==
-</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>connect.uninett.no</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect.uninett.no</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJANWZWC6gwE0uMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvbm5lY3QudW5pbmV0dC5ubzAeFw0xMDA5MjIxNTEyNDhaFw0yMDA5MTkx
-NTEyNDhaMB0xGzAZBgNVBAMTEmNvbm5lY3QudW5pbmV0dC5ubzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALIM0lNQWtE3FlIgrLpfToA8d1e76MsAngiz
-h0JVNK2mMRlnC1CJ1NccY+9Qx6plb99D/FFopE3DHMcFO3x22QAR78RF6qBnvblY
-K0z+kAgiQ2T7nT5SnKQHPfy1Ji+MEDLAuWJIDbFUaKrhm1MUa2qDB5X1mKDMifup
-bz+PCvzzGkOVUrNRFT9as6PL2hzl0wiNL5Y47aX+Bd/xgwHrIjB6WmYMFNG/GptI
-5sAlY4kh4+q1MS3y4ummGM17gRFI9hsTZ8XL0Vmah+llpXGI56qCom1S2u15/IiI
-4sEfUd137KsjnID24qhRBpx/yVt8VDMcSi2SI0ONTCDvyNUi8lECAwEAAaNAMD4w
-HQYDVR0RBBYwFIISY29ubmVjdC51bmluZXR0Lm5vMB0GA1UdDgQWBBQbibmqTOyh
-cscfToiKe/IbZYKwPDANBgkqhkiG9w0BAQUFAAOCAQEABMRM+2kFSrzMEW1BI7zX
-+4Ef+6Q8Yk/KmVc7w6P7Z2x4UdxrEIiK7O9/toGFO8j3iOGCYQ+KEbGtZ/E+BbDX
-4mQL+i3B1oS3PG84WNrgV26gHG0PTHn9yAD9gkFKNRG7QIyIlg1wgbO8zdht02vK
-QTyM4x8uqziirHV4zzOWDwVR2pZbkIMQ0pJWxbcGViFo/ZtdSiKzt8/hwcWR1DyG
-+Pi6oxtIm0md9BvlzGp9UxK6xDHFfZF4ZRQI4+nhT7bBCrBFW/8NGjlPCM9TIH7j
-ao7+7w52jMiiBR55pJftvE13MdhRq7Gb/AfWu08CuCSJ5Ge2DV13OMm0vtlLjkPC
-Jw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.uninett.no/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.uninett.no/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.uninett.no/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.uninett.no/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.uninett.no/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.uninett.no/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.uninett.no/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.uninett.no/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.uninett.no/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.uninett.no/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect.uninett.no/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.uninett.no/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.uninett.no/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.uninett.no/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.uninett.no/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">UNINETT E-Meeting Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT E-Meeting Service (Adobe Connect Pro)</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>