Changeset 6696

Timestamp:

10/23/15 07:23:22 (9 years ago)

Author:

paul.meurer@uni.no

Message:

Fixed cosmetic errors in Clarino UiB metadata

File:

• aai/clarin-sp-metadata.xml (modified) (4 diffs)

aai/clarin-sp-metadata.xml

@@ -2578 +2578 @@
   </md:EntityDescriptor>
   <!-- Clarino UiB, Norway -->
-  <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" entityID="https://clarino.uib.no/">
+  <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarino.uib.no/">
     <md:Extensions>
       <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
         <!-- The CoC-DP entity category -->
-        <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
           <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
@@ -2594 +2594 @@
       <md: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://clarino.uib.no/feide/single-login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarino.uib.no/feide/single-login" index="1"/>
+        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarino.uib.no/feide/single-login" index="1"/>
         <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
           <mdui:DisplayName xml:lang="en">Clarino, UiB</mdui:DisplayName>
@@ -2602 +2602 @@
           <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</mdui:Description>
           <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</mdui:Description>
-          <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur fÃŒr Sprachdaten und 
-Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
-          <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja 
-palvelujen, jotka liittyvÀt CLARIN aloitetta.</mdui:Description>
+          <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur fÃŒr Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
+          <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvÀt CLARIN aloitetta.</mdui:Description>
           <mdui:Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
           <mdui:Logo height="106" width="296">https://clarino.uib.no/images/clarino_duo-296.png</mdui:Logo>
@@ -2649 +2647 @@
         <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
         <md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</md:ServiceDescription>
+        <md:ServiceName xml:lang="de">Clarino, UiB</md:ServiceName>
+        <md:ServiceName xml:lang="fi">Clarino, UiB</md:ServiceName>
+        <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</md:ServiceDescription>
+        <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</md:ServiceDescription>
+        <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur fÃŒr Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
+        <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvÀt CLARIN aloitetta.</md:ServiceDescription>
         <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="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"/>
         <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
         <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="true"/>
-        <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
         <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       </md:AttributeConsumingService>