- From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 17 Aug 2009 17:54:34 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/schemas
In directory hutz:/tmp/cvs-serv5324/WebContent/WEB-INF/resources/schemas
Modified Files:
Tag: dev2
tasklist.xsd
Removed Files:
Tag: dev2
tasklist-schema.xsd
Log Message:
Removed ThenType from XML schema (then and else are now RoutineType)
--- tasklist-schema.xsd DELETED ---
Index: tasklist.xsd
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/schemas/Attic/tasklist.xsd,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- tasklist.xsd 11 Aug 2009 16:05:30 -0000 1.1.2.1
+++ tasklist.xsd 17 Aug 2009 17:54:32 -0000 1.1.2.2
@@ -1,214 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="http://www.w3.org/unicorn/tasklist"
- xmlns:tkl="http://www.w3.org/unicorn/tasklist">
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
- <xs:element name="tasklist">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:task"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="task">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="tkl:subtasks"/>
- <xs:element minOccurs="0" ref="tkl:parameters"/>
- </xs:sequence>
- <xs:attribute name="id" use="required"/>
- <xs:attribute name="visible" type="xs:boolean" default="true"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="subtasks">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="tkl:observation"/>
- <xs:element ref="tkl:subtask"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="observation">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:handle"/>
- </xs:sequence>
- <xs:attribute name="ref" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="handle">
- <xs:complexType>
- <xs:attribute name="mimetype" use="required"/>
- <xs:attribute name="priority" type="tkl:tPriority" use="optional" default="medium"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="subtask">
- <xs:complexType>
- <xs:attribute name="ref" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="parameters">
- <xs:complexType>
- <xs:sequence maxOccurs="unbounded">
- <xs:element ref="tkl:parameter"/>
- </xs:sequence>
- <!--
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="tkl:checkbox"/>
- <xs:element ref="tkl:radio"/>
- <xs:element ref="tkl:checkboxlist"/>
- <xs:element ref="tkl:textfield"/>
- <xs:element ref="tkl:textarea"/>
- <xs:element ref="tkl:parameter"/>
- </xs:choice>
- -->
- </xs:complexType>
- </xs:element>
- <!--
- <xs:element name="checkbox">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:longname" minOccurs="0"/>
- <xs:element ref="tkl:checked"/>
- <xs:element ref="tkl:unchecked"/>
- </xs:sequence>
- <xs:attribute name="default" use="optional" type="tkl:tChecked" default="unchecked"/>
- <xs:attributeGroup ref="tkl:generalInfos"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="checked">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="tkl:mapped" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="unchecked">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:mapped"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="radio">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:longname" minOccurs="0"/>
- <xs:element maxOccurs="unbounded" ref="tkl:value"/>
- </xs:sequence>
- <xs:attribute name="default" use="optional" type="xs:NCName"/>
- <xs:attributeGroup ref="tkl:generalInfos"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="checkboxlist">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:longname" minOccurs="0"/>
- <xs:element maxOccurs="unbounded" ref="tkl:value"/>
- </xs:sequence>
- <xs:attribute name="default" use="optional">
- <xs:simpleType>
- <xs:list itemType="xs:string"/>
- </xs:simpleType>
- </xs:attribute>
- <xs:attributeGroup ref="tkl:generalInfos"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="textfield">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:mapped"/>
- <xs:element maxOccurs="unbounded" ref="tkl:longname" minOccurs="0"/>
- </xs:sequence>
- <xs:attributeGroup ref="tkl:generalInfos"/>
- <xs:attribute name="value" use="optional" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="textarea">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:mapped"/>
- <xs:element maxOccurs="unbounded" ref="tkl:longname" minOccurs="0"/>
- </xs:sequence>
- <xs:attributeGroup ref="tkl:generalInfos"/>
- <xs:attribute name="value" use="optional" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- -->
- <xs:element name="parameter">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="tkl:value"/>
- </xs:sequence>
- <xs:attributeGroup ref="tkl:generalInfos"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="mapped">
- <xs:complexType>
- <xs:attribute name="observer" use="required" type="xs:NCName"/>
- <xs:attribute name="param" use="required" type="xs:NCName"/>
- <xs:attribute name="value" type="xs:string"/>
- <xs:attribute name="inputmethod" use="optional" default="uri direct file">
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.w3.org/unicorn/tasklist" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tas="http://www.w3.org/unicorn/tasklist">
+ <xs:element name="tasklist" type="tas:tasklistType" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ <xs:complexType name="parametersType">
+ <xs:sequence>
+ <xs:element type="tas:parameterType" name="parameter" maxOccurs="unbounded" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="taskType">
+ <xs:sequence>
+ <xs:element type="tas:condsType" name="conds" xmlns:tas="http://www.w3.org/unicorn/tasklist" maxOccurs="1" minOccurs="0"/>
+ <xs:element type="tas:routineType" name="routine" xmlns:tas="http://www.w3.org/unicorn/tasklist" maxOccurs="1" minOccurs="1"/>
+ <xs:element type="tas:outputseqType" name="outputseq" xmlns:tas="http://www.w3.org/unicorn/tasklist" maxOccurs="1" minOccurs="1"/>
+ <xs:element type="tas:parametersType" name="parameters" xmlns:tas="http://www.w3.org/unicorn/tasklist" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="id" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="parameterType" mixed="true">
+ <xs:sequence>
+ <xs:element type="tas:valueType" name="value" minOccurs="0" maxOccurs="unbounded" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ <xs:attribute type="xs:NCName" name="name" use="required"/>
+ <xs:attribute type="tas:tParamType" name="type" use="required"/>
+ <xs:attribute type="xs:string" name="default" use="optional"/>
+ <xs:attribute type="tas:tUi" name="ui" use="optional" default="advanced"/>
+ <xs:attribute type="xs:NCName" name="observer" use="optional"/>
+ </xs:complexType>
+ <xs:complexType name="valueType">
+ <xs:sequence>
+ <xs:element type="tas:mappedType" name="mapped" maxOccurs="unbounded" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="name"/>
+ </xs:complexType>
+ <xs:complexType name="outputseqType">
+ <xs:sequence>
+ <xs:element type="tas:outputgroupType" name="outputgroup" maxOccurs="unbounded" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="outputgroupType">
+ <xs:sequence>
+ <xs:element type="xs:string" name="tasksort" maxOccurs="unbounded" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ <xs:attribute type="xs:byte" name="id" use="optional"/>
+ </xs:complexType>
+ <xs:complexType name="paramType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:NCName" name="name"/>
+ <xs:attribute type="xs:NCName" name="observer"/>
+ <xs:attribute type="xs:string" name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="condType">
+ <xs:sequence>
+ <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="1" />
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="id" use="optional"/>
+ <xs:attribute type="xs:string" name="result" use="optional"/>
+ <xs:attribute type="xs:NCName" name="observer" use="optional"/>
+ <xs:attribute type="xs:string" name="type" use="optional"/>
+ </xs:complexType>
+ <xs:complexType name="routineType">
+ <xs:sequence maxOccurs="unbounded">
+ <xs:element type="tas:ifType" name="if" maxOccurs="unbounded" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ <xs:element type="tas:execType" name="exec" maxOccurs="unbounded" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="ref"/>
+ </xs:complexType>
+ <xs:complexType name="ifType">
+ <xs:sequence>
+ <xs:element type="tas:routineType" name="then" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ <xs:element type="tas:routineType" name="else" maxOccurs="1" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="test"/>
+ </xs:complexType>
+ <xs:complexType name="tasklistType">
+ <xs:sequence>
+ <xs:element type="tas:taskType" name="task" maxOccurs="unbounded" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="mappedType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:NCName" name="param" use="required"/>
+ <xs:attribute type="xs:NCName" name="observer" use="required"/>
+ <xs:attribute type="xs:string" name="value"/>
+ <xs:attribute name="inputmethod" use="optional" default="uri direct file">
<xs:simpleType>
- <xs:list itemType="tkl:tInputMethod"/>
+ <xs:list itemType="tas:tInputMethod"/>
</xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="value">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="tkl:mapped" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" use="optional" type="xs:NMTOKEN"/>
- </xs:complexType>
- </xs:element>
-
- <xs:attributeGroup name="generalInfos">
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:attribute name="ui" use="optional" type="tkl:tUi" default="advanced"/>
- <xs:attribute name="observer" type="xs:NCName" use="optional"/>
- <xs:attribute name="type" use="required" type="tkl:tParamType"/>
- <xs:attribute name="default" use="optional" type="xs:string"/>
- </xs:attributeGroup>
-
-
-
- <!--
- <xs:simpleType name="tChecked">
- <xs:restriction base="xs:string">
- <xs:enumeration value="checked"/>
- <xs:enumeration value="unchecked"/>
- </xs:restriction>
- </xs:simpleType>
- -->
-
- <xs:simpleType name="tInputMethod">
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="condsType">
+ <xs:sequence>
+ <xs:element type="tas:condType" name="cond" maxOccurs="unbounded" minOccurs="1" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="execType" mixed="true">
+ <xs:sequence>
+ <xs:element type="tas:paramType" name="param" minOccurs="0" xmlns:tas="http://www.w3.org/unicorn/tasklist"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="id" use="optional"/>
+ <xs:attribute type="xs:string" name="value" use="optional"/>
+ <xs:attribute type="xs:string" name="type" use="optional"/>
+ </xs:complexType>
+ <xs:simpleType name="tInputMethod" xmlns:tas="http://www.w3.org/unicorn/tasklist">
<xs:restriction base="xs:string">
<xs:enumeration value="file"/>
<xs:enumeration value="direct"/>
<xs:enumeration value="uri"/>
</xs:restriction>
</xs:simpleType>
-
- <xs:simpleType name="tUi">
+ <xs:simpleType name="tUi" xmlns:tas="http://www.w3.org/unicorn/tasklist">
<xs:restriction base="xs:string">
<xs:enumeration value="none"/>
<xs:enumeration value="simple"/>
<xs:enumeration value="advanced"/>
</xs:restriction>
</xs:simpleType>
-
- <xs:simpleType name="tPriority">
- <xs:restriction base="xs:string">
- <xs:enumeration value="low"/>
- <xs:enumeration value="medium"/>
- <xs:enumeration value="high"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="tParamType">
+ <xs:simpleType name="tParamType" xmlns:tas="http://www.w3.org/unicorn/tasklist">
<xs:restriction base="xs:string">
<xs:enumeration value="checkbox"/>
<xs:enumeration value="checkboxlist"/>
@@ -218,5 +130,5 @@
<xs:enumeration value="radio"/>
</xs:restriction>
</xs:simpleType>
-
+ <xs:attributeGroup name="NewAttributeGroup"></xs:attributeGroup>
</xs:schema>
Received on Monday, 17 August 2009 17:54:47 UTC