From 9c0f5376b778140a8f641c0a8af946d627731a5d Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 3 Sep 2014 12:09:36 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 swamid-interfederations-2.0/gw-astronomy.org.xml | 70 ++++++++++++------------
 1 file changed, 34 insertions(+), 36 deletions(-)

(limited to 'swamid-interfederations-2.0/gw-astronomy.org.xml')

diff --git a/swamid-interfederations-2.0/gw-astronomy.org.xml b/swamid-interfederations-2.0/gw-astronomy.org.xml
index 3a8bae79..4b36f849 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+<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>
       <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>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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/Shibboleth.sso/Login" index="1"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <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 Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/sp_info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/privacy_info</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPInfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -52,35 +50,35 @@ xWUYS9G3JfMMW9UY
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <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 Registry</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Scott Koranda</GivenName>
-    <EmailAddress>skoranda@uwm.edu</EmailAddress>
+  <ContactPerson contactType="administrative">
+    <GivenName>Warren Anderson</GivenName>
+    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
   </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  <ContactPerson contactType="administrative">
     <GivenName>Chris Spadanuda</GivenName>
     <EmailAddress>cspada@uwm.edu</EmailAddress>
   </ContactPerson>
-</md:EntityDescriptor>
+  <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>
-- 
cgit v1.2.3