This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git
The following commit(s) were added to refs/heads/master by this push:
new f1e391c Improved: updates test-suite.xsd, widget-form.xsd and
site-conf.xsd documentation
f1e391c is described below
commit f1e391c0e2600f21666a254191c6a04656c03a40
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Jan 23 18:09:35 2025 +0100
Improved: updates test-suite.xsd, widget-form.xsd and site-conf.xsd
documentation
---
dtds/site-conf.xsd | 10 +---------
dtds/test-suite.xsd | 29 +++++++++++++++++++++++++++++
dtds/widget-form.xsd | 23 -----------------------
3 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/dtds/site-conf.xsd b/dtds/site-conf.xsd
index 79a02b7..b3258b3 100644
--- a/dtds/site-conf.xsd
+++ b/dtds/site-conf.xsd
@@ -530,8 +530,7 @@ under the License.
request-redirect-noparam,
url,
url-redirect,
- cross-redirect,
- shortener
+ cross-redirect
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -626,13 +625,6 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
- <xs:enumeration value="shortener">
- <xs:annotation>
- <xs:documentation>
- Call ofbiz shortener to resolve the next uri
to call
- </xs:documentation>
- </xs:annotation>
- </xs:enumeration>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
diff --git a/dtds/test-suite.xsd b/dtds/test-suite.xsd
index 74d6b71..6092aff 100644
--- a/dtds/test-suite.xsd
+++ b/dtds/test-suite.xsd
@@ -89,6 +89,35 @@ 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. This is rather to be used during
development and testing.
+ When going to production; for performance reason
(compilation), you should use rather use junit-test-suite and move the test
file under main and use.
+ See existing examples.
+ </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 contains the
test suite.
+ You can use a flexible URL location like
+
component://service/src/test/groovy/org/apache/ofbizservice/test/TestServices.groovy
+ This is rather to be used during development and testing
+ When going to production you need to move the test file
under main. See existing examples.
+ When going to production; for performance reason
(compilation), you should use rather use junit-test-suite and move the test
file under main and use.
+ See existing examples.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:attributeGroup>
+
<xs:element name="service-test" substitutionGroup="TestCaseTypes">
<xs:complexType>
<xs:attributeGroup ref="attlist.service-test"/>
diff --git a/dtds/widget-form.xsd b/dtds/widget-form.xsd
index 76e9cda..09b382f 100644
--- a/dtds/widget-form.xsd
+++ b/dtds/widget-form.xsd
@@ -873,7 +873,6 @@ under the License.
<xs:element name="check" substitutionGroup="AllFields">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="group-options" />
<xs:element ref="entity-options" />
<xs:element ref="list-options" />
<xs:element ref="option" />
@@ -1101,7 +1100,6 @@ under the License.
<xs:sequence>
<xs:element ref="auto-complete" minOccurs="0" maxOccurs="1" />
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="group-options" />
<xs:element ref="entity-options" />
<xs:element ref="list-options" />
<xs:element ref="option" />
@@ -1385,7 +1383,6 @@ under the License.
<xs:element name="radio" substitutionGroup="AllFields">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="group-options" />
<xs:element ref="entity-options" />
<xs:element ref="list-options" />
<xs:element ref="option" />
@@ -1674,26 +1671,6 @@ under the License.
<xs:attribute type="xs:string" name="field-name" use="required" />
</xs:complexType>
</xs:element>
- <xs:element name="group-options">
- <xs:annotation>
- <xs:documentation>group the options </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="group-options" />
- <xs:element ref="entity-options" />
- <xs:element ref="list-options" />
- <xs:element ref="option" />
- </xs:choice>
- <xs:attribute type="xs:string" name="id" />
- <xs:attribute type="xs:string" name="widget-style" />
- <xs:attribute type="xs:string" name="description"
default="${description}">
- <xs:annotation>
- <xs:documentation>Will be presented to the user with field
values substituted using the ${} syntax.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
<xs:element name="in-place-editor">
<xs:annotation>
<xs:documentation>Enables in place editon for the display
field.</xs:documentation>
