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

1 files changed, 40 insertions, 43 deletions

diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
index 2e6ccece..2a85a69a 100644
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
@@ -1,21 +1,18 @@
 <?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/perfsonar-ui">
-  <!--
-		This is a perfsonarUI SP for GÉANT Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.ps-ui-test.qalab.geant.net/perfsonar-ui">
+  <md:Extensions>
     <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>
-  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI Test</mdui:DisplayName>
         <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -40,8 +37,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -66,34 +63,34 @@
 					</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="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"/>
-    <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"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:itsupport@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md: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"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md: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"/>
+    <md: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"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT perfSONAR UI Test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</md:ServiceDescription>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>