svn commit: r950675 - in /ofbiz/site/dtds: SeleniumXml.xsd entitymodel.xsd ofbiz-component.xsd service-group.xsd services.xsd simple-methods.xsd test-suite.xsd widget-form.xsd widget-screen.xsd

Author: jleroux
Date: Wed Jun  2 17:24:23 2010
New Revision: 950675

URL: http://svn.apache.org/viewvc?rev=950675&view=rev
Log:
Update dtds

Modified:
    ofbiz/site/dtds/SeleniumXml.xsd
    ofbiz/site/dtds/entitymodel.xsd
    ofbiz/site/dtds/ofbiz-component.xsd
    ofbiz/site/dtds/service-group.xsd
    ofbiz/site/dtds/services.xsd
    ofbiz/site/dtds/simple-methods.xsd
    ofbiz/site/dtds/test-suite.xsd
    ofbiz/site/dtds/widget-form.xsd
    ofbiz/site/dtds/widget-screen.xsd

Modified: ofbiz/site/dtds/SeleniumXml.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/SeleniumXml.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/SeleniumXml.xsd (original)
+++ ofbiz/site/dtds/SeleniumXml.xsd Wed Jun  2 17:24:23 2010
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
- <!--
- ==================================================
- ========== Element and Attribute definitions for
- ========== SeleniumXml project ===================
- ==================================================
- -->
- <xs:group name="AllCommands"><!-- All SeleniumXml command which normally match with the SeleniumRC Java API. -->
- <xs:choice>
- <xs:element ref="testcase"  />
- <xs:element ref="type" />
- <xs:element ref="loadData" />
- <xs:element ref="selectPopup" />
- <xs:element ref="getAllWindowIds" />
- <xs:element ref="captureTextInPage" />
- <xs:element ref="getSelectedLabel" />
- <xs:element ref="getSelectedValue" />
- <xs:element ref="getSelectedId" />
- <xs:element ref="assertContains" />
- <xs:element ref="getHtmlSource" />
- <xs:element ref="getBodyText" />
- <xs:element ref="print" />
- <xs:element ref="waitForPageToLoad" />
- <xs:element ref="getSelectedIds" />
- <xs:element ref="copy" />
- <xs:element ref="append" />
- <xs:element ref="open" />
- <xs:element ref="click" />
- <xs:element ref="select" />
- <xs:element ref="uniqueId" />
- <xs:element ref="randomAlphaString" />
- <xs:element ref="randomString" />
- <xs:element ref="setSpeed" />
- </xs:choice>
- </xs:group>
+    elementFormDefault="qualified">
+    <!--
+        ==================================================
+        ========== Element and Attribute definitions for
+        ========== SeleniumXml project ===================
+        ==================================================
+    -->
+    <xs:group name="AllCommands"><!-- All SeleniumXml command which normally match with the SeleniumRC Java API. -->
+        <xs:choice>
+            <xs:element ref="testcase"  />
+            <xs:element ref="type" />
+            <xs:element ref="loadData" />
+            <xs:element ref="selectPopup" />
+            <xs:element ref="getAllWindowIds" />
+            <xs:element ref="captureTextInPage" />
+            <xs:element ref="getSelectedLabel" />
+            <xs:element ref="getSelectedValue" />
+            <xs:element ref="getSelectedId" />
+            <xs:element ref="assertContains" />
+            <xs:element ref="getHtmlSource" />
+            <xs:element ref="getBodyText" />
+            <xs:element ref="print" />
+            <xs:element ref="waitForPageToLoad" />
+            <xs:element ref="getSelectedIds" />
+            <xs:element ref="copy" />
+            <xs:element ref="append" />
+            <xs:element ref="open" />
+            <xs:element ref="click" />
+            <xs:element ref="select" />
+            <xs:element ref="uniqueId" />
+            <xs:element ref="randomAlphaString" />
+            <xs:element ref="randomString" />
+            <xs:element ref="setSpeed" />
+        </xs:choice>
+    </xs:group>
 
 
- <xs:element name="testcase">
- <xs:annotation>
- <xs:documentation></xs:documentation>
- </xs:annotation>
+    <xs:element name="testcase">
+        <xs:annotation>
+            <xs:documentation></xs:documentation>
+        </xs:annotation>
 
- <xs:complexType>
- <xs:sequence>
- <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllCommands"/>
- </xs:sequence>
-
- <xs:attributeGroup ref="attlist.name-value" />
- <xs:attribute name="LABEL" type="xs:string" use="required" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="type" >
- <xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllCommands"/>
+            </xs:sequence>
+                
+            <xs:attributeGroup ref="attlist.name-value" />
+            <xs:attribute name="LABEL" type="xs:string" use="required" />
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="type" >
+        <xs:annotation>
             <xs:documentation>
             </xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:attributeGroup ref="attlist.name-value"/>
- </xs:complexType>
- </xs:element>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="loadData">
         <xs:annotation>
             <xs:documentation>
@@ -88,7 +88,7 @@
             <xs:attributeGroup ref="attlist.file"/>
             <xs:attributeGroup ref="attlist.loadData"/>
         </xs:complexType>
-    </xs:element>
+    </xs:element>    
     
      <xs:element name="selectPopup">
         <xs:annotation>
@@ -118,7 +118,7 @@
         <xs:complexType>
             <xs:attributeGroup ref="attlist.captureTextInPage"/>
         </xs:complexType>
-    </xs:element>
+    </xs:element>    
     
      <xs:element name="getSelectedLabel">
         <xs:annotation>
@@ -306,10 +306,10 @@
         </xs:complexType>
     </xs:element>
     
- <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Attribute Lists for all Element definitions -->
- <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
- <xs:attributeGroup name="attlist.file">
+    <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
+    <!-- Attribute Lists for all Element definitions -->
+    <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
+    <xs:attributeGroup name="attlist.file">
         <xs:attribute type="xs:string" name="file" use="optional">
             <xs:annotation>
                 <xs:documentation>
@@ -318,7 +318,7 @@
         </xs:attribute>
     </xs:attributeGroup>
     
- <xs:attributeGroup name="attlist.name-value">
+    <xs:attributeGroup name="attlist.name-value">
         <xs:attribute type="xs:string" name="name" use="required">
             <xs:annotation>
                 <xs:documentation>

Modified: ofbiz/site/dtds/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Wed Jun  2 17:24:23 2010
@@ -202,6 +202,14 @@ under the License.
     </xs:element>
     <xs:attributeGroup name="attlist.index-field">
         <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="function">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="lower"/>
+                    <xs:enumeration value="upper"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     
     <!-- ================== view-entity ===================== -->
@@ -452,5 +460,7 @@ under the License.
     </xs:element>
     <xs:attributeGroup name="attlist.extend-entity">
         <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="default-resource-name" type="xs:string"/>
+        <xs:attribute name="dependent-on" type="xs:string"/>
     </xs:attributeGroup>
 </xs:schema>

Modified: ofbiz/site/dtds/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-component.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/ofbiz-component.xsd (original)
+++ ofbiz/site/dtds/ofbiz-component.xsd Wed Jun  2 17:24:23 2010
@@ -252,6 +252,6 @@ under the License.
         <service-resource type="group" loader="maincomponent" location="service/groups_test.xml"/>
         <service-resource type="eca" loader="maincomponent" location="service/secas_test.xml"/>
 
-     <webapp name="webtools" title="WebTools" server="default" location="webtools" mount-point="/webtools"/>
+        <webapp name="webtools" title="WebTools" server="default" location="webtools" mount-point="/webtools"/>
     </ofbiz-component>
 -->

Modified: ofbiz/site/dtds/service-group.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-group.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/service-group.xsd (original)
+++ ofbiz/site/dtds/service-group.xsd Wed Jun  2 17:24:23 2010
@@ -82,9 +82,9 @@ under the License.
 </xs:schema>
 <!--
     <service-group>
-     <group name="testOne" send-mode="none">
-     <invoke name="testScv" mode="async"/>
-     <invoke name="testScv" mode="sync"/>
-     </group>
+        <group name="testOne" send-mode="none">
+            <invoke name="testScv" mode="async"/>
+            <invoke name="testScv" mode="sync"/>
+        </group>
     </service-group>
 -->

Modified: ofbiz/site/dtds/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/services.xsd (original)
+++ ofbiz/site/dtds/services.xsd Wed Jun  2 17:24:23 2010
@@ -188,6 +188,7 @@ under the License.
             <xs:sequence>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-permission"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-role-member"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="permission-service"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.required-permissions"/>
         </xs:complexType>

Modified: ofbiz/site/dtds/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/simple-methods.xsd (original)
+++ ofbiz/site/dtds/simple-methods.xsd Wed Jun  2 17:24:23 2010
@@ -835,6 +835,34 @@ under the License.
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="script" substitutionGroup="CallOperations">
+        <xs:annotation>
+            <xs:documentation>
+                Runs an external script (minilang, bsh, groovy) from the expanded location provided.              
+                Error messages go on the error list and are handled with the check-errors tag.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="attlist.script"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.script">
+        <xs:attribute type="xs:string" name="location">
+            <xs:annotation>
+                <xs:documentation>
+                    Script location (component://...)
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:string" name="error-list-name" default="error_list">
+            <xs:annotation>
+                <xs:documentation>
+                    The name of the list in the method environment to check for error messages.
+                    Defaults to "error_list".
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
     <xs:element name="call-bsh" substitutionGroup="CallOperations">
         <xs:annotation>
             <xs:documentation>
@@ -2575,6 +2603,7 @@ under the License.
     <xs:element name="entity-count" substitutionGroup="EntityFindOperations">
         <xs:annotation>
             <xs:documentation>
+                Returns a long presenting the number of results found matching the specified condition.
                 The entity-count is very  similar to the entity-condition.
 
                 Specify the entity-name, optionally the delgator-name if you want to override that,

Modified: ofbiz/site/dtds/test-suite.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/test-suite.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/test-suite.xsd (original)
+++ ofbiz/site/dtds/test-suite.xsd Wed Jun  2 17:24:23 2010
@@ -39,7 +39,7 @@ under the License.
             <xs:choice minOccurs="1" maxOccurs="unbounded">
                 <xs:element ref="test-case"/>
                 <xs:element ref="test-group"/>
-    </xs:choice>
+        </xs:choice>
             <xs:attributeGroup ref="attlist.test-suite"/>
         </xs:complexType>
     </xs:element>

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Wed Jun  2 17:24:23 2010
@@ -204,6 +204,7 @@ under the License.
             <xs:annotation><xs:documentation>The default-table-style specifies the style to use in the table.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute name="client-autocomplete-fields" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -213,10 +214,12 @@ under the License.
         </xs:attribute>
         <!-- not sure this is such a good idea
         <xs:attribute type="xs:string" name="hidden-values-map-name">
-            <xs:annotation><xs:documentation>A map that contains hidden field name/value pairs.
-            The reason for this is to eliminate the need to code custom forms so that auxiliary, passthru data can be sent to the server.
-            By doing it this way, more standard forms can be used.
-</xs:documentation></xs:annotation>
+            <xs:annotation>
+                <xs:documentation>A map that contains hidden field name/value pairs.
+                    The reason for this is to eliminate the need to code custom forms so that auxiliary, passthru data can be sent to the server.
+                    By doing it this way, more standard forms can be used.
+                </xs:documentation>
+            </xs:annotation>
         </xs:attribute>
         -->
     </xs:attributeGroup>
@@ -664,12 +667,21 @@ under the License.
                     <xs:enumeration value="date-time">
                         <xs:annotation><xs:documentation>Display only the date and hours:minutes part of a timestamp field</xs:documentation></xs:annotation>
                     </xs:enumeration>
+                    <xs:enumeration value="image">
+                        <xs:annotation><xs:documentation>Display the image specified in image-location</xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="accounting-number">
+                        <xs:annotation><xs:documentation>Display negatives in parentheses (configurable, see arithmetic.properties)</xs:documentation></xs:annotation>
+                    </xs:enumeration>
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute type="xs:string" name="currency">
             <xs:annotation><xs:documentation>Specifies the currency uom ID used to format context value, should generally use the ${} syntax to retrieve value.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:string" name="image-location">
+            <xs:annotation><xs:documentation>Specifies the image to display.</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="display-entity" substitutionGroup="AllFields">
         <xs:annotation><xs:documentation>This is just like display but looks up a description using the Entity Engine; note that if also-hidden is true then it uses the key as the value, not the shown description.</xs:documentation></xs:annotation>
@@ -770,6 +782,7 @@ under the License.
         <xs:attribute type="xs:positiveInteger" name="maxlength"/>
         <xs:attribute type="xs:string" name="default-value"/>
         <xs:attribute name="client-autocomplete-field" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -830,6 +843,12 @@ under the License.
             <xs:annotation><xs:documentation>Specifies the string to display, can use the ${} syntax to insert context values; if empty the value of the field will be printed for a default.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="target-window"/>
+        <xs:attribute type="xs:string" name="alternate">
+            <xs:annotation><xs:documentation>Alternate text if the image is not found at image-location</xs:documentation></xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:string" name="image-title">
+            <xs:annotation><xs:documentation>Use as a title for the HTML img tag</xs:documentation></xs:annotation>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="image-location"/>
         <xs:attribute name="request-confirmation" default="false">
             <xs:annotation><xs:documentation>If true then the user is presented with a dialog box, if confirmation-message is empty, use default</xs:documentation></xs:annotation>
@@ -841,6 +860,9 @@ under the License.
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="confirmation-message" type="xs:string"><xs:annotation><xs:documentation>The message displayed in confirmation box</xs:documentation></xs:annotation></xs:attribute>
+        <xs:attribute name="parameters-map" type="xs:string">
+            <xs:annotation><xs:documentation>A Map in the context that will be used as additional name/value pairs.</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="parameter">
         <xs:complexType>
@@ -869,6 +891,8 @@ under the License.
         <xs:attribute type="xs:positiveInteger" name="height"/>
         <xs:attribute type="xs:string" name="value"/>
         <xs:attribute type="xs:string" name="default-value"/>
+        <xs:attribute type="xs:string" name="description"/>
+        <xs:attribute type="xs:string" name="alternate"/>
     </xs:attributeGroup>
     <xs:element name="lookup" substitutionGroup="AllFields">
         <xs:complexType>
@@ -880,14 +904,17 @@ under the License.
     </xs:element>
     <xs:attributeGroup name="attlist.lookup">
         <xs:attribute type="xs:string" name="target-form-name" use="required"/>
-        <xs:attribute type="xs:positiveInteger" name="size" default="25"/>
+        <xs:attribute type="xs:nonNegativeInteger" name="size" default="25"/>
         <xs:attribute type="xs:positiveInteger" name="maxlength"/>
         <xs:attribute type="xs:string" name="default-value"/>
-        <xs:attribute type="xs:string" name="description-field-name"/>
+        <xs:attribute type="xs:string" name="description-field-name">
+            <xs:annotation><xs:documentation>The name of a field whose value is also filled when coming back from lookup selection.</xs:documentation></xs:annotation>            
+        </xs:attribute>
         <xs:attribute type="xs:string" name="target-parameter">
             <xs:annotation><xs:documentation>The name of a field whose value is passed in as a parameter to the lookup target form. Can be a comma separated list.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute name="client-autocomplete-field" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -903,8 +930,8 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="presentation" default="window">
-            <xs:annotation><xs:documentation>Shows the lookup as moveable and resizable layer or window. For layer lookups use the 'LookupLayerPopupDecorator'</xs:documentation></xs:annotation>
+        <xs:attribute name="presentation" default="layer">
+            <xs:annotation><xs:documentation>Shows the lookup as moveable and resizable layer or window. Default to layer which uses the 'LookupLayerPopupDecorator'</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="layer"/>
@@ -918,8 +945,8 @@ under the License.
         <xs:attribute type="xs:string" name="width">
             <xs:annotation><xs:documentation>Only layer width. I.e. 250px, 12%</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute name="position" default="normal">
-            <xs:annotation><xs:documentation>Only layer position. Normal sets the layer under the target field.</xs:documentation></xs:annotation>
+        <xs:attribute name="position" default="topleft">
+            <xs:annotation><xs:documentation>Only for layer position. Default to topleft, normal sets the layer just under the target field, like for the calendar.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="normal"/>
@@ -932,6 +959,24 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="fade-background" default="true">
+            <xs:annotation><xs:documentation>If true the window background will be faded, default to true.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="initially-collapsed" default="false">
+            <xs:annotation><xs:documentation>If true the search screenlet is collapsed intially, default to false.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="password" substitutionGroup="AllFields">
         <xs:complexType>
@@ -946,6 +991,7 @@ under the License.
         <xs:attribute type="xs:positiveInteger" name="maxlength"/>
         <xs:attribute type="xs:string" name="default-value"/>
         <xs:attribute name="client-autocomplete-field" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -980,6 +1026,7 @@ under the License.
         <xs:attribute type="xs:positiveInteger" name="maxlength"/>
         <xs:attribute type="xs:string" name="default-value"/>
         <xs:attribute name="client-autocomplete-field" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -1060,6 +1107,7 @@ under the License.
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="client-autocomplete-field" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -1127,10 +1175,15 @@ under the License.
                     <xs:enumeration value="contains"/>
                     <xs:enumeration value="empty"/>
                     <xs:enumeration value="notEqual"/>
+                    <xs:enumeration value="lessThan"/>
+                    <xs:enumeration value="lessThanEqualTo"/>
+                    <xs:enumeration value="greaterThan"/>
+                    <xs:enumeration value="greaterThanEqualTo"/>
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="client-autocomplete-field" default="true">
+            <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=950675&r1=950674&r2=950675&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Wed Jun  2 17:24:23 2010
@@ -35,7 +35,11 @@ under the License.
     </xs:element>
     <xs:attributeGroup name="attlist.screen">
         <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="transaction-timeout" use="optional"/>
+        <xs:attribute type="xs:string" name="transaction-timeout" use="optional">
+            <xs:annotation>
+                <xs:documentation>Transaction timeout in seconds</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -911,8 +915,8 @@ under the License.
         <xs:attribute type="xs:string" name="title">
             <xs:annotation><xs:documentation>Title text to be placed in the screenlet title bar.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="id"/>
-        <xs:attribute type="xs:string" name="name"/>
+        <xs:attribute name="id" type="xs:string"/>
+        <xs:attribute name="name" type="xs:string"/>
         <xs:attribute name="collapsible" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -921,14 +925,8 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="initially-collapsed" default="false">
-            <xs:annotation><xs:documentation>When set to true, screenlet will be collapsed initially. Defaults to false.</xs:documentation></xs:annotation>
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="true"/>
-                    <xs:enumeration value="false"/>
-                </xs:restriction>
-            </xs:simpleType>
+        <xs:attribute name="initially-collapsed" type="xs:string" default="false">
+            <xs:annotation><xs:documentation>When set to true, screenlet will be collapsed initially. Can be an expanded string to get the value from a variable. Defaults to false.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute name="save-collapsed" default="true">
             <xs:annotation><xs:documentation>When set to true, screenlet collapse status is saved as user preference. Defaults to true.</xs:documentation></xs:annotation>