fixed the User element and the form of the ApplicationData dataType.xsd definition.

[vamsas.git] / schemas / vamsas.xsd

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index 26b9bd1..745bcb4 100644 (file)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -153,6 +153,18 @@
                <xs:complexType>
                        <xs:complexContent>
                                <xs:extension base="vamsas:appData">
+                                       <xs:sequence>
+                                               <xs:element name="User" maxOccurs="unbounded" minOccurs="0">
+                                                       <xs:complexType>
+                                                               <xs:complexContent>
+                                                                       <xs:extension base="vamsas:appData">
+                                                                               <xs:attribute name="fullname" type="xs:string" use="required"/>
+                                                                               <xs:attribute name="organization" type="xs:string" use="required"/>
+                                                                       </xs:extension>
+                                                               </xs:complexContent>
+                                                       </xs:complexType>
+                                               </xs:element>
+                                       </xs:sequence>
                                        <xs:attribute name="version" type="xs:string" use="required"/>
                                        <xs:attribute name="name" type="xs:string" use="required"/>
                                        <xs:attribute name="urn" type="xs:string" use="required"/>
@@ -161,21 +173,9 @@
                </xs:complexType>
        </xs:element>
        <xs:complexType name="appData">
-               <xs:sequence>
-                       <xs:choice>
-                               <xs:element name="data" type="xs:string"/>
-                               <xs:element name="dataReference" type="xs:base64Binary"/>
-                       </xs:choice>
-                       <xs:element name="User" maxOccurs="unbounded">
-                               <xs:complexType>
-                                       <xs:complexContent>
-                                               <xs:extension base="vamsas:appData">
-                                                       <xs:attribute name="fullname" type="xs:string" use="required"/>
-                                                       <xs:attribute name="organization" type="xs:string" use="required"/>
-                                               </xs:extension>
-                                       </xs:complexContent>
-                               </xs:complexType>
-                       </xs:element>
-               </xs:sequence>
+               <xs:choice>
+                       <xs:element name="data" type="xs:base64Binary"/>
+                       <xs:element name="dataReference" type="xs:string"/>
+               </xs:choice>
        </xs:complexType>
 </xs:schema>