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

1 files changed, 40 insertions, 43 deletions

diff --git a/swamid-interfederations-2.0/alphacitaviweb.citavi.com-shibboleth.xml b/swamid-interfederations-2.0/alphacitaviweb.citavi.com-shibboleth.xml
index e581d6d4..092c8ac7 100644
--- a/swamid-interfederations-2.0/alphacitaviweb.citavi.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/alphacitaviweb.citavi.com-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://alphacitaviweb.citavi.com/shibboleth">
-  <!--
-		This is a "Citavi (Alpha)" SP for Swiss Academic Software GmbH.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://alphacitaviweb.citavi.com/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T15:24:53Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="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="de">Citavi Web (Alpha)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Citavi Web (Alpha)</mdui:DisplayName>
@@ -19,8 +16,8 @@
         <mdui:InformationURL xml:lang="en">https://citaviweb.citavi.com/</mdui:InformationURL>
         <mdui:Logo height="80" width="300">https://www.citavi.com/images/shibboleth/Citavi-EN-Logo-300x80.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -55,8 +52,8 @@
 				</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -91,34 +88,34 @@
 				</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alphacitaviweb.citavi.com/identity/AuthServices/Acs" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Citavi Web (Alpha)</ServiceName>
-      <ServiceName xml:lang="en">Citavi Web (Alpha)</ServiceName>
-      <ServiceDescription xml:lang="de">Citavi Web (Alpha)</ServiceDescription>
-      <ServiceDescription xml:lang="en">Citavi Web (Alpha)</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" 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="sn" Name="urn:oid:2.5.4.4" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Swiss Academic Software GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Citavi (Alpha)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.citavi.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Peter</GivenName>
-    <SurName>Meurer</SurName>
-    <EmailAddress>mailto:Peter.Meurer@citavi.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marc</GivenName>
-    <SurName>Eichenberger</SurName>
-    <EmailAddress>mailto:Marc.Eichenberger@citavi.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alphacitaviweb.citavi.com/identity/AuthServices/Acs" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Citavi Web (Alpha)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Citavi Web (Alpha)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Citavi Web (Alpha)</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Citavi Web (Alpha)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md: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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swiss Academic Software GmbH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Citavi (Alpha)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.citavi.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Meurer</md:SurName>
+    <md:EmailAddress>mailto:Peter.Meurer@citavi.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Eichenberger</md:SurName>
+    <md:EmailAddress>mailto:Marc.Eichenberger@citavi.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>