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

1 files changed, 28 insertions, 31 deletions

diff --git a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
index 738d5f47..3c8b0115 100644
--- a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
+++ b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.chinaclubhq.com/entity">
-  <!--
-		This is a Joomla idemauth 1.5.4 (based on SimpleSAMLPHP) SP for World Club HQ Ltd.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.chinaclubhq.com/entity">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -32,8 +29,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>
@@ -58,24 +55,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/SingleLogoutService.php"/>
-    <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://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/AssertionConsumerService.php" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Club HQ Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">World Club HQ</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukclubhq.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Colin</GivenName>
-    <SurName>Maclean</SurName>
-    <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Maclean</SurName>
-    <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/SingleLogoutService.php"/>
+    <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://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/AssertionConsumerService.php" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">World Club HQ Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">World Club HQ</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukclubhq.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Maclean</md:SurName>
+    <md:EmailAddress>mailto:colin@chinaclubhq.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Maclean</md:SurName>
+    <md:EmailAddress>mailto:colin@chinaclubhq.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>