From acd2ac90ee54a18e8580d61203157d121854e507 Mon Sep 17 00:00:00 2001
From: sebd <>
Date: Thu, 20 Jan 2005 16:42:29 +0000
Subject: [PATCH] "targetNameSpace" -> "targetNamespace", attributes after
 sequences and other slight modifications so libxml2 can validate the schemas.

---
 xml/schema/Article.xsd             |  2 +-
 xml/schema/Configuration.xsd       | 14 +++++++-------
 xml/schema/DbXmlDocumentResult.xsd |  6 +++---
 xml/schema/DbXmlNodeResult.xsd     | 20 ++++++++++++--------
 xml/schema/Description.xsd         |  8 ++++----
 xml/schema/Directory.xsd           |  2 +-
 xml/schema/Election1.xsd           |  2 +-
 xml/schema/Form1.xsd               |  2 +-
 xml/schema/HttpStatus.xsd          |  2 +-
 xml/schema/Metadata.xsd            |  8 ++++----
 xml/schema/OOoDocumentMeta.xsd     |  8 ++++----
 xml/schema/PageSequence.xsd        |  2 +-
 xml/schema/Spip.xsd                |  2 +-
 xml/schema/Thing.xsd               | 25 +------------------------
 14 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/xml/schema/Article.xsd b/xml/schema/Article.xsd
index cb54ab8..dd3a52a 100644
--- a/xml/schema/Article.xsd
+++ b/xml/schema/Article.xsd
@@ -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>
diff --git a/xml/schema/Configuration.xsd b/xml/schema/Configuration.xsd
index 2135674..d12997d 100644
--- a/xml/schema/Configuration.xsd
+++ b/xml/schema/Configuration.xsd
@@ -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>
diff --git a/xml/schema/DbXmlDocumentResult.xsd b/xml/schema/DbXmlDocumentResult.xsd
index 5d64bc5..dedceef 100644
--- a/xml/schema/DbXmlDocumentResult.xsd
+++ b/xml/schema/DbXmlDocumentResult.xsd
@@ -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>
diff --git a/xml/schema/DbXmlNodeResult.xsd b/xml/schema/DbXmlNodeResult.xsd
index bffc79d..5bb51b5 100644
--- a/xml/schema/DbXmlNodeResult.xsd
+++ b/xml/schema/DbXmlNodeResult.xsd
@@ -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>
diff --git a/xml/schema/Description.xsd b/xml/schema/Description.xsd
index 3be0b61..7c2a9bc 100644
--- a/xml/schema/Description.xsd
+++ b/xml/schema/Description.xsd
@@ -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>
diff --git a/xml/schema/Directory.xsd b/xml/schema/Directory.xsd
index c75258e..cce62c7 100644
--- a/xml/schema/Directory.xsd
+++ b/xml/schema/Directory.xsd
@@ -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">
diff --git a/xml/schema/Election1.xsd b/xml/schema/Election1.xsd
index 42852ae..cb4c344 100644
--- a/xml/schema/Election1.xsd
+++ b/xml/schema/Election1.xsd
@@ -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>
diff --git a/xml/schema/Form1.xsd b/xml/schema/Form1.xsd
index 5b8430e..a135bbd 100644
--- a/xml/schema/Form1.xsd
+++ b/xml/schema/Form1.xsd
@@ -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>
diff --git a/xml/schema/HttpStatus.xsd b/xml/schema/HttpStatus.xsd
index eebdc41..7fe3f63 100644
--- a/xml/schema/HttpStatus.xsd
+++ b/xml/schema/HttpStatus.xsd
@@ -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>
diff --git a/xml/schema/Metadata.xsd b/xml/schema/Metadata.xsd
index 3d5ae87..7e2d5d0 100644
--- a/xml/schema/Metadata.xsd
+++ b/xml/schema/Metadata.xsd
@@ -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>
diff --git a/xml/schema/OOoDocumentMeta.xsd b/xml/schema/OOoDocumentMeta.xsd
index 648bcce..debb7bb 100644
--- a/xml/schema/OOoDocumentMeta.xsd
+++ b/xml/schema/OOoDocumentMeta.xsd
@@ -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>
diff --git a/xml/schema/PageSequence.xsd b/xml/schema/PageSequence.xsd
index 563b3f0..b43007f 100644
--- a/xml/schema/PageSequence.xsd
+++ b/xml/schema/PageSequence.xsd
@@ -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>
diff --git a/xml/schema/Spip.xsd b/xml/schema/Spip.xsd
index 7c81a88..9db312c 100644
--- a/xml/schema/Spip.xsd
+++ b/xml/schema/Spip.xsd
@@ -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>
diff --git a/xml/schema/Thing.xsd b/xml/schema/Thing.xsd
index 62835f7..f394798 100644
--- a/xml/schema/Thing.xsd
+++ b/xml/schema/Thing.xsd
@@ -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>