svn commit: r1768008 - in /ofbiz/site/dtds: entity-config.xsd service-eca.xsd services.xsd simple-methods.xsd site-conf.xsd widget-common.xsd widget-form.xsd widget-screen.xsd
Locked
svn commit: r1768008 - in /ofbiz/site/dtds: entity-config.xsd service-eca.xsd services.xsd simple-methods.xsd site-conf.xsd widget-common.xsd widget-form.xsd widget-screen.xsd
 
|
Author: jleroux
Date: Fri Nov 4 11:00:12 2016 New Revision: 1768008 URL: http://svn.apache.org/viewvc?rev=1768008&view=rev Log: Updates the DTDs; I have to double-check simple-methods.xsd though, will do later Modified: ofbiz/site/dtds/entity-config.xsd ofbiz/site/dtds/service-eca.xsd ofbiz/site/dtds/services.xsd ofbiz/site/dtds/simple-methods.xsd ofbiz/site/dtds/site-conf.xsd ofbiz/site/dtds/widget-common.xsd ofbiz/site/dtds/widget-form.xsd ofbiz/site/dtds/widget-screen.xsd Modified: ofbiz/site/dtds/entity-config.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-config.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/entity-config.xsd (original) +++ ofbiz/site/dtds/entity-config.xsd Fri Nov 4 11:00:12 2016 @@ -114,7 +114,7 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="entity-eca-handler-class-name" default="org.ofbiz.entityext.eca.DelegatorEcaHandler"/> + <xs:attribute type="xs:string" name="entity-eca-handler-class-name" default="org.apache.ofbiz.entityext.eca.DelegatorEcaHandler"/> <xs:attribute name="distributed-cache-clear-enabled" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -123,10 +123,10 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="distributed-cache-clear-class-name" default="org.ofbiz.entityext.cache.EntityCacheServices"/> + <xs:attribute type="xs:string" name="distributed-cache-clear-class-name" default="org.apache.ofbiz.entityext.cache.EntityCacheServices"/> <xs:attribute type="xs:string" name="distributed-cache-clear-user-login-id" default="system"/> <xs:attribute type="xs:string" name="sequenced-id-prefix"/> - <xs:attribute type="xs:string" name="default-group-name" default="org.ofbiz"/> + <xs:attribute type="xs:string" name="default-group-name" default="org.apache.ofbiz"/> <xs:attribute type="xs:string" name="key-encrypting-key"/> </xs:attributeGroup> <xs:element name="group-map"> Modified: ofbiz/site/dtds/service-eca.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-eca.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/service-eca.xsd (original) +++ ofbiz/site/dtds/service-eca.xsd Fri Nov 4 11:00:12 2016 @@ -264,12 +264,3 @@ under the License. </xs:attribute> </xs:attributeGroup> </xs:schema> -<!-- - <service-eca> - <eca service="testBsh" event="commit"> - <condition field-name="foo" operator="equals" rhs="1"/> - <action service="testScv" mode="sync"/> - <action service="testScv" mode="sync"/> - </eca> - </service-eca> ---> Modified: ofbiz/site/dtds/services.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/services.xsd (original) +++ ofbiz/site/dtds/services.xsd Fri Nov 4 11:00:12 2016 @@ -517,7 +517,7 @@ under the License. </xs:element> <xs:attributeGroup name="attlist.type-validate"> <xs:attribute name="method" type="xs:string"/> - <xs:attribute name="class" type="xs:string" default="org.ofbiz.base.util.UtilValidate"/> + <xs:attribute name="class" type="xs:string" default="org.apache.ofbiz.base.util.UtilValidate"/> </xs:attributeGroup> <xs:element name="fail-message"> <xs:complexType> Modified: ofbiz/site/dtds/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/simple-methods.xsd (original) +++ ofbiz/site/dtds/simple-methods.xsd Fri Nov 4 11:00:12 2016 @@ -84,14 +84,20 @@ under the License. </xs:simpleType> <xs:simpleType name="javaClassName"> + <xs:annotation> + <xs:documentation> + The Java data type. + + Optional. Attribute type: constant. Attribute must contain a valid Java class name. + </xs:documentation> + </xs:annotation> <xs:restriction base="xs:token"> <xs:pattern value="[a-zA-Z_]{1}[a-zA-Z0-9_$.]+" /> </xs:restriction> </xs:simpleType> <!-- Reusable attributes and attribute groups --> - - <xs:attribute name="field"> + <xs:simpleType name="fieldType"> <xs:annotation> <xs:documentation> The name of the field to set. The target of the assignment. @@ -99,14 +105,12 @@ under the License. Required. Attribute type: expression. </xs:documentation> </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:minLength value="1" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> + <xs:restriction base="xs:token"> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> - <xs:attribute name="error-list-name" type="xs:string"> + <xs:simpleType name="error-list-name"> <xs:annotation> <xs:documentation> The name of the error message list. It will be created if it does not exist. @@ -115,19 +119,11 @@ under the License. Optional. Attribute types: constant, ${expression}. </xs:documentation> </xs:annotation> - </xs:attribute> - - <xs:attribute name="type" type="javaClassName"> - <xs:annotation> - <xs:documentation> - The Java data type. - - Optional. Attribute type: constant. Attribute must contain a valid Java class name. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"> + </xs:restriction> + </xs:simpleType> - <xs:attributeGroup name="attlist.operatorRequired"> + <xs:complexType name="attlist.operatorRequired"> <xs:attribute name="operator" use="required"> <xs:annotation> <xs:documentation> @@ -152,9 +148,9 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> - <xs:attributeGroup name="attlist.operatorOptionalRvalue"> + <xs:complexType name="attlist.operatorOptionalRvalue"> <xs:attribute name="operator" use="required"> <xs:annotation> <xs:documentation> @@ -185,9 +181,9 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> - <xs:attributeGroup name="attlist.check-permission"> + <xs:complexType name="attlist.check-permission"> <xs:attribute name="permission" type="xs:string" use="required"> <xs:annotation> <xs:documentation> @@ -208,9 +204,9 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> - <xs:attribute name="delegator-name" type="xs:string"> + <xs:simpleType name="delegator-name"> <xs:annotation> <xs:documentation> An alternate delegator name. When specified, the entity operation will use the @@ -219,7 +215,8 @@ under the License. Optional. Attribute types: constant, ${expression}. </xs:documentation> </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"/> + </xs:simpleType> <!-- ============================= @@ -482,7 +479,7 @@ under the License. <xs:element ref="fail-message" /> <xs:element ref="fail-property" /> </xs:choice> - <xs:attribute ref="error-list-name"/> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -503,7 +500,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name"/> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -531,7 +528,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name" /> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -547,24 +544,30 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element name="alt-permission" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation> - Declares an alternate permission. Alternate permissions are checked when the primary permission check fails. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.check-permission" /> - </xs:complexType> - </xs:element> - <xs:choice> - <xs:element ref="fail-message" /> - <xs:element ref="fail-property" /> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="attlist.check-permission" /> - <xs:attribute ref="error-list-name" /> + <xs:complexContent> + <xs:extension base="attlist.check-permission"> + <xs:sequence> + <xs:element name="alt-permission" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + Declares an alternate permission. Alternate permissions are checked when the primary permission check fails. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="attlist.check-permission"> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:choice> + <xs:element ref="fail-message" /> + <xs:element ref="fail-property" /> + </xs:choice> + </xs:sequence> + <xs:attribute name="error-list-name" type="error-list-name"/> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -575,7 +578,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> </xs:complexType> </xs:element> @@ -594,7 +597,7 @@ under the License. <xs:element ref="field" /> <xs:element ref="string" /> </xs:choice> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute name="class-name" type="javaClassName" use="required"> <xs:annotation> <xs:documentation> @@ -671,7 +674,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="type"> + <xs:attribute name="type" type="javaClassName"> <xs:annotation> <xs:documentation> The Java class of the argument. Defaults to "java.lang.String". @@ -905,7 +908,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute name="type"> <xs:annotation> <xs:documentation> @@ -935,7 +938,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> </xs:complexType> </xs:element> @@ -947,7 +950,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> </xs:complexType> </xs:element> @@ -999,7 +1002,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -1106,7 +1109,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="request-name"> <xs:annotation> <xs:documentation> @@ -1136,7 +1139,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> @@ -1165,7 +1168,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="from"> <xs:annotation> <xs:documentation> @@ -1259,7 +1262,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="from"> <xs:annotation> <xs:documentation> @@ -1697,7 +1700,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -1775,7 +1778,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name"/> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -1853,48 +1856,51 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:element minOccurs="0" ref="else" /> - </xs:sequence> - <xs:attribute type="xs:string" name="field" use="required"> - <xs:annotation> - <xs:documentation> - The name of the field that will be compared. The l-value. - - Required. Attribute type: expression. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attributeGroup ref="attlist.operatorOptionalRvalue" /> - <xs:attribute type="xs:string" name="value" use="required"> - <xs:annotation> - <xs:documentation> - The value that the field will be compared to. The r-value. - - Ignored when the operator attribute equals "is-null", "is-not-null", or "is-empty" - required otherwise. Attribute type: constant+expr. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute ref="type"> - <xs:annotation> - <xs:documentation> - The Java data type. Both values will be converted to this type before comparison. - Invalid when the operator attribute value is "contains". - - Optional. Attribute type: constant. Attribute must contain a valid Java class name. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format used for type conversions. Valid only when the type attribute is not empty. - - Optional. Attribute types: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:complexContent> + <xs:extension base="attlist.operatorOptionalRvalue"> + <xs:sequence> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> + <xs:element minOccurs="0" ref="else" /> + </xs:sequence> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation> + <xs:documentation> + The name of the field that will be compared. The l-value. + + Required. Attribute type: expression. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="value" use="required"> + <xs:annotation> + <xs:documentation> + The value that the field will be compared to. The r-value. + + Ignored when the operator attribute equals "is-null", "is-not-null", or "is-empty" - required otherwise. Attribute type: constant+expr. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="type" type="javaClassName"> + <xs:annotation> + <xs:documentation> + The Java data type. Both values will be converted to this type before comparison. + Invalid when the operator attribute value is "contains". + + Optional. Attribute type: constant. Attribute must contain a valid Java class name. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format used for type conversions. Valid only when the type attribute is not empty. + + Optional. Attribute types: constant, ${expression}. + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -1906,40 +1912,43 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:element minOccurs="0" ref="else" /> - </xs:sequence> - <xs:attribute type="xs:string" name="field" use="required"> - <xs:annotation> - <xs:documentation> - The name of the field that will be compared. The l-value. - - Required. Attribute type: expression. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attributeGroup ref="attlist.operatorRequired" /> - <xs:attribute type="xs:string" name="to-field" use="required"> - <xs:annotation> - <xs:documentation> - The name of the field that will be compared to the field specified in the field attribute. - The r-value. - - Required. Attribute type: expression. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute ref="type" /> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format used for type conversions. Valid only when the type attribute is not empty. - - Optional. Attribute types: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:complexContent> + <xs:extension base="attlist.operatorRequired"> + <xs:sequence> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> + <xs:element minOccurs="0" ref="else" /> + </xs:sequence> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation> + <xs:documentation> + The name of the field that will be compared. The l-value. + + Required. Attribute type: expression. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="to-field" use="required"> + <xs:annotation> + <xs:documentation> + The name of the field that will be compared to the field specified in the field attribute. + The r-value. + + Required. Attribute type: expression. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="type" type="javaClassName"/> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format used for type conversions. Valid only when the type attribute is not empty. + + Optional. Attribute types: constant, ${expression}. + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -1959,7 +1968,7 @@ under the License. <xs:annotation> <xs:documentation> The name of the field to test. - Object to test must be a collection, string, or a class that implements org.ofbiz.base.lang.IsEmpty. + Object to test must be a collection, string, or a class that implements org.apache.ofbiz.base.lang.IsEmpty. Required. Attribute type: expression. </xs:documentation> @@ -1976,11 +1985,14 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:element minOccurs="0" ref="else" /> - </xs:sequence> - <xs:attributeGroup ref="attlist.check-permission" /> + <xs:complexContent> + <xs:extension base="attlist.check-permission"> + <xs:sequence> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> + <xs:element minOccurs="0" ref="else" /> + </xs:sequence> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -2035,7 +2047,7 @@ under the License. <xs:annotation> <xs:documentation> The name of the field to test. - Object to test must be a collection, string, or a class that implements org.ofbiz.base.lang.IsEmpty. + Object to test must be a collection, string, or a class that implements org.apache.ofbiz.base.lang.IsEmpty. Required. Attribute type: expression. </xs:documentation> @@ -2115,7 +2127,7 @@ under the License. <xs:attribute type="xs:string" name="class"> <xs:annotation> <xs:documentation> - The name of the class that contains the validation method. Defaults to "org.ofbiz.base.util.UtilValidate". + The name of the class that contains the validation method. Defaults to "org.apache.ofbiz.base.util.UtilValidate". Optional. Attribute type: constant </xs:documentation> @@ -2309,7 +2321,7 @@ under the License. =========================== --> - <xs:attribute name="result-name" type="xs:string"> + <xs:simpleType name="result-name"> <xs:annotation> <xs:documentation> The name of the called service's OUT attribute. @@ -2317,9 +2329,10 @@ under the License. Required. Attribute type: expression. </xs:documentation> </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"/> + </xs:simpleType> - <xs:attributeGroup name="attlist.propertyInfoOptional"> + <xs:complexType name="attlist.propertyInfoOptional"> <xs:attribute name="resource" type="xs:string"> <xs:annotation> <xs:documentation> @@ -2338,31 +2351,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> - - <xs:element name="call-bsh" substitutionGroup="CallOperations"> - <xs:annotation> - <xs:documentation> - Executes a BSH script. Deprecated - replace with script. - - The script can be contained in a Java resource, and/or a short - script can be included in the element body. - If a Java resource is specified, and the element body contains a script, - the element body script will be executed after the Java resource script is executed. - </xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attribute type="xs:string" name="resource"> - <xs:annotation> - <xs:documentation> - A Java resource that contains the script. - - Required if the element body is empty. Attribute type: constant. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - </xs:element> + </xs:complexType> <xs:element name="call-class-method" substitutionGroup="CallOperations"> <xs:annotation> @@ -2464,7 +2453,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name" /> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -2480,7 +2469,7 @@ under the License. <xs:complexType> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="string" /> - <xs:element ref="field" /> + <xs:element ref="field"/> </xs:choice> <xs:attribute type="xs:string" name="obj-field" use="required"> <xs:annotation> @@ -2529,7 +2518,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="error-suffix" minOccurs="0"> @@ -2540,7 +2532,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="success-prefix" minOccurs="0"> @@ -2551,7 +2546,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="success-suffix" minOccurs="0"> @@ -2562,7 +2560,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="message-prefix" minOccurs="0"> @@ -2573,7 +2574,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="message-suffix" minOccurs="0"> @@ -2584,7 +2588,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="default-message" minOccurs="0"> @@ -2595,7 +2602,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:choice minOccurs="0" maxOccurs="unbounded"> @@ -2814,7 +2824,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="field"> <xs:annotation> <xs:documentation> @@ -2835,7 +2845,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="request-name"> <xs:annotation> <xs:documentation> @@ -2856,7 +2866,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> @@ -2883,7 +2893,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="service-result-name"> <xs:annotation> <xs:documentation> @@ -2935,7 +2945,7 @@ under the License. ============================= --> - <xs:attribute type="xs:string" name="began-transaction-name"> + <xs:simpleType name="began-transaction-name"> <xs:annotation> <xs:documentation> The name of the field that contains a Boolean value specifying whether or not a transaction was begun in the current transaction demarcation. @@ -2944,9 +2954,10 @@ under the License. Optional. Attribute type: expression. </xs:documentation> </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"></xs:restriction> + </xs:simpleType> - <xs:attributeGroup name="attlist.entityFindOperations"> + <xs:complexType name="attlist.entityFindOperations"> <xs:attribute name="entity-name" type="xs:string" use="required"> <xs:annotation> <xs:documentation> @@ -2996,8 +3007,8 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> - </xs:attributeGroup> + <xs:attribute name="delegator-name" type="delegator-name"/> + </xs:complexType> <xs:element name="clear-cache-line" substitutionGroup="EntityValueOperations"> <xs:annotation> @@ -3028,7 +3039,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name"/> </xs:complexType> </xs:element> @@ -3040,7 +3051,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name"/> </xs:complexType> </xs:element> @@ -3276,17 +3287,20 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <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:attributeGroup ref="attlist.entityFindOperations"/> + <xs:complexContent> + <xs:extension base="attlist.entityFindOperations"> + <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:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -3297,22 +3311,25 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <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:attributeGroup ref="attlist.entityFindOperations"/> + <xs:complexContent> + <xs:extension base="attlist.entityFindOperations"> + <xs:sequence> + <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:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -3349,7 +3366,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3397,8 +3414,8 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name" /> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="error-list-name" type="error-list-name"/> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3453,7 +3470,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3677,7 +3694,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3736,7 +3753,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4031,7 +4048,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4142,7 +4159,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4173,7 +4190,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4280,7 +4297,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="stagger-max"> <xs:annotation> <xs:documentation> @@ -4302,7 +4319,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4410,7 +4427,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4453,7 +4470,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="began-transaction-name" /> + <xs:attribute name="began-transaction-name" type="began-transaction-name" /> </xs:complexType> </xs:element> @@ -4465,7 +4482,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="began-transaction-name" /> + <xs:attribute name="began-transaction-name" type="began-transaction-name" /> </xs:complexType> </xs:element> @@ -4479,7 +4496,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="began-transaction-name" /> + <xs:attribute name="began-transaction-name" type="began-transaction-name" /> </xs:complexType> </xs:element> @@ -4500,7 +4517,9 @@ under the License. ============================== --> - <xs:attribute name="level"> + + + <xs:simpleType name="levelType"> <xs:annotation> <xs:documentation> The logging level to use. @@ -4508,21 +4527,20 @@ under the License. Defaults to "info". Required. Attribute type: constant. - </xs:documentation> + </xs:documentation> </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="info" /> - <xs:enumeration value="verbose" /> - <xs:enumeration value="timing" /> - <xs:enumeration value="important" /> - <xs:enumeration value="warning" /> - <xs:enumeration value="error" /> - <xs:enumeration value="fatal" /> - <xs:enumeration value="always" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> + <xs:restriction base="xs:token"> + <xs:enumeration value="info" /> + <xs:enumeration value="verbose" /> + <xs:enumeration value="timing" /> + <xs:enumeration value="important" /> + <xs:enumeration value="warning" /> + <xs:enumeration value="error" /> + <xs:enumeration value="fatal" /> + <xs:enumeration value="always" /> + </xs:restriction> + </xs:simpleType> + <xs:element name="log" substitutionGroup="OtherOperations"> <xs:annotation> @@ -4531,7 +4549,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="level" use="required"/> + <xs:attribute name="level" type="levelType" use="required"/> <xs:attribute name="message" type="xs:string" use="required"> <xs:annotation> <xs:documentation> @@ -4552,7 +4570,7 @@ under the License. </xs:annotation> <xs:complexType> <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:attribute ref="level" use="required"/> + <xs:attribute name="level" type="levelType" use="required"/> </xs:complexType> </xs:element> @@ -4574,7 +4592,7 @@ under the License. <xs:element ref="calcop" /> <xs:element ref="number" /> </xs:choice> - <xs:attribute ref="field" /> + <xs:attribute name="field" type="fieldType" /> <xs:attribute name="rounding-mode"> <xs:annotation> <xs:documentation> @@ -4811,16 +4829,19 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="make-in-string"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="process"/> - </xs:sequence> - <xs:attributeGroup ref="attlist.simple-map-processor"/> + <xs:complexContent> + <xs:extension base="attlist.simple-map-processor"> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="make-in-string"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="process"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.simple-map-processor"> + <xs:complexType name="attlist.simple-map-processor"> <xs:attribute type="xs:string" name="name" use="required"/> - </xs:attributeGroup> + </xs:complexType> <!-- Make In String & Operations --> <xs:element name="make-in-string"> <xs:annotation> @@ -4832,17 +4853,20 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="in-field"/> - <xs:element ref="property"/> - <xs:element ref="constant"/> - </xs:choice> - <xs:attributeGroup ref="attlist.make-in-string"/> + <xs:complexContent> + <xs:extension base="attlist.make-in-string"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="in-field"/> + <xs:element ref="property"/> + <xs:element ref="constant"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.make-in-string"> + <xs:complexType name="attlist.make-in-string"> <xs:attribute type="xs:string" name="field" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="in-field"> <xs:annotation> <xs:documentation> @@ -4850,12 +4874,15 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.in-field"/> + <xs:complexContent> + <xs:extension base="attlist.in-field"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.in-field"> + <xs:complexType name="attlist.in-field"> <xs:attribute type="xs:string" name="field" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="property"> <xs:annotation> <xs:documentation> @@ -4864,10 +4891,13 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.property"/> + <xs:complexContent> + <xs:extension base="attlist.property"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.property"> + <xs:complexType name="attlist.property"> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -4882,7 +4912,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> <xs:element name="constant" type="xs:string"> <xs:annotation> <xs:documentation> @@ -4912,42 +4942,48 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="validate-method"/> - <xs:element ref="compare"/> - <xs:element ref="compare-field"/> - <xs:element ref="regexp"/> - <xs:element ref="not-empty"/> - <xs:element ref="copy"/> - <xs:element ref="convert"/> - </xs:choice> - <xs:attributeGroup ref="attlist.process"/> + <xs:complexContent> + <xs:extension base="attlist.process"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="validate-method"/> + <xs:element ref="compare"/> + <xs:element ref="compare-field"/> + <xs:element ref="regexp"/> + <xs:element ref="not-empty"/> + <xs:element ref="copy"/> + <xs:element ref="convert"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.process"> + <xs:complexType name="attlist.process"> <xs:attribute type="xs:string" name="field" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="validate-method"> <xs:annotation> <xs:documentation> The validate-method tag is used to call any static method that accepts a String and returns a boolean. If the field coming in is not a String it will be converted to a String before calling the method. The two attributes for this tag are class and method which should contain the fully qualified class name and the method name, respectively. - If the class name is not specified it will default to org.ofbiz.base.util.UtilValidate. + If the class name is not specified it will default to org.apache.ofbiz.base.util.UtilValidate. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.validate-method"/> + <xs:complexContent> + <xs:extension base="attlist.validate-method"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.validate-method"> + <xs:complexType name="attlist.validate-method"> <xs:attribute type="xs:string" name="method" use="required"/> - <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/> - </xs:attributeGroup> + <xs:attribute type="xs:string" name="class" default="org.apache.ofbiz.base.util.UtilValidate"/> + </xs:complexType> <xs:element name="compare"> <xs:annotation> <xs:documentation> @@ -4957,31 +4993,31 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.compare"/> - <xs:attributeGroup ref="attlist.operatorRequired"/> - <xs:attributeGroup ref="attlist.typeDefaultString"/> + <xs:complexContent> + <xs:extension base="attlist.operatorRequired"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + <xs:attribute type="xs:string" name="value" use="required"> + <xs:annotation> + <xs:documentation> + Literal or flexible string using ${} syntax. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format based on the type of the object (date,number, etc.). + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attributeGroup ref="attlist.typeDefaultString"/> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.compare"> - <xs:attribute type="xs:string" name="value" use="required"> - <xs:annotation> - <xs:documentation> - Literal or flexible string using ${} syntax. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format based on the type of the object (date,number, etc.). - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> <xs:element name="compare-field"> <xs:annotation> <xs:documentation> @@ -4989,25 +5025,25 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.compare-field"/> - <xs:attributeGroup ref="attlist.operatorRequired"/> - <xs:attributeGroup ref="attlist.typeDefaultString"/> + <xs:complexContent> + <xs:extension base="attlist.operatorRequired"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + <xs:attribute type="xs:string" name="field" use="required"/> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format based on the type of the object (date,number, etc.). + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attributeGroup ref="attlist.typeDefaultString"/> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.compare-field"> - <xs:attribute type="xs:string" name="field" use="required"/> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format based on the type of the object (date,number, etc.). - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> <xs:element name="regexp"> <xs:annotation> <xs:documentation> @@ -5016,16 +5052,19 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.regexp"/> + <xs:complexContent> + <xs:extension base="attlist.regexp"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.regexp"> + <xs:complexType name="attlist.regexp"> <xs:attribute type="xs:string" name="expr" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="not-empty"> <xs:annotation> <xs:documentation> @@ -5049,10 +5088,13 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.copy"/> + <xs:complexContent> + <xs:extension base="attlist.copy"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.copy"> + <xs:complexType name="attlist.copy"> <xs:attribute type="xs:string" name="to-field"> <xs:annotation> <xs:documentation> @@ -5089,7 +5131,7 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> <xs:element name="convert"> <xs:annotation> <xs:documentation> @@ -5099,14 +5141,17 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.convert"/> + <xs:complexContent> + <xs:extension base="attlist.convert"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.convert"> + <xs:complexType name="attlist.convert"> <xs:attribute type="xs:string" name="to-field"> <xs:annotation> <xs:documentation> @@ -5167,5 +5212,5 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> </xs:schema> Modified: ofbiz/site/dtds/site-conf.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/site-conf.xsd (original) +++ ofbiz/site/dtds/site-conf.xsd Fri Nov 4 11:00:12 2016 @@ -470,6 +470,14 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> + <xs:attribute name="transaction-timeout" type="xs:int" default="0"> + <xs:annotation> + <xs:documentation> + Defines the timeout for the transaction, in seconds. + Defaults to the value set in the TransactionFactory being used (typically 60 seconds). + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:attributeGroup> <xs:element name="response"> <xs:annotation> Modified: ofbiz/site/dtds/widget-common.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-common.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/widget-common.xsd (original) +++ ofbiz/site/dtds/widget-common.xsd Fri Nov 4 11:00:12 2016 @@ -149,7 +149,7 @@ under the License. <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:attribute type="xs:string" name="class" default="org.apache.ofbiz.base.util.UtilValidate" /> </xs:complexType> </xs:element> <xs:element name="if-compare" substitutionGroup="AllConditionals"> Modified: ofbiz/site/dtds/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/widget-form.xsd (original) +++ ofbiz/site/dtds/widget-form.xsd Fri Nov 4 11:00:12 2016 @@ -737,7 +737,12 @@ under the License. </xs:attribute> <xs:attribute type="xs:string" name="title"> <xs:annotation> - <xs:documentation>The name of this field that will be shown to the user; can use the ${} and foo.bar (dot) syntax to insert values from the context for parameterization or internationalization.</xs:documentation> + <xs:documentation> + The name of this field that will be shown to the user. + It can use the ${} and foo.bar (dot) syntax to insert values from the context for parameterization or internationalization. + + Be sure a "FormFieldTitle_" labels does not already exist, else it will be overriden. + </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="header-link"> @@ -1114,7 +1119,10 @@ under the License. </xs:element> <xs:element name="display-entity" substitutionGroup="AllFields"> <xs:annotation> - <xs:documentation>This is just like display but looks up a description using the Entity Engine; note that if also-hidden is true then it uses the key as the value, not the shown description.</xs:documentation> + <xs:documentation> + This is just like display but looks up a description using the Entity Engine; + note that if also-hidden is true then it uses the key as the value, not the shown description. + </xs:documentation> </xs:annotation> <xs:complexType> <xs:sequence> @@ -1125,7 +1133,10 @@ under the License. <xs:attribute type="xs:string" name="description" default="${description}" /> <xs:attribute type="xs:integer" name="size"> <xs:annotation> - <xs:documentation>Specifies the size of the field (as a number of characters), when the text to display exceed the given size it is truncated and add the complete text as a hint</xs:documentation> + <xs:documentation> + Specifies the size of the field (as a number of characters), + when the text to display exceed the given size it is truncated and add the complete text as a hint + </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute name="cache" default="true"> Modified: ofbiz/site/dtds/widget-screen.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=1768008&r1=1768007&r2=1768008&view=diff ============================================================================== --- ofbiz/site/dtds/widget-screen.xsd (original) +++ ofbiz/site/dtds/widget-screen.xsd Fri Nov 4 11:00:12 2016 @@ -573,6 +573,7 @@ under the License. <xs:element minOccurs="0" ref="xml" /> <xs:element minOccurs="0" ref="text" /> <xs:element minOccurs="0" ref="csv" /> + <xs:element minOccurs="0" ref="xls" /> </xs:sequence> </xs:complexType> </xs:element> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |