From fb8901e93e6ab6e4a74c52cd1d211267194e292a Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 20 Apr 2016 14:56:05 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../saml.psui.geant.net.xml                        | 101 ++++++++++-----------
 1 file changed, 49 insertions(+), 52 deletions(-)

(limited to 'swamid-interfederations-2.0/saml.psui.geant.net.xml')

diff --git a/swamid-interfederations-2.0/saml.psui.geant.net.xml b/swamid-interfederations-2.0/saml.psui.geant.net.xml
index 00092f57..b3ef9108 100644
--- a/swamid-interfederations-2.0/saml.psui.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.psui.geant.net.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.psui.geant.net">
-  <!--
-		This is a perfsonarUI SP for GÉANT Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.psui.geant.net">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T12:37:33Z">
       <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</mdui:DisplayName>
         <mdui:Description xml:lang="en">GÉANT perfSONAR UI - production instance</mdui:Description>
         <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_logo.png</mdui:Logo>
       </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>
@@ -65,43 +62,43 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
-    <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://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GÉANT perfSONAR UI</ServiceName>
-      <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - production 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="true"/>
-      <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="true"/>
-      <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 perfSONAR UI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>PerfSONAR developers</GivenName>
-    <EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>PerfSONAR developers</GivenName>
-    <EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
+    <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://psui.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://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GÉANT perfSONAR UI</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - production 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="true"/>
+      <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="true"/>
+      <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 perfSONAR UI</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="support">
+    <md:GivenName>PerfSONAR developers</md:GivenName>
+    <md:EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</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:ContactPerson contactType="technical">
+    <md:GivenName>PerfSONAR developers</md:GivenName>
+    <md:EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3