Show
Ignore:
Timestamp:
03/11/10 14:34:29 (2 years ago)
Author:
amandel
Message:

Refine xsd for #80 - xsd for simple-types.xml

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/xml/schema/simple-types.xsd

    r1614 r1616  
    88    <!-- Structure --> 
    99    <xs:complexType name="simpleTypes"> 
    10         <xs:sequence> 
     10        <xs:all> 
    1111            <xs:element name="typeSafeEnumerations" type="typeSafeEnumerations" minOccurs="0"/> 
    1212            <xs:element name="restrictedStrings" type="restrictedStrings" minOccurs="0"/> 
    … …  
    1414            <xs:element name="fixPointNumbers" type="fixPointNumbers" minOccurs="0"/> 
    1515            <xs:element name="valueObjects" type="valueObjects" minOccurs="0"/> 
    16         </xs:sequence> 
     16        </xs:all> 
    1717    </xs:complexType> 
    1818 
    … …  
    6464    </xs:complexType> 
    6565    <xs:complexType mixed="true" name="restrictedString"> 
    66         <xs:choice> 
     66        <xs:sequence> 
    6767            <xs:element name="description" type="description" 
    6868                minOccurs="0"/> 
    6969            <xs:element name="constant" type="constant" 
    7070                minOccurs="0" maxOccurs="unbounded"/> 
    71         </xs:choice> 
     71        </xs:sequence> 
    7272        <xs:attribute name="min-length" type="lengthType" 
    7373            use="required"/> 
    … …  
    100100        <xs:attribute name="package" type="javaPackageName" 
    101101            use="required"/> 
    102         <xs:attribute name="max-value" type="xs:long" use="required"/> 
    103         <xs:attribute name="min-value" type="xs:long" use="required"/> 
     102        <xs:attribute name="max-value" type="xs:string" use="required"/> 
     103        <xs:attribute name="min-value" type="xs:string" use="required"/> 
    104104        <xs:attribute name="user-type" type="flag" use="optional"/> 
    105105    </xs:complexType> 
    … …  
    124124        <xs:attribute name="total-digits" type="xs:int" 
    125125            use="required"/> 
    126         <xs:attribute name="max-value" type="xs:float" use="optional"/> 
    127         <xs:attribute name="min-value" type="xs:float" use="required"/> 
     126        <xs:attribute name="max-value" type="xs:string" use="optional"/> 
     127        <xs:attribute name="min-value" type="xs:string" use="required"/> 
    128128        <xs:attribute name="fraction-digits" type="xs:int" 
    129129            use="required"/>