Grouped Identity, Person and Session in the same Schema document.

This is to avoid recursive includes.
libxml2 does not handle recursive includes properly yet.

"targetNameSpace" -> "targetNamespace" so libxml2 can validate the schemas.

src/core/sessions.py

@@ -329,7 +329,7 @@ def retrieveSession(sessionToken):
 
 elements.registerElement(
     namespaces.yep.uri, "session", Session,
-    "http://www.entrouvert.org/expression/schemas/Session.xsd",
+    "http://www.entrouvert.org/expression/schemas/User.xsd",
     "http://www.entrouvert.org/expression/descriptions/Session.xml",
     SessionHolder, newSessionHolder)
 

src/modules/identities.py

@@ -195,9 +195,9 @@ class Identity(things.Thing):
 
 elements.registerElement(
     namespaces.yep.uri, "identity", Identity,
-    "http://www.entrouvert.org/expression/schemas/Identity.xsd",
+    "http://www.entrouvert.org/expression/schemas/User.xsd",
     "http://www.entrouvert.org/expression/descriptions/Identity.xml")
 elements.registerElement(
     namespaces.yep.uri, "user", Identity,
-    "http://www.entrouvert.org/expression/schemas/Identity.xsd",
+    "http://www.entrouvert.org/expression/schemas/User.xsd",
     "http://www.entrouvert.org/expression/descriptions/Identity.xml")

src/modules/persons.py

@@ -62,5 +62,5 @@ class Person(things.Thing):
 
 elements.registerElement(
     namespaces.yep.uri, "person", Person,
-    "http://www.entrouvert.org/expression/schemas/Person.xsd",
+    "http://www.entrouvert.org/expression/schemas/User.xsd",
     "http://www.entrouvert.org/expression/descriptions/Person.xml")

xml/misc/descriptions/Identity.xml

@@ -4,7 +4,7 @@
                  xmlns:xi="http://www.w3.org/2003/XInclude"
                  xmlns:yep="http://www.entrouvert.org/namespaces/expression/0.0">
  <xforms:model id="identityModel"
-               schema="http://www.entrouvert.org/expression/schemas/Identity.xsd">
+               schema="http://www.entrouvert.org/expression/schemas/User.xsd">
   <xforms:submission action="file://tmp/abracadabra-put.xml" method="put" id="submit"/>
  </xforms:model>
 

xml/schema/FicheLiaison.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,8 +26,7 @@
   </xsd:documentation>
  </xsd:annotation>
 
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Identity.xsd"/>
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
+ <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/User.xsd"/>
 
  <xsd:element name="ficheLiaison" type="FicheLiaison"/>
 

xml/schema/Group.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,12 +26,12 @@
   </xsd:documentation>
  </xsd:annotation>
 
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Identity.xsd"/>
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
+ <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/User.xsd"/>
 
  <xsd:element name="everybody" type="Everybody"/>
 
- <xsd:simpleType name="Everybody"/> <!-- Is it correct? -->
+ <xsd:complexType name="Everybody"/>
+
 
  <xsd:element name="group" type="Group"/>
 

xml/schema/PasswordAccount.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,8 +26,7 @@
   </xsd:documentation>
  </xsd:annotation>
 
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Identity.xsd"/>
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
+ <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/User.xsd"/>
 
  <xsd:element name="passwordAccount" type="PasswordAccount"/>
 
@@ -41,7 +40,7 @@
   <xsd:complexContent>
    <xsd:extension base="Thing">
     <xsd:sequence>
-     <xsd:element name="email" type="yep:emailAddress"/>
+     <xsd:element name="email" type="EmailAddress"/>
      <xsd:element name="password" type="Password"/>
      <xsd:element name="user" type="Identity"/>
     </xsd:sequence>

xml/schema/Person.xsd

@@ -1,46 +0,0 @@
-<?xml version="1.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>
-  <xsd:documentation xml:lang="en">
-   Person Schema for Expression.
-   By: Frederic Peters &lt;fpeters@entrouvert.com&gt;
-       Emmanuel Raviart &lt;eraviart@entrouvert.com&gt;
-
-   Copyright (C) 2004 Entr'ouvert, Frederic Peters &amp; Emmanuel Raviart
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  </xsd:documentation>
- </xsd:annotation>
-
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
-
- <xsd:element name="person" type="Person"/>
-
- <xsd:complexType name="Person">
-  <xsd:complexContent>
-   <xsd:extension base="Thing">
-    <xsd:sequence>
-     <xsd:element name="fullName" type="xsd:string"/>
-     <xsd:element name="email" type="yep:emailAddress"/>
-     <xsd:element name="language" type="xsd:language"/>
-     <xsd:element name="authorizations" type="xsd:string"/>
-    </xsd:sequence>
-   </xsd:extension>
-  </xsd:complexContent>
- </xsd:complexType>
-
-</xsd:schema>

xml/schema/Session.xsd

@@ -1,52 +0,0 @@
-<?xml version="1.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>
-  <xsd:documentation xml:lang="en">
-   Session Schema for Expression.
-   By: Frederic Peters &lt;fpeters@entrouvert.com&gt;
-       Emmanuel Raviart &lt;eraviart@entrouvert.com&gt;
-
-   Copyright (C) 2004 Entr'ouvert, Frederic Peters &amp; Emmanuel Raviart
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  </xsd:documentation>
- </xsd:annotation>
-
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Identity.xsd"/>
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
-
- <xsd:element name="session" type="Session"/>
-
- <xsd:complexType name="Session">
-  <xsd:complexContent>
-   <xsd:extension base="Thing">
-    <xsd:sequence>
-     <xsd:element name="authenticationMethod" type="xsd:string"/>
-     <xsd:element name="clientHostName" type="xsd:string"/>
-     <xsd:element name="clientIpAddress" type="xsd:string"/>
-     <xsd:element name="clientPort" type="xsd:string"/>
-     <xsd:element name="peerProviderId" type="xsd:anyURI"/>
-     <xsd:element name="publishToken" type="xsd:boolean"/>
-     <xsd:element name="user" type="Identity"/>
-     <xsd:element name="libertyAllianceAuthenticationResponse"
-                  type="xsd:string"/>
-    </xsd:sequence>
-   </xsd:extension>
-  </xsd:complexContent>
- </xsd:complexType>
-
-</xsd:schema>

xml/schema/User.xsd

@@ -1,10 +1,10 @@
 <?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>
   <xsd:documentation xml:lang="en">
-   Identity Schema for Expression.
+   Person, User and Session Type Schema for Expression.
    By: Frederic Peters &lt;fpeters@entrouvert.com&gt;
        Emmanuel Raviart &lt;eraviart@entrouvert.com&gt;
 
@@ -26,13 +26,21 @@
   </xsd:documentation>
  </xsd:annotation>
 
+ <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/EmailAddress.xsd"/>
  <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Thing.xsd"/>
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Person.xsd"/>
- <xsd:include schemaLocation="http://www.entrouvert.org/expression/schemas/Session.xsd"/>
 
- <xsd:element name="identity" type="Identity"/>
+ <!-- Use of "Identity" is Deprecated: renamed to "User" -->
+ <xsd:element name="identity" type="User"/>
 
  <xsd:complexType name="Identity">
+  <xsd:complexContent>
+   <xsd:extension base="User"/>
+  </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:element name="user" type="User"/>
+
+ <xsd:complexType name="User">
   <xsd:complexContent>
    <xsd:extension base="Thing">
     <xsd:sequence>
@@ -59,4 +67,43 @@
   </xsd:complexContent>
  </xsd:complexType>
 
+ <xsd:element name="session" type="Session"/>
+
+ <xsd:complexType name="Session">
+  <xsd:complexContent>
+   <xsd:extension base="Thing">
+    <xsd:sequence>
+     <xsd:element name="authenticationMethod" type="xsd:string"/>
+     <xsd:element name="clientHostName" type="xsd:string"/>
+     <xsd:element name="clientIpAddress" type="xsd:string"/>
+     <xsd:element name="clientPort" type="xsd:string"/>
+     <xsd:element name="peerProviderId" type="xsd:anyURI"/>
+     <xsd:element name="publishToken" type="xsd:boolean"/>
+     <xsd:element name="account">
+      <xsd:complexType>
+       <xsd:attribute name="src" type="xsd:anyURI"/>
+      </xsd:complexType>
+     </xsd:element>
+     <xsd:element name="libertyAllianceAuthenticationResponse"
+                  type="xsd:string"/>
+    </xsd:sequence>
+   </xsd:extension>
+  </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:element name="person" type="Person"/>
+
+ <xsd:complexType name="Person">
+  <xsd:complexContent>
+   <xsd:extension base="Thing">
+    <xsd:sequence>
+     <xsd:element name="fullName" type="xsd:string"/>
+     <xsd:element name="email" type="EmailAddress"/>
+     <xsd:element name="language" type="xsd:language"/>
+     <xsd:element name="authorizations" type="xsd:string"/>
+    </xsd:sequence>
+   </xsd:extension>
+  </xsd:complexContent>
+ </xsd:complexType>
+
 </xsd:schema>

xml/schema/catalog.xml

@@ -32,24 +32,24 @@
          uri="Description.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/Directory.xsd"
          uri="Directory.xsd"/>
+ <system systemId="http://www.entrouvert.org/expression/schemas/EmailAddress.xsd"
+         uri="EmailAddress.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/Group.xsd"
          uri="Group.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/HttpStatus.xsd"
          uri="HttpStatus.xsd"/>
- <system systemId="http://www.entrouvert.org/expression/schemas/Identity.xsd"
-         uri="Identity.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/Metadata.xsd"
          uri="Metadata.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/OOoDocumentMeta.xsd"
          uri="OOoDocumentMeta.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/PasswordAccount.xsd"
          uri="PasswordAccount.xsd"/>
- <system systemId="http://www.entrouvert.org/expression/schemas/Person.xsd"
-         uri="Person.xsd"/>
- <system systemId="http://www.entrouvert.org/expression/schemas/Session.xsd"
-         uri="Session.xsd"/>
+ <system systemId="http://www.entrouvert.org/expression/schemas/Spip.xsd"
+         uri="Spip.xsd"/>
  <system systemId="http://www.entrouvert.org/expression/schemas/Thing.xsd"
          uri="Thing.xsd"/>
+ <system systemId="http://www.entrouvert.org/expression/schemas/User.xsd"
+         uri="User.xsd"/>
 
  <!-- Liberty Alliance Schemas -->