OFBiz › OFBiz - Commits

svn commit: r1649291 - in /ofbiz/trunk/framework/widget/dtd: widget-common.xsd widget-form.xsd widget-menu.xsd widget-screen.xsd

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

adrianc

svn commit: r1649291 - in /ofbiz/trunk/framework/widget/dtd: widget-common.xsd widget-form.xsd widget-menu.xsd widget-screen.xsd

Author: adrianc
Date: Sun Jan 4 04:51:08 2015
New Revision: 1649291

URL: http://svn.apache.org/r1649291
Log:
Update widget schemas to reuse shared actions.

Modified:
ofbiz/trunk/framework/widget/dtd/widget-common.xsd
ofbiz/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
ofbiz/trunk/framework/widget/dtd/widget-screen.xsd

Modified: ofbiz/trunk/framework/widget/dtd/widget-common.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-common.xsd?rev=1649291&r1=1649290&r2=1649291&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-common.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-common.xsd Sun Jan 4 04:51:08 2015
@@ -239,4 +239,281 @@ under the License.
<xs:attribute type="xs:string" name="field" use="required" />
</xs:complexType>
</xs:element>
+
+ <xs:element name="AllActions" abstract="true" />
+ <xs:element name="set" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="field" use="required" />
+ <xs:attribute type="xs:string" name="from-field" />
+ <xs:attribute type="xs:string" name="value" />
+ <xs:attribute type="xs:string" name="default-value" />
+ <xs:attribute name="global" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="type">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="PlainString" />
+ <xs:enumeration value="String" />
+ <xs:enumeration value="BigDecimal" />
+ <xs:enumeration value="Double" />
+ <xs:enumeration value="Float" />
+ <xs:enumeration value="List" />
+ <xs:enumeration value="Long" />
+ <xs:enumeration value="Integer" />
+ <xs:enumeration value="Date" />
+ <xs:enumeration value="Time" />
+ <xs:enumeration value="Timestamp" />
+ <xs:enumeration value="Boolean" />
+ <xs:enumeration value="Object" />
+ <xs:enumeration value="NewList" />
+ <xs:enumeration value="NewMap" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="to-scope" default="screen">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="screen" />
+ <xs:enumeration value="user" />
+ <xs:enumeration value="application" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="from-scope" default="screen">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="screen" />
+ <xs:enumeration value="user" />
+ <xs:enumeration value="application" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="property-map" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="resource" use="required" />
+ <xs:attribute type="xs:string" name="map-name" use="required" />
+ <xs:attribute name="global" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="property-to-field" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="resource" use="required" />
+ <xs:attribute type="xs:string" name="property" use="required" />
+ <xs:attribute type="xs:string" name="field" use="required" />
+ <xs:attribute type="xs:string" name="default" />
+ <xs:attribute name="no-locale" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute type="xs:string" name="arg-list-name" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="script" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="location" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="entity-one" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" />
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />
+ </xs:sequence>
+ <xs:attribute name="entity-name" type="xs:string" use="required" />
+ <xs:attribute name="value-field" type="xs:string" use="required" />
+ <xs:attribute name="use-cache" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="auto-field-map" default="true">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="get-related-one" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:attribute name="value-field" type="xs:string" use="required" />
+ <xs:attribute name="relation-name" type="xs:string" use="required" />
+ <xs:attribute name="use-cache" type="xs:string" default="false" />
+ <xs:attribute name="to-value-field" type="xs:string" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="get-related" substitutionGroup="AllActions">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="value-field" use="required" />
+ <xs:attribute type="xs:string" name="relation-name" use="required" />
+ <xs:attribute type="xs:string" name="map" />
+ <xs:attribute type="xs:string" name="order-by-list" />
+ <xs:attribute type="xs:string" name="use-cache" default="false" />
+ <xs:attribute type="xs:string" name="list" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="condition-list">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element ref="condition-expr" />
+ <xs:element ref="condition-list" />
+ <xs:element ref="condition-object" />
+ </xs:choice>
+ <xs:attribute name="combine" default="and">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="and" />
+ <xs:enumeration value="or" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="having-condition-list">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element ref="condition-expr" />
+ <xs:element ref="condition-list" />
+ <xs:element ref="condition-object" />
+ </xs:choice>
+ <xs:attribute name="combine" default="and">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="and" />
+ <xs:enumeration value="or" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="condition-expr">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="field-name" use="required" />
+ <xs:attribute name="operator" default="equals">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="less" />
+ <xs:enumeration value="greater" />
+ <xs:enumeration value="less-equals" />
+ <xs:enumeration value="greater-equals" />
+ <xs:enumeration value="equals" />
+ <xs:enumeration value="not-equals" />
+ <xs:enumeration value="in" />
+ <xs:enumeration value="not-in" />
+ <xs:enumeration value="between" />
+ <xs:enumeration value="like" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute type="xs:string" name="from-field" />
+ <xs:attribute type="xs:string" name="value" />
+ <xs:attribute name="ignore-if-null" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="ignore-if-empty" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="ignore-case" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="ignore" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Ignore the condition if flag is true.
+ Defaults to false.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="condition-object">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="field" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="select-field">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="field-name" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="order-by">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="field-name" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="limit-range">
+ <xs:complexType>
+ <xs:attribute name="start" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="limit-view">
+ <xs:complexType>
+ <xs:attribute name="view-index" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="view-size" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Should resolve into a positive integer.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="use-iterator" />
+ <xs:element name="field-map">
+ <xs:complexType>
+ <xs:attribute type="xs:string" name="field-name" use="required" />
+ <xs:attribute type="xs:string" name="from-field" />
+ <xs:attribute type="xs:string" name="value" />
+ </xs:complexType>
+ </xs:element>
</xs:schema>

Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=1649291&r1=1649290&r2=1649291&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Sun Jan 4 04:51:08 2015
@@ -18,6 +18,7 @@ specific language governing permissions
under the License.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ <xs:include schemaLocation="http://ofbiz.apache.org/dtds/widget-common.xsd" />


<xs:element name="forms">
@@ -1798,7 +1799,6 @@ under the License.
</xs:element>


- <xs:element name="AllActions" abstract="true"/>
<xs:element name="actions">
<xs:complexType>
<xs:sequence>
@@ -1813,42 +1813,6 @@ under the License.
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="property-map" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="resource" use="required" />
- <xs:attribute type="xs:string" name="map-name" use="required" />
- <xs:attribute name="global" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="property-to-field" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="resource" use="required" />
- <xs:attribute type="xs:string" name="property" use="required" />
- <xs:attribute type="xs:string" name="field" use="required" />
- <xs:attribute type="xs:string" name="default" />
- <xs:attribute name="no-locale" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute type="xs:string" name="arg-list-name" />
- </xs:complexType>
- </xs:element>
- <xs:element name="script" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="location" use="required" />
- </xs:complexType>
- </xs:element>
<xs:element name="service" substitutionGroup="AllActions">
<xs:complexType>
<xs:sequence>
@@ -1873,44 +1837,7 @@ under the License.
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="set" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field" use="required" />
- <xs:attribute type="xs:string" name="from-field" />
- <xs:attribute type="xs:string" name="value" />
- <xs:attribute type="xs:string" name="default-value" />
- <xs:attribute name="global" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="type" default="String">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="PlainString" />
- <xs:enumeration value="String" />
- <xs:enumeration value="BigDecimal" />
- <xs:enumeration value="Double" />
- <xs:enumeration value="Float" />
- <xs:enumeration value="List" />
- <xs:enumeration value="Long" />
- <xs:enumeration value="Integer" />
- <xs:enumeration value="Date" />
- <xs:enumeration value="Time" />
- <xs:enumeration value="Timestamp" />
- <xs:enumeration value="Boolean" />
- <xs:enumeration value="Object" />
- <xs:enumeration value="NewList" />
- <xs:enumeration value="NewMap" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
+ <xs:element name="call-parent-actions" substitutionGroup="AllActions" />
<xs:element name="entity-and" substitutionGroup="AllActions">
<xs:complexType>
<xs:sequence>
@@ -1923,8 +1850,7 @@ under the License.
<xs:element ref="use-iterator" />
</xs:choice>
</xs:sequence>
- <xs:attribute name="entity-name" type="xs:string" use="required" />
- <xs:attribute name="list" type="xs:string" use="optional" />
+ <xs:attribute type="xs:string" name="entity-name" use="required" />
<xs:attribute name="use-cache" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -1942,6 +1868,7 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute type="xs:string" name="list" />
<xs:attribute name="result-set-type" default="scroll">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -1969,8 +1896,7 @@ under the License.
<xs:element ref="use-iterator" />
</xs:choice>
</xs:sequence>
- <xs:attribute name="entity-name" type="xs:string" use="required" />
- <xs:attribute name="list" type="xs:string" use="optional" />
+ <xs:attribute type="xs:string" name="entity-name" use="required" />
<xs:attribute name="use-cache" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -1996,7 +1922,8 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="delegator-name" />
+ <xs:attribute type="xs:string" name="delegator-name" />
+ <xs:attribute type="xs:string" name="list" />
<xs:attribute name="result-set-type" default="scroll">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -2007,172 +1934,4 @@ under the License.
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="entity-one" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="entity-name" use="required" />
- <xs:attribute type="xs:string" name="value-field" />
- <xs:attribute name="use-cache" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="auto-field-map" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="condition-expr">
- <xs:complexType>
- <xs:attribute name="field-name" type="xs:string" use="required" />
- <xs:attribute name="operator" default="equals">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="less" />
- <xs:enumeration value="greater" />
- <xs:enumeration value="less-equals" />
- <xs:enumeration value="greater-equals" />
- <xs:enumeration value="equals" />
- <xs:enumeration value="not-equals" />
- <xs:enumeration value="in" />
- <xs:enumeration value="between" />
- <xs:enumeration value="like" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="from-field" type="xs:string" />
- <xs:attribute name="value" type="xs:string" />
- <xs:attribute name="ignore-if-null" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="ignore-if-empty" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="ignore-case" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="ignore" default="false">
- <xs:annotation>
- <xs:documentation>
- Ignore the condition if flag is true.
- Defaults to false.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="condition-list">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="condition-expr" />
- <xs:element ref="condition-list" />
- <xs:element ref="condition-object" />
- </xs:choice>
- <xs:attribute name="combine" default="and">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="and" />
- <xs:enumeration value="or" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="condition-object">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="field-map">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- <xs:attribute type="xs:string" name="from-field" />
- <xs:attribute type="xs:string" name="value" />
- </xs:complexType>
- </xs:element>
- <xs:element name="having-condition-list">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="condition-expr" />
- <xs:element ref="condition-list" />
- <xs:element ref="condition-object" />
- </xs:choice>
- <xs:attribute name="combine" default="and">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="and" />
- <xs:enumeration value="or" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="limit-range">
- <xs:complexType>
- <xs:attribute name="start" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="size" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="limit-view">
- <xs:complexType>
- <xs:attribute name="view-index" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="view-size" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a positive integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="use-iterator" />
- <xs:element name="order-by">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="select-field">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="call-parent-actions" substitutionGroup="AllActions" />
</xs:schema>

Modified: ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-menu.xsd?rev=1649291&r1=1649290&r2=1649291&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-menu.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-menu.xsd Sun Jan 4 04:51:08 2015
@@ -320,8 +320,6 @@ under the License.
</xs:complexType>
</xs:element>

- 
- <xs:element name="AllActions" abstract="true"/>
<xs:element name="actions">
<xs:complexType>
<xs:sequence>
@@ -329,11 +327,20 @@ under the License.
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="property-map" substitutionGroup="AllActions">
+ <xs:element name="entity-and" substitutionGroup="AllActions">
<xs:complexType>
- <xs:attribute type="xs:string" name="resource" use="required" />
- <xs:attribute type="xs:string" name="map-name" use="required" />
- <xs:attribute name="global" default="false">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="field-map" />
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by" />
+ <xs:choice minOccurs="0">
+ <xs:element ref="limit-range" />
+ <xs:element ref="limit-view" />
+ <xs:element ref="use-iterator" />
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="entity-name" use="required" />
+ <xs:attribute name="use-cache" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="true" />
@@ -341,37 +348,45 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="property-to-field" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="resource" use="required" />
- <xs:attribute type="xs:string" name="property" use="required" />
- <xs:attribute type="xs:string" name="field" use="required" />
- <xs:attribute type="xs:string" name="default" />
- <xs:attribute name="no-locale" default="false">
+ <xs:attribute name="filter-by-date" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="true" />
<xs:enumeration value="false" />
+ <xs:enumeration value="by-name" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute type="xs:string" name="list" use="required" />
+ <xs:attribute name="result-set-type" default="scroll">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="forward" />
+ <xs:enumeration value="scroll" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="arg-list-name" />
- </xs:complexType>
- </xs:element>
- <xs:element name="script" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="location" use="required" />
</xs:complexType>
</xs:element>
- <xs:element name="set" substitutionGroup="AllActions">
+ <xs:element name="entity-condition" substitutionGroup="AllActions">
<xs:complexType>
- <xs:attribute type="xs:string" name="field" use="required" />
- <xs:attribute type="xs:string" name="from-field" />
- <xs:attribute type="xs:string" name="value" />
- <xs:attribute type="xs:string" name="default-value" />
- <xs:attribute name="global" default="false">
+ <xs:sequence>
+ <xs:choice minOccurs="0">
+ <xs:element ref="condition-expr" />
+ <xs:element ref="condition-list" />
+ <xs:element ref="condition-object" />
+ </xs:choice>
+ <xs:element minOccurs="0" ref="having-condition-list" />
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by" />
+ <xs:choice minOccurs="0">
+ <xs:element ref="limit-range" />
+ <xs:element ref="limit-view" />
+ <xs:element ref="use-iterator" />
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="entity-name" use="required" />
+ <xs:attribute name="use-cache" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="true" />
@@ -379,42 +394,30 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="type" default="String">
+ <xs:attribute name="filter-by-date" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="PlainString" />
- <xs:enumeration value="String" />
- <xs:enumeration value="BigDecimal" />
- <xs:enumeration value="Double" />
- <xs:enumeration value="Float" />
- <xs:enumeration value="List" />
- <xs:enumeration value="Long" />
- <xs:enumeration value="Integer" />
- <xs:enumeration value="Date" />
- <xs:enumeration value="Time" />
- <xs:enumeration value="Timestamp" />
- <xs:enumeration value="Boolean" />
- <xs:enumeration value="Object" />
- <xs:enumeration value="NewList" />
- <xs:enumeration value="NewMap" />
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ <xs:enumeration value="by-name" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="to-scope" default="screen">
+ <xs:attribute name="distinct" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="screen" />
- <xs:enumeration value="user" />
- <xs:enumeration value="application" />
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="from-scope" default="screen">
+ <xs:attribute type="xs:string" name="delegator-name" />
+ <xs:attribute type="xs:string" name="list" use="required" />
+ <xs:attribute name="result-set-type" default="scroll">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="screen" />
- <xs:enumeration value="user" />
- <xs:enumeration value="application" />
+ <xs:enumeration value="forward" />
+ <xs:enumeration value="scroll" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>

Modified: ofbiz/trunk/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-screen.xsd?rev=1649291&r1=1649290&r2=1649291&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-screen.xsd Sun Jan 4 04:51:08 2015
@@ -95,7 +95,6 @@ under the License.



- <xs:element name="AllActions" abstract="true" />
<xs:element name="actions">
<xs:complexType>
<xs:sequence>
@@ -103,97 +102,6 @@ under the License.
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="set" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field" use="required" />
- <xs:attribute type="xs:string" name="from-field" />
- <xs:attribute type="xs:string" name="value" />
- <xs:attribute type="xs:string" name="default-value" />
- <xs:attribute name="global" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="type">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="PlainString" />
- <xs:enumeration value="String" />
- <xs:enumeration value="BigDecimal" />
- <xs:enumeration value="Double" />
- <xs:enumeration value="Float" />
- <xs:enumeration value="List" />
- <xs:enumeration value="Long" />
- <xs:enumeration value="Integer" />
- <xs:enumeration value="Date" />
- <xs:enumeration value="Time" />
- <xs:enumeration value="Timestamp" />
- <xs:enumeration value="Boolean" />
- <xs:enumeration value="Object" />
- <xs:enumeration value="NewList" />
- <xs:enumeration value="NewMap" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="to-scope" default="screen">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="screen" />
- <xs:enumeration value="user" />
- <xs:enumeration value="application" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="from-scope" default="screen">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="screen" />
- <xs:enumeration value="user" />
- <xs:enumeration value="application" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="property-map" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="resource" use="required" />
- <xs:attribute type="xs:string" name="map-name" use="required" />
- <xs:attribute name="global" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="property-to-field" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="resource" use="required" />
- <xs:attribute type="xs:string" name="property" use="required" />
- <xs:attribute type="xs:string" name="field" use="required" />
- <xs:attribute type="xs:string" name="default" />
- <xs:attribute name="no-locale" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute type="xs:string" name="arg-list-name" />
- </xs:complexType>
- </xs:element>
- <xs:element name="script" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="location" use="required" />
- </xs:complexType>
- </xs:element>
<xs:element name="service" substitutionGroup="AllActions">
<xs:complexType>
<xs:sequence>
@@ -208,7 +116,6 @@ under the License.
</xs:attribute>
</xs:complexType>
</xs:element>
-
<xs:element name="entity-and" substitutionGroup="AllActions">
<xs:complexType>
<xs:sequence>
@@ -305,190 +212,6 @@ under the License.
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="entity-one" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />
- </xs:sequence>
- <xs:attribute name="entity-name" type="xs:string" use="required" />
- <xs:attribute name="value-field" type="xs:string" use="required" />
- <xs:attribute name="use-cache" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="auto-field-map" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="get-related-one" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute name="value-field" type="xs:string" use="required" />
- <xs:attribute name="relation-name" type="xs:string" use="required" />
- <xs:attribute name="use-cache" type="xs:string" default="false" />
- <xs:attribute name="to-value-field" type="xs:string" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="get-related" substitutionGroup="AllActions">
- <xs:complexType>
- <xs:attribute type="xs:string" name="value-field" use="required" />
- <xs:attribute type="xs:string" name="relation-name" use="required" />
- <xs:attribute type="xs:string" name="map" />
- <xs:attribute type="xs:string" name="order-by-list" />
- <xs:attribute type="xs:string" name="use-cache" default="false" />
- <xs:attribute type="xs:string" name="list" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="condition-list">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="condition-expr" />
- <xs:element ref="condition-list" />
- <xs:element ref="condition-object" />
- </xs:choice>
- <xs:attribute name="combine" default="and">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="and" />
- <xs:enumeration value="or" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="having-condition-list">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="condition-expr" />
- <xs:element ref="condition-list" />
- <xs:element ref="condition-object" />
- </xs:choice>
- <xs:attribute name="combine" default="and">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="and" />
- <xs:enumeration value="or" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="condition-expr">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- <xs:attribute name="operator" default="equals">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="less" />
- <xs:enumeration value="greater" />
- <xs:enumeration value="less-equals" />
- <xs:enumeration value="greater-equals" />
- <xs:enumeration value="equals" />
- <xs:enumeration value="not-equals" />
- <xs:enumeration value="in" />
- <xs:enumeration value="not-in" />
- <xs:enumeration value="between" />
- <xs:enumeration value="like" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute type="xs:string" name="from-field" />
- <xs:attribute type="xs:string" name="value" />
- <xs:attribute name="ignore-if-null" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="ignore-if-empty" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="ignore-case" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="ignore" default="false">
- <xs:annotation>
- <xs:documentation>
- Ignore the condition if flag is true.
- Defaults to false.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="condition-object">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="select-field">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="order-by">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- </xs:complexType>
- </xs:element>
- <xs:element name="limit-range">
- <xs:complexType>
- <xs:attribute name="start" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="size" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="limit-view">
- <xs:complexType>
- <xs:attribute name="view-index" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="view-size" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Should resolve into a positive integer.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="use-iterator" />
- <xs:element name="field-map">
- <xs:complexType>
- <xs:attribute type="xs:string" name="field-name" use="required" />
- <xs:attribute type="xs:string" name="from-field" />
- <xs:attribute type="xs:string" name="value" />
- </xs:complexType>
- </xs:element>