From 54f80505cbaac150bd7414a7f8c45c5a7f336f50 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 16 Feb 2016 14:06:42 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 ...-module.php-saml-sp-metadata.php-default-sp.xml | 67 +++++++++++-----------
 1 file changed, 32 insertions(+), 35 deletions(-)

(limited to 'swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml')

diff --git a/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index ffe3e920..6d680583 100644
--- a/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a "NeSC" simpleSAMLphp Test SP for the University of Glasgow.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-12T11:54:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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">NeSC SimpleSAML Test SP Organisation</mdui:DisplayName>
         <mdui:Description xml:lang="en">A test SP running simpleSAMLPHP for federated access to NeSC PHP web applications</mdui:Description>
         <mdui:Logo height="168" width="190">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</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>
@@ -45,8 +42,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>
@@ -75,26 +72,26 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NeSC SimpleSAML Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gla.ac.uk/escience/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NeSC SimpleSAML Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/escience/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:John.Watt@glasgow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:John.Watt@glasgow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3