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

1 files changed, 30 insertions, 33 deletions

diff --git a/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml b/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
index ccd95b98..0ceae632 100644
--- a/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clc2.uniservity.com/shibboleth-sp">
-  <!--
-		This is a "cLc Service" Shibboleth SP for UniServity Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clc2.uniservity.com/shibboleth-sp">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-05T13:26:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -33,8 +30,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,26 +55,26 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Redirect"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity Limited: cLc Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UniServity Support</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zafaj@uniservity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UniServity Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UniServity Limited: cLc Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniservity.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UniServity Support</md:GivenName>
+    <md:EmailAddress>mailto:support@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rezar</md:GivenName>
+    <md:SurName>Zefaj</md:SurName>
+    <md:EmailAddress>mailto:rezar.zafaj@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>