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

1 files changed, 34 insertions, 31 deletions

diff --git a/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml
index 9efc2504..bf765102 100644
--- a/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-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://smartam-login.ncl.ac.uk/shibboleth/metadata">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smartam-login.ncl.ac.uk/shibboleth/metadata">
+  <!--
+		This is a SMART Project Server JBOSS PicketLink SP for the University of Newcastle upon Tyne.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:08:28Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -29,29 +32,29 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smartam-login.ncl.ac.uk/shibboleth/metadata" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Newcastle University SMART Project Server</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Chris</md:GivenName>
-    <md:SurName>Franks</md:SurName>
-    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Maciej</md:GivenName>
-    <md:SurName>Machulak</md:SurName>
-    <md:EmailAddress>mailto:maciej.machulak@ncl.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smartam-login.ncl.ac.uk/shibboleth/metadata" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Newcastle University SMART Project Server</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Chris</GivenName>
+    <SurName>Franks</SurName>
+    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Maciej</GivenName>
+    <SurName>Machulak</SurName>
+    <EmailAddress>mailto:maciej.machulak@ncl.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>