Author: jleroux
Date: Sat Sep 7 06:28:44 2019
New Revision: 1866545
URL: http://svn.apache.org/viewvc?rev=1866545&view=rev
Log:
Improved: updates DTD on site
Modified:
ofbiz/site/dtds/entitymodel.xsd
ofbiz/site/dtds/services.xsd
ofbiz/site/dtds/test-suite.xsd
ofbiz/site/dtds/widget-form.xsd
Modified: ofbiz/site/dtds/entitymodel.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=1866545&r1=1866544&r2=1866545&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Sat Sep 7 06:28:44 2019
@@ -384,7 +384,7 @@ under the License.
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="description"/>
- <xs:element maxOccurs="unbounded" ref="key-map"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="key-map"/>
<xs:element minOccurs="0" ref="entity-condition"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.view-link"/>
Modified: ofbiz/site/dtds/services.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=1866545&r1=1866544&r2=1866545&view=diff
==============================================================================
--- ofbiz/site/dtds/services.xsd (original)
+++ ofbiz/site/dtds/services.xsd Sat Sep 7 06:28:44 2019
@@ -153,12 +153,28 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="require-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="return-error-on-failure" default="true">
+ <xs:annotation><xs:documentation>If set to false, when the
permissions failed return the failMessage as error, else continue the service
and give the hand to origin service to resolve the
problem.</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="required-permissions">
<xs:complexType>
<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"/>
@@ -183,19 +199,6 @@ under the License.
<xs:attribute name="permission" type="xs:string" use="required"/>
<xs:attribute name="action" type="xs:string"/>
</xs:attributeGroup>
- <xs:element name="check-role-member">
- <xs:annotation>
- <xs:documentation>
- This is deprecated
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attributeGroup ref="attlist.check-role-member"/>
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.check-role-member">
- <xs:attribute name="role-type" type="xs:string" use="required"/>
- </xs:attributeGroup>
<xs:element name="service-security">
<xs:complexType>
<xs:attributeGroup ref="attlist.service-security"/>
Modified: ofbiz/site/dtds/test-suite.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/site/dtds/test-suite.xsd?rev=1866545&r1=1866544&r2=1866545&view=diff
==============================================================================
--- ofbiz/site/dtds/test-suite.xsd (original)
+++ ofbiz/site/dtds/test-suite.xsd Sat Sep 7 06:28:44 2019
@@ -84,28 +84,6 @@ under the License.
</xs:attribute>
</xs:attributeGroup>
- <xs:element name="groovy-test-suite" substitutionGroup="TestCaseTypes">
- <xs:annotation>
- <xs:documentation>
- Used for JUnit test suites written as a Groovy class. See
http://groovy-lang.org/testing.html
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attributeGroup ref="attlist.groovy-test-suite"/>
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.groovy-test-suite">
- <xs:attribute type="xs:string" name="name"/>
- <xs:attribute type="xs:string" name="location" use="required">
- <xs:annotation>
- <xs:documentation>
- Give the location where is groovy file that contaions the
test suite.
- You can use a flexible url location like
component://mycomponent/groovyScripts/test/MySuiteTest.groovy
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:attributeGroup>
-
<xs:element name="service-test" substitutionGroup="TestCaseTypes">
<xs:complexType>
<xs:attributeGroup ref="attlist.service-test"/>
Modified: ofbiz/site/dtds/widget-form.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1866545&r1=1866544&r2=1866545&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Sat Sep 7 06:28:44 2019
@@ -990,6 +990,11 @@ under the License.
<xs:documentation>Display negatives in
parentheses (configurable, see arithmetic.properties)</xs:documentation>
</xs:annotation>
</xs:enumeration>
+ <xs:enumeration value="number">
+ <xs:annotation>
+ <xs:documentation>Display as number with the
format type given (configurable, see arithmetic.properties)</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
@@ -1003,6 +1008,13 @@ under the License.
<xs:documentation>Specifies the image to
display.</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute type="xs:string" name="format">
+ <xs:annotation>
+ <xs:documentation>Format a type number, select the format
type to use on arithmetic.properties with the pattern
${format}.displaying.format =
+ ex: default is present in number.properties as
'default.displaying.format = ##0.00'
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute type="xs:string" name="default-value">
<xs:annotation>
<xs:documentation>Specifies a string to be displayed if
the field is empty.</xs:documentation>
