http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 40 insertions, 40 deletions

diff --git a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
index 4b36f849..057cd403 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/wiki/shibboleth-sp">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/wiki/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <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/research-and-scholarship</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
@@ -18,7 +18,7 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -50,35 +50,35 @@ xWUYS9G3JfMMW9UY
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Warren Anderson</GivenName>
-    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris Spadanuda</GivenName>
-    <EmailAddress>cspada@uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Branson Stephens</GivenName>
-    <EmailAddress>branson.stephens@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWM CGCA Help</md:GivenName>
+    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Branson Stephens</md:GivenName>
+    <md:EmailAddress>stephanb@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>