- From: Mercurial notifier <nobody@w3.org>
- Date: Tue, 29 Jun 2010 19:59:37 +0000
- To: Unicorn Updates <www-validator-cvs@w3.org>
changeset: 1305:8cddef726439
parent: 1301:27b4dc1fa90c
user: Thomas Gambet <tgambet@w3.org>
date: Fri Jun 25 17:09:06 2010 -0400
files: WebContent/WEB-INF/resources/schemas/wadl.xsd
description:
updated wadl schema to last specification
diff -r 27b4dc1fa90c -r 8cddef726439 WebContent/WEB-INF/resources/schemas/wadl.xsd
--- a/WebContent/WEB-INF/resources/schemas/wadl.xsd Thu Jun 24 11:26:32 2010 -0400
+++ b/WebContent/WEB-INF/resources/schemas/wadl.xsd Fri Jun 25 17:09:06 2010 -0400
@@ -1,68 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://research.sun.com/wadl"
- xmlns:tns="http://research.sun.com/wadl"
+ targetNamespace="http://wadl.dev.java.net/2009/02"
+ xmlns:tns="http://wadl.dev.java.net/2009/02"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
elementFormDefault="qualified">
-
+
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
<xs:element name="application">
<xs:complexType>
<xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="tns:grammars" minOccurs="0"/>
- <xs:element ref="tns:resources" minOccurs="0"/>
+ <xs:element ref="tns:resources" minOccurs="0"
+ maxOccurs="unbounded"/>
<xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:resource_type"/>
<xs:element ref="tns:method"/>
<xs:element ref="tns:representation"/>
- <xs:element ref="tns:fault"/>
+ <xs:element ref="tns:param"/>
</xs:choice>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-
+
+ <xs:element name="doc">
+ <xs:complexType mixed="true">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="title" type="xs:string"/>
+ <xs:attribute ref="xml:lang"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="grammars">
<xs:complexType>
<xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:include"/>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
-
+
<xs:element name="resources">
<xs:complexType>
<xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="tns:resource" maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="base" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
+
<xs:element name="resource">
<xs:complexType>
<xs:sequence>
- <xs:element ref="tns:path_variable" minOccurs="0"/>
- <xs:choice maxOccurs="unbounded">
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="tns:method"/>
<xs:element ref="tns:resource"/>
</xs:choice>
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"
+ processContents="lax"/>
</xs:sequence>
- <xs:attribute name="uri" type="xs:anyURI"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="type" type="tns:resource_type_list"/>
+ <xs:attribute name="queryType" type="xs:string"
+ default="application/x-www-form-urlencoded"/>
+ <xs:attribute name="path" type="xs:string"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
+
+ <xs:simpleType name="resource_type_list">
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:element name="resource_type">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:method"/>
+ <xs:element ref="tns:resource"/>
+ </xs:choice>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"
+ processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="method">
<xs:complexType>
<xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="tns:request" minOccurs="0"/>
- <xs:element ref="tns:response" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:response" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
<xs:attribute name="name" type="tns:Method"/>
@@ -70,11 +121,11 @@
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
+
<xs:simpleType name="Method">
<xs:union memberTypes="tns:HTTPMethods xs:NMTOKEN"/>
</xs:simpleType>
-
+
<xs:simpleType name="HTTPMethods">
<xs:restriction base="xs:NMTOKEN">
<xs:enumeration value="GET"/>
@@ -84,118 +135,127 @@
<xs:enumeration value="DELETE"/>
</xs:restriction>
</xs:simpleType>
-
+
<xs:element name="include">
<xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
<xs:attribute name="href" type="xs:anyURI"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
+
<xs:element name="request">
<xs:complexType>
<xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="tns:representation" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element ref="tns:query_variable" minOccurs="0"
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
+
<xs:element name="response">
<xs:complexType>
<xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="tns:representation"/>
- <xs:element ref="tns:fault"/>
- </xs:choice>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:representation" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
+ <xs:attribute name="status" type="tns:statusCodeList"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
+
+ <xs:simpleType name="uriList">
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+
<xs:element name="representation">
<xs:complexType>
<xs:sequence>
- <xs:element ref="tns:representation_variable" minOccurs="0"
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
<xs:attribute name="element" type="xs:QName"/>
<xs:attribute name="mediaType" type="xs:string"/>
<xs:attribute name="href" type="xs:anyURI"/>
+ <xs:attribute name="profile" type="tns:uriList"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
- <xs:simpleType name="faultCodeList">
+
+ <xs:simpleType name="statusCodeList">
<xs:list itemType="xs:unsignedInt"/>
</xs:simpleType>
-
- <xs:element name="fault">
+
+ <xs:simpleType name="ParamStyle">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="plain"/>
+ <xs:enumeration value="query"/>
+ <xs:enumeration value="matrix"/>
+ <xs:enumeration value="header"/>
+ <xs:enumeration value="template"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="param">
<xs:complexType>
<xs:sequence>
- <xs:element ref="tns:representation_variable" minOccurs="0"
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:link" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="id" type="xs:ID" use="required"/>
- <xs:attribute name="element" type="xs:QName"/>
- <xs:attribute name="status" type="tns:faultCodeList"/>
- <xs:attribute name="mediaType" type="xs:string"/>
<xs:attribute name="href" type="xs:anyURI"/>
+ <xs:attribute name="name" type="xs:NMTOKEN"/>
+ <xs:attribute name="style" type="tns:ParamStyle"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="type" type="xs:QName" default="xs:string"/>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="required" type="xs:boolean" default="false"/>
+ <xs:attribute name="repeating" type="xs:boolean" default="false"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="path" type="xs:string"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
- <xs:element name="query_variable">
+
+ <xs:element name="option">
<xs:complexType>
<xs:sequence>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
- <xs:attribute name="type" type="xs:QName" default="xs:string"/>
- <xs:attribute name="required" type="xs:boolean" default="false"/>
- <xs:attribute name="repeating" type="xs:boolean" default="false"/>
- <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ <xs:attribute name="mediaType" type="xs:string"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
-
- <xs:element name="path_variable">
+
+ <xs:element name="link">
<xs:complexType>
<xs:sequence>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
- <xs:attribute name="type" type="xs:QName" default="xs:string"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="representation_variable">
- <xs:complexType>
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
- <xs:attribute name="type" type="xs:QName" default="xs:string"/>
- <xs:attribute name="path" type="xs:string"/>
- <xs:attribute name="required" type="xs:boolean" default="false"/>
- <xs:attribute name="repeating" type="xs:boolean" default="false"/>
- <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="resource_type" type="xs:anyURI"/>
+ <xs:attribute name="rel" type="xs:token"/>
+ <xs:attribute name="rev" type="xs:token"/>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
</xs:element>
Received on Tuesday, 29 June 2010 19:59:39 UTC