Merge remote branch 'remotes/git-svn'

2 files changed, 2 insertions, 122 deletions

diff --git a/swamid-1.0/idp.mah.se.xml b/swamid-1.0/idp.mah.se.xml
index a9e77d5f..1014eda0 100644
--- a/swamid-1.0/idp.mah.se.xml
+++ b/swamid-1.0/idp.mah.se.xml
@@ -106,8 +106,8 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
     </AttributeAuthorityDescriptor>
 
     <Organization>
-    <OrganizationName xml:lang="en">MAH-Test</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Malmö Högskola (test)</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">MAH</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Malmö Högskola</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/shibboleth.mah.se.xml b/swamid-1.0/shibboleth.mah.se.xml
deleted file mode 100644
index ef1f6d04..00000000
--- a/swamid-1.0/shibboleth.mah.se.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<EntityDescriptor entityID="https://shibboleth.mah.se/idp/shibboleth"

-                  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">

-

-    <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">mah.se</shibmd:Scope>

-        </Extensions>

-

-        <KeyDescriptor>

-            <ds:KeyInfo>

-                <ds:X509Data>

-                    <ds:X509Certificate>

-MIIDLzCCAhegAwIBAgIUcWR2nfvwFzqkNQwlGfJEChphkuYwDQYJKoZIhvcNAQEF

-BQAwHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5tYWguc2UwHhcNMTAwNjA5MDYzNzU2

-WhcNMzAwNjA5MDYzNzU2WjAcMRowGAYDVQQDExFzaGliYm9sZXRoLm1haC5zZTCC

-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANfkjDwkPl2KYPXJP+ij1Mk9

-EZyPe/Q1VxVtnWw8Uc8aIV4jDjXW0D8EW0mSJRsnyEYGA7THSEt1L/lFC+fhZYZJ

-ez8GIPNT8sbgILOwoSIkZbdfMrt4N+XJaJonYkJbjBSciGIFQEsZf6QwhEMvs0Q0

-QkRYeXXqK4ET7r2MRNB/BOs6O2hr3vWrF/V7yWsOcHQlTf05wzTd8t3x1PZFTCqF

-ABPcEtJxmldl/8uct6zcfNY2PUf3MrBzvK4Xvyi80dd9g6m2WpKOf7P8rVKOKhUI

-T0/Vc6bfMCYoJMswOX5W3eGEGXoN1AoskGxQ2d/VTF8Ma1WWo4GEu8sw9f7VoP0C

-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYmJvbGV0aC5tYWguc2WGKGh0dHBzOi8v

-c2hpYmJvbGV0aC5tYWguc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKNQf6RL

-sOiB5XINklLQO02TlegRMA0GCSqGSIb3DQEBBQUAA4IBAQDUt1CKmkdVlPs/7/Eb

-F0mgRBDyiMuTdqn7dwaa/usK6S/B2kYWdOqudawg2tDXZ53zYherNyCssAFBbuOd

-tm9IKiLERkwEW/Go+4nEuXJIgwE4qTMMlfjsPK4yjxiPg5KJ7IKr2d0Wau6bGQLr

-J7hjfNJOmxmO68OPdXeZ31RO8VOuwErKqHAZKKK8hCQcYUQb4AX2lskCTiwHrJ16

-51AV5yfWyy+d8fCwlB2lNVhnlhHnA/KZMpdijat/MPAl290bmphMcdkAcxK3rioK

-UFoEz58y/ecPM/xFhUcayL87zOSTUiPZuQz4/TQ3G2Ecaz1OTMYKBB//DR75fIuu

-ojoA

-

-                    </ds:X509Certificate>

-                </ds:X509Data>

-            </ds:KeyInfo>

-        </KeyDescriptor>

-        

-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"

-                                   Location="https://shibboleth.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 

-                                   index="1"/>

-

-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"

-                                   Location="https://shibboleth.mah.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://shibboleth.mah.se/idp/profile/Shibboleth/SSO" />

-        

-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 

-                             Location="https://shibboleth.mah.se/idp/profile/SAML2/POST/SSO" />

-

-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 

-                             Location="https://shibboleth.mah.se/idp/profile/SAML2/POST-SimpleSign/SSO" />

-        

-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 

-                             Location="https://shibboleth.mah.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">mah.se</shibmd:Scope>

-        </Extensions>

-

-        <KeyDescriptor>

-            <ds:KeyInfo>

-                <ds:X509Data>

-                    <ds:X509Certificate>

-MIIDLzCCAhegAwIBAgIUcWR2nfvwFzqkNQwlGfJEChphkuYwDQYJKoZIhvcNAQEF

-BQAwHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5tYWguc2UwHhcNMTAwNjA5MDYzNzU2

-WhcNMzAwNjA5MDYzNzU2WjAcMRowGAYDVQQDExFzaGliYm9sZXRoLm1haC5zZTCC

-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANfkjDwkPl2KYPXJP+ij1Mk9

-EZyPe/Q1VxVtnWw8Uc8aIV4jDjXW0D8EW0mSJRsnyEYGA7THSEt1L/lFC+fhZYZJ

-ez8GIPNT8sbgILOwoSIkZbdfMrt4N+XJaJonYkJbjBSciGIFQEsZf6QwhEMvs0Q0

-QkRYeXXqK4ET7r2MRNB/BOs6O2hr3vWrF/V7yWsOcHQlTf05wzTd8t3x1PZFTCqF

-ABPcEtJxmldl/8uct6zcfNY2PUf3MrBzvK4Xvyi80dd9g6m2WpKOf7P8rVKOKhUI

-T0/Vc6bfMCYoJMswOX5W3eGEGXoN1AoskGxQ2d/VTF8Ma1WWo4GEu8sw9f7VoP0C

-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYmJvbGV0aC5tYWguc2WGKGh0dHBzOi8v

-c2hpYmJvbGV0aC5tYWguc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKNQf6RL

-sOiB5XINklLQO02TlegRMA0GCSqGSIb3DQEBBQUAA4IBAQDUt1CKmkdVlPs/7/Eb

-F0mgRBDyiMuTdqn7dwaa/usK6S/B2kYWdOqudawg2tDXZ53zYherNyCssAFBbuOd

-tm9IKiLERkwEW/Go+4nEuXJIgwE4qTMMlfjsPK4yjxiPg5KJ7IKr2d0Wau6bGQLr

-J7hjfNJOmxmO68OPdXeZ31RO8VOuwErKqHAZKKK8hCQcYUQb4AX2lskCTiwHrJ16

-51AV5yfWyy+d8fCwlB2lNVhnlhHnA/KZMpdijat/MPAl290bmphMcdkAcxK3rioK

-UFoEz58y/ecPM/xFhUcayL87zOSTUiPZuQz4/TQ3G2Ecaz1OTMYKBB//DR75fIuu

-ojoA

-

-                    </ds:X509Certificate>

-                </ds:X509Data>

-            </ds:KeyInfo>

-        </KeyDescriptor>

-

-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 

-                          Location="https://shibboleth.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />

-        

-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"

-                          Location="https://shibboleth.mah.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">MAH</OrganizationName>

-    <OrganizationDisplayName xml:lang="en">Malmö Högskola</OrganizationDisplayName>

-    <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>

-  </Organization>

-  <ContactPerson contactType="technical">

-    <GivenName>Robert</GivenName>

-    <SurName>Faling</SurName>

-    <EmailAddress>robert.faling@mah.se</EmailAddress>

-  </ContactPerson>

-    

-</EntityDescriptor>