[Qsos-commits] qsos/tools/xsd build.xml src/xsd/qsos.xsd qsos.xsd

[Romain PELISSE]

CVSROOT:        /sources/qsos
Module name:    qsos
Changes by:     Romain PELISSE <rpelisse>       07/04/21 14:36:33

Added files:
        tools/xsd      : build.xml 
        tools/xsd/src/xsd: qsos.xsd 
Removed files:
        tools/xsd      : qsos.xsd 

Log message:
        Finally i done something about this ! sorry for the far too long delay 
...
        
        A small independant project has been comitted into the qsos/tools/xsd, 
which contains :
        
        - build.xml, an ant file to actually test the xsd. The script checkout 
the sheet from cvs and attempt to validate each files ending a .qsos...
        - src/xsd/qsos.xsd , the xsd itself
        
        Note that the XSD is NOT final, there is still some work to do...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/tools/xsd/build.xml?cvsroot=qsos&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/qsos/tools/xsd/qsos.xsd?cvsroot=qsos&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/qsos/tools/xsd/src/xsd/qsos.xsd?cvsroot=qsos&rev=1.1

Patches:
Index: build.xml
===================================================================
RCS file: build.xml
diff -N build.xml
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ build.xml   21 Apr 2007 14:36:32 -0000      1.1
@@ -0,0 +1,43 @@
+<project name="xsd-qsos" default="test">
+       
+       <property name="target" value="target"/>
+       
+       <target name="cvs-co" depends="clean">
+               <property name="cvs-protocol" value=":pserver:"/>
+               <property name="user" value="anonymous"/>
+               <property name="host" value="cvs.savannah.nongnu.org"/>
+               <property name="cvsroot" value="/sources/qsos/"/>
+               <property name="cvs-path" value="qsos/sheet"/>          
+               
+               <cvs  cvsRoot="address@hidden:${cvsroot}"
+                               package="qsos/sheet"
+                               dest="${target}/"/>
+       
+               <move   file="${target}/qsos/sheet"
+                               tofile="${target}"/>
+       </target>
+       
+       <target name="test" depends="cvs-co">
+
+               <pathconvert dirsep="/" property="xsd.file">
+                       <path>
+                          <pathelement location="src/xsd/qsos.xsd"/>
+                       </path>
+               </pathconvert>
+
+               <xmlvalidate    failonerror="false" 
+                                               warn="true">
+                       <attribute      
name="http://apache.org/xml/features/validation/schema";
+                                               value="true"/>
+                       <attribute      
name="http://xml.org/sax/features/namespaces";   
+                                               value="true"/>
+                       <property       
name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation";
+                                               value="${xsd.file}"/>
+                       <fileset dir="${target}" includes="**/*.qsos"/>
+               </xmlvalidate>          
+       </target>
+       
+       <target name="clean">
+               <delete dir="${target}"/>
+       </target>
+</project>

Index: src/xsd/qsos.xsd
===================================================================
RCS file: src/xsd/qsos.xsd
diff -N src/xsd/qsos.xsd
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/xsd/qsos.xsd    21 Apr 2007 14:36:33 -0000      1.1
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema    xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
+               elementFormDefault="qualified">
+    <xsd:element name="header">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="authors"/>
+                <xsd:element ref="dates"/>
+                <xsd:element ref="language"/>
+                <xsd:element ref="appname"/>
+                <xsd:element ref="release"/>
+                <xsd:element ref="licenseid"/>
+                <xsd:element ref="licensedesc"/>
+                <xsd:element ref="url"/>
+                <xsd:element ref="desc"/>
+                <xsd:element ref="demourl"/>
+                <xsd:element ref="qsosformat"/>
+                <xsd:element ref="qsosappfamily"/>
+                <xsd:element ref="qsosspecificformat"/>
+                <xsd:element ref="qsosappname"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="authors">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="author"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="author">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="email"/>
+                <xsd:element ref="name"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="email" type="xsd:string"/>
+    <xsd:element name="name" type="xsd:string"/>
+    <xsd:element name="dates">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="creation"/>
+                <xsd:element ref="validation"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="creation">
+        <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+                <xsd:pattern value="([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9]|)"/>
+            </xsd:restriction>
+        </xsd:simpleType>        
+    </xsd:element>
+    <xsd:element name="validation">
+        <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+                <xsd:pattern value="([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9]|)"/>
+            </xsd:restriction>
+        </xsd:simpleType>                
+    </xsd:element>
+    <xsd:element name="desc" type="xsd:string"/>
+    <xsd:element name="language" type="xsd:language"/>
+    <xsd:element name="appname" type="xsd:string"/>
+    <xsd:element name="release" type="xsd:string"/>
+    <xsd:element name="licenseid" type="xsd:integer"/>
+    <xsd:element name="licensedesc" type="xsd:string"/>
+    <xsd:element name="url" type="xsd:anyURI"/>
+    <xsd:element name="demourl" type="xsd:string"/>
+    <xsd:element name="qsosformat" type="xsd:string"/>
+    <xsd:element name="qsosappfamily" type="xsd:string"/>
+    <xsd:element name="qsosspecificformat" type="xsd:string"/>
+    <xsd:element name="qsosappname" type="xsd:string"/>    
+
+    <xsd:element name="section">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="desc"/>
+                <xsd:element maxOccurs="unbounded" ref="element"/>
+            </xsd:sequence>
+            <xsd:attribute name="name" use="required" type="xsd:ID"/>
+            <xsd:attribute name="title" use="required" type="xsd:string"/>
+        </xsd:complexType>
+    </xsd:element>
+    
+    
+    <xsd:element     name="comment"  type="xsd:string"/>
+    <xsd:element     name="desc0"    type="xsd:string"/>
+    <xsd:element     name="desc1"    type="xsd:string"/>
+    <xsd:element     name="desc2"    type="xsd:string"/>
+    
+    <xsd:element name="score">
+        <xsd:simpleType>
+            <xsd:restriction base="xsd:integer">                
+                <xsd:enumeration value="0"/>
+                <xsd:enumeration value="1"/>
+                <xsd:enumeration value="2"/>
+            </xsd:restriction>
+        </xsd:simpleType>
+    </xsd:element> 
+    
+    <xsd:element name="element">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="desc"      minOccurs="0" maxOccurs="1"/>
+                <xsd:element ref="element"   minOccurs="0" 
maxOccurs="unbounded"/>                
+                <xsd:element ref="desc0"     minOccurs="0" maxOccurs="1" />
+                <xsd:element ref="desc1"     minOccurs="0" maxOccurs="1" />
+                <xsd:element ref="desc2"     minOccurs="0" maxOccurs="1" /> 
+                <xsd:element ref="score"     minOccurs="0" maxOccurs="1"/>     
            
+                <xsd:element ref="comment"   minOccurs="0" maxOccurs="1"   />
+            </xsd:sequence>
+            <xsd:attribute name="name" use="required" type="xsd:ID"/>
+            <xsd:attribute name="title" use="required" type="xsd:string"/>
+        </xsd:complexType>
+    </xsd:element>
+
+    
+            
+    <xsd:element name="document">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element     ref="header"/>
+                <xsd:element     minOccurs="1" 
+                                 maxOccurs="unbounded" 
+                                 ref="section"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    
+</xsd:schema>

Index: qsos.xsd
===================================================================
RCS file: qsos.xsd
diff -N qsos.xsd
--- qsos.xsd    5 Jul 2006 23:20:54 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
targetNamespace="http://www.qsos.org"; elementFormDefault="qualified">
-  <xs:element name="document">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="header"/>
-        <xs:element maxOccurs="unbounded" ref="section"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="authors"/>
-        <xs:element ref="dates"/>
-        <xs:element ref="language"/>
-        <xs:element ref="appname"/>
-        <xs:element ref="release"/>
-        <xs:element ref="licenseid"/>
-        <xs:element ref="licensedesc"/>
-        <xs:element ref="url"/>
-        <xs:element ref="desc"/>
-        <xs:element ref="demourl"/>
-        <xs:element ref="qsosformat"/>
-        <xs:element ref="qsosappfamily"/>
-        <xs:element ref="qsosspecificformat"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="authors">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="author"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="author">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="email"/>
-        <xs:element ref="name"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="email" type="xs:string"/>
-  <xs:element name="name" type="xs:string"/>
-  <xs:element name="dates">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="creation"/>
-        <xs:element ref="validation"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="creation" type="xs:date"/>
-  <xs:element name="validation" type="xs:date"/>
-  <xs:element name="language" type="xs:language"/>
-  <xs:element name="appname" type="xs:string"/>
-  <xs:element name="release" type="xs:string"/>
-  <xs:element name="licenseid" type="xs:integer"/>
-  <xs:element name="licensedesc" type="xs:string"/>
-  <xs:element name="url" type="xs:anyURI"/>
-  <xs:element name="demourl" type="xs:string"/>
-  <xs:element name="qsosformat" type="xs:string"/>
-  <xs:element name="qsosappfamily" type="xs:string"/>
-  <xs:element name="qsosspecificformat" type="xs:string"/>
-  <xs:element name="section">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="desc"/>
-        <xs:element maxOccurs="unbounded" ref="element"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="title" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="desc" type="xs:string"/>
-  <xs:element name="element">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="desc"/>
-       <xs:element ref="element" maxOccurs="unbounded"/>
-        <xs:element ref="comment"/>
-       <xs:element ref="desc0" minOccurs="0"/>
-       <xs:element ref="desc1" minOccurs="0"/>
-       <xs:element ref="desc2" minOccurs="0"/>
-       <xs:element ref="score" minOccurs="0"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="title" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="comment" type="xs:string"/>
-  <xs:element name="desc0" type="xs:string"/>
-  <xs:element name="desc1" type="xs:string"/>
-  <xs:element name="desc2" type="xs:string"/>
-  <xs:element name="score" type="xs:integer">
-    <xs:simpleType>
-      <xs:restriction base="xs:integer">
-        <xs:enumeration value="0"/>
-        <xs:enumeration value="1"/>
-        <xs:enumeration value="2"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element> 
-</xs:schema>