Changeset 5ffd5b9 for fedd


Ignore:
Timestamp:
Jun 17, 2009 10:39:39 AM (15 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02
Children:
af542ea
Parents:
c546d45
Message:

Reinsert Principal Type class as a clone of IDType. Icky, but XSD doesn't make complexType synonyms easy.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/wsdl/abac_types.xsd

    rc546d45 r5ffd5b9  
    7575  <xsd:complexType name="goalType">
    7676    <xsd:sequence>
    77       <xsd:element name="Verifier"   type="xsd1:IDType"/>
     77      <xsd:element name="Verifier"   type="tns:principalType"/>
    7878      <xsd:element name="Target" type="tns:entityType"/>
    79       <xsd:element name="Subject"   type="xsd1:IDType"/>
     79      <xsd:element name="Subject"   type="tns:principalType"/>
    8080    </xsd:sequence>
    8181  </xsd:complexType>
     
    8585  <xsd:complexType name="entityType">
    8686    <xsd:choice>
    87       <xsd:element name="principal" type="xsd1:IDType"/>
     87      <xsd:element name="principal" type="tns:principalType"/>
    8888      <xsd:element name="role" type="tns:simpleRoleType"/>
    8989      <xsd:element name="linkedrole" type="tns:linkedRoleType"/>
     
    100100  </xsd:complexType>
    101101
     102  <!-- This is a copy of fedd's IDType, included in case we have to expand or
     103       restrict it. XSD isn't wonderful at expressing these kinds of synonyms
     104       between complex types. -->
     105  <xsd:complexType name="principalType">
     106    <xsd:choice>
     107      <xsd:element name="uuid" type="xsd:base64Binary"/>
     108      <xsd:element name="fedid" type="xsd:base64Binary"/>
     109      <xsd:element name="uri" type="xsd:string"/>
     110      <xsd:element name="localname" type="xsd:string"/>
     111      <xsd:element name="kerberosUsername" type="xsd:string"/>
     112    </xsd:choice>
     113  </xsd:complexType>
     114
    102115  <xsd:complexType name="simpleRoleType">
    103116    <xsd:sequence>
    104       <xsd:element name="principal" type="xsd1:IDType"/>
     117      <xsd:element name="principal" type="tns:principalType"/>
    105118      <xsd:element name="rolename" type="xsd:string"/>
    106119    </xsd:sequence>
Note: See TracChangeset for help on using the changeset viewer.