Change to attribute name.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@522 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/schemas/eduPerson.xsd b/src/schemas/eduPerson.xsd
index 91487b3..1f82a44 100644 (file)
--- a/src/schemas/eduPerson.xsd
+++ b/src/schemas/eduPerson.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <?xml version="1.0" encoding="US-ASCII"?>

-<schema targetNamespace="urn:mace:eduPerson:1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:edu="urn:mace:eduPerson:1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<schema targetNamespace="urn:mace:eduPerson:1.0" xmlns:edu="urn:mace:eduPerson:1.0" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

     <!--
     Attribute Identifiers:
     
     <!--
     Attribute Identifiers:
     

@@ -9,18 +9,12 @@
         - Scope, if any, contains the RHS of the eduPerson-defined EPPN
         - MUST be singly occurring value
     
         - Scope, if any, contains the RHS of the eduPerson-defined EPPN
         - MUST be singly occurring value
     

-    urn:mace:eduPerson:1.0:eduPersonAffiliation
-        - AttributeValue xsi:type is eduPersonAffiliationType
+    urn:mace:eduPerson:1.0:eduPersonScopedAffiliation
+        - AttributeValue xsi:type is eduPersonScopedAffiliationType

         - AttributeValue elements contain an eduPerson-defined affiliation token
         - Scope, if any, contains a DNS-style organization name
         - MAY be multi-valued
     
         - AttributeValue elements contain an eduPerson-defined affiliation token
         - Scope, if any, contains a DNS-style organization name
         - MAY be multi-valued
     

-    urn:mace:eduPerson:1.0:eduPersonPrimaryAffiliation
-        - AttributeValue xsi:type is eduPersonAffiliationType
-        - AttributeValue element contains an eduPerson-defined affiliation token
-        - Scope, if any, contains a DNS-style organization name
-        - MUST be singly occurring value
-    

     urn:mace:eduPerson:1.0:eduPersonEntitlement
         - AttributeValue xsi:type is xsd:anyURI
         - AttributeValue elements contain a URI representing the entitlement
     urn:mace:eduPerson:1.0:eduPersonEntitlement
         - AttributeValue xsi:type is xsd:anyURI
         - AttributeValue elements contain a URI representing the entitlement

@@ -41,7 +35,7 @@
             </restriction>
         </simpleContent>
     </complexType>
             </restriction>
         </simpleContent>
     </complexType>

-    <complexType name="eduPersonAffiliationType">
+    <complexType name="eduPersonScopedAffiliationType">

         <simpleContent>
             <restriction base="edu:ScopedStringValueType">
                 <enumeration value="faculty"/>
         <simpleContent>
             <restriction base="edu:ScopedStringValueType">
                 <enumeration value="faculty"/>