OFBiz › OFBiz - Commits

svn commit: r1846727 [1/2] - in /ofbiz/ofbiz-framework/trunk/framework: base/dtd/ datafile/dtd/ entity/dtd/ minilang/dtd/ service/dtd/ widget/dtd/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r1846727 [1/2] - in /ofbiz/ofbiz-framework/trunk/framework: base/dtd/ datafile/dtd/ entity/dtd/ minilang/dtd/ service/dtd/ widget/dtd/

Author: jleroux
Date: Fri Nov 16 16:38:24 2018
New Revision: 1846727

URL: http://svn.apache.org/viewvc?rev=1846727&view=rev
Log:
Improved: XML schemas should use predefined boolean type
(OFBIZ-10411)

To define boolean values, some ad-hoc enumeration of "true" and "false" are
repeatedly used. Since XML Schema defines a standard boolean datatype it's
better to use it.

Thanks: Mathieu Lirzin

Modified:
ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd
ofbiz/ofbiz-framework/trunk/framework/datafile/dtd/datafiles.xsd
ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-config.xsd
ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd
ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entitymodel.xsd
ofbiz/ofbiz-framework/trunk/framework/minilang/dtd/simple-methods.xsd
ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-config.xsd
ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd
ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-group.xsd
ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-mca.xsd
ofbiz/ofbiz-framework/trunk/framework/service/dtd/services.xsd
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-common.xsd
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-menu.xsd
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-screen.xsd
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-tree.xsd

Modified: ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd Fri Nov 16 16:38:24 2018
@@ -172,22 +172,8 @@ under the License.
</xs:simpleType>
</xs:attribute>
<xs:attribute name="password" type="xs:string" use="required"/>
- <xs:attribute name="is-truststore" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="is-certstore" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="is-truststore" type="xs:boolean" use="required"/>
+ <xs:attribute name="is-certstore" type="xs:boolean" use="required"/>
<xs:attribute type="xs:string" name="loader" use="required"/>
<xs:attribute type="xs:string" name="location" use="required"/>
</xs:attributeGroup>
@@ -242,35 +228,15 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="privileged" 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="app-bar-display" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="use-autologin-cookie" default="false">
- <xs:simpleType>
- <xs:annotation>
- <xs:documentation>
- Defines if the webapp uses the auto login feature which keeps a memory of the user last visit.
- This allows an user easier login by showing his/her username.
- </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
+ <xs:attribute name="privileged" type="xs:boolean" default="false"/>
+ <xs:attribute name="app-bar-display" type="xs:boolean" default="true"/>
+ <xs:attribute name="use-autologin-cookie" type="xs:boolean" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Defines if the webapp uses the auto login feature which keeps a memory of the user last visit.
+ This allows an user easier login by showing his/her username.
+ </xs:documentation>
+ </xs:annotation>
</xs:attribute>
</xs:attributeGroup>
<xs:element name="virtual-host">
@@ -323,4 +289,4 @@ under the License.
<xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
</xs:sequence>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: ofbiz/ofbiz-framework/trunk/framework/datafile/dtd/datafiles.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/datafile/dtd/datafiles.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/datafile/dtd/datafiles.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/datafile/dtd/datafiles.xsd Fri Nov 16 16:38:24 2018
@@ -74,14 +74,7 @@ under the License.
<xs:attribute name="type-code"/>
<xs:attribute name="tc-min"/>
<xs:attribute name="tc-max"/>
- <xs:attribute name="tc-isnum" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="false"/>
- <xs:enumeration value="true"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="tc-isnum" type="xs:boolean" default="true"/>
<xs:attribute name="tc-position"/>
<xs:attribute name="tc-length"/>
<xs:attribute name="description"/>
@@ -135,30 +128,9 @@ under the License.
<xs:attribute name="valid-exp"/>
<xs:attribute name="description"/>
<xs:attribute name="default-value"/>
- <xs:attribute name="prim-key" 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="ignored" 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="expression" 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="prim-key" type="xs:boolean" default="false"/>
+ <xs:attribute name="ignored" type="xs:boolean" default="false"/>
+ <xs:attribute name="expression" type="xs:boolean" default="false"/>
<xs:attribute name="ref-field"/>
</xs:attributeGroup>
</xs:schema>

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-config.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-config.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-config.xsd Fri Nov 16 16:38:24 2018
@@ -106,23 +106,10 @@ under the License.
<xs:attribute type="xs:string" name="entity-model-reader" use="required"/>
<xs:attribute type="xs:string" name="entity-group-reader" use="required"/>
<xs:attribute type="xs:string" name="entity-eca-reader"/>
- <xs:attribute name="entity-eca-enabled" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="entity-eca-enabled" type="xs:boolean" default="true"/>
<xs:attribute type="xs:string" name="entity-eca-handler-class-name" default="org.apache.ofbiz.entityext.eca.DelegatorEcaHandler"/>
- <xs:attribute name="distributed-cache-clear-enabled" 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="distributed-cache-clear-enabled"
+ type="xs:boolean" default="false"/>
<xs:attribute type="xs:string" name="distributed-cache-clear-class-name" default="org.apache.ofbiz.entityext.cache.EntityCacheServices"/>
<xs:attribute type="xs:string" name="distributed-cache-clear-user-login-id" default="system"/>
<xs:attribute type="xs:string" name="sequenced-id-prefix"/>
@@ -223,90 +210,24 @@ under the License.
<xs:attribute type="xs:string" name="name" use="required"/>
<xs:attribute type="xs:string" name="helper-class" use="required"/>
<xs:attribute type="xs:string" name="field-type-name" use="required"/>
- <xs:attribute name="use-schemas" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="use-schemas" type="xs:boolean" default="true"/>
<xs:attribute type="xs:string" name="schema-name"/>
- <xs:attribute name="check-on-start" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="add-missing-on-start" 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="use-pk-constraint-names" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="check-pks-on-start" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="check-on-start" type="xs:boolean" default="true"/>
+ <xs:attribute name="add-missing-on-start" type="xs:boolean"
+ default="false"/>
+ <xs:attribute name="use-pk-constraint-names" type="xs:boolean"
+ default="true"/>
+ <xs:attribute name="check-pks-on-start" type="xs:boolean" default="true"/>
<xs:attribute type="xs:nonNegativeInteger" name="constraint-name-clip-length" default="30"/>
- <xs:attribute name="use-proxy-cursor" 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="use-proxy-cursor" type="xs:boolean" default="false"/>
<xs:attribute type="xs:string" name="proxy-cursor-name" default="p_cursor"/>
<xs:attribute type="xs:integer" name="result-fetch-size" default="-1"/>
- <xs:attribute name="use-foreign-keys" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="use-foreign-key-indices" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="check-fks-on-start" 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="check-fk-indices-on-start" 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="use-foreign-keys" type="xs:boolean" default="true"/>
+ <xs:attribute name="use-foreign-key-indices" type="xs:boolean"
+ default="true"/>
+ <xs:attribute name="check-fks-on-start" type="xs:boolean" default="false"/>
+ <xs:attribute name="check-fk-indices-on-start"
+ type="xs:boolean" default="false"/>
<xs:attribute name="fk-style" default="name_constraint">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -315,40 +236,16 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="use-fk-initially-deferred" 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="use-indices" default="true">
+ <xs:attribute name="use-fk-initially-deferred"
+ type="xs:boolean" default="false"/>
+ <xs:attribute name="use-indices" type="xs:boolean" default="true">
<xs:annotation><xs:documentation>Use manually declared indices (indexes)?</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>
- <xs:attribute name="use-indices-unique" default="true">
+ <xs:attribute name="use-indices-unique" type="xs:boolean" default="true">
<xs:annotation><xs:documentation>For manually declared indices (if used), use the unique constraint?</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>
- <xs:attribute name="check-indices-on-start" 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="check-indices-on-start" type="xs:boolean"
+ default="false"/>
<xs:attribute name="join-style" default="ansi">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -359,46 +256,14 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="alias-view-columns" 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="always-use-constraint-keyword" 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="drop-fk-use-foreign-key-keyword" 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="use-binary-type-for-blob" 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="use-order-by-nulls" 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="alias-view-columns" type="xs:boolean" default="false"/>
+ <xs:attribute name="always-use-constraint-keyword"
+ type="xs:boolean" default="false"/>
+ <xs:attribute name="drop-fk-use-foreign-key-keyword"
+ type="xs:boolean" default="false"/>
+ <xs:attribute name="use-binary-type-for-blob"
+ type="xs:boolean" default="false"/>
+ <xs:attribute name="use-order-by-nulls" type="xs:boolean" default="false"/>
<xs:attribute name="offset-style" default="none">
<xs:simpleType>
<xs:restriction base="xs:token">

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd Fri Nov 16 16:38:24 2018
@@ -70,22 +70,8 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="run-on-error" 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="enabled" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="run-on-error" type="xs:boolean" default="false"/>
+ <xs:attribute name="enabled" type="xs:boolean" default="true"/>
</xs:attributeGroup>
<xs:element name="condition">
<xs:complexType>
@@ -220,38 +206,10 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="result-to-value" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="abort-on-error" 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="rollback-on-error" 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="persist" 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="result-to-value" type="xs:boolean" default="true"/>
+ <xs:attribute name="abort-on-error" type="xs:boolean" default="false"/>
+ <xs:attribute name="rollback-on-error" type="xs:boolean" default="false"/>
+ <xs:attribute name="persist" type="xs:boolean" default="false"/>
<xs:attribute type="xs:string" name="run-as-user" default="system"/>
<xs:attribute type="xs:string" name="value-attr">
<xs:annotation>

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entitymodel.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entitymodel.xsd Fri Nov 16 16:38:24 2018
@@ -23,12 +23,6 @@ under the License.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

- <xs:simpleType name="boolean">
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="aggregate-function">
<xs:restriction base="xs:token">
<xs:enumeration value="min"/>
@@ -97,12 +91,12 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="enable-lock" default="false" type="boolean"/>
- <xs:attribute name="no-auto-stamp" default="false" type="boolean"/>
- <xs:attribute name="never-cache" default="false" type="boolean"/>
- <xs:attribute name="never-check" default="false" type="boolean"/>
- <xs:attribute name="auto-clear-cache" default="true" type="boolean"/>
- <xs:attribute name="redefinition" type="boolean">
+ <xs:attribute name="enable-lock" default="false" type="xs:boolean"/>
+ <xs:attribute name="no-auto-stamp" default="false" type="xs:boolean"/>
+ <xs:attribute name="never-cache" default="false" type="xs:boolean"/>
+ <xs:attribute name="never-check" default="false" type="xs:boolean"/>
+ <xs:attribute name="auto-clear-cache" default="true" type="xs:boolean"/>
+ <xs:attribute name="redefinition" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Indicates if this entity redefines an existing entity.
@@ -147,7 +141,7 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="enable-audit-log" default="false" type="boolean">
+ <xs:attribute name="enable-audit-log" default="false" type="xs:boolean">
<xs:annotation>
<xs:documentation>
If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity.
@@ -155,7 +149,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="not-null" default="false" type="boolean">
+ <xs:attribute name="not-null" default="false" type="xs:boolean">
<xs:annotation>
<xs:documentation>
This makes the field NOT NULL on the database (like primary key fields).
@@ -226,7 +220,7 @@ under the License.
</xs:element>
<xs:attributeGroup name="attlist.index">
<xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="unique" default="false" type="boolean"/>
+ <xs:attribute name="unique" default="false" type="xs:boolean"/>
</xs:attributeGroup>
<xs:element name="index-field">
<xs:complexType>
@@ -266,13 +260,13 @@ under the License.
<xs:attribute name="package-name" type="xs:string" use="required"/>
<xs:attribute name="dependent-on" type="xs:string"/>
<xs:attribute name="default-resource-name" type="xs:string"/>
- <xs:attribute name="never-cache" default="false" type="boolean"/>
- <xs:attribute name="auto-clear-cache" default="true" type="boolean"/>
+ <xs:attribute name="never-cache" default="false" type="xs:boolean"/>
+ <xs:attribute name="auto-clear-cache" default="true" type="xs:boolean"/>
<xs:attribute name="title" type="xs:string"/>
<xs:attribute name="copyright" type="xs:string"/>
<xs:attribute name="author" type="xs:string"/>
<xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="redefinition" type="boolean">
+ <xs:attribute name="redefinition" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Indicates if this entity redefines an existing entity.
@@ -306,7 +300,7 @@ under the License.
<xs:attributeGroup name="attlist.alias-all">
<xs:attribute name="entity-alias" type="xs:string" use="required"/>
<xs:attribute name="prefix" type="xs:string"/>
- <xs:attribute name="group-by" default="false" type="boolean"/>
+ <xs:attribute name="group-by" default="false" type="xs:boolean"/>
<xs:attribute name="function" type="aggregate-function"/>
<xs:attribute name="field-set" default="" type="xs:string">
<xs:annotation>
@@ -339,7 +333,7 @@ under the License.
<xs:attribute name="field" type="xs:string"/>
<xs:attribute name="col-alias" type="xs:string"/>
<xs:attribute name="prim-key" type="xs:string"/>
- <xs:attribute name="group-by" default="false" type="boolean"/>
+ <xs:attribute name="group-by" default="false" type="xs:boolean"/>
<xs:attribute name="function" type="aggregate-function"/>
<xs:attribute name="field-set" default="" type="xs:string">
<xs:annotation>
@@ -399,7 +393,7 @@ under the License.
<xs:attributeGroup name="attlist.view-link">
<xs:attribute name="entity-alias" type="xs:string" use="required"/>
<xs:attribute name="rel-entity-alias" type="xs:string" use="required"/>
- <xs:attribute name="rel-optional" default="false" type="boolean"/>
+ <xs:attribute name="rel-optional" default="false" type="xs:boolean"/>
</xs:attributeGroup>
<xs:element name="entity-condition">
<xs:complexType>
@@ -425,7 +419,7 @@ under the License.
</xs:simpleType>
</xs:attribute>

- <xs:attribute name="distinct" default="false" type="boolean"/>
+ <xs:attribute name="distinct" default="false" type="xs:boolean"/>
</xs:attributeGroup>
<xs:element name="condition-expr">
<xs:complexType>
@@ -454,7 +448,7 @@ under the License.
<xs:attribute name="rel-entity-alias" type="xs:string"/>
<xs:attribute name="rel-field-name" type="xs:string"/>
<xs:attribute name="value" type="xs:string"/>
- <xs:attribute name="ignore-case" default="false" type="boolean"/>
+ <xs:attribute name="ignore-case" default="false" type="xs:boolean"/>
</xs:attributeGroup>
<xs:element name="condition-list">
<xs:complexType>
@@ -533,9 +527,9 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="enable-lock" type="boolean"/>
- <xs:attribute name="no-auto-stamp" type="boolean"/>
- <xs:attribute name="never-cache" type="boolean"/>
- <xs:attribute name="auto-clear-cache" type="boolean"/>
+ <xs:attribute name="enable-lock" type="xs:boolean"/>
+ <xs:attribute name="no-auto-stamp" type="xs:boolean"/>
+ <xs:attribute name="never-cache" type="xs:boolean"/>
+ <xs:attribute name="auto-clear-cache" type="xs:boolean"/>
</xs:attributeGroup>
</xs:schema>

Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/dtd/simple-methods.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/dtd/simple-methods.xsd Fri Nov 16 16:38:24 2018
@@ -70,13 +70,6 @@ under the License.



- <xs:simpleType name="booleanConst">
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
-
<xs:simpleType name="booleanExpr">
<xs:restriction base="xs:string">
<xs:pattern value="\$\{.+\}|true|false" />
@@ -269,7 +262,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="login-required" type="booleanConst">
+ <xs:attribute name="login-required" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Require a user login to run this method. Defaults to "true".
@@ -278,7 +271,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="use-transaction" type="booleanConst">
+ <xs:attribute name="use-transaction" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Create a transaction if none exists for this thread. Defaults to "true".
@@ -1031,7 +1024,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="booleanConst" name="no-locale">
+ <xs:attribute type="xs:boolean" name="no-locale">
<xs:annotation>
<xs:documentation>
Suppress property value localization. The user's/system locale will be ignored
@@ -1232,7 +1225,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="set-if-null" type="booleanConst">
+ <xs:attribute name="set-if-null" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Controls if the target field can be set to null when the from attribute evaluates to null.
@@ -1242,7 +1235,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="set-if-empty" type="booleanConst">
+ <xs:attribute name="set-if-empty" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Controls if the target field can be set to an empty value. The meaning of "empty" depends on the Java data type.
@@ -1307,7 +1300,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="set-if-null" type="booleanConst">
+ <xs:attribute name="set-if-null" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Controls if the target field can be set to null when the from attribute evaluates to null.
@@ -2634,7 +2627,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="include-user-login" type="booleanConst">
+ <xs:attribute name="include-user-login" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Include the current UserLogin entity value in the called service's IN parameters.
@@ -2644,7 +2637,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="break-on-error" type="booleanConst">
+ <xs:attribute name="break-on-error" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Halt script execution if the called service returns an error.
@@ -2674,7 +2667,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="require-new-transaction" type="booleanConst">
+ <xs:attribute name="require-new-transaction" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Require a new transaction for the called service.
@@ -2724,7 +2717,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="include-user-login" type="booleanConst">
+ <xs:attribute name="include-user-login" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Include the current UserLogin entity value in the called service's IN parameters.
@@ -3145,7 +3138,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="ignore-if-null" type="booleanConst">
+ <xs:attribute name="ignore-if-null" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Ignore the condition if the r-value is null.
@@ -3155,7 +3148,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="ignore-if-empty" type="booleanConst">
+ <xs:attribute name="ignore-if-empty" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Ignore the condition if the r-value is empty.
@@ -3165,7 +3158,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="ignore-case" type="booleanConst">
+ <xs:attribute name="ignore-case" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Perform a case-insensitive comparison.
@@ -3256,7 +3249,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="do-cache-clear" type="booleanConst">
+ <xs:attribute name="do-cache-clear" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
@@ -3265,7 +3258,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="or-store" type="booleanConst">
+ <xs:attribute name="or-store" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Store the entity value if it already exists. Defaults to "false".
@@ -4309,7 +4302,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="get-long-only" type="booleanConst">
+ <xs:attribute name="get-long-only" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Preserve the sequence type - a numeric long. If set to "false" the sequence

Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-config.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-config.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-config.xsd Fri Nov 16 16:38:24 2018
@@ -147,7 +147,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="poll-enabled">
+ <xs:attribute name="poll-enabled" type="xs:boolean">
<xs:annotation>
<xs:documentation>
Enable database polling. Defaults to "true".
@@ -155,12 +155,6 @@ under the License.
attribute set to "true" - otherwise you might experience database locking problems.
</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>
<xs:attribute name="poll-db-millis" type="xs:nonNegativeInteger">
<xs:annotation>
@@ -264,14 +258,7 @@ under the License.
<xs:attribute name="username" type="xs:string" />
<xs:attribute name="password" type="xs:string" />
<xs:attribute name="client-id" type="xs:string" />
- <xs:attribute name="listen" 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="listen" type="xs:boolean" default="false"/>
<xs:attribute type="xs:string" name="listener-class" />
</xs:complexType>
</xs:element>

Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd Fri Nov 16 16:38:24 2018
@@ -58,30 +58,9 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="run-on-failure" 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="run-on-error" 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="enabled" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="run-on-failure" type="xs:boolean" default="false"/>
+ <xs:attribute name="run-on-error" type="xs:boolean" default="false"/>
+ <xs:attribute name="enabled" type="xs:boolean" default="true"/>
</xs:attributeGroup>
<xs:element name="condition">
<xs:complexType>
@@ -221,54 +200,13 @@ under the License.
</xs:attribute>
<xs:attribute type="xs:string" name="run-as-user"/>
<xs:attribute type="xs:string" name="result-map-name"/>
- <xs:attribute name="new-transaction" 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="result-to-context" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="result-to-result" default="false">
+ <xs:attribute name="new-transaction" type="xs:boolean" default="false"/>
+ <xs:attribute name="result-to-context" type="xs:boolean" default="true"/>
+ <xs:attribute name="result-to-result" type="xs:boolean" default="false">
<xs:annotation><xs:documentation>If true, copies the action's result Map into the service's result Map.</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>
- <xs:attribute name="ignore-failure" default="true">
- <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-error" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="persist" 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-failure" type="xs:boolean" default="true"/>
+ <xs:attribute name="ignore-error" type="xs:boolean" default="true"/>
+ <xs:attribute name="persist" type="xs:boolean" default="false"/>
</xs:attributeGroup>
</xs:schema>

Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-group.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-group.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-group.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-group.xsd Fri Nov 16 16:38:24 2018
@@ -70,14 +70,7 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="result-to-context" 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="result-to-context" type="xs:boolean" default="false"/>
</xs:attributeGroup>
</xs:schema>
<!--

Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-mca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-mca.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-mca.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-mca.xsd Fri Nov 16 16:38:24 2018
@@ -107,14 +107,7 @@ under the License.
</xs:simpleType>
</xs:attribute>
<xs:attribute type="xs:string" name="run-as-user"/>
- <xs:attribute name="persist" 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="persist" type="xs:boolean" default="false"/>
</xs:attributeGroup>
</xs:schema>
<!--

Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/dtd/services.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/dtd/services.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/dtd/services.xsd Fri Nov 16 16:38:24 2018
@@ -62,46 +62,20 @@ under the License.
<xs:attribute name="engine" type="xs:string" use="required"/>
<xs:attribute name="location" type="xs:string"/>
<xs:attribute name="invoke" type="xs:string"/>
- <xs:attribute name="auth" 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="export" 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="validate" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="auth" type="xs:boolean" default="false"/>
+ <xs:attribute name="export" type="xs:boolean" default="false"/>
+ <xs:attribute name="validate" type="xs:boolean" default="true"/>
<xs:attribute name="default-entity-name" type="xs:string"/>
- <xs:attribute name="use-transaction" default="true">
+ <xs:attribute name="use-transaction" type="xs:boolean" default="true">
<xs:annotation>
<xs:documentation>
If set to true and there is no transaction already in place the Service Engine will begin one.
If set to false or there is a transaction already in place the Service Engine will do nothing (this also means that if set to false and a transaction is already in place it will do nothing).
</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>
- <xs:attribute name="require-new-transaction" default="false">
+ <xs:attribute name="require-new-transaction" type="xs:boolean"
+ default="false">
<xs:annotation>
<xs:documentation>
If set to true and there is a transaction already in place the Service Engine will suspend that transaction, begin a new one just for this service, commit or rollback the local transaction when the service is complete, and will resume the original transaction.
@@ -110,25 +84,13 @@ under the License.
Beware: using require-new-transaction=true in a service called (maybe not directly) by a pre-invoke or earlier event ( preprocessor, firstvisit and so on) is not yet supported.
</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>
- <xs:attribute name="hideResultInLog" default="false">
+ <xs:attribute name="hideResultInLog" type="xs:boolean" default="false">
<xs:annotation>
<xs:documentation>
If set to true the result will be hidden from possible exposition in LocalDispatcher.runSync()
</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>
<xs:attribute name="transaction-timeout" type="xs:int" default="0">
<xs:annotation>
@@ -141,14 +103,7 @@ under the License.
</xs:annotation>
</xs:attribute>
<xs:attribute name="max-retry" type="xs:int" default="0"/>
- <xs:attribute name="debug" 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="debug" type="xs:boolean" default="false"/>
<xs:attribute name="semaphore" default="none">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -257,15 +212,8 @@ under the License.
</xs:element>
<xs:attributeGroup name="attlist.implements">
<xs:attribute name="service" type="xs:string" use="required"/>
- <xs:attribute name="optional" default="false">
+ <xs:attribute name="optional" type="xs:boolean" default="false">
<xs:annotation><xs:documentation>If set to true all attributes inherited will have be optional whether or not they were in the implemented service definition.</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>
</xs:attributeGroup>
<xs:element name="metric">
@@ -338,22 +286,8 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="optional" 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="form-display" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="optional" type="xs:boolean" default="false"/>
+ <xs:attribute name="form-display" type="xs:boolean" default="true"/>
<xs:attribute name="allow-html" use="optional" default="none">
<xs:annotation>
<xs:documentation>
@@ -401,14 +335,7 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="optional" 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="optional" type="xs:boolean" default="false"/>
<xs:attribute name="default-value" type="xs:string">
<xs:annotation>
<xs:documentation>The value specified will be used for the attribute if no value is passed in.
@@ -425,14 +352,7 @@ under the License.
<xs:attribute name="session-attribute-name" type="xs:string"/>
<xs:attribute name="string-map-prefix" type="xs:string"/>
<xs:attribute name="string-list-suffix" type="xs:string"/>
- <xs:attribute name="form-display" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="form-display" type="xs:boolean" default="true"/>
<xs:attribute name="allow-html" use="optional" default="none">
<xs:annotation><xs:documentation>
Applies only to String fields.
@@ -484,24 +404,10 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="optional">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="optional" type="xs:boolean"/>
<xs:attribute name="default-value" type="xs:string"/>
<xs:attribute name="form-label" type="xs:string"/>
- <xs:attribute name="form-display">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="form-display" type="xs:boolean"/>
<xs:attribute name="allow-html" use="optional">
<xs:annotation>
<xs:documentation>

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-common.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-common.xsd?rev=1846727&r1=1846726&r2=1846727&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-common.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-common.xsd Fri Nov 16 16:38:24 2018
@@ -105,14 +105,8 @@ under the License.
<xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="display-fail-cond" 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="display-fail-cond" type="xs:boolean"
+ default="false"/>
</xs:complexType>
</xs:element>
<xs:element name="permission-condition-getter">
@@ -144,7 +138,8 @@ under the License.
</xs:element>
<xs:element name="if-validate-method" substitutionGroup="AllConditionals">
<xs:annotation>
- <xs:documentation>Calls a static Java method that takes a String and returns a boolean.</xs:documentation>
+ <xs:documentation>Calls a static Java method that takes a
+ String and returns a boolean.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:attribute type="xs:string" name="field" use="required" />
@@ -247,14 +242,7 @@ under the License.
<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="global" type="xs:boolean" default="false"/>
<xs:attribute name="type">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -318,14 +306,7 @@ under the License.
<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:attribute name="global" type="xs:boolean" default="false"/>
</xs:complexType>
</xs:element>
<xs:element name="property-to-field" substitutionGroup="AllActions">
@@ -334,14 +315,7 @@ under the License.
<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 name="no-locale" type="xs:boolean" default="false"/>
<xs:attribute type="xs:string" name="arg-list-name" />
</xs:complexType>
</xs:element>
@@ -358,22 +332,8 @@ under the License.
</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:attribute name="use-cache" type="xs:boolean" default="false"/>
+ <xs:attribute name="auto-field-map" type="xs:boolean" default="true"/>
</xs:complexType>
</xs:element>
<xs:element name="get-related-one" substitutionGroup="AllActions">
@@ -449,31 +409,10 @@ under the License.
</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:attribute name="ignore-if-null" type="xs:boolean" default="false"/>
+ <xs:attribute name="ignore-if-empty" type="xs:boolean" default="false"/>
+ <xs:attribute name="ignore-case" type="xs:boolean" default="false"/>
+ <xs:attribute name="ignore" type="xs:boolean" default="false">
<xs:annotation>
<xs:documentation>
Ignore the condition if flag is true.
@@ -551,14 +490,7 @@ under the License.
<xs:documentation>The service name used to resolve parameters. If empty, use form defaultServiceName. Flexible string allowed.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="send-if-empty" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="send-if-empty" type="xs:boolean" default="true"/>
</xs:complexType>
</xs:element>
<xs:element name="auto-parameters-entity">
@@ -580,14 +512,7 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="send-if-empty" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="send-if-empty" type="xs:boolean" default="true"/>
</xs:complexType>
</xs:element>
<xs:element name="exclude">
@@ -647,40 +572,14 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="full-path" 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="secure" 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="encode" 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="request-confirmation" default="false">
+ <xs:attribute name="full-path" type="xs:boolean" default="false"/>
+ <xs:attribute name="secure" type="xs:boolean" default="false"/>
+ <xs:attribute name="encode" type="xs:boolean" default="false"/>
+ <xs:attribute name="request-confirmation" type="xs:boolean"
+ 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>
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
</xs:attribute>
<xs:attribute name="confirmation-message" type="xs:string">
<xs:annotation>