Changeset 4275


Ignore:
Timestamp:
01/16/14 15:56:21 (10 years ago)
Author:
olhsha
Message:

Comitting shcema: all the properties except ID's (UIR's) and references to ID's are now elements.

Location:
DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources
Files:
3 added
1 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd

    r4225 r4275  
    11<?xml version="1.1" encoding="UTF-8"?>
    22<xs:schema targetNamespace="http://www.dasish.eu/ns/addit"
    3     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
    4     xmlns:dasish="http://www.dasish.eu/ns/addit">
     3           xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     4           xmlns:dasish="http://www.dasish.eu/ns/addit">
    55    <xs:import namespace="http://www.w3.org/XML/1998/namespace"
    6         schemaLocation="http://www.w3.org/2005/08/xml.xsd"/>
     6               schemaLocation="http://www.w3.org/2005/08/xml.xsd"/>
    77
    88    <xs:complexType name="List">
    … …  
    2222
    2323    <xs:complexType name="CachedRepresentationInfo">
     24        <xs:sequence>
     25            <xs:element name="mimeType" type="xs:string" minOccurs="1" maxOccurs="1"/>
     26            <xs:element name="tool" type="xs:string" minOccurs="1" maxOccurs="1"/>
     27            <xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1"/>
     28        </xs:sequence>
    2429        <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    25         <xs:attribute name="mimeType" type="xs:string" use="required"/>
    26         <xs:attribute name="tool" type="xs:string" use="required"/>
    27         <xs:attribute name="type" type="xs:string" use="required"/>
    28     </xs:complexType>
    29 
    30    <!-- used in the target -->
     30    </xs:complexType>
     31
     32    <!-- used in the target -->
    3133    <xs:complexType name="CachedRepresentationFragment">
    32         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    33         <xs:attribute name="fragmentString" type="xs:string" use="required"/>
     34        <xs:sequence>
     35            <xs:element name="fragmentString" type="xs:string" minOccurs="1" maxOccurs="1"/>
     36        </xs:sequence>
     37        <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    3438    </xs:complexType>
    3539   
    … …  
    4751    <xs:complexType name="Target">
    4852        <xs:sequence>
    49             <xs:element name="siblingTargets" type="dasish:ReferenceList" minOccurs="1"/>     
    50             <xs:element name="cachedRepresentatinons" type="dasish:CachedRepresentationFragmentList" minOccurs="1"/>
     53            <xs:element name="lastModified" type="xs:dateTime" minOccurs="1" maxOccurs="1"/>
     54            <xs:element name="link" type="xs:anyURI" minOccurs="1" maxOccurs="1"/>
     55            <xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1"/>
     56            <xs:element name="siblingTargets" type="dasish:ReferenceList" minOccurs="1"/>
     57            <xs:element name="cachedRepresentatinons" type="dasish:CachedRepresentationFragmentList"
     58                minOccurs="1"/>
    5159        </xs:sequence>
    5260        <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    53         <xs:attribute name="lastModified" type="xs:dateTime" use="required"/>
    54         <xs:attribute name="link" type="xs:anyURI" use="required"/>
    55         <xs:attribute name="version" type="xs:string" use="required"/>
    5661    </xs:complexType>
    5762
    5863
    5964    <xs:complexType name="TargetInfo">
    60         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    61         <xs:attribute name="link" type="xs:anyURI" use="required"/>
    62         <xs:attribute name="version" type="xs:string" use="required"/>
     65        <xs:sequence>
     66            <xs:element name="link" type="xs:anyURI" minOccurs="1" maxOccurs="1"/>
     67            <xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1"/>
     68        </xs:sequence>       
     69        <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    6370    </xs:complexType>
    6471
    … …  
    6875                <xs:sequence>
    6976                    <xs:element name="targetInfo" type="dasish:TargetInfo" minOccurs="0"
    70                         maxOccurs="unbounded"/>
     77                                maxOccurs="unbounded"/>
    7178                </xs:sequence>
    7279            </xs:extension>
    … …  
    7683
    7784    <xs:complexType name="User">
    78         <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    79         <xs:attribute name="displayName" type="xs:string" use="required"/>
    80         <xs:attribute name="eMail" type="xs:string" use="required"/>
     85        <xs:sequence>           
     86            <xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1"/>
     87            <xs:element name="eMail" type="xs:string" minOccurs="1" maxOccurs="1"/>   
     88        </xs:sequence>
     89        <xs:attribute name="URI" type="xs:anyURI" use="required"/>   
    8190    </xs:complexType>
    8291
    8392
    8493    <xs:complexType name="CurrentUserInfo">
    85         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    86         <xs:attribute name="currentUser" type="xs:boolean" use="required"/>
     94        <xs:sequence>           
     95            <xs:element name="currentUser" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
     96        </xs:sequence>
     97        <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    8798    </xs:complexType>
    8899
    … …  
    92103                <xs:sequence>
    93104                    <xs:element name="currentUserInfo" type="dasish:CurrentUserInfo" minOccurs="0"
    94                         maxOccurs="unbounded"/>
     105                                maxOccurs="unbounded"/>
    95106                </xs:sequence>
    96107            </xs:extension>
    … …  
    107118
    108119    <xs:complexType name="UserWithPermission">
    109         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    110         <xs:attribute name="permission" type="dasish:Permission" use="required"/>
     120        <xs:sequence>
     121            <xs:element name="permission" type="dasish:Permission" minOccurs="1" maxOccurs="1"/>
     122        </xs:sequence>
     123        <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    111124    </xs:complexType>
    112125
    … …  
    116129                <xs:sequence>
    117130                    <xs:element name="userWithPermission" type="dasish:UserWithPermission"
    118                         minOccurs="0" maxOccurs="unbounded"/>
     131                                minOccurs="0" maxOccurs="unbounded"/>
    119132                </xs:sequence>
    120133            </xs:extension>
    … …  
    124137
    125138    <xs:complexType name="Annotation">
    126         <xs:sequence>
     139        <xs:sequence>           
     140            <xs:element name="headline" type="xs:string"  minOccurs="1" maxOccurs="1"/>
     141            <xs:element name="lastModified" type="xs:dateTime"  minOccurs="1" maxOccurs="1"/>
    127142            <xs:element name="body" type="dasish:AnnotationBody" minOccurs="1" maxOccurs="1"/>
    128143            <xs:element name="targets" type="dasish:TargetInfoList" minOccurs="1" maxOccurs="1"/>
    129144            <xs:element name="permissions" type="dasish:UserWithPermissionList" minOccurs="1"
    130                 maxOccurs="1"/>
     145                        maxOccurs="1"/>
    131146        </xs:sequence>
    132147        <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    133         <xs:attribute name="lastModified" type="xs:dateTime" use="required"/>
    134         <xs:attribute name="ownerRef" type="xs:anyURI" use="required"/>
    135         <xs:attribute name="headline" type="xs:string" use="required"/>
     148        <xs:attribute name="ownerRef" type="xs:anyURI"  use="required"/>
    136149    </xs:complexType>
    137150
    138151
    139152    <xs:complexType name="AnnotationInfo">
    140         <xs:sequence>
     153        <xs:sequence>           
     154            <xs:element name="headline" type="xs:string"  minOccurs="1" maxOccurs="1"/>
     155            <xs:element name="lastModified" type="xs:dateTime"  minOccurs="1" maxOccurs="1"/>
    141156            <xs:element name="targets" type="dasish:ReferenceList" minOccurs="1" maxOccurs="1"
    142157            />
    143158        </xs:sequence>
    144159        <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    145         <xs:attribute name="lastModified" type="xs:dateTime" use="required"/>
    146160        <xs:attribute name="ownerRef" type="xs:anyURI" use="required"/>
    147         <xs:attribute name="headline" type="xs:string" use="required"/>
    148161    </xs:complexType>
    149162
    … …  
    153166                <xs:sequence>
    154167                    <xs:element name="annotationInfo" type="dasish:AnnotationInfo" minOccurs="0"
    155                         maxOccurs="unbounded"/>
     168                                maxOccurs="unbounded"/>
    156169                </xs:sequence>
    157170            </xs:extension>
    … …  
    163176            <xs:element name="textBody">
    164177                <xs:complexType>
    165                     <xs:simpleContent>
    166                         <xs:extension base="xs:string">
    167                             <xs:attribute name="mimeType" type="xs:string"/>
    168                         </xs:extension>
    169                     </xs:simpleContent>
     178                    <xs:sequence>
     179                        <xs:element name="mimeType" type="xs:string" minOccurs="1" maxOccurs="1"/>
     180                        <xs:element name="body" type="xs:string" minOccurs="1" maxOccurs="1"/>
     181                    </xs:sequence>
    170182                </xs:complexType>
    171183            </xs:element>
    … …  
    173185                <xs:complexType>
    174186                    <xs:sequence>
     187                        <xs:element name="mimeType" type="xs:string" minOccurs="1" maxOccurs="1"/>
    175188                        <xs:any minOccurs="1" maxOccurs="1" processContents="skip"/>
    176189                    </xs:sequence>
    177                     <xs:attribute name="mimeType" type="xs:string"/>
    178190                </xs:complexType>
    179191            </xs:element>
    … …  
    183195
    184196    <xs:complexType name="Notebook">
    185         <xs:sequence>
     197        <xs:sequence>             
     198            <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>
     199            <xs:element name="lastModified" type="xs:dateTime" minOccurs="1" maxOccurs="1"/>
    186200            <xs:element name="annotations" type="dasish:ReferenceList" minOccurs="1" maxOccurs="1"/>
    187201            <xs:element name="permissions" type="dasish:UserWithPermissionList" minOccurs="1"
    188                 maxOccurs="1"/>
     202                        maxOccurs="1"/>
    189203        </xs:sequence>
    190204        <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    191         <xs:attribute name="lastModified" type="xs:dateTime" use="required"/>
    192         <xs:attribute name="title" type="xs:string" use="required"/>
    193205    </xs:complexType>
    194206
    195207
    196208    <xs:complexType name="NotebookInfo">
    197         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    198         <xs:attribute name="title" type="xs:string" use="required"/>
     209        <xs:sequence>             
     210            <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>           
     211        </xs:sequence>
     212        <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    199213    </xs:complexType>
    200214
    … …  
    204218                <xs:sequence>
    205219                    <xs:element name="notebookInfo" type="dasish:NotebookInfo" minOccurs="0"
    206                         maxOccurs="unbounded"/>
     220                                maxOccurs="unbounded"/>
    207221                </xs:sequence>
    208222            </xs:extension>
    … …  
    227241
    228242    <xs:complexType name="Action">
    229         <xs:attribute name="object" type="xs:anyURI" use="required"/>
    230         <xs:attribute name="message" type="xs:string"/>
     243        <xs:sequence>
     244            <xs:element name="object" type="xs:anyURI" minOccurs="1" maxOccurs="1"/>
     245            <xs:element name="message" type="xs:string" minOccurs="0" maxOccurs="1"/>
     246        </xs:sequence>
    231247    </xs:complexType>
    232248
    … …  
    247263    <xs:complexType name="ResponseBody">
    248264        <xs:sequence>
    249         <xs:choice>
    250             <xs:element name="annotation" type="dasish:Annotation"/>
    251             <xs:element name="permissions" type="dasish:UserWithPermissionList"/>
    252         </xs:choice>
     265            <xs:choice>
     266                <xs:element name="annotation" type="dasish:Annotation"/>
     267                <xs:element name="permissions" type="dasish:UserWithPermissionList"/>
     268            </xs:choice>
    253269            <xs:element name="actionList" type="dasish:ActionList" minOccurs="1"
    254                 maxOccurs="1"/>
     270                        maxOccurs="1"/>
    255271        </xs:sequence>
    256272    </xs:complexType>
Note: See TracChangeset for help on using the changeset viewer.