http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-interfederations-2.0

1 files changed, 52 insertions, 49 deletions

diff --git a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
index 84e0191f..bbd1e9a0 100644
--- a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
+++ b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://oasp.beta.athensams.net/OaspMetadata">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://oasp.beta.athensams.net/OaspMetadata">
+  <!--
+		This is an Eduserv OpenAthens test combined SP/IdP.
+	-->
+  <Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
     <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>
+  </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">openathens.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -45,12 +48,12 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oasp-beta.athensams.net/oala/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oasp-beta.athensams.net/oala/sso"/>
-  </md:IDPSSODescriptor>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
+    </KeyDescriptor>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oasp-beta.athensams.net/oala/sso"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oasp-beta.athensams.net/oala/sso"/>
+  </IDPSSODescriptor>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -83,8 +86,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -117,37 +120,37 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/art" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/post" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/art" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/post" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/art" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/authrev.aspx" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/authrev.aspx" index="18"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Eduserv Beta</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.athensams.net/dsp/openathens_sp</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Athens Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Athens Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/art" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/post" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/art" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/post" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/art" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/authrev.aspx" index="17"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/authrev.aspx" index="18"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Eduserv Beta</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.athensams.net/dsp/openathens_sp</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>