svn commit: r1741395 - in /ofbiz/site/dtds: compound-widgets.xsd ofbiz-component.xsd widget-common.xsd

[jl...@apache.org]

Author: jleroux
Date: Thu Apr 28 08:51:36 2016
New Revision: 1741395

URL: http://svn.apache.org/viewvc?rev=1741395&view=rev
Log:
Updates DTDs

Modified:
    ofbiz/site/dtds/compound-widgets.xsd
    ofbiz/site/dtds/ofbiz-component.xsd
    ofbiz/site/dtds/widget-common.xsd

Modified: ofbiz/site/dtds/compound-widgets.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/compound-widgets.xsd?rev=1741395&r1=1741394&r2=1741395&view=diff
==============================================================================
--- ofbiz/site/dtds/compound-widgets.xsd (original)
+++ ofbiz/site/dtds/compound-widgets.xsd Thu Apr 28 08:51:36 2016
@@ -4,9 +4,9 @@
         <xs:complexType>
             <xs:all minOccurs="0" maxOccurs="1">
                 <xs:element name="site-conf"/>
-                <xs:element name="menus"/>
+                <xs:element name="menus" minOccurs="0" maxOccurs="1"/>
                 <xs:element name="screens"/>
-                <xs:element name="trees"/>
+                <xs:element name="trees" minOccurs="0" maxOccurs="1"/>
                 <xs:element name="forms"/>
                 <xs:element name="simple-methods"/>
             </xs:all>

Modified: ofbiz/site/dtds/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-component.xsd?rev=1741395&r1=1741394&r2=1741395&view=diff
==============================================================================
--- ofbiz/site/dtds/ofbiz-component.xsd (original)
+++ ofbiz/site/dtds/ofbiz-component.xsd Thu Apr 28 08:51:36 2016
@@ -184,15 +184,22 @@ under the License.
     </xs:element>
     <xs:attributeGroup name="attlist.webapp">
         <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="title"/>
+        <xs:attribute type="xs:string" name="title">
+            <xs:annotation>
+                <xs:documentation>
+                    This value is shown in the application menu, when no uiLabelMap is available.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="description"/>
-        <xs:attribute name="menu-name" default="main">
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="main"/>
-                    <xs:enumeration value="secondary"/>
-                </xs:restriction>
-            </xs:simpleType>
+        <xs:attribute name="menu-name" use="optional" default="main">
+            <xs:annotation>
+                <xs:documentation>
+                    This value determines in which application menu the application is shown. 
+                    For instance "secondary" is used by specialpurpose and webtools webapps to put their menu-names in the second menu.
+                    Note that not all OOTB themes use this "secondary" option, for instance Flat-Grey does not.
+                </xs:documentation>
+            </xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="position"/>
         <xs:attribute type="xs:string" name="server" use="required"/>

Modified: ofbiz/site/dtds/widget-common.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-common.xsd?rev=1741395&r1=1741394&r2=1741395&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-common.xsd (original)
+++ ofbiz/site/dtds/widget-common.xsd Thu Apr 28 08:51:36 2016
@@ -579,6 +579,8 @@ under the License.
     </xs:element>
     <xs:complexType name="link">
         <xs:sequence>
+            <xs:element minOccurs="0" ref="auto-parameters-service"/>
+            <xs:element minOccurs="0" ref="auto-parameters-entity"/>
             <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" />
             <xs:element minOccurs="0" name="image" type="image" />
         </xs:sequence>