Author: jleroux Date: Sun May 3 08:57:18 2015 New Revision: 1677376 URL: http://svn.apache.org/r1677376 Log: Updates DTDS
Added: ofbiz/site/dtds/SeoConfig.xsd (with props) Modified: ofbiz/site/dtds/entitymodel.xsd ofbiz/site/dtds/services.xsd ofbiz/site/dtds/simple-methods-v2.xsd ofbiz/site/dtds/widget-form.xsd ofbiz/site/dtds/widget-screen.xsd Added: ofbiz/site/dtds/SeoConfig.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/SeoConfig.xsd?rev=1677376&view=auto ============================================================================== --- ofbiz/site/dtds/SeoConfig.xsd (added) +++ ofbiz/site/dtds/SeoConfig.xsd Sun May 3 08:57:18 2015 @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + <xs:element name="seo-config"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="regexpifmatch"/> + <xs:element minOccurs="0" maxOccurs="1" ref="category-url"/> + <xs:element minOccurs="0" maxOccurs="1" ref="jsessionid"/> + <xs:element minOccurs="0" maxOccurs="1" ref="url-configs"/> + <xs:element minOccurs="0" maxOccurs="1" ref="char-filters"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="regexpifmatch"/> + <xs:element name="category-url"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="1" maxOccurs="1" ref="value"/> + <xs:element minOccurs="0" maxOccurs="1" ref="allowed-context-paths"/> + <xs:element minOccurs="0" maxOccurs="1" ref="category-name"/> + <xs:element minOccurs="0" maxOccurs="1" ref="category-url-suffix"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="value" default="disable"/> + <xs:element name="allowed-context-paths"/> + <xs:element name="category-name" default="disable"/> + <xs:element name="category-url-suffix" default=".html"/> + <xs:element name="jsessionid"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="anonymous"/> + <xs:element minOccurs="0" maxOccurs="1" ref="user"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="anonymous"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="value"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="user"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="value"/> + <xs:element minOccurs="0" maxOccurs="1" ref="exceptions"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="exceptions"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="url-pattern"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="url-configs"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="url-config"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="char-filters"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="char-filter"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="url-config"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="description"/> + <xs:element minOccurs="1" maxOccurs="1" ref="url-pattern"/> + <xs:element minOccurs="1" maxOccurs="1" ref="seo"/> + <xs:element minOccurs="0" maxOccurs="1" ref="forward"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="description"/> + <xs:element name="url-pattern"/> + <xs:element name="seo"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="1" maxOccurs="1" ref="replacement"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="forward"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="1" maxOccurs="1" ref="replacement"/> + <xs:element minOccurs="0" maxOccurs="1" ref="responsecode"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="replacement"/> + <xs:element name="responsecode" default="301"/> + <xs:element name="char-filter"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="1" maxOccurs="1" ref="character-pattern"/> + <xs:element minOccurs="1" maxOccurs="1" ref="replacement"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="character-pattern"/> +</xs:schema> Propchange: ofbiz/site/dtds/SeoConfig.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/site/dtds/SeoConfig.xsd ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/site/dtds/SeoConfig.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xsd Modified: ofbiz/site/dtds/entitymodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=1677376&r1=1677375&r2=1677376&view=diff ============================================================================== --- ofbiz/site/dtds/entitymodel.xsd (original) +++ ofbiz/site/dtds/entitymodel.xsd Sun May 3 08:57:18 2015 @@ -39,6 +39,9 @@ under the License. <xs:enumeration value="count-distinct"/> <xs:enumeration value="upper"/> <xs:enumeration value="lower"/> + <xs:enumeration value="extract-year"/> + <xs:enumeration value="extract-month"/> + <xs:enumeration value="extract-day"/> </xs:restriction> </xs:simpleType> Modified: ofbiz/site/dtds/services.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=1677376&r1=1677375&r2=1677376&view=diff ============================================================================== --- ofbiz/site/dtds/services.xsd (original) +++ ofbiz/site/dtds/services.xsd Sun May 3 08:57:18 2015 @@ -228,6 +228,11 @@ under the License. <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> Modified: ofbiz/site/dtds/simple-methods-v2.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods-v2.xsd?rev=1677376&r1=1677375&r2=1677376&view=diff ============================================================================== --- ofbiz/site/dtds/simple-methods-v2.xsd (original) +++ ofbiz/site/dtds/simple-methods-v2.xsd Sun May 3 08:57:18 2015 @@ -2770,8 +2770,8 @@ under the License. <xs:attribute name="scope"> <xs:annotation> <xs:documentation> - The memory scope to use. In an "inline" memory scope, fields declared or modified in the called method - will be reflected back to the calling method - as if the called method was inline. In a "function" memory + The memory scope to use. In an "inline" memory scope, fields declared or modified in the called method + will be reflected back to the calling method - as if the called method was inline. In a "function" memory scope, fields declared or modified in the called method are local to the called method - they are not reflected back to the calling method. Modified: ofbiz/site/dtds/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1677376&r1=1677375&r2=1677376&view=diff ============================================================================== --- ofbiz/site/dtds/widget-form.xsd (original) +++ ofbiz/site/dtds/widget-form.xsd Sun May 3 08:57:18 2015 @@ -23,12 +23,273 @@ under the License. <!-- ================== FORMS ==================== --> <xs:element name="forms"> <xs:complexType> + <xs:choice maxOccurs="unbounded"> + <xs:element ref="form"/> + <xs:element ref="grid"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="form"> + <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" ref="form"/> + <xs:element minOccurs="0" ref="actions" /> + <xs:element minOccurs="0" ref="row-actions" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="alt-row-style" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="alt-target" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="auto-fields-service" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="auto-fields-entity" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="field" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="on-event-update-area" /> + <xs:element minOccurs="0" ref="sort-order" /> </xs:sequence> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="type"> + <xs:annotation> + <xs:documentation>The form type is always required unless you are extending another form.</xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="single"> + <xs:annotation> + <xs:documentation>a single form is a simple single form with values from a single set of values</xs:documentation> + </xs:annotation> + </xs:enumeration> + <xs:enumeration value="list"> + <xs:annotation> + <xs:documentation>a list form is a list of individual forms in a table (could be called a tabular form), it has a list of sets of values and creates one form for each list element</xs:documentation> + </xs:annotation> + </xs:enumeration> + <xs:enumeration value="multi"> + <xs:annotation> + <xs:documentation>a multi form is like a list/tabular form, but it creates a single form to submit all list item forms at once; the field names in the resulting form have an appendage attached to make them unique according to the pattern used for the multi-service + event handler that will call one service for each list element</xs:documentation> + </xs:annotation> + </xs:enumeration> + <xs:enumeration value="upload"> + </xs:enumeration> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="target" type="xs:string" /> + <xs:attribute name="target-window" type="xs:string" /> + <xs:attribute name="target-type" default="intra-app"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="intra-app" /> + <xs:enumeration value="inter-app" /> + <xs:enumeration value="content" /> + <xs:enumeration value="plain" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="id" type="xs:string" /> + <xs:attribute name="style" type="xs:string" /> + <xs:attribute name="focus-field-name" type="xs:string" /> + <xs:attribute name="title" type="xs:string" /> + <xs:attribute name="tooltip" type="xs:string" /> + <xs:attribute name="list-name" type="xs:string"> + <xs:annotation> + <xs:documentation>for list type and other multiple data/form types this is the name of the list in the context to iterate over</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="list-entry-name" type="xs:string"> + <xs:annotation> + <xs:documentation>if specified each list entry will be put in the context with this name; otherwise the list entry must be a Map and the entries in the Map will be put into the context by name</xs:documentation> + </xs:annotation> + </xs:attribute> + <!-- this is now deprecated, never made sense to separate anyway; use list-name instead <xs:attribute type="xs:string" name="list-iterator-name"/> --> + <xs:attribute type="xs:string" name="default-map-name" /> + <xs:attribute type="xs:string" name="default-entity-name" /> + <xs:attribute type="xs:string" name="default-service-name" /> + <xs:attribute type="xs:string" name="form-title-area-style"> + <xs:annotation> + <xs:documentation>The form-title-area-style specifies the style to use in the header or title area for the form in a multi-form widget with all form fields rendered in one area.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="form-widget-area-style"> + <xs:annotation> + <xs:documentation>The form-widget-area-style specifies the style to use in the main or widget area for the form in a multi-form widget with all form fields rendered in one area.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="default-title-area-style" /> + <xs:attribute type="xs:string" name="default-widget-area-style" /> + <xs:attribute type="xs:string" name="default-title-style" /> + <xs:attribute type="xs:string" name="default-widget-style" /> + <xs:attribute type="xs:string" name="default-tooltip-style" /> + <xs:attribute type="xs:string" name="default-required-field-style" /> + <xs:attribute type="xs:string" name="sort-field-parameter-name"> + <xs:annotation> + <xs:documentation> + The name of the request parameter that is used for specifying the sorted column. This is required when you + have more than one list on a screen - each list must use its own sort field parameter. Defaults to "sortField". + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="default-sort-field-style"> + <xs:annotation> + <xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order".</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="default-sort-field-asc-style"> + <xs:annotation> + <xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order-asc".</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="default-sort-field-desc-style"> + <xs:annotation> + <xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order-desc".</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate" default="${paginate}"> + <xs:annotation> + <xs:documentation>Indicate if this form is paginated or not, true by default.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-target"> + <xs:annotation> + <xs:documentation>Target location for the [Previous] and [Next] buttons in a form with pagination. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-target-anchor"> + <xs:annotation> + <xs:documentation>Target anchor for the [Previous] and [Next] buttons in a form with pagination.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-size-field"> + <xs:annotation> + <xs:documentation>The name of the parameter that specifies the number of rows to display for each page in a list form with multiple pages. The default is VIEW_SIZE. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-index-field"> + <xs:annotation> + <xs:documentation>The name of the parameter that specifies what the current page is in a list form with multiple pages. The default is VIEW_INDEX Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="override-list-size"> + <xs:annotation> + <xs:documentation>The total number of rows in the original list (used for pagination). If not specified, the size of the list will be used. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-first-label"> + <xs:annotation> + <xs:documentation>Text to display for the [First] button in a form with pagination. Defaults to the CommonFirst label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-previous-label"> + <xs:annotation> + <xs:documentation>Text to display for the [Previous] button in a form with pagination. Defaults to the CommonPrevious label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-next-label"> + <xs:annotation> + <xs:documentation>Text to display for the [Next] button in a form with pagination. Defaults to the CommonNext label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-last-label"> + <xs:annotation> + <xs:documentation>Text to display for the [Last] button in a form with pagination. Defaults to the CommonLast label defined in CommonUiLabels.xml. Accepts ${} notation.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="paginate-style"> + <xs:annotation> + <xs:documentation>CSS style to use for the whole pager in a form with pagination. Defaults to "nav-pager".</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="item-index-separator" default="_o_" /> + <xs:attribute type="xs:string" name="extends" /> + <xs:attribute type="xs:string" name="extends-resource" /> + <xs:attribute name="separate-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="group-columns" 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 type="xs:integer" name="view-size"> + <xs:annotation> + <xs:documentation>The number of items to display per page</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="row-count" /> + <xs:attribute name="use-row-submit" 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="skip-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="skip-end" 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="hide-header" 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 type="xs:string" name="odd-row-style"> + <xs:annotation> + <xs:documentation>The odd-row-style specifies the style to use in the table content odd rows.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="even-row-style"> + <xs:annotation> + <xs:documentation>The even-row-style specifies the style to use in the table content even rows.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="header-row-style"> + <xs:annotation> + <xs:documentation>The header-row-style specifies the style to use in the header of table.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="default-table-style"> + <xs:annotation> + <xs:documentation>The default-table-style specifies the style to use in the table.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="client-autocomplete-fields" default="true"> + <xs:annotation> + <xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</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> + <!-- + not sure this is such a good idea <xs:attribute type="xs:string" name="hidden-values-map-name"> <xs:annotation> <xs:documentation>A map that contains hidden field name/value pairs. The reason for this is to eliminate the need to code custom forms so that auxiliary, passthru data can + be sent to the server. By doing it this way, more standard forms can be used. </xs:documentation> </xs:annotation> </xs:attribute> + --> </xs:complexType> </xs:element> - <xs:element name="form"> + <xs:element name="grid"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" ref="actions" /> @@ -651,6 +912,23 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute type="xs:string" name="form-name"> + <xs:annotation> + <xs:documentation> + The name of the parent form, needed at least for lookups when using skip-start="true" + Must be set also on the related field if description-field-name is used. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="tabindex"> + <xs:annotation> + <xs:documentation> + The HTML tabindex specifies the tab order of an element (when the "tab" button is used for navigating). + To exclude an element from the tab order, set the value of tabindex to 0 + In that case the element is skipped when the user tabs around the form. + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:complexType> </xs:element> Modified: ofbiz/site/dtds/widget-screen.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=1677376&r1=1677375&r2=1677376&view=diff ============================================================================== --- ofbiz/site/dtds/widget-screen.xsd (original) +++ ofbiz/site/dtds/widget-screen.xsd Sun May 3 08:57:18 2015 @@ -450,6 +450,20 @@ under the License. </xs:attribute> </xs:complexType> </xs:element> + <xs:element name="include-grid" substitutionGroup="AllWidgets"> + <xs:complexType> + <xs:attribute type="xs:string" name="name" use="required" /> + <xs:attribute type="xs:string" name="location" use="required" /> + <xs:attribute name="share-scope" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:complexType> + </xs:element> <xs:element name="include-menu" substitutionGroup="AllWidgets"> <xs:complexType> <xs:attribute type="xs:string" name="name" use="required" />