[Amedes-cvs-commit] [ame] xml/schema

sebd at users.labs.libre-entreprise.org sebd at users.labs.libre-entreprise.org
Fri Feb 11 17:31:39 CET 2005


Changement dans le répertoire ame/xml/schema:
---
Fixed everything, more or less.
---  (par sebd)

Fichiers affectés:
-----------------
Permission.xsd       modifié     (1.1.1.1 -> 1.2)
Thing.xsd            modifié     (1.1.1.1 -> 1.2)
-------------- next part --------------
Index: ame/xml/schema/Permission.xsd
diff -u ame/xml/schema/Permission.xsd:1.1.1.1 ame/xml/schema/Permission.xsd:1.2
--- ame/xml/schema/Permission.xsd:1.1.1.1	Wed Jan 26 14:55:34 2005
+++ ame/xml/schema/Permission.xsd	Fri Feb 11 16:31:33 2005
@@ -29,17 +29,21 @@
  <xsd:include schemaLocation="AbstractQuery.xsd"/>
  <xsd:element name="permission" type="Permission"/>
  <xsd:complexType name="Access">
+  <xsd:attribute name="name" type="xsd:string"/>
+  <xsd:attribute name="writeAccess" type="xsd:boolean"/>
+ </xsd:complexType>
+ <xsd:complexType name="Permission">
   <xsd:complexContent>
    <xsd:extension base="AbstractQuery">
     <xsd:sequence>
-     <xsd:element name="access" minOccurs="0" maxOccurs="unbounded">
-      <xsd:complexType>
-       <xsd:attribute name="fieldGroupName" type="xsd:string"/>
-       <xsd:attribute name="writeAccess" type="xsd:boolean"/>
-      </xsd:complexType>
-     </xsd:element>
-     <xsd:attribute name="canCreateAndDelete" type="xsd:boolean"/>
+     <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="attributeAccess" type="Access"/>
+      <xsd:element name="elementAccess" type="Access"/>
+      <xsd:element name="attributeGroupAccess" type="Access"/>
+      <xsd:element name="groupAccess" type="Access"/>
+     </xsd:choice>
     </xsd:sequence>
+    <xsd:attribute name="canCreateAndDelete" type="xsd:boolean"/>
    </xsd:extension>
   </xsd:complexContent>
  </xsd:complexType>

Index: ame/xml/schema/Thing.xsd
diff -u ame/xml/schema/Thing.xsd:1.1.1.1 ame/xml/schema/Thing.xsd:1.2
--- ame/xml/schema/Thing.xsd:1.1.1.1	Wed Jan 26 14:55:34 2005
+++ ame/xml/schema/Thing.xsd	Fri Feb 11 16:31:33 2005
@@ -26,13 +26,17 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:yep="http://www.entrouvert.org/namespaces/expression/0.0"
 >
+<!--
  <xsd:import
      namespace="http://www.entrouvert.org/namespaces/expression/0.0"
      schemaLocation="/usr/local/share/xml/schema/expression/Thing.xsd"
  />
- <xsd:complexType name="Thing">
+-->
+ <xsd:complexType name="Thing"/>
+<!--
   <xsd:complexContent>
    <xsd:extension base="yep:Thing"/>
   </xsd:complexContent>
  </xsd:complexType>
+-->
 </xsd:schema>


More information about the Amedes-cvs-commit mailing list