| [Dev OpenGP] [29] Quickfix |
[ Thread Index |
Date Index
| More opengp.tuxfamily.org/development Archives
]
Revision: 29
Author: alband85
Date: 2009-03-10 18:26:20 +0100 (Tue, 10 Mar 2009)
Log Message:
-----------
Quickfix
Modified Paths:
--------------
trunk/schemas/ogpxmlconfig-test.xml
trunk/schemas/ogpxmlconfig.xsd
Modified: trunk/schemas/ogpxmlconfig-test.xml
===================================================================
--- trunk/schemas/ogpxmlconfig-test.xml 2009-03-10 17:20:23 UTC (rev 28)
+++ trunk/schemas/ogpxmlconfig-test.xml 2009-03-10 17:26:20 UTC (rev 29)
@@ -1,11 +1,10 @@
-<!-- XML file for ogpxmlconfig.xsd's tests
- First plugin entry is clean, th second one must raise (using xmllint) :
- - ogpxmlconfig-test.xml:50: element acl: Schemas validity error : Element 'acl': Missing child element(s). Expected is ( ace ).
- - ogpxmlconfig-test.xml:83: element ur: Schemas validity error : Element 'ur': 'dsffffdkdsjf' is not a valid value of the atomic type 'xs:boolean'.
- - ogpxmlconfig-test.xml:91: element ace: Schemas validity error : Element 'ace': Duplicate key-sequence ['0'] in unique identity-constraint 'ace_id'.
- - ogpxmlconfig-test.xml:93: element t: Schemas validity error : Element 't': This element is not expected. Expected is one of ( gr, gw, gx, or, ow, ox ).
- - ogpxmlconfig-test.xml:79: element file: Schemas validity error : Element 'file': Duplicate key-sequence ['enabled-sites'] in unique identity-constraint 'file_name'.
- - ogpxmlconfig-test.xml:59: element plugin: Schemas validity error : Element 'plugin': Duplicate key-sequence ['apache'] in unique identity-constraint 'plugin_name'.
+<!-- XML file for ogpxmlconfig.xsd's tests. First plugin entry is clean, th second one must raise (using xmllint) :
+ - ogpxmlconfig-test.xml:50: element acl: Schemas validity error : Element 'acl': Missing child element(s). Expected is ( ace ).
+ - ogpxmlconfig-test.xml:83: element ur: Schemas validity error : Element 'ur': 'dsffffdkdsjf' is not a valid value of the atomic type 'xs:boolean'.
+ - ogpxmlconfig-test.xml:91: element ace: Schemas validity error : Element 'ace': Duplicate key-sequence ['0'] in unique identity-constraint 'ace_id'.
+ - ogpxmlconfig-test.xml:93: element t: Schemas validity error : Element 't': This element is not expected. Expected is one of ( gr, gw, gx, or, ow, ox ).
+ - ogpxmlconfig-test.xml:79: element file: Schemas validity error : Element 'file': Duplicate key-sequence ['enabled-sites'] in unique identity-constraint 'file_name'.
+ - ogpxmlconfig-test.xml:59: element plugin: Schemas validity error : Element 'plugin': Duplicate key-sequence ['apache'] in unique identity-constraint 'plugin_name'.
-->
<ogp>
@@ -47,7 +46,10 @@
<us>0</us> <!-- SetUID -->
<gs>0</gs> <!-- SetGID -->
<t>0</t> <!-- Sticky bit -->
- <acl />
+ <acl>
+ <ace id="1" value="none"/>
+ <ace id="3" value="pas"/>
+ </acl>
</security>
<conf>
<sfhksdks sdfhfksd="khjkhkh" />
Modified: trunk/schemas/ogpxmlconfig.xsd
===================================================================
--- trunk/schemas/ogpxmlconfig.xsd 2009-03-10 17:20:23 UTC (rev 28)
+++ trunk/schemas/ogpxmlconfig.xsd 2009-03-10 17:26:20 UTC (rev 29)
@@ -76,11 +76,8 @@
-->
<xs:element name="ace">
<xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="id" type="xs:nonNegativeInteger" use="required"/>
- </xs:extension>
- </xs:simpleContent>
+ <xs:attribute name="id" type="xs:nonNegativeInteger" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
</xs:choice>
@@ -132,4 +129,4 @@
<xs:field xpath="@name"/>
</xs:unique>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>