Bypass spurious warning

[shibboleth/sp.git] / schemas / eduPerson.xsd

diff --git a/schemas/eduPerson.xsd b/schemas/eduPerson.xsd
index 1e537ed..5d8e4c7 100644 (file)
--- a/schemas/eduPerson.xsd
+++ b/schemas/eduPerson.xsd
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="US-ASCII"?>
-<!-- edited with XML Spy v4.3 U (http://www.xmlspy.com) by Throckmorton P. Ruddygore (Personal Gratification, Inc.) -->
 <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:
@@ -10,18 +9,12 @@
         - 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
     
-    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
@@ -42,7 +35,7 @@
             </restriction>
         </simpleContent>
     </complexType>
-    <complexType name="eduPersonAffiliationType">
+    <complexType name="eduPersonScopedAffiliationType">
         <simpleContent>
             <restriction base="edu:ScopedStringValueType">
                 <enumeration value="faculty"/>
@@ -102,7 +95,7 @@
     <element name="AttributeAcceptancePolicy">
         <complexType>
             <sequence>
-                <element ref="edu:AttributeRule" maxOccurs="unbounded"/>
+                <element ref="edu:AttributeRule" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
         </complexType>
         <key name="AttributeNameKey">