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

1 files changed, 64 insertions, 67 deletions

diff --git a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
index 7ab0e1f1..4cf0643a 100644
--- a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
-  <!--
-		This is a "IOP online services" Shibboleth SP for IOP Publishing Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T16:45:39Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor 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 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>
@@ -49,8 +46,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>
@@ -90,60 +87,60 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IOP Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IOP online services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iop.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Hayes</SurName>
-    <EmailAddress>mailto:Chris.Hayes@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Estela</GivenName>
-    <SurName>Garcia</SurName>
-    <EmailAddress>mailto:estela.garcia@iop.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IOP Publishing Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IOP online services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iop.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Hayes</md:SurName>
+    <md:EmailAddress>mailto:Chris.Hayes@iop.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Estela</md:GivenName>
+    <md:SurName>Garcia</md:SurName>
+    <md:EmailAddress>mailto:estela.garcia@iop.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>