1 files changed, 43 insertions, 40 deletions
diff --git a/swamid-interfederations-2.0/perfsonarui.geant.org.xml b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
index 7a72306f..3e2aefc3 100644
--- a/swamid-interfederations-2.0/perfsonarui.geant.org.xml
+++ b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://perfsonarui.geant.org">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://perfsonarui.geant.org">
+  <!--
+		This is a 'GÉANT perfSONAR UI' SP for GÉANT Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T12:03:05Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <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 - Operations 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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -50,8 +53,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -88,34 +91,34 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceSOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perfsonar.geant.org/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 - Operations 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</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Garnizov</md:SurName>
-    <md:EmailAddress>mailto:ivan.garnizov@fau.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Garnizov</md:SurName>
-    <md:EmailAddress>mailto:ivan.garnizov@fau.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceSOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perfsonar.geant.org/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 - Operations 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</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Ivan</GivenName>
+    <SurName>Garnizov</SurName>
+    <EmailAddress>mailto:ivan.garnizov@fau.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Garnizov</SurName>
+    <EmailAddress>mailto:ivan.garnizov@fau.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>