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

1 files changed, 40 insertions, 37 deletions

diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
index 6be9f959..bf7252bd 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/ecspubs">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/ecspubs">
+  <!--
+		This is "The Electrochemical Society" Shibboleth SP for HighWire Press, Inc.
+	-->
+  <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -15,12 +18,12 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </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:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <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">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Login"/>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -51,32 +54,32 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/POST" index="9"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The Electrochemical Society</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ecsdl.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Olga</md:GivenName>
-    <md:SurName>Biasotti</md:SurName>
-    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Olga</md:GivenName>
-    <md:SurName>Biasotti</md:SurName>
-    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/POST" index="9"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">The Electrochemical Society</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://ecsdl.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Olga</GivenName>
+    <SurName>Biasotti</SurName>
+    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Olga</GivenName>
+    <SurName>Biasotti</SurName>
+    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>