svn commit: r1649482 [14/26] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1649482 [14/26] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy Mon Jan 5 08:50:30 2015 @@ -28,6 +28,7 @@ import org.ofbiz.service.ModelPermission import org.ofbiz.service.ServiceContainer; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.entity.util.EntityUtilProperties; List getEcaListForService(String selectedService) { ecaMap = org.ofbiz.service.eca.ServiceEcaUtil.getServiceEventMap(selectedService); @@ -476,7 +477,7 @@ if (selectedService) { if (showWsdl?.equals("true")) { try { - wsdl = curServiceModel.toWSDL("http://${request.getServerName()}:${UtilProperties.getPropertyValue("url.properties", "port.http", "80")}${parameters._CONTROL_PATH_}/SOAPService"); + wsdl = curServiceModel.toWSDL("http://${request.getServerName()}:${EntityUtilProperties.getPropertyValue("url.properties", "port.http", "80", delegator)}${parameters._CONTROL_PATH_}/SOAPService"); curServiceMap.wsdl = UtilXml.writeXmlDocument(wsdl); } catch (WSDLException ex) { curServiceMap.wsdl = ex.getLocalizedMessage(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-catalog.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-catalog.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-catalog.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-catalog.xml Mon Jan 5 08:50:30 2015 @@ -26,6 +26,7 @@ under the License. <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <!-- <public publicId="-//W3C//DTD SVG 1.0//EN" uri="svg10.dtd"/> --> + <system systemId="http://ofbiz.apache.org/dtds/widget-common.xsd" uri="widget-common.xsd"/> <system systemId="http://ofbiz.apache.org/dtds/widget-form.xsd" uri="widget-form.xsd"/> <system systemId="http://ofbiz.apache.org/dtds/widget-menu.xsd" uri="widget-menu.xsd"/> <system systemId="http://ofbiz.apache.org/dtds/widget-screen.xsd" uri="widget-screen.xsd"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd Mon Jan 5 08:50:30 2015 @@ -18,6 +18,7 @@ specific language governing permissions under the License. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + <xs:include schemaLocation="http://ofbiz.apache.org/dtds/widget-common.xsd" /> <!-- ================== FORMS ==================== --> <xs:element name="forms"> @@ -1798,7 +1799,6 @@ under the License. </xs:element> <!-- ================== ACTIONS ==================== --> - <xs:element name="AllActions" abstract="true"/> <xs:element name="actions"> <xs:complexType> <xs:sequence> @@ -1813,42 +1813,6 @@ under the License. </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="property-map" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="resource" use="required" /> - <xs:attribute type="xs:string" name="map-name" use="required" /> - <xs:attribute name="global" 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="property-to-field" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="resource" use="required" /> - <xs:attribute type="xs:string" name="property" use="required" /> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="default" /> - <xs:attribute name="no-locale" 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="arg-list-name" /> - </xs:complexType> - </xs:element> - <xs:element name="script" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="location" use="required" /> - </xs:complexType> - </xs:element> <xs:element name="service" substitutionGroup="AllActions"> <xs:complexType> <xs:sequence> @@ -1873,44 +1837,7 @@ under the License. </xs:attribute> </xs:complexType> </xs:element> - <xs:element name="set" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="from-field" /> - <xs:attribute type="xs:string" name="value" /> - <xs:attribute type="xs:string" name="default-value" /> - <xs:attribute name="global" 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="type" default="String"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="List" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> - <xs:enumeration value="NewList" /> - <xs:enumeration value="NewMap" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - + <xs:element name="call-parent-actions" substitutionGroup="AllActions" /> <xs:element name="entity-and" substitutionGroup="AllActions"> <xs:complexType> <xs:sequence> @@ -1923,8 +1850,7 @@ under the License. <xs:element ref="use-iterator" /> </xs:choice> </xs:sequence> - <xs:attribute name="entity-name" type="xs:string" use="required" /> - <xs:attribute name="list" type="xs:string" use="optional" /> + <xs:attribute type="xs:string" name="entity-name" use="required" /> <xs:attribute name="use-cache" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -1942,6 +1868,7 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> + <xs:attribute type="xs:string" name="list" /> <xs:attribute name="result-set-type" default="scroll"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -1969,8 +1896,7 @@ under the License. <xs:element ref="use-iterator" /> </xs:choice> </xs:sequence> - <xs:attribute name="entity-name" type="xs:string" use="required" /> - <xs:attribute name="list" type="xs:string" use="optional" /> + <xs:attribute type="xs:string" name="entity-name" use="required" /> <xs:attribute name="use-cache" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -1996,7 +1922,8 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="delegator-name" /> + <xs:attribute type="xs:string" name="delegator-name" /> + <xs:attribute type="xs:string" name="list" /> <xs:attribute name="result-set-type" default="scroll"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -2007,172 +1934,4 @@ under the License. </xs:attribute> </xs:complexType> </xs:element> - <xs:element name="entity-one" substitutionGroup="AllActions"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" /> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> - </xs:sequence> - <xs:attribute type="xs:string" name="entity-name" use="required" /> - <xs:attribute type="xs:string" name="value-field" /> - <xs:attribute name="use-cache" 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="auto-field-map" default="true"> - <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="condition-expr"> - <xs:complexType> - <xs:attribute name="field-name" type="xs:string" use="required" /> - <xs:attribute name="operator" default="equals"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="less" /> - <xs:enumeration value="greater" /> - <xs:enumeration value="less-equals" /> - <xs:enumeration value="greater-equals" /> - <xs:enumeration value="equals" /> - <xs:enumeration value="not-equals" /> - <xs:enumeration value="in" /> - <xs:enumeration value="between" /> - <xs:enumeration value="like" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="from-field" type="xs:string" /> - <xs:attribute name="value" type="xs:string" /> - <xs:attribute name="ignore-if-null" 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="ignore-if-empty" 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="ignore-case" 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="ignore" default="false"> - <xs:annotation> - <xs:documentation> - Ignore the condition if flag is true. - Defaults to false. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="condition-list"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element ref="condition-expr" /> - <xs:element ref="condition-list" /> - <xs:element ref="condition-object" /> - </xs:choice> - <xs:attribute name="combine" default="and"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="and" /> - <xs:enumeration value="or" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="condition-object"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="field-map"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - <xs:attribute type="xs:string" name="from-field" /> - <xs:attribute type="xs:string" name="value" /> - </xs:complexType> - </xs:element> - <xs:element name="having-condition-list"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element ref="condition-expr" /> - <xs:element ref="condition-list" /> - <xs:element ref="condition-object" /> - </xs:choice> - <xs:attribute name="combine" default="and"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="and" /> - <xs:enumeration value="or" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="limit-range"> - <xs:complexType> - <xs:attribute name="start" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="size" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="limit-view"> - <xs:complexType> - <xs:attribute name="view-index" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="view-size" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a positive integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="use-iterator" /> - <xs:element name="order-by"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="select-field"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - </xs:complexType> - </xs:element> - - <xs:element name="call-parent-actions" substitutionGroup="AllActions" /> </xs:schema> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-menu.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-menu.xsd?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-menu.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-menu.xsd Mon Jan 5 08:50:30 2015 @@ -18,6 +18,7 @@ specific language governing permissions under the License. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + <xs:include schemaLocation="http://ofbiz.apache.org/dtds/widget-common.xsd" /> <xs:element name="menus"> <xs:complexType> <xs:sequence> @@ -96,7 +97,32 @@ under the License. <xs:element name="menu-item"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" ref="condition" /> + <xs:element name="condition" minOccurs="0"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="ConditionRootType"> + <xs:attribute type="xs:string" name="pass-style"> + <xs:annotation> + <xs:documentation> + If a pass-style provided and the condition passes, the widget-style of + the parent menu-item is set with the pass-style. If no pass-style is given, + the widget-style is not changed. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="disabled-style"> + <xs:annotation> + <xs:documentation> + If a disabled-style provided and the condition fails, the disabled-style of + the parent menu-item is set with the disabled-style and processing is allowed to continue. + If no disabled-style is given, the widget-style is not changed and the menu-item is not rendered. + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> <xs:element minOccurs="0" ref="actions" /> <xs:element minOccurs="0" ref="link" /> <xs:element minOccurs="0" maxOccurs="unbounded" ref="menu-item" /> @@ -294,8 +320,6 @@ under the License. </xs:complexType> </xs:element> - <!-- ================ ACTIONS ================ --> - <xs:element name="AllActions" abstract="true"/> <xs:element name="actions"> <xs:complexType> <xs:sequence> @@ -303,27 +327,20 @@ under the License. </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="property-map" substitutionGroup="AllActions"> + <xs:element name="entity-and" substitutionGroup="AllActions"> <xs:complexType> - <xs:attribute type="xs:string" name="resource" use="required" /> - <xs:attribute type="xs:string" name="map-name" use="required" /> - <xs:attribute name="global" 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="property-to-field" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="resource" use="required" /> - <xs:attribute type="xs:string" name="property" use="required" /> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="default" /> - <xs:attribute name="no-locale" default="false"> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="field-map" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by" /> + <xs:choice minOccurs="0"> + <xs:element ref="limit-range" /> + <xs:element ref="limit-view" /> + <xs:element ref="use-iterator" /> + </xs:choice> + </xs:sequence> + <xs:attribute type="xs:string" name="entity-name" use="required" /> + <xs:attribute name="use-cache" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true" /> @@ -331,166 +348,45 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="arg-list-name" /> - </xs:complexType> - </xs:element> - <xs:element name="script" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="location" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="set" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="from-field" /> - <xs:attribute type="xs:string" name="value" /> - <xs:attribute type="xs:string" name="default-value" /> - <xs:attribute name="global" default="false"> + <xs:attribute name="filter-by-date" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true" /> <xs:enumeration value="false" /> + <xs:enumeration value="by-name" /> </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="type" default="String"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="List" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> - <xs:enumeration value="NewList" /> - <xs:enumeration value="NewMap" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="to-scope" default="screen"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="screen" /> - <xs:enumeration value="user" /> - <xs:enumeration value="application" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="from-scope" default="screen"> + <xs:attribute type="xs:string" name="list" use="required" /> + <xs:attribute name="result-set-type" default="scroll"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="screen" /> - <xs:enumeration value="user" /> - <xs:enumeration value="application" /> + <xs:enumeration value="forward" /> + <xs:enumeration value="scroll" /> </xs:restriction> </xs:simpleType> </xs:attribute> </xs:complexType> </xs:element> - - <!-- ================ CONDITIONS ================ --> - <xs:element name="AllConditionals" abstract="true"/> - <xs:element name="condition"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="1" maxOccurs="1" ref="AllConditionals" /> - </xs:sequence> - <xs:attribute type="xs:string" name="pass-style"> - <xs:annotation> - <xs:documentation> - If a pass-style provided and the condition passes, the widget-style of - the parent menu-item is set with the pass-style. If no pass-style is given, - the widget-style is not changed. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="disabled-style"> - <xs:annotation> - <xs:documentation> - If a disabled-style provided and the condition fails, the disabled-style of - the parent menu-item is set with the disabled-style and processing is allowed to continue. - If no disabled-style is given, the widget-style is not changed and the menu-item is not rendered. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="and" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="xor" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="or" substitutionGroup="AllConditionals"> + <xs:element name="entity-condition" substitutionGroup="AllActions"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" ref="AllConditionals"/> + <xs:choice minOccurs="0"> + <xs:element ref="condition-expr" /> + <xs:element ref="condition-list" /> + <xs:element ref="condition-object" /> + </xs:choice> + <xs:element minOccurs="0" ref="having-condition-list" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by" /> + <xs:choice minOccurs="0"> + <xs:element ref="limit-range" /> + <xs:element ref="limit-view" /> + <xs:element ref="use-iterator" /> + </xs:choice> </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="not" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="if-service-permission" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute type="xs:string" name="service-name" use="required" /> - <xs:attribute type="xs:string" name="resource-description" use="optional" /> - <xs:attribute name="main-action" use="optional"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="CREATE" /> - <xs:enumeration value="UPDATE" /> - <xs:enumeration value="DELETE" /> - <xs:enumeration value="VIEW" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="if-has-permission" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute type="xs:string" name="permission" use="required" /> - <xs:attribute type="xs:string" name="action" /> - </xs:complexType> - </xs:element> - <xs:element name="if-entity-permission" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:choice minOccurs="0"> - <xs:element minOccurs="0" maxOccurs="1" ref="permission-condition-getter" /> - <xs:element minOccurs="0" maxOccurs="1" ref="related-role-getter" /> - <xs:element minOccurs="0" maxOccurs="1" ref="auxiliary-value-getter" /> - </xs:choice> <xs:attribute type="xs:string" name="entity-name" use="required" /> - <xs:attribute type="xs:string" name="entity-id" use="required"> - <xs:annotation> - <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="target-operation" use="required"> - <xs:annotation> - <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="display-fail-cond" default="false"> + <xs:attribute name="use-cache" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true" /> @@ -498,130 +394,33 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="permission-condition-getter"> - <xs:complexType> - <xs:attribute type="xs:string" name="entity-name" /> - <xs:attribute type="xs:string" name="operation-field-name" /> - <xs:attribute type="xs:string" name="role-field-name" /> - <xs:attribute type="xs:string" name="auxiliary-field-name" /> - <xs:attribute type="xs:string" name="status-field-name" /> - <xs:attribute type="xs:string" name="privilege-field-name" /> - </xs:complexType> - </xs:element> - <xs:element name="related-role-getter"> - <xs:complexType> - <xs:attribute type="xs:string" name="entity-name" /> - <xs:attribute type="xs:string" name="role-entity-name" /> - <xs:attribute type="xs:string" name="role-type-field-name" /> - <xs:attribute type="xs:string" name="party-field-name" /> - <xs:attribute type="xs:string" name="owner-entity-field-name" /> - <xs:attribute type="xs:string" name="entity-id-name" /> - </xs:complexType> - </xs:element> - <xs:element name="auxiliary-value-getter"> - <xs:complexType> - <xs:attribute type="xs:string" name="entity-name" /> - <xs:attribute type="xs:string" name="auxiliary-field-name" /> - <xs:attribute type="xs:string" name="entity-id-name" /> - </xs:complexType> - </xs:element> - <xs:element name="if-validate-method" substitutionGroup="AllConditionals"> - <xs:annotation> - <xs:documentation>Calls a static Java method that takes a String and returns a boolean.</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attribute name="field" use="required" /> - <xs:attribute name="method" use="required" /> - <xs:attribute name="class" default="org.ofbiz.base.util.UtilValidate" /> - </xs:complexType> - </xs:element> - <xs:element name="if-compare" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute name="field" use="required" /> - <xs:attribute name="operator" use="required"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="less" /> - <xs:enumeration value="greater" /> - <xs:enumeration value="less-equals" /> - <xs:enumeration value="greater-equals" /> - <xs:enumeration value="equals" /> - <xs:enumeration value="not-equals" /> - <xs:enumeration value="contains" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="value" use="required" /> - <xs:attribute name="type" default="String"> + <xs:attribute name="filter-by-date" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> + <xs:enumeration value="by-name" /> </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="format" /> - </xs:complexType> - </xs:element> - <xs:element name="if-compare-field" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute name="field" use="required" /> - <xs:attribute name="operator" use="required"> + <xs:attribute name="distinct" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="less" /> - <xs:enumeration value="greater" /> - <xs:enumeration value="less-equals" /> - <xs:enumeration value="greater-equals" /> - <xs:enumeration value="equals" /> - <xs:enumeration value="not-equals" /> - <xs:enumeration value="contains" /> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="to-field" /> - <xs:attribute name="type" default="String"> + <xs:attribute type="xs:string" name="delegator-name" /> + <xs:attribute type="xs:string" name="list" use="required" /> + <xs:attribute name="result-set-type" default="scroll"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> + <xs:enumeration value="forward" /> + <xs:enumeration value="scroll" /> </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="format" /> - </xs:complexType> - </xs:element> - <xs:element name="if-regexp" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute name="field" use="required" /> - <xs:attribute name="expr" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="if-empty" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute name="field" use="required" /> </xs:complexType> </xs:element> </xs:schema> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd Mon Jan 5 08:50:30 2015 @@ -18,10 +18,11 @@ specific language governing permissions under the License. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + <xs:include schemaLocation="http://ofbiz.apache.org/dtds/widget-common.xsd" /> <xs:element name="screens"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" ref="screen"/> + <xs:element maxOccurs="unbounded" ref="screen" /> </xs:sequence> </xs:complexType> </xs:element> @@ -57,7 +58,7 @@ under the License. <xs:element name="section" substitutionGroup="AllWidgets"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" ref="condition" /> + <xs:element name="condition" type="ScreenConditionRootType" minOccurs="0" /> <xs:element minOccurs="0" ref="actions" /> <xs:element minOccurs="0" ref="widgets" /> <xs:element minOccurs="0" ref="fail-widgets" /> @@ -67,217 +68,25 @@ under the License. </xs:element> <!-- ================ CONDITIONS ================ --> - <xs:element name="AllConditionals" abstract="true"/> - <xs:element name="condition"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="1" maxOccurs="1" ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="and" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="xor" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="or" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="not" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:sequence> - <xs:element ref="AllConditionals"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="if-service-permission" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute type="xs:string" name="service-name" use="required" /> - <xs:attribute type="xs:string" name="resource-description" use="optional" /> - <xs:attribute type="xs:string" name="context-map" use="optional" /> - <xs:attribute name="main-action" use="optional"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="CREATE" /> - <xs:enumeration value="UPDATE" /> - <xs:enumeration value="DELETE" /> - <xs:enumeration value="VIEW" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="if-has-permission" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute type="xs:string" name="permission" use="required" /> - <xs:attribute type="xs:string" name="action" /> - </xs:complexType> - </xs:element> - <xs:element name="if-entity-permission" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:choice minOccurs="0"> - <xs:element minOccurs="0" maxOccurs="1" ref="permission-condition-getter" /> - <xs:element minOccurs="0" maxOccurs="1" ref="related-role-getter" /> - <xs:element minOccurs="0" maxOccurs="1" ref="auxiliary-value-getter" /> - </xs:choice> - <xs:attribute type="xs:string" name="entity-name" use="required" /> - <xs:attribute type="xs:string" name="entity-id" use="required"> - <xs:annotation> - <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="target-operation" use="required"> - <xs:annotation> - <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="display-fail-cond" 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="permission-condition-getter"> - <xs:complexType> - <xs:attribute type="xs:string" name="entity-name" /> - <xs:attribute type="xs:string" name="operation-field-name" /> - <xs:attribute type="xs:string" name="role-field-name" /> - <xs:attribute type="xs:string" name="auxiliary-field-name" /> - <xs:attribute type="xs:string" name="status-field-name" /> - <xs:attribute type="xs:string" name="privilege-field-name" /> - </xs:complexType> - </xs:element> - <xs:element name="related-role-getter"> - <xs:complexType> - <xs:attribute type="xs:string" name="entity-name" /> - <xs:attribute type="xs:string" name="role-entity-name" /> - <xs:attribute type="xs:string" name="role-type-field-name" /> - <xs:attribute type="xs:string" name="party-field-name" /> - <xs:attribute type="xs:string" name="owner-entity-field-name" /> - <xs:attribute type="xs:string" name="entity-id-name" /> - </xs:complexType> - </xs:element> - <xs:element name="auxiliary-value-getter"> - <xs:complexType> - <xs:attribute type="xs:string" name="entity-name" /> - <xs:attribute type="xs:string" name="auxiliary-field-name" /> - <xs:attribute type="xs:string" name="entity-id-name" /> - </xs:complexType> - </xs:element> - <xs:element name="if-validate-method" substitutionGroup="AllConditionals"> - <xs:annotation> - <xs:documentation>Calls a static Java method that takes a String and returns a boolean.</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="method" use="required" /> - <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate" /> - </xs:complexType> - </xs:element> - <xs:element name="if-compare" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute name="field" type="xs:string" use="required" /> - <xs:attribute name="operator" use="required"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="less" /> - <xs:enumeration value="greater" /> - <xs:enumeration value="less-equals" /> - <xs:enumeration value="greater-equals" /> - <xs:enumeration value="equals" /> - <xs:enumeration value="not-equals" /> - <xs:enumeration value="contains" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="value" type="xs:string" use="required" /> - <xs:attribute name="type" default="String"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute type="xs:string" name="format" /> - </xs:complexType> - </xs:element> - <xs:element name="if-compare-field" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute name="field" type="xs:string" use="required" /> - <xs:attribute name="operator" use="required"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="less" /> - <xs:enumeration value="greater" /> - <xs:enumeration value="less-equals" /> - <xs:enumeration value="greater-equals" /> - <xs:enumeration value="equals" /> - <xs:enumeration value="not-equals" /> - <xs:enumeration value="contains" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="to-field" type="xs:string" /> - <xs:attribute name="type" default="String"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute type="xs:string" name="format" /> - </xs:complexType> - </xs:element> - <xs:element name="if-regexp" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="expr" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="if-empty" substitutionGroup="AllConditionals"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - </xs:complexType> - </xs:element> + + <xs:complexType name="ScreenConditionRootType"> + <xs:choice> + <xs:element ref="and" /> + <xs:element ref="or" /> + <xs:element ref="xor" /> + <xs:element ref="not" /> + <xs:element ref="if-service-permission" /> + <xs:element ref="if-has-permission" /> + <xs:element ref="if-entity-permission" /> + <xs:element ref="if-validate-method" /> + <xs:element ref="if-compare" /> + <xs:element ref="if-compare-field" /> + <xs:element ref="if-regexp" /> + <xs:element ref="if-empty" /> + <xs:element ref="if-empty-section" /> + </xs:choice> + </xs:complexType> + <xs:element name="if-empty-section" substitutionGroup="AllConditionals"> <xs:complexType> <xs:attribute type="xs:string" name="section-name" use="required" /> @@ -285,105 +94,14 @@ under the License. </xs:element> <!-- ================ ACTIONS ================ --> - <xs:element name="AllActions" abstract="true"/> + <xs:element name="actions"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="AllActions"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="AllActions" /> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="set" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="from-field" /> - <xs:attribute type="xs:string" name="value" /> - <xs:attribute type="xs:string" name="default-value" /> - <xs:attribute name="global" 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="type"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="PlainString" /> - <xs:enumeration value="String" /> - <xs:enumeration value="BigDecimal" /> - <xs:enumeration value="Double" /> - <xs:enumeration value="Float" /> - <xs:enumeration value="List" /> - <xs:enumeration value="Long" /> - <xs:enumeration value="Integer" /> - <xs:enumeration value="Date" /> - <xs:enumeration value="Time" /> - <xs:enumeration value="Timestamp" /> - <xs:enumeration value="Boolean" /> - <xs:enumeration value="Object" /> - <xs:enumeration value="NewList" /> - <xs:enumeration value="NewMap" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="to-scope" default="screen"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="screen" /> - <xs:enumeration value="user" /> - <xs:enumeration value="application" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="from-scope" default="screen"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="screen" /> - <xs:enumeration value="user" /> - <xs:enumeration value="application" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="property-map" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="resource" use="required" /> - <xs:attribute type="xs:string" name="map-name" use="required" /> - <xs:attribute name="global" 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="property-to-field" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="resource" use="required" /> - <xs:attribute type="xs:string" name="property" use="required" /> - <xs:attribute type="xs:string" name="field" use="required" /> - <xs:attribute type="xs:string" name="default" /> - <xs:attribute name="no-locale" 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="arg-list-name" /> - </xs:complexType> - </xs:element> - <xs:element name="script" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="location" use="required" /> - </xs:complexType> - </xs:element> <xs:element name="service" substitutionGroup="AllActions"> <xs:complexType> <xs:sequence> @@ -398,7 +116,6 @@ under the License. </xs:attribute> </xs:complexType> </xs:element> - <xs:element name="entity-and" substitutionGroup="AllActions"> <xs:complexType> <xs:sequence> @@ -495,204 +212,21 @@ under the License. </xs:attribute> </xs:complexType> </xs:element> - <xs:element name="entity-one" substitutionGroup="AllActions"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" /> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> - </xs:sequence> - <xs:attribute name="entity-name" type="xs:string" use="required" /> - <xs:attribute name="value-field" type="xs:string" use="required" /> - <xs:attribute name="use-cache" 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="auto-field-map" default="true"> - <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="get-related-one" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute name="value-field" type="xs:string" use="required" /> - <xs:attribute name="relation-name" type="xs:string" use="required" /> - <xs:attribute name="use-cache" type="xs:string" default="false" /> - <xs:attribute name="to-value-field" type="xs:string" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="get-related" substitutionGroup="AllActions"> - <xs:complexType> - <xs:attribute type="xs:string" name="value-field" use="required" /> - <xs:attribute type="xs:string" name="relation-name" use="required" /> - <xs:attribute type="xs:string" name="map" /> - <xs:attribute type="xs:string" name="order-by-list" /> - <xs:attribute type="xs:string" name="use-cache" default="false" /> - <xs:attribute type="xs:string" name="list" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="condition-list"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element ref="condition-expr" /> - <xs:element ref="condition-list" /> - <xs:element ref="condition-object" /> - </xs:choice> - <xs:attribute name="combine" default="and"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="and" /> - <xs:enumeration value="or" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="having-condition-list"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element ref="condition-expr" /> - <xs:element ref="condition-list" /> - <xs:element ref="condition-object" /> - </xs:choice> - <xs:attribute name="combine" default="and"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="and" /> - <xs:enumeration value="or" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="condition-expr"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - <xs:attribute name="operator" default="equals"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="less" /> - <xs:enumeration value="greater" /> - <xs:enumeration value="less-equals" /> - <xs:enumeration value="greater-equals" /> - <xs:enumeration value="equals" /> - <xs:enumeration value="not-equals" /> - <xs:enumeration value="in" /> - <xs:enumeration value="not-in" /> - <xs:enumeration value="between" /> - <xs:enumeration value="like" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute type="xs:string" name="from-field" /> - <xs:attribute type="xs:string" name="value" /> - <xs:attribute name="ignore-if-null" 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="ignore-if-empty" 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="ignore-case" 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="ignore" default="false"> - <xs:annotation> - <xs:documentation> - Ignore the condition if flag is true. - Defaults to false. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="condition-object"> - <xs:complexType> - <xs:attribute type="xs:string" name="field" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="select-field"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="order-by"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - </xs:complexType> - </xs:element> - <xs:element name="limit-range"> - <xs:complexType> - <xs:attribute name="start" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="size" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="limit-view"> - <xs:complexType> - <xs:attribute name="view-index" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="view-size" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>Should resolve into a positive integer.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="use-iterator" /> - <xs:element name="field-map"> - <xs:complexType> - <xs:attribute type="xs:string" name="field-name" use="required" /> - <xs:attribute type="xs:string" name="from-field" /> - <xs:attribute type="xs:string" name="value" /> - </xs:complexType> - </xs:element> <!-- ================ WIDGETS ================ --> - <xs:element name="AllWidgets" abstract="true"/> + + <xs:element name="AllWidgets" abstract="true" /> <xs:element name="widgets"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="AllWidgets"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="AllWidgets" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="fail-widgets"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="AllWidgets"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="AllWidgets" /> </xs:sequence> </xs:complexType> </xs:element> @@ -725,7 +259,8 @@ under the License. <xs:attribute type="xs:string" name="auto-update-target"> <xs:annotation> <xs:documentation>The URL to be called for periodic asynchronous area updates. - Some widget rendering environments support asynchronous updates.</xs:documentation> + Some widget rendering environments support asynchronous updates. + </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="auto-update-interval"> @@ -772,8 +307,8 @@ under the License. <xs:element name="link" substitutionGroup="AllWidgets"> <xs:complexType> <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-service" /> + <xs:element minOccurs="0" ref="auto-parameters-entity" /> <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" /> <xs:element minOccurs="0" ref="image" /> </xs:sequence> @@ -792,7 +327,7 @@ under the License. <xs:enumeration value="auto"> <xs:annotation> <xs:documentation> - If selected the hidden-form type will be used if the url-mode is intra-app + If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used, except if the ajax-window mode is specified. </xs:documentation> @@ -850,18 +385,18 @@ under the License. <xs:element name="auto-parameters-service"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" /> </xs:sequence> <xs:attribute name="service-name" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>The service name used to resolve parameters. If empty, use form defaultServiceName. Flexible string allowed.</xs:documentation> - </xs:annotation> + <xs:annotation> + <xs:documentation>The service name used to resolve parameters. If empty, use form defaultServiceName. Flexible string allowed.</xs:documentation> + </xs:annotation> </xs:attribute> <xs:attribute name="send-if-empty" default="true"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> </xs:restriction> </xs:simpleType> </xs:attribute> @@ -870,27 +405,27 @@ under the License. <xs:element name="auto-parameters-entity"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" /> </xs:sequence> <xs:attribute name="entity-name" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>The entity name used to resolve parameters. If empty use form defaultEntityName attribute. Flexible string allowed.</xs:documentation> - </xs:annotation> + <xs:annotation> + <xs:documentation>The entity name used to resolve parameters. If empty use form defaultEntityName attribute. Flexible string allowed.</xs:documentation> + </xs:annotation> </xs:attribute> <xs:attribute name="include" default="pk"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="pk"/> - <xs:enumeration value="nonpk"/> - <xs:enumeration value="all"/> + <xs:enumeration value="pk" /> + <xs:enumeration value="nonpk" /> + <xs:enumeration value="all" /> </xs:restriction> </xs:simpleType> </xs:attribute> <xs:attribute name="send-if-empty" default="true"> <xs:simpleType> <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> </xs:restriction> </xs:simpleType> </xs:attribute> @@ -898,7 +433,7 @@ under the License. </xs:element> <xs:element name="exclude"> <xs:complexType> - <xs:attribute name="field-name" type="xs:string" use="required"/> + <xs:attribute name="field-name" type="xs:string" use="required" /> </xs:complexType> </xs:element> @@ -968,6 +503,7 @@ under the License. </xs:element> <!-- ================ WIDGETS - Includers ================ --> + <xs:element name="content" substitutionGroup="AllWidgets"> <xs:complexType> <xs:attribute type="xs:string" name="content-id" /> @@ -1148,57 +684,58 @@ under the License. <xs:element name="platform-specific" substitutionGroup="AllWidgets"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" ref="html"/> - <xs:element minOccurs="0" ref="swing"/> - <xs:element minOccurs="0" ref="xsl-fo"/> - <xs:element minOccurs="0" ref="xml"/> + <xs:element minOccurs="0" ref="html" /> + <xs:element minOccurs="0" ref="swing" /> + <xs:element minOccurs="0" ref="xsl-fo" /> + <xs:element minOccurs="0" ref="xml" /> </xs:sequence> </xs:complexType> </xs:element> <!-- ============== HTML Specific Elements =============== --> - <xs:element name="HtmlWidgets" abstract="true"/> + <xs:element name="HtmlWidgets" abstract="true" /> <xs:element name="html"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="xsl-fo"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="xml"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="html-template" substitutionGroup="HtmlWidgets"> <xs:complexType> - <xs:attributeGroup ref="attlist.html-template"/> + <xs:attributeGroup ref="attlist.html-template" /> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.html-template"> - <xs:attribute type="xs:string" name="location" use="required"/> + <xs:attribute type="xs:string" name="location" use="required" /> </xs:attributeGroup> <xs:element name="html-template-decorator" substitutionGroup="HtmlWidgets"> <xs:annotation> <xs:documentation> We don't really want to encourage the use of the html-template-decorator, should be done on the screen level. To include the sections in the decorator template just use the "render(sectionName)" method "sections" object, FTL example: ${sections.render("main")}. - For more efficient use the sections.render(sectionName, writer) method should be used, in FTL this would be in a transform or something. + For more + efficient use the sections.render(sectionName, writer) method should be used, in FTL this would be in a transform or something. </xs:documentation> </xs:annotation> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" ref="html-template-decorator-section"/> + <xs:element maxOccurs="unbounded" ref="html-template-decorator-section" /> </xs:sequence> - <xs:attribute type="xs:string" name="location" use="required"/> + <xs:attribute type="xs:string" name="location" use="required" /> </xs:complexType> </xs:element> <xs:element name="html-template-decorator-section"> @@ -1211,6 +748,6 @@ under the License. </xs:element> <!-- ============== Swing Specific Elements =============== --> <xs:element name="swing"> - <xs:complexType/> + <xs:complexType /> </xs:element> </xs:schema> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |