Author: lektran
Date: Tue Jul 28 14:00:26 2009 New Revision: 798528 URL: http://svn.apache.org/viewvc?rev=798528&view=rev Log: Update the website xsds Modified: ofbiz/site/dtds/entitymodel.xsd ofbiz/site/dtds/services.xsd ofbiz/site/dtds/simple-methods.xsd ofbiz/site/dtds/site-conf.xsd ofbiz/site/dtds/test-suite.xsd ofbiz/site/dtds/widget-form.xsd ofbiz/site/dtds/widget-menu.xsd ofbiz/site/dtds/widget-screen.xsd Modified: ofbiz/site/dtds/entitymodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/entitymodel.xsd (original) +++ ofbiz/site/dtds/entitymodel.xsd Tue Jul 28 14:00:26 2009 @@ -60,12 +60,12 @@ </xs:element> <!-- see the children of entitymodel section for description, etc. --> <xs:attributeGroup name="attlist.entity"> - <xs:attribute type="xs:string" name="entity-name" use="required"/> - <xs:attribute type="xs:string" name="table-name"/> - <xs:attribute type="xs:string" name="package-name" use="required"/> - <xs:attribute type="xs:string" name="default-resource-name"/> - <xs:attribute type="xs:string" name="dependent-on"/> - <xs:attribute type="xs:string" name="sequence-bank-size"/> + <xs:attribute name="entity-name" type="xs:string" use="required"/> + <xs:attribute name="table-name" type="xs:string"/> + <xs:attribute name="package-name" type="xs:string" use="required"/> + <xs:attribute name="default-resource-name" type="xs:string"/> + <xs:attribute name="dependent-on" type="xs:string"/> + <xs:attribute name="sequence-bank-size" type="xs:string"/> <xs:attribute name="enable-lock" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -98,10 +98,10 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="title"/> - <xs:attribute type="xs:string" name="copyright"/> - <xs:attribute type="xs:string" name="author"/> - <xs:attribute type="xs:string" name="version"/> + <xs:attribute name="title" type="xs:string"/> + <xs:attribute name="copyright" type="xs:string"/> + <xs:attribute name="author" type="xs:string"/> + <xs:attribute name="version" type="xs:string"/> </xs:attributeGroup> <xs:element name="prim-key"> <xs:complexType> @@ -109,7 +109,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.prim-key"> - <xs:attribute type="xs:string" name="field" use="required"/> + <xs:attribute name="field" type="xs:string" use="required"/> </xs:attributeGroup> <!-- ==================== field ===================== --> <xs:element name="field"> @@ -122,9 +122,9 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="col-name"/> - <xs:attribute type="xs:string" name="type" use="required"/> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="col-name" type="xs:string"/> + <xs:attribute name="type" type="xs:string" use="required"/> <xs:attribute name="encrypt" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -171,7 +171,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.validate"> - <xs:attribute type="xs:string" name="name" use="required"/> + <xs:attribute name="name" type="xs:string" use="required"/> </xs:attributeGroup> <!-- ==================== relation ====================== --> <!-- specifies whether or not the relation is a dependent one; ie if the related entity can exist without the main entity --> @@ -194,9 +194,9 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="title"/> - <xs:attribute type="xs:string" name="rel-entity-name" use="required"/> - <xs:attribute type="xs:string" name="fk-name"/> + <xs:attribute name="title" type="xs:string"/> + <xs:attribute name="rel-entity-name" type="xs:string" use="required"/> + <xs:attribute name="fk-name" type="xs:string"/> </xs:attributeGroup> <xs:element name="key-map"> <xs:complexType> @@ -204,8 +204,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.key-map"> - <xs:attribute type="xs:string" name="field-name" use="required"/> - <xs:attribute type="xs:string" name="rel-field-name"/> + <xs:attribute name="field-name" type="xs:string" use="required"/> + <xs:attribute name="rel-field-name" type="xs:string"/> </xs:attributeGroup> <!-- ==================== index ===================== --> <xs:element name="index"> @@ -218,7 +218,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.index"> - <xs:attribute type="xs:string" name="name" use="required"/> + <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="unique" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -234,8 +234,9 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.index-field"> - <xs:attribute type="xs:string" name="name" use="required"/> + <xs:attribute name="name" type="xs:string" use="required"/> </xs:attributeGroup> + <!-- ================== view-entity ===================== --> <xs:element name="view-entity"> <xs:complexType> @@ -246,16 +247,17 @@ <xs:element minOccurs="0" maxOccurs="unbounded" ref="alias"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="view-link"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="relation"/> + <xs:element minOccurs="0" ref="entity-condition"/> </xs:sequence> <xs:attributeGroup ref="attlist.view-entity"/> </xs:complexType> </xs:element> <!-- see the children of entitymodel section for description, etc. --> <xs:attributeGroup name="attlist.view-entity"> - <xs:attribute type="xs:string" name="entity-name" use="required"/> - <xs:attribute type="xs:string" name="package-name" use="required"/> - <xs:attribute type="xs:string" name="dependent-on"/> - <xs:attribute type="xs:string" name="default-resource-name"/> + <xs:attribute name="entity-name" type="xs:string" use="required"/> + <xs:attribute name="package-name" type="xs:string" use="required"/> + <xs:attribute name="dependent-on" type="xs:string"/> + <xs:attribute name="default-resource-name" type="xs:string"/> <xs:attribute name="never-cache" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -272,10 +274,10 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="title"/> - <xs:attribute type="xs:string" name="copyright"/> - <xs:attribute type="xs:string" name="author"/> - <xs:attribute type="xs:string" name="version"/> + <xs:attribute name="title" type="xs:string"/> + <xs:attribute name="copyright" type="xs:string"/> + <xs:attribute name="author" type="xs:string"/> + <xs:attribute name="version" type="xs:string"/> </xs:attributeGroup> <xs:element name="member-entity"> <xs:complexType> @@ -286,8 +288,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.member-entity"> - <xs:attribute type="xs:string" name="entity-alias" use="required"/> - <xs:attribute type="xs:string" name="entity-name" use="required"/> + <xs:attribute name="entity-alias" type="xs:string" use="required"/> + <xs:attribute name="entity-name" type="xs:string" use="required"/> </xs:attributeGroup> <xs:element name="alias-all"> <xs:complexType> @@ -299,8 +301,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.alias-all"> - <xs:attribute type="xs:string" name="entity-alias" use="required"/> - <xs:attribute type="xs:string" name="prefix"/> + <xs:attribute name="entity-alias" type="xs:string" use="required"/> + <xs:attribute name="prefix" type="xs:string"/> <xs:attribute name="group-by" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -330,7 +332,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.exclude"> - <xs:attribute type="xs:string" name="field" use="required"/> + <xs:attribute name="field" type="xs:string" use="required"/> </xs:attributeGroup> <xs:element name="alias"> <xs:complexType> @@ -342,11 +344,11 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.alias"> - <xs:attribute type="xs:string" name="entity-alias"/> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="field"/> - <xs:attribute type="xs:string" name="col-alias"/> - <xs:attribute type="xs:string" name="prim-key"/> + <xs:attribute name="entity-alias" type="xs:string"/> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="field" type="xs:string"/> + <xs:attribute name="col-alias" type="xs:string"/> + <xs:attribute name="prim-key" type="xs:string"/> <xs:attribute name="group-by" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -393,7 +395,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.complex-alias"> - <xs:attribute type="xs:string" name="operator" use="required"/> + <xs:attribute name="operator" type="xs:string" use="required"/> </xs:attributeGroup> <xs:element name="complex-alias-field"> <xs:complexType> @@ -401,9 +403,9 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.complex-alias-field"> - <xs:attribute type="xs:string" name="entity-alias" use="required"/> - <xs:attribute type="xs:string" name="field" use="required"/> - <xs:attribute type="xs:string" name="default-value"/> + <xs:attribute name="entity-alias" type="xs:string" use="required"/> + <xs:attribute name="field" type="xs:string" use="required"/> + <xs:attribute name="default-value" type="xs:string"/> <xs:attribute name="function"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -424,13 +426,14 @@ <xs:sequence> <xs:element minOccurs="0" ref="description"/> <xs:element maxOccurs="unbounded" ref="key-map"/> + <xs:element minOccurs="0" ref="entity-condition"/> </xs:sequence> <xs:attributeGroup ref="attlist.view-link"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.view-link"> - <xs:attribute type="xs:string" name="entity-alias" use="required"/> - <xs:attribute type="xs:string" name="rel-entity-alias" use="required"/> + <xs:attribute name="entity-alias" type="xs:string" use="required"/> + <xs:attribute name="rel-entity-alias" type="xs:string" use="required"/> <xs:attribute name="rel-optional" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -440,7 +443,124 @@ </xs:simpleType> </xs:attribute> </xs:attributeGroup> + <xs:element name="entity-condition"> + <xs:complexType> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="condition-expr"/> + <xs:element ref="condition-list"/> + </xs:choice> + <xs:element minOccurs="0" ref="having-condition-list"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by"/> + </xs:sequence> + <xs:attributeGroup ref="attlist.entity-condition"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.entity-condition"> + <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> + <!-- TODO: variation on filter-by-date to easily compare from/thru date to date in another field, ie: alias.from_date <= rel_alias.date_field and (alias.thru_date > rel_alias.date_field or alias.thru_date is null) --> + <xs:attribute name="distinct" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="condition-expr"> + <xs:complexType> + <xs:attributeGroup ref="attlist.condition-expr"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.condition-expr"> + <xs:attribute name="entity-alias" type="xs:string"/> + <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"/> + <!-- TODO: add not-in, or handle not in more general way --> + <xs:enumeration value="between"/> + <xs:enumeration value="like"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="rel-entity-alias" type="xs:string"/> + <xs:attribute name="rel-field-name" type="xs:string"/> + <xs:attribute name="value" type="xs:string"/> + <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:attributeGroup> + <xs:element name="condition-list"> + <xs:complexType> + <xs:choice maxOccurs="unbounded"> + <xs:element ref="condition-expr"/> + <xs:element ref="condition-list"/> + </xs:choice> + <xs:attributeGroup ref="attlist.condition-list"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.condition-list"> + <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:attributeGroup> + <xs:element name="having-condition-list"> + <xs:complexType> + <xs:choice maxOccurs="unbounded"> + <xs:element ref="condition-expr"/> + <xs:element ref="condition-list"/> + </xs:choice> + <xs:attributeGroup ref="attlist.having-condition-list"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.having-condition-list"> + <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:attributeGroup> + <xs:element name="order-by"> + <xs:complexType> + <xs:attributeGroup ref="attlist.order-by"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.order-by"> + <xs:attribute name="field-name" type="xs:string" use="required"/> + </xs:attributeGroup> + + <!-- ================== extend-entity ===================== --> <xs:element name="extend-entity"> <xs:complexType> <xs:sequence> @@ -452,6 +572,6 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.extend-entity"> - <xs:attribute type="xs:string" name="entity-name" use="required"/> + <xs:attribute name="entity-name" type="xs:string" use="required"/> </xs:attributeGroup> </xs:schema> Modified: ofbiz/site/dtds/services.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/services.xsd (original) +++ ofbiz/site/dtds/services.xsd Tue Jul 28 14:00:26 2009 @@ -86,6 +86,12 @@ </xs:attribute> <xs:attribute name="default-entity-name" type="xs:string"/> <xs:attribute name="use-transaction" default="true"> + <xs:annotation> + <xs:documentation> + If set to true and there is no transaction already in place the Service Engine will begin one. + If set to false or there is a transaction already in place the Service Engine will do nothing (this also means that if set to false and a transaction is already in place it will do nothing). + </xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> @@ -94,6 +100,13 @@ </xs:simpleType> </xs:attribute> <xs:attribute name="require-new-transaction" default="false"> + <xs:annotation> + <xs:documentation> + If set to true and there is a transaction already in place the Service Engine will suspend that transaction, begin a new one just for this service, commit or rollback the local transaction when the service is complete, and will resume the original transaction. + If set to true and there is no transaction already in place it will just begin a transaction and manage it as would be done for a normal user-transaction=true. + If use-transaction=false this setting is ignored. + </xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> @@ -101,7 +114,16 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="transaction-timeout" type="xs:int" default="0"/> + <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). + This value is only used if this service begins a transaction (either require-new-transaction=true, or use-transaction=true and there is no other transaction already in place). + If use-transaction=false this setting is ignored. + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute name="max-retry" type="xs:int" default="-1"/> <xs:attribute name="debug" default="false"> <xs:simpleType> Modified: ofbiz/site/dtds/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/simple-methods.xsd (original) +++ ofbiz/site/dtds/simple-methods.xsd Tue Jul 28 14:00:26 2009 @@ -578,8 +578,9 @@ <xs:attribute type="xs:string" name="transaction-timeout"> <xs:annotation> <xs:documentation> - Defines the time out for the transaction, in milliseconds. - None by defaults. + Defines the timeout for the transaction, in seconds. + Defaults to the value set in the service definition which in turn defaults to the setting + in the TransactionFactory being used (typically 60 seconds). </xs:documentation> </xs:annotation> </xs:attribute> @@ -1358,7 +1359,7 @@ <xs:attribute name="type"> <xs:annotation> <xs:documentation> - Type to convert to. + Type to convert to. NewList will create a new List, NewMap will create a new Map. </xs:documentation> </xs:annotation> <xs:simpleType> @@ -1376,6 +1377,8 @@ <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> Modified: ofbiz/site/dtds/site-conf.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/site-conf.xsd (original) +++ ofbiz/site/dtds/site-conf.xsd Tue Jul 28 14:00:26 2009 @@ -245,8 +245,20 @@ <xs:restriction base="xs:token"> <xs:enumeration value="none"/> <xs:enumeration value="view"/> - <xs:enumeration value="view-last"><xs:annotation><xs:documentation>Will use the view from the last request unless there is a saved from some previous request (using the save-last-view attribute).</xs:documentation></xs:annotation></xs:enumeration> - <xs:enumeration value="view-home"><xs:annotation><xs:documentation>Will use the view from the last saved 'home' position (using the save-home-view attribute).</xs:documentation></xs:annotation></xs:enumeration> + <xs:enumeration value="view-last"> + <xs:annotation> + <xs:documentation>Will use the view from the last request unless there + is a saved from some previous request (using the save-last-view + attribute). Use the value attribute to specify a default view + in case no previous view can be retrieved.</xs:documentation> + </xs:annotation> + </xs:enumeration> + <xs:enumeration value="view-home"> + <xs:annotation> + <xs:documentation>Will use the view from the last saved 'home' position + (using the save-home-view attribute).</xs:documentation> + </xs:annotation> + </xs:enumeration> <xs:enumeration value="request"/> <xs:enumeration value="request-redirect"/> <xs:enumeration value="request-redirect-noparam"/> @@ -256,7 +268,10 @@ </xs:attribute> <xs:attribute name="value" type="xs:string"/> <xs:attribute name="save-last-view" default="false"> - <xs:annotation><xs:documentation>Saves the last (previous) request's view for future use, generally with the view-last type of response.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation>Saves the last (previous) request's view for future use, generally + with the view-last type of response.</xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> @@ -265,7 +280,10 @@ </xs:simpleType> </xs:attribute> <xs:attribute name="save-current-view" default="false"> - <xs:annotation><xs:documentation>Saves the current request's view for future use, generally with the view-last type of response.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation>Saves the current request's view for future use, generally with + the view-last type of response.</xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> @@ -274,7 +292,10 @@ </xs:simpleType> </xs:attribute> <xs:attribute name="save-home-view" default="false"> - <xs:annotation><xs:documentation>Saves the current request's view for future use, generally with the view-home type of response.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation>Saves the current request's view for future use, generally with + the view-home type of response.</xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> @@ -284,7 +305,11 @@ </xs:attribute> </xs:attributeGroup> <xs:element name="redirect-parameter"> - <xs:annotation><xs:documentation>Adds a parameter with the given name to the redirect. Finds value in a request attribute if exists, or a request parameter if no attribute is found.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation>Adds a parameter with the given name to the redirect. Finds value in a + request attribute if exists, or a request parameter if no attribute is + found.</xs:documentation> + </xs:annotation> <xs:complexType> <xs:attributeGroup ref="attlist.redirect-parameter"/> </xs:complexType> @@ -292,7 +317,10 @@ <xs:attributeGroup name="attlist.redirect-parameter"> <xs:attribute type="xs:string" name="name" use="required"/> <xs:attribute type="xs:string" name="from" use="optional"> - <xs:annotation><xs:documentation>If specified used instead of the value of name for the key to find a request attribute or parameter.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation>If specified used instead of the value of name for the key to find + a request attribute or parameter.</xs:documentation> + </xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="view-map"> Modified: ofbiz/site/dtds/test-suite.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/test-suite.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/test-suite.xsd (original) +++ ofbiz/site/dtds/test-suite.xsd Tue Jul 28 14:00:26 2009 @@ -77,7 +77,12 @@ </xs:element> <xs:attributeGroup name="attlist.junit-test-suite"> <xs:attribute type="xs:string" name="class-name" use="required"> - <xs:annotation><xs:documentation>Should extend the junit.framework.TestCase class.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation> + At minimum should extend the junit.framework.TestCase class. If you want to use a GenericDelegator or + LocalDispatcher you should extend the OFBizTestCase class and use the ones provided by it. + </xs:documentation> + </xs:annotation> </xs:attribute> </xs:attributeGroup> Modified: ofbiz/site/dtds/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/widget-form.xsd (original) +++ ofbiz/site/dtds/widget-form.xsd Tue Jul 28 14:00:26 2009 @@ -455,7 +455,11 @@ </xs:simpleType> </xs:attribute> <xs:attribute name="use-when" type="xs:string"> - <xs:annotation><xs:documentation>Used to specify a condition that must be true to use this field; the condition should be written using the Java syntax and can operate on values in the form context; if this is used the field will only be put on the field list, and not in the field map meaning that values for this field cannot be overridden.</xs:documentation></xs:annotation> + <xs:annotation><xs:documentation> + Used to specify a condition that must be true to use this field; the condition should be written using the + Java syntax and can operate on values in the form context; conditional fields are evaluated in reverse + order so the last field defined that evaluates to true is the one that is rendered. + </xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="encode-output" default="true"> <xs:annotation><xs:documentation> @@ -658,6 +662,9 @@ <xs:enumeration value="date"> <xs:annotation><xs:documentation>Display only the date part of a timestamp field</xs:documentation></xs:annotation> </xs:enumeration> + <xs:enumeration value="date-time"> + <xs:annotation><xs:documentation>Display only the date and hours:minutes part of a timestamp field</xs:documentation></xs:annotation> + </xs:enumeration> </xs:restriction> </xs:simpleType> </xs:attribute> @@ -1528,6 +1535,8 @@ <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> Modified: ofbiz/site/dtds/widget-menu.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-menu.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/widget-menu.xsd (original) +++ ofbiz/site/dtds/widget-menu.xsd Tue Jul 28 14:00:26 2009 @@ -210,6 +210,16 @@ </xs:restriction> </xs:simpleType> </xs:attribute> + <xs:attribute name="request-confirmation" default="false"> + <xs:annotation><xs:documentation>If true then the user is presented with a dialog box requesting confirmation prior to proceeding</xs:documentation></xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="confirmation-message" type="xs:string"><xs:annotation><xs:documentation>The message displayed when request-confirm is set to true</xs:documentation></xs:annotation></xs:attribute> </xs:attributeGroup> <xs:element name="parameter"> <xs:complexType> @@ -310,6 +320,8 @@ <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> Modified: ofbiz/site/dtds/widget-screen.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=798528&r1=798527&r2=798528&view=diff ============================================================================== --- ofbiz/site/dtds/widget-screen.xsd (original) +++ ofbiz/site/dtds/widget-screen.xsd Tue Jul 28 14:00:26 2009 @@ -343,6 +343,8 @@ <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> |
Free forum by Nabble | Edit this page |