http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 43 insertions, 47 deletions

diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
index 25a7bb0f..e9c5d164 100644
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.ps-ui-test.qalab.geant.net">
-  <!--
-		This is a perfSONAR UI SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.ps-ui-test.qalab.geant.net/perfsonar-ui">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T15:25:50Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T10:07:05Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -19,24 +16,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
-						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6yykwlB/6E0us
-						mtnDv6wniXzry26DbtIv8I5Bn588caVmJmYgeDQSn5ED8riG9BJgYUcOuIZBANfL
-						IzpuKgl91Hr8fAnBJ9TgssX623YkoQ1LFoXul9mfW9FrwyZQSxp3FzyKg9mKLsXJ
-						eDXOi1VFfHUhYnlPrnc0auSNDnBZ9tcMYSY9Q3xNDCsIsg2Mlqqp2p9l99oxMHIi
-						tFT0SXvjDYP+pBiVBfaXDHRPKlTdBeO1HR7TZLpjEA7gPKmNXTTK/wNMP/al9MOw
-						K/93kvcQePV3mb1JugDF9yuZIJOzAAdxXSb5vS9ijRg1MOW6O2XtxyCGGr7rrf09
-						sCpO1kR5AgMBAAGjeTB3MFYGA1UdEQRPME2CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
-						bnQubmV0hi9odHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aTAdBgNVHQ4EFgQUfw6mrDLe+r53jDsgfKCkYTxXAnYwDQYJKoZIhvcN
-						AQEFBQADggEBAFqcGCSPmdl+S/e4GRWSNVEfe9XEf7z/YKMe6j8fnOTpO6WPFOZX
-						bTYctAUCwoefVBj9aKb17kotmg4jPL8SABR9zk24D4pudXUmlTTPeJDZyC6TVIyL
-						jOTIpR3K6nGXu644BjE0ofUv0BJV/kTepdbjKXD1NJRSJQIdEbGZcQMKhdBk+5+y
-						WPSLKAT9q9ZQLPCammS1mXbwWe3yhLt5vkVfmimQd9C7zuFwVmW/MBiEFcsEbArb
-						L7qgb1CfXuXWFY/Ec1yYFAviHb8LFe92VaTrrdme6Qqba3eryueU4FvjtYfWy6+K
-						KMdsLHnE6yUSj1WUz0AHzZUPDcM9drnKw/k=
+						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
+						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
+						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
+						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
+						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
+						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
+						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
+						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
+						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
+						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
+						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
+						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
+						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -45,36 +42,35 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
-						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6yykwlB/6E0us
-						mtnDv6wniXzry26DbtIv8I5Bn588caVmJmYgeDQSn5ED8riG9BJgYUcOuIZBANfL
-						IzpuKgl91Hr8fAnBJ9TgssX623YkoQ1LFoXul9mfW9FrwyZQSxp3FzyKg9mKLsXJ
-						eDXOi1VFfHUhYnlPrnc0auSNDnBZ9tcMYSY9Q3xNDCsIsg2Mlqqp2p9l99oxMHIi
-						tFT0SXvjDYP+pBiVBfaXDHRPKlTdBeO1HR7TZLpjEA7gPKmNXTTK/wNMP/al9MOw
-						K/93kvcQePV3mb1JugDF9yuZIJOzAAdxXSb5vS9ijRg1MOW6O2XtxyCGGr7rrf09
-						sCpO1kR5AgMBAAGjeTB3MFYGA1UdEQRPME2CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
-						bnQubmV0hi9odHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aTAdBgNVHQ4EFgQUfw6mrDLe+r53jDsgfKCkYTxXAnYwDQYJKoZIhvcN
-						AQEFBQADggEBAFqcGCSPmdl+S/e4GRWSNVEfe9XEf7z/YKMe6j8fnOTpO6WPFOZX
-						bTYctAUCwoefVBj9aKb17kotmg4jPL8SABR9zk24D4pudXUmlTTPeJDZyC6TVIyL
-						jOTIpR3K6nGXu644BjE0ofUv0BJV/kTepdbjKXD1NJRSJQIdEbGZcQMKhdBk+5+y
-						WPSLKAT9q9ZQLPCammS1mXbwWe3yhLt5vkVfmimQd9C7zuFwVmW/MBiEFcsEbArb
-						L7qgb1CfXuXWFY/Ec1yYFAviHb8LFe92VaTrrdme6Qqba3eryueU4FvjtYfWy6+K
-						KMdsLHnE6yUSj1WUz0AHzZUPDcM9drnKw/k=
+						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
+						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
+						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
+						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
+						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
+						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
+						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
+						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
+						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
+						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
+						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
+						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
+						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-    <AttributeConsumingService index="0" isDefault="true">
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1"/>
+    <AttributeConsumingService index="1">
       <ServiceName xml:lang="en">GÉANT perfSONAR UI Test</ServiceName>
       <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</ServiceDescription>
       <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -90,11 +86,11 @@
     <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
+    <Company>DANTE IT Support</Company>
     <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
+    <Company>DANTE IT</Company>
     <EmailAddress>mailto:it@dante.net</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>