Changeset 5ffd5b9

Timestamp:

Jun 17, 2009 10:39:39 AM (16 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:

• fedd/wsdl/abac_types.xsd (modified) (3 diffs)

fedd/wsdl/abac_types.xsd

@@ -75 +75 @@
   <xsd:complexType name="goalType">
     <xsd:sequence>
-      <xsd:element name="Verifier"   type="xsd1:IDType"/>
+      <xsd:element name="Verifier"   type="tns:principalType"/>
       <xsd:element name="Target" type="tns:entityType"/>
-      <xsd:element name="Subject"   type="xsd1:IDType"/>
+      <xsd:element name="Subject"   type="tns:principalType"/>
     </xsd:sequence>
   </xsd:complexType>
@@ -85 +85 @@
   <xsd:complexType name="entityType">
     <xsd:choice>
-      <xsd:element name="principal" type="xsd1:IDType"/>
+      <xsd:element name="principal" type="tns:principalType"/>
       <xsd:element name="role" type="tns:simpleRoleType"/>
       <xsd:element name="linkedrole" type="tns:linkedRoleType"/>
@@ -100 +100 @@
   </xsd:complexType>
 
+  <!-- This is a copy of fedd's IDType, included in case we have to expand or
+       restrict it. XSD isn't wonderful at expressing these kinds of synonyms
+       between complex types. -->
+  <xsd:complexType name="principalType">
+    <xsd:choice>
+      <xsd:element name="uuid" type="xsd:base64Binary"/>
+      <xsd:element name="fedid" type="xsd:base64Binary"/>
+      <xsd:element name="uri" type="xsd:string"/>
+      <xsd:element name="localname" type="xsd:string"/>
+      <xsd:element name="kerberosUsername" type="xsd:string"/>
+    </xsd:choice>
+  </xsd:complexType>
+
   <xsd:complexType name="simpleRoleType">
     <xsd:sequence>
-      <xsd:element name="principal" type="xsd1:IDType"/>
+      <xsd:element name="principal" type="tns:principalType"/>
       <xsd:element name="rolename" type="xsd:string"/>
     </xsd:sequence>