From 259295b7c5298dc9214bc35761ad1e2b55c28661 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 16 Feb 2016 14:29:36 +0100
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 ...avasp.test.openathens.net-hello-oa-metadata.xml | 61 ++++++++++++----------
 1 file changed, 32 insertions(+), 29 deletions(-)

(limited to 'swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml')

diff --git a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
index 8d7aba7c..668c0d8d 100644
--- a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
+++ b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://javasp.test.openathens.net/hello/oa/metadata">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://javasp.test.openathens.net/hello/oa/metadata">
+  <!--
+		This is an OpenAthens test SP for Eduserv.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:54:26Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="encryption">
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -28,8 +31,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -53,25 +56,25 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/art" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/post" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/art" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Eduserv: Test Java SP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Andy</md:GivenName>
-    <md:SurName>Anderson</md:SurName>
-    <md:EmailAddress>mailto:andy.anderson@eduserv.org.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andy</md:GivenName>
-    <md:SurName>Anderson</md:SurName>
-    <md:EmailAddress>mailto:andy.anderson@eduserv.org.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/art" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/post" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/art" index="4"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Eduserv: Test Java SP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Andy</GivenName>
+    <SurName>Anderson</SurName>
+    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Andy</GivenName>
+    <SurName>Anderson</SurName>
+    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
-- 
cgit v1.2.3