"targetNameSpace" -> "targetNamespace", attributes after sequences and other slight modifications so libxml2 can validate the schemas.
This commit is contained in:
parent
7d17d02938
commit
acd2ac90ee
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
@ -29,7 +29,6 @@
|
|||
<xsd:element name="configuration" type="Configuration"/>
|
||||
|
||||
<xsd:complexType name="Configuration">
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="logFilePath" type="xsd:string"/>
|
||||
<xsd:element name="pidFilePath" type="xsd:string"/>
|
||||
|
@ -38,7 +37,6 @@
|
|||
<xsd:element name="group" type="xsd:string"/>
|
||||
<xsd:element name="module" maxOccurs="unbounded">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="name" type="xsd:string"/>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="thing" maxOccurs="unbounded">
|
||||
<xsd:complexType>
|
||||
|
@ -51,6 +49,7 @@
|
|||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string"/>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
|
@ -58,6 +57,7 @@
|
|||
<xsd:element name="sslVirtualHost" type="SSLVirtualHost"/>
|
||||
</xsd:choice>
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
</xsd:complexType>
|
||||
|
||||
<xsd:complexType name="SSLVirtualHost">
|
||||
|
@ -73,10 +73,6 @@
|
|||
</xsd:complexType>
|
||||
|
||||
<xsd:complexType name="VirtualHost">
|
||||
<xsd:attribute name="ip" type="xsd:string"/>
|
||||
<xsd:attribute name="port" type="xsd:integer"/>
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
<xsd:attribute name="src" type="xsd:anyURI"/>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="serverName" type="xsd:string"/>
|
||||
<xsd:element name="title" type="xsd:string"/>
|
||||
|
@ -84,6 +80,10 @@
|
|||
<xsd:element name="language" type="xsd:language"/>
|
||||
<!-- FIXME: <xsd:element name="talkback"/> -->
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="ip" type="xsd:string"/>
|
||||
<xsd:attribute name="port" type="xsd:integer"/>
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
<xsd:attribute name="src" type="xsd:anyURI"/>
|
||||
</xsd:complexType>
|
||||
|
||||
</xsd:schema>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
@ -28,11 +28,11 @@
|
|||
|
||||
<xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
|
||||
|
||||
<xsd:element name="dbXmlDocumentResult" type="yep:DbXmlDocumentResult"/>
|
||||
<xsd:element name="dbXmlDocumentResult" type="DbXmlDocumentResult"/>
|
||||
|
||||
<xsd:complexType name="DbXmlDocumentResult">
|
||||
<xsd:complexContent>
|
||||
<xsd:extension base="yep:Thing">
|
||||
<xsd:extension base="Thing">
|
||||
<xsd:sequence>
|
||||
<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
|
||||
<xsd:complexType>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
@ -28,16 +28,20 @@
|
|||
|
||||
<xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
|
||||
|
||||
<xsd:element name="dbXmlNodeResult" type="yep:DbXmlNodeResult"/>
|
||||
<xsd:element name="dbXmlNodeResult" type="DbXmlNodeResult"/>
|
||||
|
||||
<xsd:complexType name="DbXmlNodeResult">
|
||||
<xsd:complexContent>
|
||||
<xsd:extension base="yep:Thing">
|
||||
<xsd:element name="node" minOccurs="0" maxOccurs="unbounded">
|
||||
<xsd:complexType>
|
||||
<xsd:any namespace="##any" processContents="skip"/>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:extension base="Thing">
|
||||
<xsd:sequence>
|
||||
<xsd:element name="node" minOccurs="0" maxOccurs="unbounded">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:any namespace="##any" processContents="skip"/>
|
||||
</xsd:sequence>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:sequence>
|
||||
</xsd:extension>
|
||||
</xsd:complexContent>
|
||||
</xsd:complexType>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xforms="http://www.w3.org/2002/xforms"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
|
@ -27,16 +27,16 @@
|
|||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
|
||||
<xsd:include schemaLocation="http://www.w3.org/MarkUp/Forms/2002/XForms-Schema.xsd"/>
|
||||
<xsd:import namespace="http://www.w3.org/MarkUp/Forms/2002/XForms-Schema.xsd"/>
|
||||
|
||||
<xsd:element name="description" type="Description"/>
|
||||
|
||||
<xsd:complexType name="Description">
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
<xsd:attribute name="src" type="xsd:anyURI"/>
|
||||
<xsd:sequence>
|
||||
<!-- FIXME: Add xforms:model and xforms:group. -->
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
<xsd:attribute name="src" type="xsd:anyURI"/>
|
||||
</xsd:complexType>
|
||||
|
||||
</xsd:schema>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xforms="http://www.w3.org/2002/xforms"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
|
@ -35,9 +35,9 @@
|
|||
<xsd:complexContent>
|
||||
<xsd:extension base="Thing">
|
||||
<xsd:sequence>
|
||||
<xsd:element name="dc:description" type="xsd:string"/>
|
||||
<xsd:element name="dc:subject" type="xsd:string"/>
|
||||
<xsd:element name="dc:title" type="xsd:string"/>
|
||||
<xsd:element name="description" type="xsd:string"/>
|
||||
<xsd:element name="subject" type="xsd:string"/>
|
||||
<xsd:element name="title" type="xsd:string"/>
|
||||
</xsd:sequence>
|
||||
</xsd:extension>
|
||||
</xsd:complexContent>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://openoffice.org/2000/office"
|
||||
xmlns="http://openoffice.org/2000/office"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
|
@ -34,9 +34,9 @@
|
|||
<xsd:element name="meta">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="dc:description" type="xsd:string"/>
|
||||
<xsd:element name="dc:subject" type="xsd:string"/>
|
||||
<xsd:element name="dc:title" type="xsd:string"/>
|
||||
<xsd:element name="description" type="xsd:string"/>
|
||||
<xsd:element name="subject" type="xsd:string"/>
|
||||
<xsd:element name="title" type="xsd:string"/>
|
||||
</xsd:sequence>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsd:schema targetNameSpace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
<xsd:schema targetNamespace="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns="http://www.entrouvert.org/namespaces/expression/0.0"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<xsd:annotation>
|
||||
|
@ -26,33 +26,10 @@
|
|||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
|
||||
<xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Group.xsd"/>
|
||||
<xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Identity.xsd"/>
|
||||
|
||||
<xsd:simpleType name="Id">
|
||||
<xsd:restriction base="xsd:anyURI">
|
||||
<xsd:pattern value="https?://.+"/>
|
||||
</xsd:restriction>
|
||||
</xsd:simpleType>
|
||||
|
||||
<xsd:complexType name="Thing">
|
||||
<xsd:attribute name="publicName" type="xsd:string"/>
|
||||
<xsd:attribute name="schema" type="xsd:anyURI"/>
|
||||
<xsd:attribute name="src" type="xsd:anyURI"/>
|
||||
<!--
|
||||
<xsd:element name="users">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="mode" type="xsd:string"/>
|
||||
<xsd:sequence>
|
||||
<xsd:choice minOccurs="0" maxOccurs="unbounded">
|
||||
<xsd:element name="everybody" type="Everybody/">
|
||||
<xsd:element name="identity" type="Identity"/>
|
||||
<xsd:element name="group" type="Group"/>
|
||||
</xsd:choice>
|
||||
</xsd:sequence>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
-->
|
||||
</xsd:complexType>
|
||||
|
||||
</xsd:schema>
|
||||
|
|
Reference in New Issue