urkund new entityID

1 files changed, 28 insertions, 31 deletions

diff --git a/swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml b/swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml
index 01b222e5..c1bf260a 100644
--- a/swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apsjournals.apsnet.org/shibboleth">
-  <!--
-		This is an OpenSAML "APS Journals" SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apsjournals.apsnet.org/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-10T09:43:56Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">APS Journals</mdui:DisplayName>
         <mdui:Description xml:lang="en">Journals of the American Phytopathological Society: peer-reviewed plant pathology research.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://apsjournals.apsnet.org</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -41,24 +38,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apsjournals.apsnet.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apsjournals.apsnet.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apsjournals.apsnet.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">APS Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.apsnet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SSO-Support</GivenName>
-    <SurName>SSO-Support</SurName>
-    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SSO-Tech</GivenName>
-    <SurName>SSO-Tech</SurName>
-    <EmailAddress>mailto:SSO-Tech@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apsjournals.apsnet.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apsjournals.apsnet.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apsjournals.apsnet.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">APS Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.apsnet.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:SurName>SSO-Support</md:SurName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:SurName>SSO-Tech</md:SurName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>