Changeset 4ac0a41

Timestamp:

Dec 3, 2009 3:51:36 PM (15 years ago)

Author:

Jay Jacobs <Jay.Jacobs@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

a3ad8bd

Parents:

1e643da

Message:

Added dsicovery datatypes and modified the credential updates for
issuer and subject credentials.

File:

• wsdl/abac_types.xsd (modified) (5 diffs)

wsdl/abac_types.xsd

@@ -29 +29 @@
   <xsd:complexType name="observationType">
     <xsd:choice>
-      <!-- TBD: remove simple trust target node becuase it's a node op -->
-      <xsd:element name="SimpleTTNode" type="tns:simpleTTNodeType"/>
       <xsd:element name="NodeOp" type="tns:nodeOpType"/>
       <xsd:element name="EdgeOp" type="tns:edgeOpType"/>
@@ -60 +58 @@
   <xsd:complexType name="discoveryType">
     <xsd:sequence>
-      <xsd:element name="subject" type="tns:simpleRoleType"/>
-      <xsd:element name="result" type="tns:credentialSet"/>
+      <!-- issuedBy, byRole (defining role), bySubject -->
+      <xsd:element name="op" type="xsd:string"/>
+      <xsd:choice>
+        <xsd:element name="role" type="tns:entityType"/>
+        <xsd:element name="subject" type="tns:simpleRoleType"/>
+        <xsd:element name="issuer" type="tns:principalType"/>
+      </xsd:choice>
+      <xsd:element name="result" type="tns:credentialType" 
+              minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
@@ -181 +186 @@
   <xsd:complexType name="updateRequest">
     <xsd:sequence>
-      <xsd:element name="credential" type="xsd:string"
+      <xsd:element name="issuerCredentials" type="tns:credentialType"
+        minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="subjectCredentials" type="tns:credentialType"
         minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="traces" type="tns:roleTraceability"
@@ -208 +215 @@
         maxOccurs="unbounded"/>
       <xsd:element name="OpCount" type="xsd:integer"/>
-      <xsd:element name="evidence" type="tns:evidenceType"/>
+      <xsd:element name="Evidence" type="tns:evidenceType"/>
     </xsd:sequence>
   </xsd:complexType>  
 
-  <xsd:complexType name="simpleTTNodeType">
-    <xsd:sequence>
-      <xsd:element name="Goal"              type="tns:goalType"/>
-      <xsd:element name="SatisfactionState" type="xsd:string"/>
-      <xsd:element name="ProcessingState"   type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="type" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
   <xsd:complexType name="nodeOpType">
     <xsd:sequence>
       <xsd:element name="TrustTarget"      type="tns:goalType"/>
+      <!--xsd:element name="SatisfactionState" type="xsd:string"/-->
       <xsd:element name="ProcessingState"  type="xsd:string"/>
       <xsd:element name="Order"            type="xsd:integer"/>
@@ -235 +234 @@
       <xsd:element name="Child"            type="tns:goalType"/>
       <xsd:element name="ProcessingState"  type="xsd:string"/>
+      <!--xsd:element name="SatisfactionState" type="xsd:string"/-->
       <xsd:element name="Order"            type="xsd:integer"/>
     </xsd:sequence>