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

1 files changed, 62 insertions, 70 deletions

diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index d1de9903..951de878 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,29 +1,22 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shibboleth-i.sgul.ac.uk">
-	<!--
-		This is a Shibboleth IdP for St George's Hospital Medical School.
-	-->
-	<Extensions>
-		<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-
-
-
-
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-		<Extensions>
-			<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
-			<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-				<mdui:DisplayName xml:lang="en">St George's, University of London</mdui:DisplayName>
-				<mdui:Logo height="150" width="200">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_standard.png</mdui:Logo>
-				<mdui:Logo height="60" width="80">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_small.png</mdui:Logo>
-				<mdui:Logo height="16" width="16">https://sgsa01.sgul.ac.uk/idp/images/favicon.ico</mdui:Logo>
-			</mdui:UIInfo>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:X509Data>
-					<ds:X509Certificate>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shibboleth-i.sgul.ac.uk">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    </md:Extensions>
+    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">St George's, University of London</mdui:DisplayName>
+          <mdui:Logo height="150" width="200">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_standard.png</mdui:Logo>
+          <mdui:Logo height="60" width="80">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_small.png</mdui:Logo>
+          <mdui:Logo height="16" width="16">https://sgsa01.sgul.ac.uk/idp/images/favicon.ico</mdui:Logo>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
 						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
@@ -43,26 +36,26 @@
 						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
 						qCZw
 					</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-		<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sgsa01.sgul.ac.uk/idp/profile/Shibboleth/SSO"/>
-		<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST/SSO"/>
-		<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-		<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-		<Extensions>
-			<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:X509Data>
-					<ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sgsa01.sgul.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
 						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
@@ -82,28 +75,27 @@
 						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
 						qCZw
 					</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">St George's Hospital Medical School</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">St George's, University of London</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.sgul.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>Keith</GivenName>
-		<SurName>Carr</SurName>
-		<EmailAddress>mailto:kecarr@sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Keith</GivenName>
-		<SurName>Carr</SurName>
-		<EmailAddress>mailto:kecarr@sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">St George's Hospital Medical School</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">St George's, University of London</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.sgul.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Keith</md:GivenName>
+      <md:SurName>Carr</md:SurName>
+      <md:EmailAddress>mailto:kecarr@sgul.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Keith</md:GivenName>
+      <md:SurName>Carr</md:SurName>
+      <md:EmailAddress>mailto:kecarr@sgul.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>