Changeset eda00e1

Timestamp:

Apr 19, 2010 2:42:34 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

f54e8e4

Parents:

eeab22e

Message:

move userType into the deprecated section

File:

• wsdl/fedd_types.xsd (modified) (2 diffs)

wsdl/fedd_types.xsd

@@ -106 +106 @@
     </xsd:restriction>
   </xsd:simpleType>
+
+  <xsd:complexType name="userType">
+    <xsd:annotation>
+      <xsd:documentation>
+        The definition of a user principal.  It includes the
+        identification of the user as an ID type, the access credential(s)
+        that the user will use, and the role of the user, if any.
+        Multiple access keys may be used, and it is also possible for
+        the user to be anonymous.  Though it is possible to specify a
+        user without ID, access, or role, it is difficult to imagine
+        such a user being useful.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="userID" type="tns:IDType" minOccurs="0"
+        maxOccurs="1"/>
+      <xsd:element name="access" type="tns:accessType" minOccurs="0"
+        maxOccurs="unbounded"/>
+      <!-- begin deprecated -->
+      <xsd:element name="role" type="tns:userRole" minOccurs="0" maxOccurs="1"/>
+      <!-- end deprecated -->
+    </xsd:sequence>
+  </xsd:complexType>
 
   <!-- end deprecated -->
@@ -140 +163 @@
       <xsd:element name="passwordHash" type="xsd:string"/>
     </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="userType">
-    <xsd:annotation>
-      <xsd:documentation>
-        The definition of a user principal.  It includes the
-        identification of the user as an ID type, the access credential(s)
-        that the user will use, and the role of the user, if any.
-        Multiple access keys may be used, and it is also possible for
-        the user to be anonymous.  Though it is possible to specify a
-        user without ID, access, or role, it is difficult to imagine
-        such a user being useful.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="userID" type="tns:IDType" minOccurs="0"
-        maxOccurs="1"/>
-      <xsd:element name="access" type="tns:accessType" minOccurs="0"
-        maxOccurs="unbounded"/>
-      <!-- begin deprecated -->
-      <xsd:element name="role" type="tns:userRole" minOccurs="0" maxOccurs="1"/>
-      <!-- end deprecated -->
-    </xsd:sequence>
   </xsd:complexType>