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 a3afa14 Improved: updates DTDs
a3afa14 is described below
commit a3afa144c9e4e8403f19ffbf24fef81266b535e5
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Jun 11 16:41:05 2023 +0200
Improved: updates DTDs
---
dtds/services.xsd | 2 +-
dtds/site-conf.xsd | 41 +++--------------------------------------
dtds/widget-common.xsd | 12 ------------
dtds/widget-form.xsd | 12 +-----------
4 files changed, 5 insertions(+), 62 deletions(-)
diff --git a/dtds/services.xsd b/dtds/services.xsd
index e7e90b4..7620381 100644
--- a/dtds/services.xsd
+++ b/dtds/services.xsd
@@ -41,7 +41,7 @@ under the License.
<xs:element minOccurs="0" ref="description"/>
<xs:element minOccurs="0" ref="namespace"/>
<xs:element minOccurs="0" maxOccurs="1" ref="deprecated"/>
- <xs:element minOccurs="0" maxOccurs="unbounded"
ref="notification"/>
+ <xs:element minOccurs="0" ref="notification"/>
<xs:element minOccurs="0" maxOccurs="1"
ref="permission-service"/>
<xs:element minOccurs="0" maxOccurs="unbounded"
ref="required-permissions"/>
<xs:element minOccurs="0" maxOccurs="unbounded"
ref="implements"/>
diff --git a/dtds/site-conf.xsd b/dtds/site-conf.xsd
index 8f3bf37..44d98a5 100644
--- a/dtds/site-conf.xsd
+++ b/dtds/site-conf.xsd
@@ -382,40 +382,6 @@ under the License.
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="return-user-message">
- <xs:annotation>
- <xs:documentation>
- Before return a response to the end user, we can override the
event message from different origin.
- Hard coded, from the labelling system or from a given field
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="ressource" type="xs:string">
- <xs:annotation>
- <xs:documentation>
- Properties ressource to use for resolve the message,
if you set a value here, indicate the key on value attribute
- otherwise this attribute will be ignored.
- 'like: CommonUiLabels'
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="value" type="xs:string">
- <xs:annotation>
- <xs:documentation>
- Value to use to display the response user message.
- You can set a plain text, a flexible string or use a
key from the property file give in ressource attribute.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="from-field" type="xs:string">
- <xs:annotation>
- <xs:documentation>
- Set from what field in context we can found the
response user message. This field can contain a flexible string
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
<xs:element name="event">
<xs:annotation>
<xs:documentation>
@@ -451,7 +417,7 @@ under the License.
after-login,
before-logout)
where the name allows to differentiate them.
- Most of the time request-maps, which have only 1 event,
don't use it.
+ Most of the time reques-maps, which have only 1 event,
don't use it.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -491,7 +457,7 @@ under the License.
<xs:documentation>
You can have one response for each possible return code from
the event.
An event can return any string, and that string can be used to
route to different responses.
- At least one response by request-map.
+ At least one reponse by request-map.
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -503,7 +469,6 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" ref="return-user-message"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.response"/>
</xs:complexType>
@@ -512,7 +477,7 @@ under the License.
<xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
- The name of the response, that also matches the string
returned by the event
+ The name of the response, wich also matches the string
returned by the event
</xs:documentation>
</xs:annotation>
</xs:attribute>
diff --git a/dtds/widget-common.xsd b/dtds/widget-common.xsd
index d164f61..4ceebcc 100644
--- a/dtds/widget-common.xsd
+++ b/dtds/widget-common.xsd
@@ -522,18 +522,6 @@ under the License.
<xs:attribute name="send-if-empty" type="xs:boolean"
default="true"/>
</xs:complexType>
</xs:element>
- <xs:element name="auto-parameters-form">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="exclude" />
- </xs:sequence>
- <xs:attribute name="form-name" type="xs:string">
- <xs:annotation>
- <xs:documentation>See OFBIZ-12684.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
<xs:element name="exclude">
<xs:complexType>
<xs:attribute name="field-name" type="xs:string" use="required" />
diff --git a/dtds/widget-form.xsd b/dtds/widget-form.xsd
index bb5c1d5..50c779e 100644
--- a/dtds/widget-form.xsd
+++ b/dtds/widget-form.xsd
@@ -586,7 +586,6 @@ under the License.
<xs:sequence>
<xs:element minOccurs="0" ref="auto-parameters-service"/>
<xs:element minOccurs="0" ref="auto-parameters-entity"/>
- <xs:element minOccurs="0" ref="auto-parameters-form"/>
<xs:element minOccurs="0" maxOccurs="unbounded"
ref="parameter" />
</xs:sequence>
<xs:attribute name="event-type" use="required">
@@ -857,15 +856,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="disabled">
- <xs:annotation>
- <xs:documentation>
- Set a field as disabled : not mutable, not focusable,
not submitted if in a form.
- Accepts ${} notation to allow use of expressions.
- Expressions must evaluate to the strings 'true',
'false' (without quotes) or empty (equivalent to false)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ <xs:attribute name="disabled" type="xs:boolean" default="false"/>
</xs:complexType>
</xs:element>
@@ -1558,7 +1549,6 @@ under the License.
<xs:sequence>
<xs:element minOccurs="0" ref="auto-parameters-service"/>
<xs:element minOccurs="0" ref="auto-parameters-entity"/>
- <xs:element minOccurs="0" ref="auto-parameters-form"/>
<xs:element minOccurs="0" maxOccurs="unbounded"
ref="parameter" />
</xs:sequence>
<xs:attribute name="event-type" use="required">
